diff --git a/Manifest.files.gz b/Manifest.files.gz
index 14a58c8d5c7c..640132bab3fb 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a989b67751c6..7c3ba7b176b9 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/logrotate/files/gcc-fnocommon.patch b/app-admin/logrotate/files/gcc-fnocommon.patch
deleted file mode 100644
index d490c20ce0a9..000000000000
--- a/app-admin/logrotate/files/gcc-fnocommon.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 908e86191bf062711ea44c922e66d27203e90214 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
-Date: Wed, 8 Jan 2020 10:54:53 +0100
-Subject: [PATCH] split declaration and definition of queue variable
-
-Support compilation with -fno-common flag, which is the default for GCC 10.
-
-Fixes: #288
-Closes #289
----
- config.c    | 2 ++
- logrotate.h | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/config.c b/config.c
-index 0e9a828..f027c7e 100644
---- a/config.c
-+++ b/config.c
-@@ -28,6 +28,8 @@
- #include "log.h"
- #include "logrotate.h"
- 
-+struct logInfoHead logs;
-+
- #if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
- #define GLOB_ABORTED GLOB_ABEND
- #endif
-diff --git a/logrotate.h b/logrotate.h
-index 1c178da..6c1c2e7 100644
---- a/logrotate.h
-+++ b/logrotate.h
-@@ -89,7 +89,8 @@ struct logInfo {
-     TAILQ_ENTRY(logInfo) list;
- };
- 
--TAILQ_HEAD(logInfoHead, logInfo) logs;
-+TAILQ_HEAD(logInfoHead, logInfo);
-+extern struct logInfoHead logs;
- 
- extern int numLogs;
- extern int debug;
diff --git a/app-admin/rasdaemon/files/ras-mc-ctl.openrc b/app-admin/rasdaemon/files/ras-mc-ctl.openrc
deleted file mode 100644
index c428d78e64da..000000000000
--- a/app-admin/rasdaemon/files/ras-mc-ctl.openrc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for rasdaemon"
-
-command="/usr/sbin/${SVCNAME}"
-command_args="--register-labels"
-pidfile=/run/${SVCNAME}.pid
-command_background=true
diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc b/app-admin/rasdaemon/files/rasdaemon.openrc
deleted file mode 100644
index 08fc09e64165..000000000000
--- a/app-admin/rasdaemon/files/rasdaemon.openrc
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service"
-
-command="/usr/sbin/${SVCNAME}"
-command_args="--foreground --record"
-pidfile=/run/${SVCNAME}.pid
-command_background=true
-
-start_post() {
-  "${command}" --enable
-}
-
-stop_post() {
-  "${command}" --disable
-}
diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc-r1 b/app-admin/rasdaemon/files/rasdaemon.openrc-r1
deleted file mode 100644
index 6532826add50..000000000000
--- a/app-admin/rasdaemon/files/rasdaemon.openrc-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts Reliablity, Availability and Serviceability (RAS) service"
-
-depend() {
-	need localmount
-	use logger
-}
-
-command="/usr/sbin/rasdaemon"
-command_args="--foreground --record"
-command_background=true
-pidfile=/run/${RC_SVCNAME}.pid
-
-
-start_post() {
-	"${command}" --enable >/dev/null 2>&1
-}
-
-stop_post() {
-	"${command}" --disable >/dev/null 2>&1
-}
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 035f7371f7ff..23e9d47ddc55 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -476,6 +476,8 @@ DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b1863
 DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip 25634 BLAKE2B a236740e22b6dcadaf27ea0f90a68c15bed68599ef6cb086acfb1c555a8c0210663f165f3bc64bd9cfc20f3b8a9f1c5828a4a658699d3bda97104f759aef78b4 SHA512 a5ffd5713ddc3d9bd49ee9cbb0a8f5154bcf0eb073c9a772c24a6e11e824b2deee18425347f84b267192c52f3559086573e966fdd8e73e84fcee03c1971e1b7f
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.zip 109027 BLAKE2B cdf1ed976d193fcfe3a3e632354605c4ee3caf5313525ebb04f12199036f6a2ed748a3c90c1c1847884670f47d61d94b3704de6e4d591a29b6b28b99c0158e75 SHA512 a3e7d0eedd2b18ca5580819c4983b700f242accfb08293898ef74e8f3ebde28a35a90c9927f90d2103aafbfa7274da3a91d274da6ec0e8cfdb1f8b994a5fd79e
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip 118447 BLAKE2B 35bf2178c21f6b65693863db7160f4e2392b3525ca9d51db07c64eb026e736cc346009cf8b9b9a0415386c7792833ffe3715ce9658a2e0bdcff8162b7ace7829 SHA512 d01f415ee9e59e1e9b9d8d55a4f79b508aa871ea1106686defab608b6f2c76223e0b85bf7aef3b098b12cf66de89be5767180789691c1abe17680defedf408f4
 DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod 33 BLAKE2B 86b48a32cb6fc28be9a4bff7a4bb26476927a721756fbbdbed15c5616fe1a24c923012bb0e7096461a98f3a502cdb0b6629ad7fe271a19a603076647b0509c1e SHA512 57b4b2e6362f8ae9ea2f6051a0759ede6e9ef235b150e612e6851604e6d64878df76b986caa743113ff3c849ba812b072a3f82b9e2f31a06bb07380daf3f109b
 DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod 111 BLAKE2B cc5feebcb8909656facde261e7ce1b4d57be6af1021845409567aa6748d9b53f69a101d7fce3031a8b579266d28c8edbabc6193939c99968387e6ad1ef8827e9 SHA512 11ccbd759b2a4a93296b0904b0059bb8327a7dfc79b603dc01d218fb7beef19e2bc55fc7a7290de833c138a0c254a3289ae58364d2d9441b7a25f480704bec63
 DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod 111 BLAKE2B bea53bdd22d5d5fc097a7fb5ea923b1fe0e5fc18abef971c00f917fa0340295d95f9439a2b4787ccced87c49061e8555619e316c3c32a738e880d9d6fbfef4d6 SHA512 debde42d51813c72b30425ca7bc3073fdd430c84951f1c757732f50b6c99e551b702d55edc03ad36526899f9e69d7e8cab6d9fd059bd11ac16c05a1b2a716912
@@ -1066,3 +1068,4 @@ DIST terraform-0.13.3.tar.gz 12801673 BLAKE2B 2e966dc17195acf500690a60cb98e66435
 DIST terraform-0.13.4.tar.gz 12800024 BLAKE2B af158e318c335d750e4fdefa4ce18e150202aeadf26f389ef27dd83669946957799e9e3f38e6cba0bc48ab96721109fb408b01493e733159c15a57ba6a767e96 SHA512 e02cb2a9967a923b918e64acd2ffa6f8a8a03676e5207d238a6cf215f4e5cb0e1db3ac9760792187757a8f18d9d23cbfd44c1ce5d6d5bacf70786ef473824dc3
 DIST terraform-0.13.5.tar.gz 12802967 BLAKE2B a70c3209a17e75c8c5f68deacade8e7b1b85c68d1d978933ab1fa32d6b64b2298f9ea5fe11fdc040ba40c7b73480d6da4020b58602e9a5f963ef0dd287540ed7 SHA512 d8af93023275b5aa50ef0dbb66fcc834593ad598300a1c38bfcf2b9bd43bc84eab81a5e63bef29701b2a078019e4b7223cae2a846ef7680a6105b5f90790b41c
 DIST terraform-0.14.4.tar.gz 2804977 BLAKE2B 28a2f1acb4f1f11d81bebd2b120c0fc7230ace921aa9feb382a5338d248697e1d7a9f6721932cd2803dac387b844c8fade793cd1645c8837bb90013141c139a3 SHA512 b39d081e03a9a2272ba979ae236049d1b5825110e0cae35961de42464e98d531a8be8b4c1fae150c10d148583cada30ff820f8a09cd71e2ea7bae43e8367f2c4
+DIST terraform-0.14.5.tar.gz 2807756 BLAKE2B 0edc56fb36a3aa560c7fe7031fedc2591cc12cd6f0dd874b5cdfb68b5be97a56f6b2c3f315bead51ff40270a8609a024e60ff80c5880432c22d17411a555b34f SHA512 f18744d32006c2ecf0217d1710c2134d7aa2c2eacbbc2cfa445e786611250d14508b13fef763a1c4820f357481eebc21649cef8f8c7d3774ff62680d2fc7f2d5
diff --git a/app-admin/terraform/terraform-0.14.5.ebuild b/app-admin/terraform/terraform-0.14.5.ebuild
new file mode 100644
index 000000000000..cd3ef080dbc7
--- /dev/null
+++ b/app-admin/terraform/terraform-0.14.5.ebuild
@@ -0,0 +1,982 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"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"
+	"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"
+	"cloud.google.com/go v0.65.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"
+	"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 v45.0.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v11.1.2+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.3"
+	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/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.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/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/autorest/validation v0.3.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.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/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.2"
+	"github.com/agext/levenshtein v1.2.2/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/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.1.0"
+	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-textseg/v12 v12.0.0"
+	"github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
+	"github.com/apparentlymart/go-versions v1.0.1"
+	"github.com/apparentlymart/go-versions v1.0.1/go.mod"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.9"
+	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"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.0"
+	"github.com/coreos/bbolt v1.3.0/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/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/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"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-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.1/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/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-20160516000752-02826c3e7903/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"
+	"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"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.1.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4"
+	"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-20160524151835-7d79101e329e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1"
+	"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/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0"
+	"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/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.0"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.12.0"
+	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.5.0"
+	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-getter v1.5.1"
+	"github.com/hashicorp/go-getter v1.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.4"
+	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-plugin v1.3.0"
+	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.2"
+	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-slug v0.4.1"
+	"github.com/hashicorp/go-slug v0.4.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+	"github.com/hashicorp/go-tfe v0.8.1"
+	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0"
+	"github.com/hashicorp/go-version v1.2.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/hcl v0.0.0-20170504190234-a4b07c25de5f"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.8.2"
+	"github.com/hashicorp/hcl/v2 v2.8.2/go.mod"
+	"github.com/hashicorp/memberlist v0.1.0"
+	"github.com/hashicorp/memberlist v0.1.0/go.mod"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.9"
+	"github.com/imdario/mergo v0.3.9/go.mod"
+	"github.com/jhump/protoreflect v1.6.0"
+	"github.com/jhump/protoreflect v1.6.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"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/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.8.0"
+	"github.com/lib/pq v1.8.0/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+	"github.com/likexian/gokit v0.20.15"
+	"github.com/likexian/gokit v0.20.15/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.5"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.4"
+	"github.com/mattn/go-shellwords v1.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.8"
+	"github.com/miekg/dns v1.0.8/go.mod"
+	"github.com/mitchellh/cli v1.1.0"
+	"github.com/mitchellh/cli v1.1.0/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.1"
+	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mozillazg/go-httpheader v0.2.1"
+	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.8.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/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/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.1"
+	"github.com/posener/complete v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.2.0"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/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/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
+	"github.com/tombuildsstuff/giovanni v0.12.0"
+	"github.com/tombuildsstuff/giovanni v0.12.0/go.mod"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
+	"github.com/ulikunitz/xz v0.5.8"
+	"github.com/ulikunitz/xz v0.5.8/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod"
+	"github.com/vmihailenco/tagparser v0.1.1"
+	"github.com/vmihailenco/tagparser v0.1.1/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/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"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.1.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.7.1"
+	"github.com/zclconf/go-cty v1.7.1/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.2"
+	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0"
+	"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.3.2"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.9.1"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/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-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/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"
+	"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"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/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-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-20190812203447-cdfb69ac37fc/go.mod"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/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"
+	"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-20201021035429-f5854403a974"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/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/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-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/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/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-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/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-20191128015809-6d18c012aee9"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/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-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+	"golang.org/x/text v0.3.2"
+	"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-20161028155119-f51c12702a4d/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/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-20191203134012-c197fd4bf371"
+	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/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-20200904185747-39188db58858"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb"
+	"golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb/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"
+	"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"
+	"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.34.0"
+	"google.golang.org/api v0.34.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5"
+	"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-20170818010345-ee236bd376b0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/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"
+	"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-20200904004341-0bd0a958aa1d"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/grpc v1.8.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/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"
+	"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"
+	"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/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/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.0"
+	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"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"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.1/go.mod"
+	"k8s.io/klog v0.4.0"
+	"k8s.io/klog v0.4.0/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/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"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+="${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build -mod=readonly \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/whowatch/files/whowatch-1.8.4-select.patch b/app-admin/whowatch/files/whowatch-1.8.4-select.patch
deleted file mode 100644
index 0907c70e6750..000000000000
--- a/app-admin/whowatch/files/whowatch-1.8.4-select.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/whowatch.c
-+++ b/src/whowatch.c
-@@ -436,12 +436,12 @@
- 		gettimeofday(&after, 0);
- 		tv.tv_sec -= (after.tv_sec - before.tv_sec);
- 		if(retval > 0) {
--			int key = read_key();
-+			int key = getkey();
- 			key_action(key);
- 		}
- 		if(tv.tv_sec <= 0) {
- 			ticks++;
--			periodic();
-+			main_periodic();
- 			tv.tv_sec = TIMEOUT;
- 		}
- #endif
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 247e755ad2a5..468f49e8d414 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.18.2-krb5-config.patch b/app-crypt/mit-krb5/files/mit-krb5-1.18.2-krb5-config.patch
new file mode 100644
index 000000000000..ec901ce9c31f
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.18.2-krb5-config.patch
@@ -0,0 +1,15 @@
+--- a/build-tools/krb5-config.in
++++ b/build-tools/krb5-config.in
+@@ -208,12 +208,6 @@
+ 
+ 
+ if test -n "$do_libs"; then
+-    # Assumes /usr/lib is the standard library directory everywhere...
+-    if test "$libdir" = /usr/lib; then
+-	libdirarg=
+-    else
+-	libdirarg="-L$libdir"
+-    fi
+     # Ugly gross hack for our build tree
+     lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
+ 	    -e 's/\$(PURE)//' \
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild
new file mode 100644
index 000000000000..7bbe482d448a
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 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 multilib-minimal python-any-r1 systemd toolchain-funcs
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_run.patch"
+	"${FILESDIR}/${PN}-1.18-libressl.patch"
+	"${FILESDIR}/CVE-2020-28196.patch"
+	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath \
+		\
+		AR="$(tc-getAR)"
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.3-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.3-r1.ebuild
new file mode 100644
index 000000000000..b17423863743
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.3-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 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 multilib-minimal python-any-r1 systemd toolchain-funcs
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_run.patch"
+	"${FILESDIR}/${PN}-1.18-libressl.patch"
+	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath \
+		\
+		AR="$(tc-getAR)"
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 419acc16ebb9..2fd84f3307a2 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 4a1d3c68275e..95109b4bd028 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,4 +1,5 @@
 DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
+DIST docker-compose-1.28.0.tar.gz 318112 BLAKE2B 2e721f2aed08f8c63c7c75aa91e6ee28d997763a7d93921e9a62c41b7d48943221aa2135e6ba3925db67b2376f662f81ef71df15180895ea4d5ced1edd0cc493 SHA512 c673f25ff993e7dcaf75512c378339bb7435d96310bf9a47ee3fd3a515967b323ed911b77c030a8e9c1d04b8aca235565a0ca0eaeab401c4ac48110712da405e
 DIST docker-compose-1.28.0_rc1.tar.gz 313984 BLAKE2B 3307aab3ec842d21de73ab282905016f6b0934a2ce9d1dde474ea1e7c5894cea028363c03ec9f597cb3e9b2910e9286b2ffb3070885b20787f28767fec909a73 SHA512 87704f16bd2d6551fed0b3d38264e10cf12604f40a68637ac9dacc3aebe618872f54a890aa6bb1412143055021751bcba1b542d51b252e78b0b8948e2b8cc8fd
 DIST docker-compose-1.28.0_rc2.tar.gz 314331 BLAKE2B c2e169152a6da067e47ca7654b3866fd2b46779bbf35f917008dc71a4c70ede1704bd3f6e5f2231b42d50d6d11ae9df402ed1b01832c26d5d14bdb4db33e7432 SHA512 0320f96b177034c5575797540d38981d591fe22d39ee2e1c338589189333c9eac5e595103bc7295b43b90f697b5a09daffa7f611b395e6bcf81fdce3a391eed6
 DIST docker-compose-1.28.0_rc3.tar.gz 317485 BLAKE2B 5954ebf8224b8701decf7b7c4447592f0a8ce5472e5c9307364c605e2a260ae36c69ceb95b6dc254701650873ea8f443e8767a7ba96bbeec44343b94fb8c5d36 SHA512 0d09d306c38b6c9990f5801fe12c7554694f1a270c13babeb8aecda06c428f4c8d37153439c43fd02fe3ffd59fe4f38ad48d066abfb81fcc1ce8e23e6b353ef3
diff --git a/app-emulation/docker-compose/docker-compose-1.28.0.ebuild b/app-emulation/docker-compose/docker-compose-1.28.0.ebuild
new file mode 100644
index 000000000000..b76ffd2a6855
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.28.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 020b1bcf6d2b..097fec1322a9 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index fd156edc2d38..2c9697a65ce1 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,24 +1,12 @@
-DIST amd64-debug-libreoffice-6.4.7.2_p1.tar.xz 1110421236 BLAKE2B b7aad45577e4a9604d3cef7a8a6d90f50772075ca041aff14bac3d0cd60ef9c42c0dc0fe4bc93dc8f6fe40c8105ff4ca3711eb5d4f54535717f224cf620f3d3a SHA512 c832575c7d32117ba22da36db3bfef17587275e99dfe58be489f97495ec9d3cbaeed0640ba1a8d9621d8d1c95f0aeabeb7a62e2fbd486e3f5ce2737390aacc6f
 DIST amd64-debug-libreoffice-6.4.7.2_p2.tar.xz 1110439052 BLAKE2B 54aa720a740c94d146fe2ae8c5ba11bd4e65efbbd18188bbf6b7aedc88a3d8907a18beb74cf901cc3fcf7b7053816f5c3b7c08c1513ff3e9d3e8130fdf995a28 SHA512 f3392bdfffb47abcca83ddc50b0fb3f3cb5fdbe6f1b70d4dd866cca4586a61def6c21439ea34ae8bf758bb3cfa77ddaffe0f4e9bfac5ee3ccd354bed24e14aef
-DIST amd64-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1137103 BLAKE2B 94bb01a6eb22de43778590729e96f4b60eccb2531a08df9c3cafcdf69222b0a29eb64e79f14306b265532f3d0fa5e7b24bd19b93e9104d3497f5fc381916221f SHA512 8a28e2250bb8f057fff56481e739e0ffd36c1c2cd2f0ed70c018e640b5b5f7e3512bbbeec2fb2d9123e7cee53d02125c36e2bc2de7964ed0a2d94c306306da26
 DIST amd64-debug-libreoffice-gnome-6.4.7.2_p2.xd3 1136937 BLAKE2B 49749de74736b6749ece897dac2f7f1a4ebbb2a3cdce82b27e3eae8ae045dbc9b4849238e8ff8631a0db9f1004cc51a2ee00f34f4df82a118982a45f3474e1c3 SHA512 372e9173f269555102f7e5fc7f2dc6c668ae6d4c18eab9d2e96e6b28db056a9ed12a1e7aca18094ddf54419a26ea1aa8b12b40527c29f4d146b3e4370f9f6606
-DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505924630 BLAKE2B 4b56f6d58a9d6a4f856f5c4b95c8d6036ac16b7c19f8f68ae6f6fa8003937bb37e01541180c0d6bbb8f50b89b943153bf18a99d86bfc4c8e9d37539cf27194b8 SHA512 2f9352b0a2e336992444f513fd1eed5be90ad46077a9e734a2b777d7415edf256eec04ebffd77a178c8ecb0dbbae27ee6a03b93e7e8aa1f05dbbbc6ff4c8e869
 DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 505817824 BLAKE2B a911ebe4fb2f0ab5efc644b41c966cf18d9904bd13cce8fbc8c57e8cf2433a5a43c2b6fd7bbf3cd957c82153518932b5e124d11ca5711ff195a2089ddc8bfc10 SHA512 11138384e355e08fd5bb98fe5a0e4aacbd02cea53b0c416bb78e2406b604f6dbcc839bc5b6318183186a2e04e1597e56dbf2267e0202e9d2dbf54d4f3b523e21
-DIST amd64-debug-libreoffice-java-6.4.7.2_p1.xd3 504793922 BLAKE2B f5b138b430af48e9efb61f7d203c09ab20ab73e035a817d4d8b542fd3fa50dff493954818ae89f572c43312c1ca8bbbd1020d1543892e1253b8243cae9dc2397 SHA512 f2fca65534a03af999e47d6a5d2f79a69a0bad9f577d561fe4ab0638d221a19f5ba8b0370c3f05c410a69d474e709902ad8565aa72b6feed69f09d0f0c6b7016
 DIST amd64-debug-libreoffice-java-6.4.7.2_p2.xd3 504686001 BLAKE2B 7bb5b84f06c91495a1765e00d54ef933aa73e237a3c28f4c87956c34577cdc6e5ca55a19a287a43c21f42b218c41d0c7a5fc0ab698fbfd6163a026ca00af9447 SHA512 008e79263223f430acbf2f3aa29050319de8ef20e5a2d50c424eb644bcf3e3103e0a2fdb2b566d25b4e266e7a70de693b596266c849510c641d6f1bfabed7f79
-DIST amd64-debug-libreoffice-kde-6.4.7.2_p1.xd3 294249182 BLAKE2B 177ebea55369432c3e3b28763d8ab8bce5b9e88cf6c6eeebb4844e8e6f36a1fcef95fe12d8972c19a1f8ecba28ec3c24117fbe007980635b4b6e9caf4ab054f8 SHA512 689023e9b69291f27edd9d1ff3844d56124e519a0d04c843a1222ae0760868b34748dcf310865d004876b91b167c4a1adf0494f6ef6b6be49bec1f691a278f10
 DIST amd64-debug-libreoffice-kde-6.4.7.2_p2.xd3 294278544 BLAKE2B feb74b38abb5d8f11442d5437c50a1e33f31aaa077a29a908e083936afdbc9a8bd42fff035f587391df510c9af4a481b4625783e181a05f66d7f1661ebd2a634 SHA512 ebf44dc2af818b2190dfae1d418b1a3705def0dfdca59cd01957bf2b6687a1d64814d755afbb1215300d49c3efdb16fd37650fcfbf2ab164bbf981e7384f389c
-DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 513057171 BLAKE2B a91c73bd6d4b4883a5ada8ea9198dee1e4c5d2693be36996b73b2c092ebc3b10805e320a14927e323709167392d6e5a0473b7081c6c799665b7939711c86f6ac SHA512 f90350bd5120e64ebf6c42e3aecb0006d302c35f2192cf0fa51a99a77abf7cf6a4f3d562d40598e9ca1839b9c181835640645963795b30a22fbf3071403afdeb
 DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 512988426 BLAKE2B f2558a4d962e991ec18ddcedbb8d25c0720f6cddc02f542695c5623ae1ad8ea76896139749620c96d69bce76ecea1d1ff7985ee3c0907705f332e4a67b3701cf SHA512 84a1d7ebb4460a9615863e0136a3b6d2acac5dbf8d3812633142a1b3092fbc324570dd3e0faf9f3e55e25001d308b0b03bc0217a08f9c1aa90479b6705ec0251
-DIST x86-debug-libreoffice-6.4.7.2_p1.tar.xz 1108972372 BLAKE2B 509f6482e83bdd5539e9f1affab16489ce473168251e73b260bee5be72e12de1fef1f66ec4d2c6f7e72999cf25ec515a47e6050387d3ca474c62440d75630d75 SHA512 cf8aea2a8c8c52d1d42d2a4771ceaeb0641242aa21316b47a02f9c34d4d76f96a3602102bcd8a458e7a0591848a2059a3dd4fcefb34f6cc6fda411225938c535
 DIST x86-debug-libreoffice-6.4.7.2_p2.tar.xz 1108975220 BLAKE2B b5cba545c995462b3281146fc5a86c597157a89696b1cc76c1b249d583223f3e1c9355c8d3452eb59216cbdf2968f73f7e804fcaa675e67d7d310da590c8db1c SHA512 0613735ef4f11cb80cd8589f7d1713c4d6fa7ad8e1dd7a611598e744075afd016b00440a0cb75c107fe20995252a7f01062ddce2060f6825da719e1cb86279a3
-DIST x86-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1133117 BLAKE2B b45195154069fb8216967f0093ea59f6ecf1f872d636f4afcac58f500e2281275b7262176666f88d6599dd9b41072cde083ed6f6b7f939b8c1f3d3167b233f79 SHA512 31eccf49c4ab11fd3ac6ef354802e72122042efdc683ddbd3b48f25fed1ee87c1be9f9d222c1da8ee3066c2ce9b090d91d27ef3af57a84a2f275d7e5d01922ae
 DIST x86-debug-libreoffice-gnome-6.4.7.2_p2.xd3 1134093 BLAKE2B 6d53b91a5c9c37b0bdee0b08f3600403e342ccdd470f508ec374284a0c4e548ad39af554b079619a67a079212ae690098ef4d2c6825733ff57b009db3ac127b5 SHA512 5c2fbc64f88e0e3f6129cf7a3210a16e7edc4483903aee24a73bdfa80896e0a743e217e8566c7352d727f79afe100490d2952cfb3d29345ed716ecaace90d1ee
-DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505451908 BLAKE2B f313c0eabb4ff2fc812db2fc0ed08a85e34c081bf8616c52d231db5a35a30907ecd3d1facf4dfcbbcde84db850d7914476acb8bdadb5398fe6d1800823e21681 SHA512 47f73b23276b7a8f4a6d29cb415d60f9ccb1ac66cc403bec371dd89de659e62e8158665bed69365aa3c4471ff5e28f30db15e6b17f7331c20e929ef6c538480d
 DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 505408886 BLAKE2B ca886fcd42c9f3c2b1e634974e0dcdb18b5001db8cc0015465f6146487d830c4ca5e56d0543cd550a3f19b81eece2cbb9d421716f9203191254335f7724b4df2 SHA512 74c5fa80c9e0716befda497e90405cf85a5aa5ed5d27c129dfd48e65cf123a4d28457e70fa4592a583a0ff2f111ddc6fc6d7481a130f8520d48039b3f267f02d
-DIST x86-debug-libreoffice-java-6.4.7.2_p1.xd3 504312380 BLAKE2B de2fb9ba9dca1b76cb4c92b5a24540598b0e01d6cc94cf2d483190e5acf6dd6024868fcb50085ec55bd4d03a552a07dad886505a0e63678066883c7fcdf852ca SHA512 dce66dd9c5f7f3cd601dc148e838887c90bfb48a599a7051701086a1f1794fb8a5dd4d0eab3ae7ebfe48b7c99c48732a0086e16496174688370afdcf27a49cfa
 DIST x86-debug-libreoffice-java-6.4.7.2_p2.xd3 504269108 BLAKE2B f89d79891225c5c3c87f006cceffef9f8228990f2dcb9777721dc3f8a1f7988b2c0753b10d03a77ff42090aa9471d4034b802309dfdf4958cbb03ab2b162c691 SHA512 55c1eb19f3f7a0fe365f946f1f46d2ec57437bfda514f3111e63eea284c8cd7e1ee33ad047fa776edf6231fc1f39a6369793d09012204a4aa1c1c687a91d87b4
-DIST x86-debug-libreoffice-kde-6.4.7.2_p1.xd3 285518032 BLAKE2B a213129359e4d5912dd514c4d00d879fdd5635f2a6237bba9771f064811a1f48bc3d0be706a3a2237ca7a48df6f1e1aae1cc0b790ac3e5c02310ace18b4fc141 SHA512 93a0475bb64849414fbf72199f6c2cffe2e67dbb64d89d8edec77af881cbdc6eb55d53362052296846619911be4f8d3e2f1d0a1b94e1eda0977d12b68e460d6e
 DIST x86-debug-libreoffice-kde-6.4.7.2_p2.xd3 285508996 BLAKE2B 5779310599eb281247a137f2565067b829b6711beb7823a54973cc35f31b20ef0c64da29e3615426eb548e6033416b0f2189a17a0f4f0f5435520dae5400ba45 SHA512 d2312309477a96e33c6101e33aa68c42389c191a4969cb4f6378138faeb231c1cde941818af81366da87ef544531a412fea6a402c1c7fdbd3d4bcbdcb99d54ac
-DIST x86-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 504334898 BLAKE2B 20ef380020b1688b769f5d01f440cee328ba5b94e4ccd60ec6616e45d409d2e4d966ddf37d9ec1e5093cfde48874f4f866a728efa0c0015252739d4979082c2e SHA512 75498a9104e66b4acf95d765cf1c97ff61dac26c4b64e743b02cae94d4de87e3daa8971b1a069de1ba300af6bf51e2146ed0c2d118dc8cef17810b4cce031e93
 DIST x86-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 504189621 BLAKE2B aca65755c930755d97c64f860160b8c090bb04cbfb48d5a413419a16828b8fb50bc8dd2d42941181f4996733b6c04e351cd6b2017cfb0b0776b0f44baeae3a55 SHA512 e6e5d91fb4e063a0dc432b0d546a0af9a744c33f223c03b583a223e5d118de0729fb717c8b580252ee142560522bdbb5ea970755a79d768da5048d528a25c8b3
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.ebuild
deleted file mode 100644
index 5a22e4b4a277..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.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
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index e3d654b4eef7..c696354f3f00 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,24 +1,12 @@
-DIST amd64-bin-libreoffice-6.4.7.2_p1.tar.xz 132939056 BLAKE2B bf289afca20492f6fe099ad180d33a730e90ccba60c133fa9ddd034d6751b86ef5f68b630ac1e67738d67d94bb79d39946df52cdd49b38fce401d33521926db4 SHA512 5138d6caf05817f658377b938927053fde3b98a8496cca9555202e862dabef75f35cbcd91c6a570611e2b908e150f6f38b3b775b9af9048cbe0ac31d7b912182
 DIST amd64-bin-libreoffice-6.4.7.2_p2.tar.xz 132899212 BLAKE2B daab7c709cef0298e445e8c2ebb1690a7df1b6bef2932bf3a1d965d80117bc3f5a1aedb293ec7a7c73b61a81cb6ba9d595fa4698636eba066453461dde83d28c SHA512 50715cefdbf6e949b010d449c831387ffe7f1444cdb6f8dfa890113e034401cf4d19774043604475c9ea6fd840f21ed7299234eec742177d82f2b9a3095dee42
-DIST amd64-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1921163 BLAKE2B 15da9d0e63cc85026ab7a3a9a98dfef7a0971722d2a663d54e6c1f9af069f007b3cbdca8b4730007b70d2ce5b6594732f2672578a3739e5be8f1f37d41fa8d51 SHA512 b0e1039cb094eee47e7e146c60e17f1ae0e2c49400a66741c8f9a4f34c32129028b4387a03881a28fdce6c9e56ca71ce0c28d07972821a22a78901670112bca0
 DIST amd64-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1915838 BLAKE2B 4ac09d0e9cadd34b8bf374b91526763d8059f36faa0e701310df76f01dd471a781e7a4a57eca0458200b55cd73803e44d2fa902bc4cf9ffdc9b7819583f66e61 SHA512 bd6754ba2512f1679ab7a98af007723b5a2bcd64f1813c6a2c2b61c5aef65bee1cfd866016b67a456e4bb2295b3664cdbf73923dea9900aff5b88d5f42baa535
-DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 29288984 BLAKE2B c1379fd0ef1899244a513b1f53bba861d41bfd5eae26518fe6931bd805e9b2a8ac5be79710415b4f539d48e38fd964f198f3401f29c073c14d1af0f57ca8e51e SHA512 69bd379194cbf6c376738408a1979f4822b52d2012d1442c32b4320ce410768e69dcaf323527936aa3a9f183c4a846da95f00d8379dffaff055130d2ede4ba8b
 DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 29294532 BLAKE2B fc9d82a6dc3986dbb6d68f8d17deb5bb2477ca1cabaa3abcb214800e668440f3b80338767329aeeb1c0c0c9f2793e482d6749021798c8123f1a07c7f0bbf0ad8 SHA512 b6852c3e504a4a37f151d50df92c6f545434dd285e6635791516e279d93b51b7dd7bdd65d40157aaf5ea9d1cd8bdf06630fceecd4953626ebcfe42f1f015c835
-DIST amd64-bin-libreoffice-java-6.4.7.2_p1.xd3 29140522 BLAKE2B 957fe72caa6c1f8b156d217b8d66b45275bd44b08769ebbc4d1d2cc9e1d4b3918a4c720bc873b9ba181203496a5fa66defb596b3f1ab1d0a7cef07cfbc1f21f9 SHA512 6bc23b125754e0da7c27101e650adf3a0660088306c2dd70ffa6cb403873e1ae0cfdbe4384913575ee4698be9f52ad77d845c8c11bf7a040f09c409da944d28d
 DIST amd64-bin-libreoffice-java-6.4.7.2_p2.xd3 29174648 BLAKE2B 1349e5db1bde42d695bd12dab39af30b8288f0ac318a662b1bfced9e3b18b67d02bb2d00201b1e8ae40f5f860d02be132e4e27ff686f703c229d1ec3c6de3e41 SHA512 ec281709877764827b9fb481be480b0f1177fbb3a281a6be7fc50a75733cca9d8212d9b2d420ec823605a9e2881a02da8716c482c82d85e7a7d9b43efa3fe469
-DIST amd64-bin-libreoffice-kde-6.4.7.2_p1.xd3 19705370 BLAKE2B 8548d25cda6812f20e2a7f8b9a7e0a87a92de4755f7883edd2291cc7b042f316ab43c0825cdcd6b2ad87cf86f715a5d12a63ca81de57feb383ee51410e71bd9b SHA512 1967b746f68e764e3f2499d4f8b23ecfc3c53cc07ab8b17c40b311dc5211b4624218db257058772bebe2455e9ac2dbc243764e9e142663a5fe6dff944a91aa6a
 DIST amd64-bin-libreoffice-kde-6.4.7.2_p2.xd3 19690260 BLAKE2B 902b28eaf17c8ba8eb2496674c1c03fa7317eb7eb5455c0650752f9f0313a1b18910775844ab26933aa95d00be57e4c01b3c93f8a0d7dac15198e56138ec404d SHA512 356014519693e5ca73761f13720abac5e8ff715cd9939bfc50581892946d073664753c373ef501cf6bd407cbce7d85fc232eeac1af3fe5279f65f10585e07635
-DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 29774822 BLAKE2B ae1ee0dcd887eecd425a723827ee831e143369f4d0b4674d0c88ca8a00b1b976940b1d9d6fa56b11beae80955ffb9c6177a823f2aa187f86c7ecb96729500730 SHA512 c31abcdb7402f602e3b912831ebaa7ba41350399866b0955d5852e7c946efc676be8dcee1614478ff4217ce090a3947ea2cc1fe266bfb5c29f462bc5f264e98b
 DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 29809537 BLAKE2B f975c8bb30067a97eb6fd8b7a13b95e6788c5593c7da7eef870dc52ac1d7c3d7c8d3dfbdb92998f88cd69f4578044ed783477e072f1aa4f91cedcca362c467c4 SHA512 802326419d9bcf88add3dd0712d1feb2c8663a9663c762dc1d08e28cb577e4aa0ac4800ef27b39dd523729df8edc069098a69c25f57b461ba908a4cd2064bba3
-DIST x86-bin-libreoffice-6.4.7.2_p1.tar.xz 134606628 BLAKE2B b6bba84073dc16b473947b7bf2f103f2e66226e172e66f612a396d1b206253229eac4320766f0977e8f531290e8365d7c491a6a4ced066f57ada553549741bce SHA512 dbab1dcbb39909b88d77351314441d096ec59d69c383c9a8bcbb82801477e14f0674932e0215ea1945630f328da8de8875b8e240c7e5c8494e57de233a030f0b
 DIST x86-bin-libreoffice-6.4.7.2_p2.tar.xz 134593448 BLAKE2B 26b57979c917dd379c590891fb630485d1ba51eddc18407fd2287de03fd76403137c61a8e8b4a49a2a34c71638b15918912187eb0e7a682ca4b338467d376a77 SHA512 62364be3d5513247d95c839a90643bff630ddc075b6e1c1cc9fe46f8c98338f93fce55c939913417423c0f559c697f1156e2d4a0448f08501b23f65a354d82df
-DIST x86-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1918270 BLAKE2B 3ac058041b731c79e45920a88c6258408acb6b3fdb664da0cd17d0747a1656b1df61c4ab7929c00755fb2b9f62e2f79789a1d915e5f93806435b96ecde072b26 SHA512 7a9ae3883f3abbdd80a63a52d12fe263540686c1a33203693c2ec1d729677017776f3cb9fc391d0796743bedd8315b203603eaeee4a35948d105f5c2265cd24f
 DIST x86-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1892727 BLAKE2B d1cf2b679a91dd5c1947ec60be83fde839159f5b1e514925b90f47cfc28bf0a902d22c4d57834e9548f8fe6867a1452d4d42d098ac08a8632d341110fa550691 SHA512 d9ef6b5fe1b60fd4085feadb0b7f00ea239d4ce86828db7a3f2d07a89dc1bd879d4d6e2e5277a6b98518dd2c52cc692b1b84b74964ee287a1d9e749e6a47ab8c
-DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 27287304 BLAKE2B 8631b35146ed208577dbb621ddd947e3bded055419c34fc20fde02d942bf5b09ab614849ef8ce3fb8374f2761eeda074af6504c122e7072ce93256b603acb57b SHA512 794ad30ce84e4fb2b57fe4de985cd5dbd035317eac1e3a3951b0012204feb581134e57cccf7d113f9129f0a4891cdd65a5c419c35bce866d29dcc37e84abc87e
 DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 27275582 BLAKE2B 4b91ba882e76747227f780b505ca691d7d5dc2bc2a1d3a8305b43248df595e4c429769bc998724dbbd8d0949951b2fb3d19b00f0c76339ee15182bf5193e95ab SHA512 e62fd9d5e7864ef9d7dd745364768e390e3313cee9ea55f021d5f0a12d935132e526c2134c1733c9564622730645c0e1200da9194521f96f5884a678e09391c0
-DIST x86-bin-libreoffice-java-6.4.7.2_p1.xd3 27166653 BLAKE2B 2773a3776d63c87a4fefabbee8336f759c86b08cce6c035da3da88f18a6a5ee3d64ed56e26fe1fc7321aaacce9f1f2df07005765fbf9a5eabdd33df000aff1f5 SHA512 2042f578bfc5610a7d07e754f6eec56a1fc654f254e4a75295171c8ea032b629994ca07b4fa9c4cb96f440677f3bf59a4816de38d1e3eca7dca81a4543cea84c
 DIST x86-bin-libreoffice-java-6.4.7.2_p2.xd3 27169643 BLAKE2B b84c5e9851ff563e5ecc9cb0368aba008f3f43cda15f81d832c3a5fec97953665fcba6b3d1231a7bb14effd5358cc0a363567d5cdf1d00265a093c18ec9035f2 SHA512 39f4465c340fd6b70717fad48905e38519dfb274fdd97f9b018572814bcd2e903690f5a627e40eb20eff004a55cd3a8157e2943d90685ae872f8c51ddbcb6b05
-DIST x86-bin-libreoffice-kde-6.4.7.2_p1.xd3 17414679 BLAKE2B acb084343f735bf0d0cce5eca48a0c66f36ee59d189ba76e664fb65cac76663a83baf7ec921b1a601e142f2a3f4cf90a7a53479c6459dd766a04dd749a95cda0 SHA512 30b6ad2b27ccd3c2e26e0da6a868fa48e5e5648e235cc056f5186718f688fc937158f01ebd8b3916819dab9339db812e470d1543a2254ef8b57b9a92b25b1a72
 DIST x86-bin-libreoffice-kde-6.4.7.2_p2.xd3 17409833 BLAKE2B 032f5b6ca8262443e2d891dbaa8bbbfd8b7a6a2257a40eafbdd06273fc947cd3a9b96cc10334e3a11086fce7ba3cfc5596e767640d1e5d9258f6bf78ad4266af SHA512 d107cfa5310ee9d139e73cf84bb128d91485caf1b51c62168e29697416649e428e0e55cc55d0347ae8e20f4893907e522515e0f5d4fa350417fe9d181de75a9b
-DIST x86-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 27725217 BLAKE2B 30ef34c9234fda34194e11abac36522a97dde1b62ada1cc67fdd54d03f805ca1c65ad9a97c7484023801d15644a85a652c2f4c30c32c18a715bd3b9dddb263da SHA512 753ec089ed19f65fa2b371f02fb3183d34f9f280d6ecb3c93698f394f4376de89b7111d0a8248379f7ee96ae28cc770b66f3efbba5804403f390131fd29d476d
 DIST x86-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 27721907 BLAKE2B 9ef839325facb31ce7b90f9aae404098d49bf135d9507b1941eb3af2c3f7919783f4bee289549c49041a843d87336bbc8a91cc10a0c72a1d9a48d5dd06ef99e7 SHA512 1965b8b044dbef3f3b02b5fde8fbc2b4fb7890ffb01e337d5471b1886361096fd7a5d06d2955bf6df2a448bd143df4f5263aa203a13d5d92f61e2f3cf4961879
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild
deleted file mode 100644
index 725223d732bf..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="xml"
-
-inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.74.0
-	dev-libs/icu:0/67.1
-	dev-libs/liborcus:0/0.15
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-9.3.0
-	>=sys-libs/glibc-2.32
-	virtual/jpeg-compat:62
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.15
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus[X]
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	!kde? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	dev-db/mariadb-connector-c
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.8 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9c4a8055333f..1d88be64c965 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 7c0401e0f4ea..e16520321862 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1 +1,2 @@
 DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a
+DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346
diff --git a/app-text/xournalpp/xournalpp-1.0.20.ebuild b/app-text/xournalpp/xournalpp-1.0.20.ebuild
new file mode 100644
index 000000000000..8d5be9b04fe0
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.0.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	media-libs/portaudio
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.18-nostrip.patch" # bug 745255
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 7057d336d41d..6ef5cab3894d 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -41,5 +41,5 @@ BDEPEND="
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b5b9c6b52aca..a2cc48f4e596 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/redis/files/redis-6.0.3-sharedlua.patch b/dev-db/redis/files/redis-6.0.3-sharedlua.patch
deleted file mode 100644
index 20df7983d7a8..000000000000
--- a/dev-db/redis/files/redis-6.0.3-sharedlua.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c
-index c26c0d7..fa50c41 100644
---- a/deps/lua/src/lua_cjson.c
-+++ b/deps/lua/src/lua_cjson.c
-@@ -46,7 +46,7 @@
- #include "strbuf.h"
- #include "fpconv.h"
- 
--#include "../../../src/solarisfixes.h"
-+#include "solarisfixes.h"
- 
- #ifndef CJSON_MODNAME
- #define CJSON_MODNAME   "cjson"
-diff --git a/src/Makefile b/src/Makefile
-index b8c05c3..e5a7cc2 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -76,6 +76,7 @@ endif
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
-+FINAL_LIBS+=@LUA_LIBS@
- DEBUG=-g -ggdb
- 
- # Linux ARM needs -latomic at linking time
-@@ -149,7 +150,7 @@ endif
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -217,6 +218,7 @@ endif
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o
-+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -268,7 +270,7 @@ endif
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c75f410b8c42..321e3ba91b06 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 5adbdb1ef2d7..85fdcd7caf02 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,2 +1,4 @@
 DIST go1.14.13.src.tar.gz 22553900 BLAKE2B 35aed1c43a59e06c1d5feaa91a6c4120c586958257cb3e4f83ab4e767159e20ae953d70bc0debabd80722bca0965d1b129531a2bd89f558df0a8700cadc09edc SHA512 b54a0bc3b85809a78d4704fe2e97ad7417a2027608ec0f90c2784e2ddb28b505df3cda862dc6f1b99af2d136363cbb9b120e2fd6ed985cb300c43f8e539a5e28
+DIST go1.14.14.src.tar.gz 22557733 BLAKE2B aa3638c7a20f89e90bf17e9da1b12323cc8c0f52fb0a92ca6a850f7b2c94e406ea50a57fc28cc34b951bf7ecee0a9bb1ce884ad86dfc23241d7b62cd9435f881 SHA512 76213b19eeec66ca6c6b5bdef875bea0b64c3877c70eec64dd65f7869ceb8db016ff19193f01771f8944fd5f0ae3b54c68185e158f2622d1db5552fec1f37976
 DIST go1.15.6.src.tar.gz 23019337 BLAKE2B d328401af9843f4a099dee7d82433ad2a0b349add0f2ecb609635814cca610e17a6fc50215e9928b8cb0d8ea8dd6ae9d84ffca125e1362dfb18ba08783bb4264 SHA512 f20e495204f32170d6554e8f4b64763dae8302a7859005020f650d1d53a5b15de3afbaff28e0b6418287396166c67bdc4c6bee7a0fd7ba8a87bb79b6c1d38326
+DIST go1.15.7.src.tar.gz 23017978 BLAKE2B 15b0827fb56b8e9208c65e8f7f11c7f67820efce1627b4123e937301bb437c597e87adfff9a2eee9aaf53ba0f22eb2f10746bafb7247b4250566f20181b7a2a0 SHA512 7b3e8bcd2fc95baad41f8b5f0456c009e01896d160e65c2670d51c23d8cfcf7a6801e831e6f9a8877fe58c8f54ac8f75bf6e7935b38ba7aaa51dc8e46cf76ddb
diff --git a/dev-lang/go/go-1.14.14.ebuild b/dev-lang/go/go-1.14.14.ebuild
new file mode 100644
index 000000000000..461f57dcd52f
--- /dev/null
+++ b/dev-lang/go/go-1.14.14.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install()
+{
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	einfo "due to the static linking nature of go."
+	einfo "If this is not done, the packages compiled with the older"
+	einfo "version of the compiler will not be updated until they are"
+	einfo "updated individually, which could mean they will have"
+	einfo "vulnerabilities."
+	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	einfo "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/go/go-1.15.7.ebuild b/dev-lang/go/go-1.15.7.ebuild
new file mode 100644
index 000000000000..461f57dcd52f
--- /dev/null
+++ b/dev-lang/go/go-1.15.7.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install()
+{
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	einfo "due to the static linking nature of go."
+	einfo "If this is not done, the packages compiled with the older"
+	einfo "version of the compiler will not be updated until they are"
+	einfo "updated individually, which could mean they will have"
+	einfo "vulnerabilities."
+	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	einfo "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/python/python-2.7.18-r6.ebuild b/dev-lang/python/python-2.7.18-r6.ebuild
index 4b884090348a..3ffc8e249f95 100644
--- a/dev-lang/python/python-2.7.18-r6.ebuild
+++ b/dev-lang/python/python-2.7.18-r6.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-libs/Manifest.gz b/dev-libs/Manifest.gz
index 492bb53b4c33..810dfd9a5e7a 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 4838621448ee..7051b66f002a 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,3 +1 @@
-DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
-DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
diff --git a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
deleted file mode 100644
index a1af526c5f82..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-67.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
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
deleted file mode 100644
index 62b585924f49..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-68.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
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 4838621448ee..7051b66f002a 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,3 +1 @@
-DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
-DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
diff --git a/dev-libs/icu/icu-67.1.ebuild b/dev-libs/icu/icu-67.1.ebuild
deleted file mode 100644
index 82238a8b671b..000000000000
--- a/dev-libs/icu/icu-67.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://site.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild
deleted file mode 100644
index eb3e9df49f3e..000000000000
--- a/dev-libs/icu/icu-68.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://site.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild
index 6439664874b0..0dda6fc59ce2 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 136a50b10fea..14676a58327c 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -2,3 +2,4 @@ DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad
 DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
 DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113
 DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
+DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
similarity index 98%
rename from dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild
rename to dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
index 0c2cba44761d..ca365bb03da9 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -169,7 +169,9 @@ src_configure() {
 
 	}
 
-	lua_foreach_impl run_in_build_dir lua_configure
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
 
 	php_configure() {
 		local myconf=(
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.692.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.740.ebuild
similarity index 98%
rename from dev-perl/Lab-Measurement/Lab-Measurement-3.692.ebuild
rename to dev-perl/Lab-Measurement/Lab-Measurement-3.740.ebuild
index 4bf9cc43266b..e3f434a03ec7 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.692.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.740.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index 906b7d518284..f2c96dc09dd0 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,2 +1,2 @@
-DIST Lab-Measurement-3.692.tar.gz 609567 BLAKE2B 0e73254415927cf4a6454aa33ffe5408d23b2f7ab0773fe35b12096879bbd618eb856cb99b8611d61a72926d55d4c8a2ef1aecc354b6246fa0ee27f08bff6b3f SHA512 9a94a47af43e479f28aa7c8243cd2e79f27df9f7a809fffaba58c42031aa858a7f7daa26f3f0b7d648eaa721d8163d1d840150089bba4bfa0f3cfd9a9b2338d4
 DIST Lab-Measurement-3.721.tar.gz 615005 BLAKE2B 90982b7d5cbb1b62c3bd2444645649e39704d44e519e6484dabb3702fbdfccf82ea5af1c6ba31b5f75eca4a779eaac4d83cb6fe92232ae4bdde4618d7e5477a4 SHA512 4d5e493339c7d50f96dae999d1f2c2fe59e9e970862f4ac8747a4e9e89aad72e1c72801bffddcf9f1e7a434f9eb6b23a21f563cd1612fdb2b986af9ea118e731
+DIST Lab-Measurement-3.740.tar.gz 630593 BLAKE2B d3b7bb07e9a99f993a900fc8bcf391c69999f052535dc505259dd212374a3a2fc681d187a0c3119be915dfaf698901defc9686b38f1b0c11772182bf5f64bd2e SHA512 b036821a3af73d2278dbfd0e08efb5f5eb1f07a71203ba0a85208bdbab7142e0182f9bae6045233bbbb3d992d6598cc5c3401ef7c2e694ddbd3f3a6884271b70
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 0b82a8f963c5..0ce199500930 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 14a84f006e2c..6f01dad0b0e4 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index eb018948dc41..d7a64d8c8cfb 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,3 +1,5 @@
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.3.tgz 220204 BLAKE2B 2a712dc8f69a8a80f6f8c306883df580fdff4a0d4cb0ac06cc004f8622b30b8e2f5d373276381fd3ad67657a80cc929be81745f200a98b6ed5e475de5639dfc5 SHA512 e955e3246db9a9172081dd9a077154139c585bfce546e91839052bbab4d0db9d0695122574a66891ceba5c0b7e8a8f0768274e1516521ccb95cd19504dc13666
+DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
+DIST pecl_http-4.0.0.tgz 218259 BLAKE2B c9f5973686fd4db95a24dd4c50f217b93becc6a439066a395b0b7fec6e977154e5ae8f2261414458aed8e4a9d1281f44da2ecc67a05127610579f5be91196a88 SHA512 268b569c23f10ed72fe3c84fc5e5bf526c3e5ac345ca0556a24fbd01ce95da468d4e9aac6300d058001534ab826836793bf901e9560b744f1e20d7059be2ec79
 DIST pecl_http-4.0.0beta1.tgz 219277 BLAKE2B 184ea0a92fc514f24fd31aaec7824ba80293a52d168d11b3b3a9cea410df1bc9a6a819c45f301b357a3d19246e3c36b56f238c264579509eadf00fb42ae32d91 SHA512 d3e487d10e18e8af1a750d171e4432dd30562e1fb8d8ae7cbb33a379e3d385d27a6ce1896ed8f727802eae1045505254cb68840395098310e22f6dc640c5c616
diff --git a/dev-php/pecl-http/pecl-http-3.2.4.ebuild b/dev-php/pecl-http/pecl-http-3.2.4.ebuild
new file mode 100644
index 000000000000..f4816f1ac8c3
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.2.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_INI_NAME="50-http"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-3 php7-4"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="7"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+COMMON_DEPEND="app-arch/brotli:=
+	dev-libs/libevent
+	dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
+	net-dns/libidn2
+	sys-libs/zlib
+	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+	!ssl? ( net-misc/curl[-ssl] )
+"
+DEPEND="
+	php_targets_php7-3? ( ${COMMON_DEPEND} dev-lang/php:7.3[hash,session,iconv] )
+	php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session,iconv] )"
+RDEPEND="${DEPEND}
+	php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
+
+src_prepare() {
+	if use php_targets_php7-3 || use php_targets_php7-4 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-3 || use php_targets_php7-4 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
+
+src_test() {
+	# Cannot use eclass function due to required modules
+	# All tests SKIP otherwise
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Link in required modules for testing
+		ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
+		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+		sed -i \
+			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
+			Makefile || die
+		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
+		# Clean up testing links
+		rm modules/propro.so modules/raphf.so || die
+	done
+}
diff --git a/dev-php/pecl-http/pecl-http-4.0.0.ebuild b/dev-php/pecl-http/pecl-http-4.0.0.ebuild
new file mode 100644
index 000000000000..a65db6f26344
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-4.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_INI_NAME="50-http"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php8-0"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="8"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+COMMON_DEPEND="app-arch/brotli:=
+	dev-libs/libevent
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?]
+	net-dns/libidn2
+	sys-libs/zlib
+	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+	!ssl? ( net-misc/curl[-ssl] )
+"
+DEPEND="
+	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session,iconv] )"
+RDEPEND="${DEPEND}
+	php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] )
+	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
+
+src_prepare() {
+	if use php_targets_php8-0 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php8-0 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
+
+src_test() {
+	# Cannot use eclass function due to required modules
+	# All tests SKIP otherwise
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Link in required modules for testing
+		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+		sed -i \
+			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \
+			Makefile || die
+		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
+		# Clean up testing links
+		rm modules/raphf.so || die
+	done
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ea7d68f61ab5..6d9107dd104f 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyICU/Manifest b/dev-python/PyICU/Manifest
index 132d253f8629..a364e5a1c082 100644
--- a/dev-python/PyICU/Manifest
+++ b/dev-python/PyICU/Manifest
@@ -1,2 +1 @@
-DIST PyICU-2.5.tar.gz 225591 BLAKE2B 0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151 SHA512 b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
 DIST PyICU-2.6.tar.gz 233826 BLAKE2B 318b87b878f8d49f47f48780567751671f5f88902c4cae9a243a81300b002ca6ea2336aee38bfc76a3037326f15f197fd71819173b678c68094d16f8db51864e SHA512 ab4c167cbeb80a23904476e51a3c16aa4721e26840b1d4c2f44b5a610e5467a6880c45f27636efb9e44e8e4302a095d437f4868409103270d79ecd56a3d90c9c
diff --git a/dev-python/PyICU/PyICU-2.5.ebuild b/dev-python/PyICU/PyICU-2.5.ebuild
deleted file mode 100644
index 9a4833b145dd..000000000000
--- a/dev-python/PyICU/PyICU-2.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
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyQt5/PyQt5-5.15.2.ebuild b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
index 0950b911b826..6aa88dd74cdd 100644
--- a/dev-python/PyQt5/PyQt5-5.15.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
similarity index 94%
rename from dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
rename to dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
index 677f0b8d9890..22de5978719b 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
 	"${FILESDIR}/ros_packages.patch"
 	"${FILESDIR}/infinite_loop4.patch"
+	"${FILESDIR}/summary_single_line.patch"
 )
 
 python_test() {
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 677f0b8d9890..22de5978719b 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
 	"${FILESDIR}/ros_packages.patch"
 	"${FILESDIR}/infinite_loop4.patch"
+	"${FILESDIR}/summary_single_line.patch"
 )
 
 python_test() {
diff --git a/dev-python/catkin_pkg/files/summary_single_line.patch b/dev-python/catkin_pkg/files/summary_single_line.patch
new file mode 100644
index 000000000000..d24c284da9ea
--- /dev/null
+++ b/dev-python/catkin_pkg/files/summary_single_line.patch
@@ -0,0 +1,19 @@
+setuptools will disallow newlines in descriptions, so do not generate them
+see e.g. https://bugs.gentoo.org/765868
+
+Index: catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
+===================================================================
+--- catkin_pkg-0.4.23.orig/src/catkin_pkg/python_setup.py
++++ catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
+@@ -99,9 +99,9 @@ def generate_distutils_setup(package_xml
+         data['url'] = package.urls[0].url
+ 
+     if len(package.description) <= 200:
+-        data['description'] = package.description
++        data['description'] = package.description.replace('\n', ' ')
+     else:
+-        data['description'] = package.description[:197] + '...'
++        data['description'] = package.description[:197].replace('\n', ' ') + '...'
+         data['long_description'] = package.description
+ 
+     data['license'] = ', '.join(package.licenses)
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 2bf8e7d068aa..a9697a5e7faf 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,4 +1,4 @@
 DIST gevent-20.12.0.tar.gz 5898634 BLAKE2B a73129c7d393aedcd84b6e62c890c3b306722876a1ea4c96485096ce2ea7d1db5f03c77ea77a2c35ef41c7a96183246316c577735bcf4b25fb41095282c64d38 SHA512 76c75128ba2b33e47bd85ef2788387aa6d47d230ef9aeac4bceee03e8a2555dd204c321de7d1779fe4f44503e4fca5dce3b43c1922238da994faed0d78e5c4c1
 DIST gevent-20.12.1.tar.gz 5908977 BLAKE2B fd3536de1ca518e889868537cfb856d022ec2be8f5f658cddb06b9797841333a475d2c4d7eb3f97ecd715a19999804e724f8126b189087582452a88076bf5d12 SHA512 63bf8d63ed0eeed63b5ae6b58a2a0a36bb4a606d7d76f51cb59d5b76aa639296264a01455699cfb6abee53c958368c17f4c6bfca1543d04f9d750637b113046b
 DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
-DIST gevent-21.1.1.tar.gz 5928822 BLAKE2B dac05942b228a9e29da459c078e2c182f59a7ed8352c14d7efdb63ded8a0c7d25b1d91468c6a3e75e5fdfe8b101fa5be43db61bba6b24b00a6a20778b56b34d2 SHA512 668f30f62a923e53f11ba272f96adc2289f6af82424a800a9c83dda6d093e993b28857fad3bfc07de1002bcd3f62b5670f486bbaab900d443ebc01a4a03c3fce
+DIST gevent-21.1.2.tar.gz 5943652 BLAKE2B ef85e9941a8e46370437a34728c012f9d8976b5680b22bf9b13ab35d7417019ac0e85fac5cfc8632972e38a2f70028a00ba3fe9f8be11aa2ff64e364052da594 SHA512 1ee2b748a97fa40f67ad2c3b83c6b9f48dbfaae9f2b4f1c118919cfd642c1ca27de0e33a00d950f003f90131354b56a4868ce3051864dbe2ea9b7f22eeafc1eb
diff --git a/dev-python/gevent/gevent-21.1.1.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
similarity index 100%
rename from dev-python/gevent/gevent-21.1.1.ebuild
rename to dev-python/gevent/gevent-21.1.2.ebuild
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index f3681458fa11..e5765ca7382c 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1 +1,2 @@
 DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
+DIST humanfriendly-9.1.tar.gz 359616 BLAKE2B c67ca9498ff4a0dac237c8f1c81ae88882a7ab162e2cfd663cd50a066dbcfe045424bdf4dcc1df473f5fc41f0c1b8c0f2aca9883aa21915281618ba332c579a3 SHA512 859a9ff01abe0671a23a63e73c9c09c0f92151e96ec38dd5695c75f99fa436e186835cb8a16f59b82d5216b9c427ea0abd419b470b067f8032fe984776f02a8f
diff --git a/dev-python/humanfriendly/humanfriendly-9.1.ebuild b/dev-python/humanfriendly/humanfriendly-9.1.ebuild
new file mode 100644
index 000000000000..9ba2dcee001c
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-9.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.org/project/humanfriendly/
+	https://github.com/xolox/python-humanfriendly/
+	https://humanfriendly.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coloredlogs[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_test() {
+	pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/humanfriendly/metadata.xml b/dev-python/humanfriendly/metadata.xml
index 963d1abe79b3..16360517e2a3 100644
--- a/dev-python/humanfriendly/metadata.xml
+++ b/dev-python/humanfriendly/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">humanfriendly</remote-id>
 		<remote-id type="github">xolox/python-humanfriendly</remote-id>
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
index d6c42806e7cd..567fb54e50bd 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/ipy/Manifest
@@ -1 +1,2 @@
 DIST IPy-1.00.tar.gz 35324 BLAKE2B a0e04201a59c61e5cc8f7ce2837c83dded99d0d786406e2e341183a0903d43ed5496ae8ea05d1bee019007bfef7420be623ab3dc08cce33812f1720a59ca413d SHA512 94a8f26cad0d966fdf8d4e57284eadf4cfde88515af6f5aafc8f9597eb0758324b876039d1a121021ba1ac26be2e2ffa89a3f5803dddefdee03fdb5d65b07a81
+DIST IPy-1.01.tar.gz 33641 BLAKE2B 10d5ac5c3df00a562393ee762e9ad0f458ecf4745f894ab23e686b7112842adcbb3f25064c0010630745273fa72280ba5ef92a951d687d0f46f341acd6c041ad SHA512 f0983254523025a1819d543877d9651fb6a9e39dabd3b043488495f681b02e43b544a0121658a0430a418a1c39b360a59db1699af87a75a16a2bdc29fcb2b74c
diff --git a/dev-python/ipy/ipy-1.01.ebuild b/dev-python/ipy/ipy-1.01.ebuild
new file mode 100644
index 000000000000..a8260ce8a9d2
--- /dev/null
+++ b/dev-python/ipy/ipy-1.01.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="IPy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
+HOMEPAGE="https://github.com/autocracy/python-ipy/wiki https://pypi.org/project/IPy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+python_test() {
+	# 1 test fail under pypy, persistent from 0.82a, not a regression.
+	cp -r test_doc.py README.rst test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"${PYTHON}" test/test_IPy.py || die "Tests fail with ${EPYTHON}"
+	"${PYTHON}" test_doc.py || die "Doctests fail with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipy/metadata.xml b/dev-python/ipy/metadata.xml
index 4ec74958c566..27b69f8f156b 100644
--- a/dev-python/ipy/metadata.xml
+++ b/dev-python/ipy/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">IPy</remote-id>
     <remote-id type="github">autocracy/python-ipy</remote-id>
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index c6a1a3d7e888..0617a4b6f93f 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1 +1,2 @@
 DIST iso8601-0.1.12.tar.gz 8868 BLAKE2B 5463af17cfaf2c1f256790ec11dc50f808857abdf0a341f2c88033e9e94f09069ed570223c3743007e0fff8fdd9a714bce0ef3e88a961c2bb131b79e88a1424f SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613
+DIST iso8601-0.1.13.tar.gz 12205 BLAKE2B 21dbc1f4212ec76bba2105e15eaeaac1a3bbac9f296e91e813efcb0811e75e45c4dcb5500bb29446e401c88035a602746ebe9394abc65b4d9637a12a2bf96a00 SHA512 0a16e2699ba3f33cec57acdd2be70c64d0e2655f08d30581f56997992945b700e6bfb14164f1f422e073eefeaefab4377a56ec6b3800156347e1568172c32737
diff --git a/dev-python/iso8601/iso8601-0.1.13.ebuild b/dev-python/iso8601/iso8601-0.1.13.ebuild
new file mode 100644
index 000000000000..530faf4427d4
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.13.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://pypi.org/project/iso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/iso8601/metadata.xml b/dev-python/iso8601/metadata.xml
index 7320caf6f361..8e99ce2c78df 100644
--- a/dev-python/iso8601/metadata.xml
+++ b/dev-python/iso8601/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">iso8601</remote-id>
+		<remote-id type="github">micktwomey/pyiso8601</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 78896f1cf487..3826a56adb87 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,2 +1,2 @@
 DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
-DIST pyyaml-5.4.gh.tar.gz 173140 BLAKE2B 2ff298cce44442b8431197b9222c2fba18d4f0aaf600fe636174864096f49f1392c3e965155b36c94ad0cf659402ffbd660cea5719b509bf90e9f316c1893248 SHA512 a76f9cf1838380b2e509bf1d5251f175cca1b413aadc511517de5fb3b4743747918f94abc1cf1976171731a1ba67596def3cb0652d08e1e3af3235cf7c0a610f
+DIST pyyaml-5.4.1.gh.tar.gz 173319 BLAKE2B b81cdec32588a419840dd536a2d8addb41eec3e20897f6c464a00a5badb4d6eed9b34b4f95146695187e7d9bcf2d03b81e884290c6dc47927be6192dfdb21eab SHA512 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997
diff --git a/dev-python/pyyaml/pyyaml-5.4.ebuild b/dev-python/pyyaml/pyyaml-5.4.1.ebuild
similarity index 100%
rename from dev-python/pyyaml/pyyaml-5.4.ebuild
rename to dev-python/pyyaml/pyyaml-5.4.1.ebuild
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
new file mode 100644
index 000000000000..79e9099de5d4
--- /dev/null
+++ b/dev-python/smartypants/Manifest
@@ -0,0 +1 @@
+DIST smartypants-2.0.1.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
diff --git a/dev-python/smartypants/metadata.xml b/dev-python/smartypants/metadata.xml
new file mode 100644
index 000000000000..21caf30ef387
--- /dev/null
+++ b/dev-python/smartypants/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>nerdboy@gentoo.org</email>
+	<name>Steve Arnold</name>
+</maintainer>
+<longdescription lang="en">
+	smartypants is a Python fork of SmartyPants (wha?)
+</longdescription>
+<upstream>
+	<remote-id type="pypi">smartypants</remote-id>
+	<remote-id type="github">leohemsted/smartypants.py</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/smartypants/smartypants-2.0.1.ebuild b/dev-python/smartypants/smartypants-2.0.1.ebuild
new file mode 100644
index 000000000000..0624ab1574f9
--- /dev/null
+++ b/dev-python/smartypants/smartypants-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_PN="${PN}.py"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1
+
+DESCRIPTION="ASCII quote-dot-dash to HTML entity converter"
+HOMEPAGE="https://pypi.python.org/pypi/smartypants/"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/leohemsted/smartypants.py.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+distutils_enable_sphinx docs
diff --git a/dev-python/smartypants/smartypants-9999.ebuild b/dev-python/smartypants/smartypants-9999.ebuild
new file mode 100644
index 000000000000..0624ab1574f9
--- /dev/null
+++ b/dev-python/smartypants/smartypants-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_PN="${PN}.py"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1
+
+DESCRIPTION="ASCII quote-dot-dash to HTML entity converter"
+HOMEPAGE="https://pypi.python.org/pypi/smartypants/"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/leohemsted/smartypants.py.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+distutils_enable_sphinx docs
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index b99906dae1f2..89fde39d9ba5 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.0.3.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.3.ebuild
new file mode 100644
index 000000000000..370c1f7cd0cd
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-python/ament_package
+	dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.3.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.3.ebuild
new file mode 100644
index 000000000000..6ac3919b8389
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.3.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.3.ebuild
new file mode 100644
index 000000000000..6713c25e3394
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.3.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.3.ebuild
new file mode 100644
index 000000000000..5c7886431d21
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.3.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.3.ebuild
new file mode 100644
index 000000000000..45106f08c2c2
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.3.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.3.ebuild
new file mode 100644
index 000000000000..d4c3c7ec2f73
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.3.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.3.ebuild
new file mode 100644
index 000000000000..a448d65732b8
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.3.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.3.ebuild
new file mode 100644
index 000000000000..ad4a03f26007
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export targets to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
index 56fccc8713e1..037e37d7dda7 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -1,2 +1,3 @@
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.3.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.3.ebuild
new file mode 100644
index 000000000000..aaa2ff2d8833
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add Google mock-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.3.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.3.ebuild
new file mode 100644
index 000000000000..19e8b3f3f026
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.3.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.3.ebuild
new file mode 100644
index 000000000000..5c7886431d21
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.3.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.3.ebuild
new file mode 100644
index 000000000000..54072eb71aef
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
index 56fccc8713e1..037e37d7dda7 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -1,2 +1,3 @@
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.3.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.3.ebuild
new file mode 100644
index 000000000000..cefdc0d87e32
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to run Python tests using pytest in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.3.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.3.ebuild
new file mode 100644
index 000000000000..7f0a525558f8
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.3.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.3.ebuild
new file mode 100644
index 000000000000..034cb6e5b257
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_include_directories
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.3.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.3.ebuild
new file mode 100644
index 000000000000..0649041487a2
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_python
+	${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_foreach_impl cmake_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake_src_install
+	python_foreach_impl python_optimize
+}
diff --git a/dev-ros/ament_cmake_version/Manifest b/dev-ros/ament_cmake_version/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.3.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.3.ebuild
new file mode 100644
index 000000000000..f177169cb5a4
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index e5ec34665571..371049e29aa3 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.3.10.tar.gz 191615 BLAKE2B 6d0247859099bda3c0edde109681364490654dbffb167a4aa252d7c1406dc8b77da6055d22b46b9fd0df10e3f8617b15544632ce1012d9a302c06a5732a217e6 SHA512 79a2bbc5cd9f837b9262d6a1a397b6bb5f2bf926959c44b05b6e2815862f0b32f430396cdf0f8960c9e5780fdfff3815285c037f82ca9b654c16c772fb732e66
 DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
 DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
 DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
diff --git a/dev-ros/audio_capture/audio_capture-0.3.10.ebuild b/dev-ros/audio_capture/audio_capture-0.3.10.ebuild
new file mode 100644
index 000000000000..a8a93e01d50c
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.3.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:1.0
+"
+DEPEND="${RDEPEND}
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+RDEPEND="${RDEPEND}
+	media-plugins/gst-plugins-lame:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-base:1.0
+"
+BDEPEND="
+	virtual/pkgconfig"
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index e5ec34665571..371049e29aa3 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.3.10.tar.gz 191615 BLAKE2B 6d0247859099bda3c0edde109681364490654dbffb167a4aa252d7c1406dc8b77da6055d22b46b9fd0df10e3f8617b15544632ce1012d9a302c06a5732a217e6 SHA512 79a2bbc5cd9f837b9262d6a1a397b6bb5f2bf926959c44b05b6e2815862f0b32f430396cdf0f8960c9e5780fdfff3815285c037f82ca9b654c16c772fb732e66
 DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
 DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
 DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.10.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.10.ebuild
new file mode 100644
index 000000000000..7be554e1915f
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for transmitting audio via ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index e5ec34665571..371049e29aa3 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.3.10.tar.gz 191615 BLAKE2B 6d0247859099bda3c0edde109681364490654dbffb167a4aa252d7c1406dc8b77da6055d22b46b9fd0df10e3f8617b15544632ce1012d9a302c06a5732a217e6 SHA512 79a2bbc5cd9f837b9262d6a1a397b6bb5f2bf926959c44b05b6e2815862f0b32f430396cdf0f8960c9e5780fdfff3815285c037f82ca9b654c16c772fb732e66
 DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
 DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
 DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
diff --git a/dev-ros/audio_play/audio_play-0.3.10.ebuild b/dev-ros/audio_play/audio_play-0.3.10.ebuild
new file mode 100644
index 000000000000..31fe9ddef381
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.3.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Outputs audio to a speaker from a source node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:1.0
+"
+DEPEND="${RDEPEND}
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+RDEPEND="${RDEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-base:1.0
+"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/hector_compressed_map_transport/Manifest b/dev-ros/hector_compressed_map_transport/Manifest
index c13922877575..82bb9ffe5c37 100644
--- a/dev-ros/hector_compressed_map_transport/Manifest
+++ b/dev-ros/hector_compressed_map_transport/Manifest
@@ -1,2 +1 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.0.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.1.ebuild
similarity index 100%
rename from dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.0.ebuild
rename to dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.1.ebuild
diff --git a/dev-ros/hector_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
index c13922877575..82bb9ffe5c37 100644
--- a/dev-ros/hector_geotiff/Manifest
+++ b/dev-ros/hector_geotiff/Manifest
@@ -1,2 +1 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_geotiff/files/qt5.patch b/dev-ros/hector_geotiff/files/qt5.patch
deleted file mode 100644
index 07b44ef23a13..000000000000
--- a/dev-ros/hector_geotiff/files/qt5.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: hector_geotiff/CMakeLists.txt
-===================================================================
---- hector_geotiff.orig/CMakeLists.txt
-+++ hector_geotiff/CMakeLists.txt
-@@ -9,7 +9,7 @@ find_package(catkin REQUIRED COMPONENTS
- ## System dependencies are found with CMake's conventions
- # find_package(Boost REQUIRED COMPONENTS system)
- 
--find_package(Qt4 4.6 COMPONENTS QtCore QtGui REQUIRED)
-+find_package(Qt5 5.7 COMPONENTS Core Gui Widgets REQUIRED)
- 
- # Find Eigen3 (from http://wiki.ros.org/jade/Migration)
- find_package(Eigen3)
-@@ -24,8 +24,7 @@ else()
-   set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
- endif()
- 
--include(${QT_USE_FILE})
--
-+add_compile_options(-fPIC)
- 
- ## Uncomment this if the package has a setup.py. This macro ensures
- ## modules and global scripts declared therein get installed
-@@ -82,10 +81,14 @@ include_directories(include include/hect
- include_directories(
-   ${catkin_INCLUDE_DIRS}
-   ${EIGEN3_INCLUDE_DIRS}
-+  ${Qt5Core_INCLUDE_DIRS}
-+  ${Qt5Widgets_INCLUDE_DIRS}
-+  ${Qt5Gui_INCLUDE_DIRS}
- )
- 
- add_library(geotiff_writer src/geotiff_writer/geotiff_writer.cpp)
--target_link_libraries(geotiff_writer ${catkin_LIBRARIES} ${QT_LIBRARIES})
-+target_link_libraries(geotiff_writer ${catkin_LIBRARIES} ${Qt5Core_LIBRARIES}
-+	${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES})
- add_dependencies(geotiff_writer ${catkin_EXPORTED_TARGETS})
- 
- add_executable(geotiff_saver src/geotiff_saver.cpp)
-Index: hector_geotiff/include/hector_geotiff/geotiff_writer.h
-===================================================================
---- hector_geotiff.orig/include/hector_geotiff/geotiff_writer.h
-+++ hector_geotiff/include/hector_geotiff/geotiff_writer.h
-@@ -37,7 +37,7 @@
- #include <nav_msgs/MapMetaData.h>
- 
- #include <QtGui/QImage>
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QFont>
- #include <QtGui/QPen>
- 
-Index: hector_geotiff/src/geotiff_node.cpp
-===================================================================
---- hector_geotiff.orig/src/geotiff_node.cpp
-+++ hector_geotiff/src/geotiff_node.cpp
-@@ -40,7 +40,7 @@
- 
- #include <Eigen/Geometry>
- 
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- 
- #include <hector_map_tools/HectorMapTools.h>
- 
-Index: hector_geotiff/src/geotiff_saver.cpp
-===================================================================
---- hector_geotiff.orig/src/geotiff_saver.cpp
-+++ hector_geotiff/src/geotiff_saver.cpp
-@@ -34,7 +34,7 @@
- 
- #include <Eigen/Geometry>
- 
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- 
- #include <hector_map_tools/HectorMapTools.h>
- 
-Index: hector_geotiff/src/geotiff_writer/geotiff_writer.cpp
-===================================================================
---- hector_geotiff.orig/src/geotiff_writer/geotiff_writer.cpp
-+++ hector_geotiff/src/geotiff_writer/geotiff_writer.cpp
-@@ -31,7 +31,7 @@
- 
- #include <QtGui/QPainter>
- #include <QtGui/QImageWriter>
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtCore/QFile>
- //#include <QtCore/QDateTime>
- #include <QtCore/QTime>
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.5.0.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.5.1.ebuild
similarity index 100%
rename from dev-ros/hector_geotiff/hector_geotiff-0.5.0.ebuild
rename to dev-ros/hector_geotiff/hector_geotiff-0.5.1.ebuild
diff --git a/dev-ros/hector_geotiff_launch/Manifest b/dev-ros/hector_geotiff_launch/Manifest
new file mode 100644
index 000000000000..82bb9ffe5c37
--- /dev/null
+++ b/dev-ros/hector_geotiff_launch/Manifest
@@ -0,0 +1 @@
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.1.ebuild
similarity index 66%
rename from dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild
rename to dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.1.ebuild
index a3654d956875..1a0d1f94dc3f 100644
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild
+++ b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,16 +8,14 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
+DESCRIPTION="Launch files for the hector_geotiff mapper"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
 RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
 	dev-ros/hector_geotiff
 	dev-ros/hector_geotiff_plugins
+	dev-ros/hector_trajectory_server
 "
+DEPEND=""
diff --git a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-9999.ebuild b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-9999.ebuild
new file mode 100644
index 000000000000..1a0d1f94dc3f
--- /dev/null
+++ b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files for the hector_geotiff mapper"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_plugins
+	dev-ros/hector_trajectory_server
+"
+DEPEND=""
diff --git a/dev-ros/hector_geotiff_launch/metadata.xml b/dev-ros/hector_geotiff_launch/metadata.xml
new file mode 100644
index 000000000000..29147f0be960
--- /dev/null
+++ b/dev-ros/hector_geotiff_launch/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>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/hector_geotiff_plugins/Manifest b/dev-ros/hector_geotiff_plugins/Manifest
index c13922877575..5621bc8ca341 100644
--- a/dev-ros/hector_geotiff_plugins/Manifest
+++ b/dev-ros/hector_geotiff_plugins/Manifest
@@ -1,2 +1,3 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.1.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.1.ebuild
new file mode 100644
index 000000000000..b45c4e15ac25
--- /dev/null
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_geotiff
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_attitude_to_tf/Manifest b/dev-ros/hector_imu_attitude_to_tf/Manifest
index c13922877575..82bb9ffe5c37 100644
--- a/dev-ros/hector_imu_attitude_to_tf/Manifest
+++ b/dev-ros/hector_imu_attitude_to_tf/Manifest
@@ -1,2 +1 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.0.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.1.ebuild
similarity index 100%
rename from dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.0.ebuild
rename to dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.1.ebuild
diff --git a/dev-ros/hector_imu_tools/Manifest b/dev-ros/hector_imu_tools/Manifest
index c13922877575..5621bc8ca341 100644
--- a/dev-ros/hector_imu_tools/Manifest
+++ b/dev-ros/hector_imu_tools/Manifest
@@ -1,2 +1,3 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.1.ebuild
similarity index 66%
rename from dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild
rename to dev-ros/hector_imu_tools/hector_imu_tools-0.5.1.ebuild
index ae76fd8031f7..45f66eda01ab 100644
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
+DESCRIPTION="Tools for processing IMU messages"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -19,5 +19,7 @@ RDEPEND="
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/hector_map_server/Manifest b/dev-ros/hector_map_server/Manifest
index c13922877575..5621bc8ca341 100644
--- a/dev-ros/hector_map_server/Manifest
+++ b/dev-ros/hector_map_server/Manifest
@@ -1,2 +1,3 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild b/dev-ros/hector_map_server/hector_map_server-0.5.1.ebuild
similarity index 54%
rename from dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild
rename to dev-ros/hector_map_server/hector_map_server-0.5.1.ebuild
index 0fd828ef8d7d..c3cd30cb4ede 100644
--- a/dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild
+++ b/dev-ros/hector_map_server/hector_map_server-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,26 +8,19 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Saves occupancy grid map, robot trajectory and object data to GeoTiff images"
+DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 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-ros/hector_map_tools
+	dev-ros/hector_marker_drawing
+	dev-ros/tf
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
-
-PATCHES=( "${FILESDIR}/qt5.patch" )
+"
diff --git a/dev-ros/hector_map_tools/Manifest b/dev-ros/hector_map_tools/Manifest
index c13922877575..5621bc8ca341 100644
--- a/dev-ros/hector_map_tools/Manifest
+++ b/dev-ros/hector_map_tools/Manifest
@@ -1,2 +1,3 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.5.1.ebuild
similarity index 53%
rename from dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild
rename to dev-ros/hector_map_tools/hector_map_tools-0.5.1.ebuild
index 0177e578893d..85ada002eff2 100644
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild
+++ b/dev-ros/hector_map_tools/hector_map_tools-0.5.1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Messages and services used in the hector_slam stack"
+DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+"
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index c13922877575..5621bc8ca341 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1,2 +1,3 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_mapping/hector_mapping-0.5.1.ebuild b/dev-ros/hector_mapping/hector_mapping-0.5.1.ebuild
new file mode 100644
index 000000000000..becdf3842966
--- /dev/null
+++ b/dev-ros/hector_mapping/hector_mapping-0.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/message_filters
+	dev-ros/laser_geometry
+	dev-ros/tf_conversions
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/Manifest b/dev-ros/hector_marker_drawing/Manifest
index c13922877575..5621bc8ca341 100644
--- a/dev-ros/hector_marker_drawing/Manifest
+++ b/dev-ros/hector_marker_drawing/Manifest
@@ -1,2 +1,3 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.1.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.1.ebuild
new file mode 100644
index 000000000000..693076a81b34
--- /dev/null
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Convenience functions for easier publishing of visualization markers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_nav_msgs/Manifest b/dev-ros/hector_nav_msgs/Manifest
index c13922877575..82bb9ffe5c37 100644
--- a/dev-ros/hector_nav_msgs/Manifest
+++ b/dev-ros/hector_nav_msgs/Manifest
@@ -1,2 +1 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.0.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.1.ebuild
similarity index 94%
rename from dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.0.ebuild
rename to dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.1.ebuild
index f1150dade972..44844ddc3e42 100644
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.0.ebuild
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.1.ebuild
@@ -6,7 +6,7 @@ ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
 
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
index 0177e578893d..44844ddc3e42 100644
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
 
diff --git a/dev-ros/hector_slam_launch/Manifest b/dev-ros/hector_slam_launch/Manifest
index c13922877575..82bb9ffe5c37 100644
--- a/dev-ros/hector_slam_launch/Manifest
+++ b/dev-ros/hector_slam_launch/Manifest
@@ -1,2 +1 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.5.0.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.5.1.ebuild
similarity index 100%
rename from dev-ros/hector_slam_launch/hector_slam_launch-0.5.0.ebuild
rename to dev-ros/hector_slam_launch/hector_slam_launch-0.5.1.ebuild
diff --git a/dev-ros/hector_trajectory_server/Manifest b/dev-ros/hector_trajectory_server/Manifest
index c13922877575..5621bc8ca341 100644
--- a/dev-ros/hector_trajectory_server/Manifest
+++ b/dev-ros/hector_trajectory_server/Manifest
@@ -1,2 +1,3 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.1.ebuild
similarity index 50%
rename from dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild
rename to dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.1.ebuild
index 74e246177533..0a7151550c78 100644
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,20 +8,18 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
+DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
+	dev-ros/roscpp
 	dev-ros/hector_map_tools
-	dev-ros/image_transport
-	media-libs/opencv
+	dev-ros/tf
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3"
+"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 3da7861a6308..387980174060 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index 100be14cb08a..0589318ef519 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -344,6 +344,76 @@ _lua_export() {
 	done
 }
 
+# @FUNCTION: lua_enable_tests
+# @USAGE: <test-runner> <test-directory>
+# @DESCRIPTION:
+# Set up IUSE, RESTRICT, BDEPEND and src_test() for running tests
+# with the specified test runner.  Also copies the current value
+# of RDEPEND to test?-BDEPEND.  The test-runner argument must be one of:
+#
+# - busted: dev-lua/busted
+#
+# Additionally, a second argument can be passed after <test-runner>,
+# so <test-runner> will use that directory to search for tests.
+# If not passed, a default directory of <test-runner> will be used.
+#
+# - busted: spec
+#
+# This function is meant as a helper for common use cases, and it only
+# takes care of basic setup.  You still need to list additional test
+# dependencies manually.  If you have uncommon use case, you should
+# not use it and instead enable tests manually.
+#
+# This function must be called in global scope, after RDEPEND has been
+# declared.  Take care not to overwrite the variables set by it.
+lua_enable_tests() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	[[ ${#} -ge 1 ]] || die "${FUNCNAME} takes at least one argument: test-runner (test-directory)"
+	local test_directory
+	local test_pkg
+	case ${1} in
+		busted)
+			test_directory="${2:-spec}"
+			test_pkg="dev-lua/busted"
+			if [[ ! ${_LUA_SINGLE_R0} ]]; then
+				eval "lua_src_test() {
+					busted --lua=\"\${ELUA}\" --output=\"plainTerminal\" \"${test_directory}\" || die \"Tests fail with \${ELUA}\"
+				}"
+				src_test() {
+					lua_foreach_impl lua_src_test
+				}
+			else
+				eval "src_test() {
+					busted --lua=\"\${ELUA}\" --output=\"plainTerminal\" \"${test_directory}\" || die \"Tests fail with \${ELUA}\"
+				}"
+			fi
+			;;
+		*)
+			die "${FUNCNAME}: unsupported argument: ${1}"
+	esac
+
+	local test_deps=${RDEPEND}
+	if [[ -n ${test_pkg} ]]; then
+		if [[ ! ${_LUA_SINGLE_R0} ]]; then
+			test_deps+=" ${test_pkg}[${LUA_USEDEP}]"
+		else
+			test_deps+=" $(lua_gen_cond_dep "
+				${test_pkg}[\${LUA_USEDEP}]
+			")"
+		fi
+	fi
+	if [[ -n ${test_deps} ]]; then
+		IUSE+=" test"
+		RESTRICT+=" !test? ( test )"
+		BDEPEND+=" test? ( ${test_deps} )"
+	fi
+
+	# we need to ensure successful return in case we're called last,
+	# otherwise Portage may wrongly assume sourcing failed
+	return 0
+}
+
 # @FUNCTION: lua_get_CFLAGS
 # @USAGE: [<impl>]
 # @DESCRIPTION:
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b063d78b9fcf..5cd85ac8a4ed 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 9048977f8e67..2455bcce9116 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,2 @@
 DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
-DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
+DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
index ebd89f20c15d..01a5f16bfc2d 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2.ebuild
similarity index 90%
rename from media-gfx/inkscape/inkscape-1.0-r1.ebuild
rename to media-gfx/inkscape/inkscape-1.0.2.ebuild
index 53bd4516401d..ed4d6019f5e0 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,20 +10,16 @@ inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-PATCHES=(
-	"${FILESDIR}/missing_atomic_include.patch"
-)
-
 BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40
@@ -102,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
-S="${WORKDIR}"/${P}_2020-05-01_4035a4fb49
+S="${WORKDIR}"/${P}_2021-01-15_e86c870879
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -155,4 +151,7 @@ src_install() {
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a922eef35107..1e283b121f25 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 0836ac39f0c8..fc9e118fb705 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Jan 2021 19:08:31 +0000
+Thu, 21 Jan 2021 05:08:27 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0836ac39f0c8..fc9e118fb705 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Jan 2021 19:08:31 +0000
+Thu, 21 Jan 2021 05:08:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 40a4badf7b37..7b622fced403 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0e744d4939dd..ef77d15d2e7b 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/conky-1.11.6-r2 b/metadata/md5-cache/app-admin/conky-1.11.6-r2
index 767048c54d88..ddcde4b1625a 100644
--- a/metadata/md5-cache/app-admin/conky-1.11.6-r2
+++ b/metadata/md5-cache/app-admin/conky-1.11.6-r2
@@ -11,5 +11,5 @@ RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libi
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.11.6.tar.gz -> conky-1.11.6.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89cfa8ca3ee4cdfa80404e085075d289
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.3 b/metadata/md5-cache/app-admin/lsyncd-2.2.3
index 36eeabffe56f..5e86a9c9b4d1 100644
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.3
+++ b/metadata/md5-cache/app-admin/lsyncd-2.2.3
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_single_ta
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.3.tar.gz -> lsyncd-2.2.3.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68e1857ac1790b1be580d265db6d35df
diff --git a/metadata/md5-cache/app-admin/terraform-0.14.5 b/metadata/md5-cache/app-admin/terraform-0.14.5
new file mode 100644
index 000000000000..af2a5378ab2c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/terraform-0.14.5
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A tool for building, changing, and combining infrastructure safely
+EAPI=7
+HOMEPAGE=https://www.terraform.io/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/terraform/archive/v0.14.5.tar.gz -> terraform-0.14.5.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//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.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip 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.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.zip 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/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.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip 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/v45.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv45.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v45.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv45.0.0+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/@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.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.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.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.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/autorest/validation/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.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/!azure/go-ntlmssp/@v/v0.0.0-20180810175552-4a21cbd618b4.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20180810175552-4a21cbd618b4.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.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/!chris!trenkamp/goxpath/@v/v0.0.0-20170922090931-c385f95c6022.zip -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.zip mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20170922090931-c385f95c6022.mod -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.mod mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20190607011252-c5096ec8773d.zip -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20190607011252-c5096ec8773d.zip mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20190607011252-c5096ec8773d.mod -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20190607011252-c5096ec8773d.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!qcloud!api/qcloud_sign_golang/@v/v0.0.0-20141224014652-e4130a326409.mod -> github.com%2F!qcloud!api%2Fqcloud_sign_golang%2F@v%2Fv0.0.0-20141224014652-e4130a326409.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.1.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.zip -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.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/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.mod mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.zip -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.zip mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.mod -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.mod mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.zip -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.zip mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.mod -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.mod mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.zip -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.zip mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.mod -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.mod mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.1.0.zip -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.1.0.mod -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20180507223929-23540a00eaa3.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.zip -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.zip mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.mod mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.zip -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.mod -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/apparentlymart/go-textseg/v12/@v/v12.0.0.zip -> github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.zip mirror://goproxy//github.com/apparentlymart/go-textseg/v12/@v/v12.0.0.mod -> github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.mod mirror://goproxy//github.com/apparentlymart/go-userdirs/@v/v0.0.0-20200915174352-b0c018a67c13.zip -> github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20200915174352-b0c018a67c13.zip mirror://goproxy//github.com/apparentlymart/go-userdirs/@v/v0.0.0-20200915174352-b0c018a67c13.mod -> github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20200915174352-b0c018a67c13.mod mirror://goproxy//github.com/apparentlymart/go-versions/@v/v1.0.1.zip -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/apparentlymart/go-versions/@v/v1.0.1.mod -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 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.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.9.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.9.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 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/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 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/bmatcuk/doublestar/@v/v1.1.5.zip -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.mod -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.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/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip 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.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip 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.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip 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.0.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.0.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.zip 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.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 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-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 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/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20160705203006-01aeca54ebda.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.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/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 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/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.zip -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.mod -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.zip -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.zip mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.mod -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/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/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.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-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-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-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/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v0.0.0-20171007142547-342cbe0a0415.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.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.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/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-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-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.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip 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.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip 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/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.1.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.zip 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-20160524151835-7d79101e329e.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.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.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.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.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/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 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.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/v3/@v/v3.0.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.zip 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/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.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/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/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190126172459-c818fa66e4c8.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.6.1-0.20191122030953-d8ac278c1c9d.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.6.1-0.20191122030953-d8ac278c1c9d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.10.1-0.20200424014253-c3bfe50899e5.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.10.1-0.20200424014253-c3bfe50899e5.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.mod mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20200423144003-7c72efc7435d.zip -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.zip mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20200423144003-7c72efc7435d.mod -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.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/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/gregjones/httpcache/@v/v0.0.0-20170728041850-787624de3eb7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip 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.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 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.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.zip 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/hashicorp/aws-sdk-go-base/@v/v0.6.0.zip -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.6.0.mod -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.zip -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.zip mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.mod -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 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-azure-helpers/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 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-getter/@v/v1.5.1.zip -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.5.1.mod -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 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-plugin/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip 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-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.8.1.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.8.1.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.8.1.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.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 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-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.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/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.8.2.zip -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.8.2.zip mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.8.2.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.8.2.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.mod mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20191212124732-c6ae6269b9d7.zip -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.zip mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20191212124732-c6ae6269b9d7.mod -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.mod mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20200729002733-f050f53b9734.zip -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20200729002733-f050f53b9734.zip mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20200729002733-f050f53b9734.mod -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20200729002733-f050f53b9734.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.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/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/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.0.zip -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.0.mod -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.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.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/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 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/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/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.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip 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.2.1+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+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/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.zip -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.mod -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 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/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/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.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/lib/pq/@v/v1.0.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.zip -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.zip mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.zip -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.zip mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.mod -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20160608183007-4572e39b1ab9.zip -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.zip mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20160608183007-4572e39b1ab9.mod -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.mod mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20190410153822-31eea3082786.zip -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.zip mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20190410153822-31eea3082786.mod -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.mod mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20200615185753-c42b5136ff88.zip -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.zip mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20200615185753-c42b5136ff88.mod -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.mod 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.1.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.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.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 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.8.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%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-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.zip -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.zip mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.mod -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 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/go-wordwrap/@v/v0.0.0-20150314170334-ad45545899c7.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv0.0.0-20150314170334-ad45545899c7.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/prefixedio/@v/v0.0.0-20190213213902-5733675afd51.zip -> github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.zip mirror://goproxy//github.com/mitchellh/prefixedio/@v/v0.0.0-20190213213902-5733675afd51.mod -> github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.zip -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.mod -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.zip -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.zip mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.mod -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180921211025-c76d91c1e7db.zip -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.zip mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180921211025-c76d91c1e7db.mod -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 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/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.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/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/posener/complete/@v/v1.2.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.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.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.zip 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_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-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 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.2.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.zip 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/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.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.zip 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/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/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/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 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/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip 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/v0.0.0-20180222194500-ef6db91d284a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 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/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/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.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/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-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.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/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.zip -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.mod -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.82+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.82+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.mod mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.0.0-20190808065407-f07404cefc8c.zip -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.zip mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.0.0-20190808065407-f07404cefc8c.mod -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20171017195756-830351dc03c6.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20171017195756-830351dc03c6.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.mod mirror://goproxy//github.com/tombuildsstuff/giovanni/@v/v0.12.0.zip -> github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/tombuildsstuff/giovanni/@v/v0.12.0.mod -> github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20180813092308-00b869d2f4a5.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.zip mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20180813092308-00b869d2f4a5.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.8.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.8.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.mod mirror://goproxy//github.com/vmihailenco/msgpack/@v/v3.3.3+incompatible.zip -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.zip mirror://goproxy//github.com/vmihailenco/msgpack/@v/v3.3.3+incompatible.mod -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod mirror://goproxy//github.com/vmihailenco/msgpack/v4/@v/v4.3.12.zip -> github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.zip mirror://goproxy//github.com/vmihailenco/msgpack/v4/@v/v4.3.12.mod -> github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.mod mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.1.zip -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.1.mod -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20160813154853-07dd2e8dfe18.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20160813154853-07dd2e8dfe18.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.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//github.com/zclconf/go-cty/@v/v1.0.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.1.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.7.1.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.7.1.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.2.zip -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.2.mod -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.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.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.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.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 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/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 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.9.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.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-20181025213731-e84da0312774.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190222235706-ffb98f73852f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190222235706-ffb98f73852f.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-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.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-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-20191202143827-86a70503ff7e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191202143827-86a70503ff7e.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 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/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.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 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.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 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.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip 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-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180530234432-1e491301e022.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180530234432-1e491301e022.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-20180811021610-c39426892332.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180811021610-c39426892332.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.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-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-20190812203447-cdfb69ac37fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190812203447-cdfb69ac37fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191009170851-d66e71096ffb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191126235420-ef20fe5d7933.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191126235420-ef20fe5d7933.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.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/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-20201021035429-f5854403a974.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-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-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/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.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-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.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.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-20190509141414-a5b02f93d862.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190509141414-a5b02f93d862.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-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.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-20191128015809-6d18c012aee9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191128015809-6d18c012aee9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.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-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-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-20200930185726-fdedc70b468f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.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.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.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-20161028155119-f51c12702a4d.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.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/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-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-20191203134012-c197fd4bf371.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191203134012-c197fd4bf371.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191203134012-c197fd4bf371.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191203134012-c197fd4bf371.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-20200904185747-39188db58858.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.zip 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-20201028111035-eafbe7b904eb.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201028111035-eafbe7b904eb.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201028111035-eafbe7b904eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201028111035-eafbe7b904eb.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.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//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.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip 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.34.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.34.0.zip mirror://goproxy//google.golang.org/api/@v/v0.34.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.34.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip 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.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip 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-20170818010345-ee236bd376b0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20170818010345-ee236bd376b0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/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.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 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-20200904004341-0bd0a958aa1d.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.zip 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/grpc/@v/v1.8.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.8.0.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.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.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.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip 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.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip 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/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.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.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/inf.v0/@v/v0.9.0.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/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/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//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//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190612205821-1799e75a0719.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190612205821-1799e75a0719.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190913080033-27d36303b655.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190913080033-27d36303b655.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190913080033-27d36303b655.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190913080033-27d36303b655.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.zip mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.1.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.1.mod mirror://goproxy//k8s.io/klog/@v/v0.4.0.zip -> k8s.io%2Fklog%2F@v%2Fv0.4.0.zip mirror://goproxy//k8s.io/klog/@v/v0.4.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190221042446-c2654d5206da.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200411171748-3d5a2fe318e4.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200411171748-3d5a2fe318e4.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200411171748-3d5a2fe318e4.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200411171748-3d5a2fe318e4.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 mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=d071a3edf29a65e41da08fb777721b35
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index cf99d065ce84..78711201e7fe 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/rpm-4.16.0 b/metadata/md5-cache/app-arch/rpm-4.16.0
index f647191df7d8..e53a3b2492b6 100644
--- a/metadata/md5-cache/app-arch/rpm-4.16.0
+++ b/metadata/md5-cache/app-arch/rpm-4.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 ) ) python? ( ^^ ( python_sing
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.16.x/rpm-4.16.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d7b917d7bfa776843f0be82cfed256f
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index da35da100f4d..63aadca6f5d6 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
index 4eca11de686a..609ceae8404a 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit ) ^^ ( python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.20.tar.gz -> sysbench-1.0.20.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=51da2adad7ee3a75eec28a481fcd5813
diff --git a/metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100 b/metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
index 73a55f12ed4b..236212b7075e 100644
--- a/metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
+++ b/metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
@@ -10,5 +10,5 @@ RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) lu
 REQUIRED_USE=^^ ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://www.github.com/wg/wrk/archive/4.1.0.tar.gz -> wrk-4.1.0.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=d7ab4574a30292852a25ee19f092efdf
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index f5ad4b9d1a2e..1c81606b54de 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/cardpeek-0.8.4 b/metadata/md5-cache/app-crypt/cardpeek-0.8.4
index 760a708fdcd3..e523c858a54b 100644
--- a/metadata/md5-cache/app-crypt/cardpeek-0.8.4
+++ b/metadata/md5-cache/app-crypt/cardpeek-0.8.4
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/pcsc-lite x11-li
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=http://downloads.pannetrat.com/install/cardpeek-0.8.4.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69d19508e2a8590fbdf32a6351315417
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r100 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r100
index 9d7d98eefda8..fc0f22ce32d9 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r100
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r100
@@ -11,5 +11,5 @@ RDEPEND=!minimal? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_ta
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=943662d2abc325617c03bfc767b1e42b
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r3 b/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r3
new file mode 100644
index 000000000000..0508feea8ded
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r3
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/yacc cpu_flags_x86_aes? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) doc? ( virtual/latex-base ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/tcl:0 dev-util/dejagnu dev-util/cmocka ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd )
+DESCRIPTION=MIT Kerberos V
+EAPI=7
+HOMEPAGE=https://web.mit.edu/kerberos/www/
+IUSE=cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
+RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.2.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=48d066bed73e9fc49e2baefcb662bf6c
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.18.3-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.18.3-r1
new file mode 100644
index 000000000000..9656c3f857f2
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.18.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/yacc cpu_flags_x86_aes? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) doc? ( virtual/latex-base ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/tcl:0 dev-util/dejagnu dev-util/cmocka ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd )
+DESCRIPTION=MIT Kerberos V
+EAPI=7
+HOMEPAGE=https://web.mit.edu/kerberos/www/
+IUSE=cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
+RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.3.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=212e58616ddf2dace4a3ab804b3c1743
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 5e96dae99e84..565839ff8bd2 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/gvim-8.2.0814-r100 b/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
index e0235499a206..8e36dd31e8bd 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
+++ b/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e046cd9dcb26eeb915fd32744e94606f
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 288e4e22c77e..f6b9f5522192 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -11,5 +11,5 @@ RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurs
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e046cd9dcb26eeb915fd32744e94606f
diff --git a/metadata/md5-cache/app-editors/neovim-0.4.4-r100 b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
index a3bfd8716f8a..819659a82071 100644
--- a/metadata/md5-cache/app-editors/neovim-0.4.4-r100
+++ b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.4.4.tar.gz -> neovim-0.4.4.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08f5ce1055eebef4115982405b2f3aa3
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index 31cd00251e49..c3402b26611c 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lpeg[lua_targets_lua5-2(-)] dev-lua/mpack[lua_targets_lua5-2(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) dev-libs/libutf8proc:= dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-libs/tree-sitter:= net-libs/libnsl tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f19d2c16f4020f9868305609469c250f
diff --git a/metadata/md5-cache/app-editors/scite-4.4.4-r10 b/metadata/md5-cache/app-editors/scite-4.4.4-r10
index 258d1951f328..3a0569c2804a 100644
--- a/metadata/md5-cache/app-editors/scite-4.4.4-r10
+++ b/metadata/md5-cache/app-editors/scite-4.4.4-r10
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-l
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://www.scintilla.org/scite444.tgz -> scite-4.4.4.tgz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48e23991ed87ca62ee937bff83b3bcd7
diff --git a/metadata/md5-cache/app-editors/texworks-0.6.5-r100 b/metadata/md5-cache/app-editors/texworks-0.6.5-r100
index 6415d28be41d..c7232352dd4a 100644
--- a/metadata/md5-cache/app-editors/texworks-0.6.5-r100
+++ b/metadata/md5-cache/app-editors/texworks-0.6.5-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TeXworks/texworks/archive/release-0.6.5.tar.gz -> texworks-0.6.5.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=866197dae839ca849fb4fff117fd3a09
diff --git a/metadata/md5-cache/app-editors/vim-8.2.0814-r100 b/metadata/md5-cache/app-editors/vim-8.2.0814-r100
index 8a191c01f36c..770f04055df8 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.0814-r100
+++ b/metadata/md5-cache/app-editors/vim-8.2.0814-r100
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12c2e2a5ddfdc7be7f21a5d08623c0bf
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 9f44856ba452..61a39cecadfa 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) vim-pager? ( !minimal )
 SLOT=0
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12c2e2a5ddfdc7be7f21a5d08623c0bf
diff --git a/metadata/md5-cache/app-editors/vis-0.7 b/metadata/md5-cache/app-editors/vis-0.7
index 723bf8f1cae8..87ac098a9853 100644
--- a/metadata/md5-cache/app-editors/vis-0.7
+++ b/metadata/md5-cache/app-editors/vis-0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martanne/vis/releases/download/v0.7/vis-0.7.tar.gz test? ( https://github.com/martanne/vis-test/releases/download/v0.5/vis-test-0.5.tar.gz )
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=945af73800f2e8f3d3f7cb5d85b30e55
diff --git a/metadata/md5-cache/app-editors/vis-9999 b/metadata/md5-cache/app-editors/vis-9999
index de1b69894945..3f3143e54488 100644
--- a/metadata/md5-cache/app-editors/vis-9999
+++ b/metadata/md5-cache/app-editors/vis-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_t
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=d8d611ffba5110655562ab39254651dc
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index a1b97fa3277b..154dc50cc4c6 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/docker-compose-1.28.0 b/metadata/md5-cache/app-emulation/docker-compose-1.28.0
new file mode 100644
index 000000000000..7adee723577c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.28.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/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(-)] >=dev-python/cached-property-1.2.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/distro-1.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(-)] >=dev-python/docker-py-4.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/dockerpty-0.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/docopt-0.6.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/python-dotenv-0.13.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/jsonschema-2.5.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/paramiko[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/PySocks-1.6.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/pyyaml-3.10[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/requests-2.20.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/six-1.3.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/texttable-0.9.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/websocket-client-0.32.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(-)] test? ( >=dev-python/pytest-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(-)] >=dev-python/ddt-1.2.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(-)] )
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=7
+HOMEPAGE=https://github.com/docker/compose
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_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/cached-property-1.2.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/distro-1.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(-)] >=dev-python/docker-py-4.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/dockerpty-0.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/docopt-0.6.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/python-dotenv-0.13.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/jsonschema-2.5.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/paramiko[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/PySocks-1.6.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/pyyaml-3.10[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/requests-2.20.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/six-1.3.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/texttable-0.9.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/websocket-client-0.32.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/docker/compose/archive/1.28.0.tar.gz -> docker-compose-1.28.0.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=09aa7409ba20aa3062207347710bcead
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r101 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r101
index cce14fb6dfd1..d8fcc83c8051 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r101
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1.38
 SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7dbe89bafdb9e61c3a71e0998d3962e3
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 91793f111aef..48ad1e04274e 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/fcitx-4.2.9.8 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.8
index 968d1fd5aa0a..622560a49fd7 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.8
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.9.8
@@ -12,5 +12,5 @@ REQUIRED_USE=cairo? ( X ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.8_dict.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f24968db2b5b09f39423dd2fcae1c82b
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.9999 b/metadata/md5-cache/app-i18n/fcitx-4.9999
index 08ca47f47c0f..413a313e83d4 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-4.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=cairo? ( X ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b888f905ac0dd7dfa439ab3b86bc5e0
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
index cc881b9225cf..e2773bd3061e 100644
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
@@ -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 python_single_target_python3_9 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.11.92.tar.gz -> ibus-libpinyin-1.11.92.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb6ed89f9687806b739e5276f28c188f
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
index 155ee6635f6e..98d0430185b0 100644
--- a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
+++ b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
@@ -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 python_single_target_python3_9 ) lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=91446992af415249818adf834bfc2253
diff --git a/metadata/md5-cache/app-i18n/librime-lua-20201011103348 b/metadata/md5-cache/app-i18n/librime-lua-20201011103348
index 95a28a93291c..bc30f9681c36 100644
--- a/metadata/md5-cache/app-i18n/librime-lua-20201011103348
+++ b/metadata/md5-cache/app-i18n/librime-lua-20201011103348
@@ -11,5 +11,5 @@ RDEPEND=>=app-i18n/librime-1.6:0= lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/hchunhui/librime-lua/archive/d45a41af2f9d731e3c1516a191cc3160e3cb8377.tar.gz -> librime-lua-20201011103348.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=904b4755bf334eb8dbad7968de4f20d2
diff --git a/metadata/md5-cache/app-i18n/librime-lua-99999999999999 b/metadata/md5-cache/app-i18n/librime-lua-99999999999999
index 4de0b2291487..c91580148a93 100644
--- a/metadata/md5-cache/app-i18n/librime-lua-99999999999999
+++ b/metadata/md5-cache/app-i18n/librime-lua-99999999999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-i18n/librime-1.6:0= lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ff1e85d6189888559a9ee95b57b0bda
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 86d05ae94e8d..db117374266b 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100 b/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
index f9336349c9ab..73c3b1b6769c 100644
--- a/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
+++ b/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) www-servers/nginx[nginx_
 REQUIRED_USE=^^ ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://github.com/knyar/nginx-lua-prometheus/archive/0.1-20170610.tar.gz -> nginx-lua-prometheus-0.1_pre20170610.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=bc6e04e52b24e72df7cf82e41beb617d
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index dde3c6305461..b2ee3753747f 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/worker-3.8.3-r100 b/metadata/md5-cache/app-misc/worker-3.8.3-r100
index cd978d261cf3..e77ac40f8370 100644
--- a/metadata/md5-cache/app-misc/worker-3.8.3-r100
+++ b/metadata/md5-cache/app-misc/worker-3.8.3-r100
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 SLOT=0
 SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-3.8.3.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=d6d51a9fea588a82d0292c035b88cc02
diff --git a/metadata/md5-cache/app-misc/worker-4.6.1-r100 b/metadata/md5-cache/app-misc/worker-4.6.1-r100
index fbab12c296c9..b797372c0d07 100644
--- a/metadata/md5-cache/app-misc/worker-4.6.1-r100
+++ b/metadata/md5-cache/app-misc/worker-4.6.1-r100
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( sys-apps/dbus ) lu
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 SLOT=0
 SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-4.6.1.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=61d2854856dc9d44af784d558791dbcb
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 885c7bfded3f..b06ae36e7529 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/libreoffice-bin-6.4.7.2_p1 b/metadata/md5-cache/app-office/libreoffice-bin-6.4.7.2_p1
deleted file mode 100644
index 143a0cbab10c..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.4.7.2_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde elibc_FreeBSD java +python_single_target_python3_8
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-6.4.7.2*
-RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.74.0 dev-libs/icu:0/67.1 dev-libs/liborcus:0/0.15 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 virtual/jpeg-compat:62 python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.15 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_8 )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-6.4.7.2_p1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-6.4.7.2_p1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-6.4.7.2_p1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-java-6.4.7.2_p1.xd3 ) ) ) )
-_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=544a66a15261bd348d258585055939c2
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p1
deleted file mode 100644
index 974faf431d6e..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND=~app-office/libreoffice-bin-6.4.7.2_p1[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-6.4.7.2_p1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-6.4.7.2_p1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-6.4.7.2_p1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-java-6.4.7.2_p1.xd3 ) ) ) )
-_md5_=ab848c305ccc6979e1d507b8e5d1304f
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d62cfea4d9a0..5d4e749641d5 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/highlight-3.57-r100 b/metadata/md5-cache/app-text/highlight-3.57-r100
index 4383f08d77c0..ff7f9047bc87 100644
--- a/metadata/md5-cache/app-text/highlight-3.57-r100
+++ b/metadata/md5-cache/app-text/highlight-3.57-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.57.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=01de173abbf82960cc8fd4daa18f3828
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100 b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
index b8c05c1e5747..4dd7e97cb82b 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20190928.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b91a37e23cc4e751ca0b65f1026fe68
diff --git a/metadata/md5-cache/app-text/xournalpp-1.0.20 b/metadata/md5-cache/app-text/xournalpp-1.0.20
new file mode 100644
index 000000000000..f4df94a9803e
--- /dev/null
+++ b/metadata/md5-cache/app-text/xournalpp-1.0.20
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Handwriting notetaking software with PDF annotation support
+EAPI=7
+HOMEPAGE=https://github.com/xournalpp/xournalpp
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/xournalpp/xournalpp/archive/1.0.20.tar.gz -> xournalpp-1.0.20.tgz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6d00a983cac3990c637fa987d18cb3e
diff --git a/metadata/md5-cache/app-text/xournalpp-9999 b/metadata/md5-cache/app-text/xournalpp-9999
index 83e413c1608f..a1275c7de539 100644
--- a/metadata/md5-cache/app-text/xournalpp-9999
+++ b/metadata/md5-cache/app-text/xournalpp-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7154613fe7739e99e9dcc908d22ece8
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b5944e43cec84dbfbffee8d9e42b521f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ce852e69f49c..52dc1167c1d1 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/redis-6.0.9-r100 b/metadata/md5-cache/dev-db/redis-6.0.9-r100
index 6f475945371c..90700dcfd1a6 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.9-r100
+++ b/metadata/md5-cache/dev-db/redis-6.0.9-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-6.0.9.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43c75a1c1247816371197f5a1006561e
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 96a52da2a747..5ee802aa2224 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/cegui-0.8.7-r100 b/metadata/md5-cache/dev-games/cegui-0.8.7-r100
index a515f42008d3..e8ceed65792c 100644
--- a/metadata/md5-cache/dev-games/cegui-0.8.7-r100
+++ b/metadata/md5-cache/dev-games/cegui-0.8.7-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( me
 REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.tar.bz2
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a12d87ebd352aaa8a20b36bb1869a13
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
index 4c495a47ec33..1a285241d077 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
@@ -11,5 +11,5 @@ RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs
 REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) openexr? ( zlib ) sdl2? ( sdl )
 SLOT=0/161
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29a5af6ecc8aad21498214cfbadca7e2
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
index 6f0894153af6..8e2ce09db8f7 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
@@ -11,5 +11,5 @@ RDEPEND=!dev-games/openscenegraph media-libs/mesa[egl?] virtual/glu virtual/open
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) sdl2? ( sdl ) openexr? ( zlib )
 SLOT=0/132
 SRC_URI=https://github.com/OpenMW/osg/archive/8b07809fa674ecffe77338aaea2e223b3aadff0e.tar.gz -> openscenegraph-openmw-3.4_p20200425.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7573b8d5f71db90e8c599f3d9ba65290
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 7b48350ee1f5..9f6af31f8815 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/go-1.14.14 b/metadata/md5-cache/dev-lang/go-1.14.14
new file mode 100644
index 000000000000..0bae3154adb8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.14.14
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.14.14
+SRC_URI=https://storage.googleapis.com/golang/go1.14.14.src.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=b17a7097a537f4b6611e330a88601ff5
diff --git a/metadata/md5-cache/dev-lang/go-1.15.7 b/metadata/md5-cache/dev-lang/go-1.15.7
new file mode 100644
index 000000000000..9b6a0afd3c7b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.15.7
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.15.7
+SRC_URI=https://storage.googleapis.com/golang/go1.15.7.src.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=b17a7097a537f4b6611e330a88601ff5
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18-r6 b/metadata/md5-cache/dev-lang/python-2.7.18-r6
index ac4fdb54bdbc..382869861941 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18-r6
+++ b/metadata/md5-cache/dev-lang/python-2.7.18-r6
@@ -5,10 +5,10 @@ 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
 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-r6.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7552546e86764ca65d2f9cd4f2f5c91
+_md5_=621a103a549f1708ee0f7b83c43636a4
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b317e4133ca8..b86f723dda4b 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/efl-1.25.1-r10 b/metadata/md5-cache/dev-libs/efl-1.25.1-r10
index cdc5c73bbb30..7b9fcde559a9 100644
--- a/metadata/md5-cache/dev-libs/efl-1.25.1-r10
+++ b/metadata/md5-cache/dev-libs/efl-1.25.1-r10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz
-_eclasses_=docs	96928b5b33de2dbadb4741c31b71b595	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=docs	96928b5b33de2dbadb4741c31b71b595	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7dc742e26002ea223e0f9894e84b35f2
diff --git a/metadata/md5-cache/dev-libs/icu-67.1 b/metadata/md5-cache/dev-libs/icu-67.1
deleted file mode 100644
index c2f536dfaa82..000000000000
--- a/metadata/md5-cache/dev-libs/icu-67.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=International Components for Unicode
-EAPI=7
-HOMEPAGE=http://site.icu-project.org/
-IUSE=debug doc examples 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=BSD
-SLOT=0/67.1
-SRC_URI=https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-src.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=80a8577d4dec19b6e48f14c637d56d59
diff --git a/metadata/md5-cache/dev-libs/icu-68.1 b/metadata/md5-cache/dev-libs/icu-68.1
deleted file mode 100644
index 11e9032a61f5..000000000000
--- a/metadata/md5-cache/dev-libs/icu-68.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=International Components for Unicode
-EAPI=7
-HOMEPAGE=http://site.icu-project.org/
-IUSE=debug doc examples 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=BSD
-SLOT=0/68.1
-SRC_URI=https://github.com/unicode-org/icu/releases/download/release-68-1/icu4c-68_1-src.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4899ef61dc9ee2fc0f41070eb410d1a2
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-67.1 b/metadata/md5-cache/dev-libs/icu-layoutex-67.1
deleted file mode 100644
index 5a603cade36d..000000000000
--- a/metadata/md5-cache/dev-libs/icu-layoutex-67.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/icu-67.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[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=External layout part of International Components for Unicode
-EAPI=7
-HOMEPAGE=http://www.icu-project.org/
-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=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=~dev-libs/icu-67.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[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/67.1
-SRC_URI=https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-src.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b4925cc4ecc4c39dfd871a3885baff22
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-68.1 b/metadata/md5-cache/dev-libs/icu-layoutex-68.1
deleted file mode 100644
index 36bd24fc389a..000000000000
--- a/metadata/md5-cache/dev-libs/icu-layoutex-68.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/icu-68.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[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=External layout part of International Components for Unicode
-EAPI=7
-HOMEPAGE=http://www.icu-project.org/
-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=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=~dev-libs/icu-68.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[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/68.1
-SRC_URI=https://github.com/unicode-org/icu/releases/download/release-68-1/icu4c-68_1-src.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cda5329ca8f73387cfe2009b87073b02
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.9.0 b/metadata/md5-cache/dev-libs/libgcrypt-1.9.0
index 5423b7fce802..a60910eb225f 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.9.0
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.9.0
@@ -5,10 +5,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/
 IUSE=doc o-flag-munging 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.9.0.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b50eac7d82b3a9bf0917bdb0096b0898
+_md5_=6899efa3c013b509fda7985b21820ae3
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.26.0-r100 b/metadata/md5-cache/dev-libs/libpeas-1.26.0-r100
index 9e9a5a0049dc..05905d82bed4 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.26.0-r100
+++ b/metadata/md5-cache/dev-libs/libpeas-1.26.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.26/libpeas-1.26.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10f770b7048b1d14377c619108922ca7
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.28.0-r100 b/metadata/md5-cache/dev-libs/libpeas-1.28.0-r100
index 8e88c1fcc69c..894d80c8c486 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.28.0-r100
+++ b/metadata/md5-cache/dev-libs/libpeas-1.28.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.28/libpeas-1.28.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2e300a59bee6d4dc5f5834a99c7c271
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10 b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
index a68983de4e43..4a07373485ff 100644
--- a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
+++ b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
@@ -11,5 +11,5 @@ RDEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libprelude-5.2.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=e0e6ba9e56cb7933055a811f2444d492
diff --git a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100 b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
index 45cf7d501209..2d6ebd8ae002 100644
--- a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
+++ b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/libucl/archive/0.8.1.tar.gz -> libucl-0.8.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=71d8ad695b7e804e4ad7dd77a544233f
diff --git a/metadata/md5-cache/dev-libs/libucl-9999 b/metadata/md5-cache/dev-libs/libucl-9999
index 80542746c6e9..a4e6e1637d5d 100644
--- a/metadata/md5-cache/dev-libs/libucl-9999
+++ b/metadata/md5-cache/dev-libs/libucl-9999
@@ -11,5 +11,5 @@ RDEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=71d8ad695b7e804e4ad7dd77a544233f
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
index dd25c51ea6f4..a42bf94ed44e 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=83a41e2be0ae64a92db75e3b09584464
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.17-r100 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
similarity index 95%
rename from metadata/md5-cache/dev-libs/xapian-bindings-1.4.17-r100
rename to metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
index c8b1ff9fcb35..2aeecf3832c3 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.17-r100
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[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[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) ruby? ( || ( ruby_targets_ruby25 ruby_targets_ruby26 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
-SRC_URI=https://oligarchy.co.uk/xapian/1.4.17/xapian-bindings-1.4.17.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=86f25610c0075c6737d4022ad0f159ae
+SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-bindings-1.4.18.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=df46167b12209c16e64fc27e4c985f9b
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
index bd48d9d5337e..44520fe47a87 100644
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=38a82d817e10df7361b1e5e5fdc6aa34
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index f6ad8e74f4f5..47f272a4f5e0 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/busted-2.0.0-r101 b/metadata/md5-cache/dev-lua/busted-2.0.0-r101
index cd22728586fb..826df4f33508 100644
--- a/metadata/md5-cache/dev-lua/busted-2.0.0-r101
+++ b/metadata/md5-cache/dev-lua/busted-2.0.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/busted/archive/v2.0.0.tar.gz -> busted-2.0.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=b739e430bbad739514a6abb290261728
diff --git a/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100 b/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
index fb2e31a76584..16a5dae9df0b 100644
--- a/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
+++ b/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
 SLOT=0
 SRC_URI=https://github.com/hishamhm/busted-htest/archive/1.0.0.tar.gz -> busted-htest-1.0.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=5c25d139c60ab57753d934be37d26198
diff --git a/metadata/md5-cache/dev-lua/dkjson-2.5-r100 b/metadata/md5-cache/dev-lua/dkjson-2.5-r100
index 419d2e172b69..1f8aa54e87c0 100644
--- a/metadata/md5-cache/dev-lua/dkjson-2.5-r100
+++ b/metadata/md5-cache/dev-lua/dkjson-2.5-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5 -> dkjson-2.5.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=f25c474b68037934083305a7038e0d7a
diff --git a/metadata/md5-cache/dev-lua/inifile-1.0-r100 b/metadata/md5-cache/dev-lua/inifile-1.0-r100
index 3cb333903c1a..bfbdd83035db 100644
--- a/metadata/md5-cache/dev-lua/inifile-1.0-r100
+++ b/metadata/md5-cache/dev-lua/inifile-1.0-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/bartbes/inifile/archive/v1.0.tar.gz -> inifile-1.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=783a1676a1f9262986e9cf49fd4d3254
diff --git a/metadata/md5-cache/dev-lua/lanes-3.13.0-r100 b/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
index 293b4721b185..1dfb6fac73a5 100644
--- a/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
+++ b/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/LuaLanes/lanes/archive/v3.13.0.tar.gz -> lanes-3.13.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=13e53aba06a6a401db59b22ad2545ce6
diff --git a/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100 b/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
index 39005ab1cbd3..ce003dd5a1b7 100644
--- a/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
+++ b/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/stevedonovan/LDoc/archive/1.4.6.tar.gz -> ldoc-1.4.6.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=3a4f775c00df40f6df6da1555af1e3a8
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100 b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
index 7db7dc649863..bff5e9ae12d7 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.2.tar.gz -> lgi-0.9.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14130788ff0500fc21334a9a347afe7a
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101 b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
index a9891d895603..f727d76027b9 100644
--- a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44b89a4031850a93291bfcf9fc788c0b
diff --git a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100 b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100
index 6604e273cb37..38ef918735df 100644
--- a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100
+++ b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpeterv/argparse/archive/0.6.0.tar.gz -> lua-argparse-0.6.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=fe19c986626bed061e8ad285346c6c46
diff --git a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r101 b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r101
index 3abc1710f506..f95d05a266e2 100644
--- a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r101
+++ b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5-r101
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat53-0.10.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=aed18a74da4cb30f733a669c55c15d54
diff --git a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100 b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
index 34ecfdd20247..d52cbb065524 100644
--- a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
+++ b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=threads? ( internal-fpconv ) || ( lua_targets_luajit lua_targets_lu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openresty/lua-cjson/archive/2.1.0.8.tar.gz -> lua-cjson-2.1.0.8.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=ba7a88083d720fab902d5b6017f4c339
diff --git a/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101 b/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
index 99116ec54060..00c7a3834ac2 100644
--- a/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
+++ b/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zhaozg/lua-openssl/archive/0.7.8-0.tar.gz -> lua-openssl-0.7.8_p0.tar.gz https://github.com/zhaozg/lua-auxiliar/archive/8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz -> lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat-5.3-0.10.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=629d09d91954561ab80a9b936a2c6621
diff --git a/metadata/md5-cache/dev-lua/lua-term-0.7-r101 b/metadata/md5-cache/dev-lua/lua-term-0.7-r101
index 2db69e1143bc..da047e1162fe 100644
--- a/metadata/md5-cache/dev-lua/lua-term-0.7-r101
+++ b/metadata/md5-cache/dev-lua/lua-term-0.7-r101
@@ -11,5 +11,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/hoelzro/lua-term/archive/0.07.tar.gz -> lua-term-0.7.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=ef7e00dd7aac40c2850c9e9f766cd6c1
diff --git a/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100 b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
index 950e56a27d96..db9a7d50a6b7 100644
--- a/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
+++ b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/starwing/luautf8/archive/0.1.3.tar.gz -> lua-utf8-0.1.3.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=549fc136627bd68d5deaff89574e6d6b
diff --git a/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100 b/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
index 09dee6c7dc9c..fcec51e3275e 100644
--- a/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
+++ b/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 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	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=595f5d75107306bbb6b999821bdb64c1
diff --git a/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100 b/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
index 25b46935030c..3c4a4f8beb8e 100644
--- a/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
+++ b/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/amireh/lua_cliargs/archive/v3.0-2.tar.gz -> lua_cliargs-3.0_p2.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=1ce471aae03bd67a8d49b39c2cc10b0e
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100 b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100
index b455794eb701..37c46a504375 100644
--- a/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100
+++ b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpeterv/luacheck/archive/0.23.0.tar.gz -> luacheck-0.23.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=8f617f456ecb217732b45fd40fa67d11
diff --git a/metadata/md5-cache/dev-lua/luacov-0.14.0-r100 b/metadata/md5-cache/dev-lua/luacov-0.14.0-r100
index 42c6bcfd9d47..9e9735785756 100644
--- a/metadata/md5-cache/dev-lua/luacov-0.14.0-r100
+++ b/metadata/md5-cache/dev-lua/luacov-0.14.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keplerproject/luacov/archive/v0.14.0.tar.gz -> luacov-0.14.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=afc062d92af0bec402c533b8a799f5e9
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102 b/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
index 91432263fa99..249a57066b33 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
+++ b/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mwild1/luadbi/archive/v0.7.2.tar.gz -> luadbi-0.7.2.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=478ddca371b005d33b1fef81e96d6ad3
diff --git a/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100 b/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
index 38f9ee5cd0dd..b5fca4e1e845 100644
--- a/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
+++ b/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.6.tar.gz -> luaevent-0.4.6.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=58235d33b3bc9454fd9bd3e24a5b5b73
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r102 b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r102
index f88b0494f49a..09968dc61aaf 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r102
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r102
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=60e9d62801ffef088b4b1c31ad24c57a
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r102 b/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r102
index d1b773e077d8..77766b0960ba 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r102
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r102
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz -> luaexpat-1.3.3.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=a8fc321770bcfea7ef5fc5ca5428a14b
diff --git a/metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101 b/metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
index 17a0f318038e..ad6a149895d1 100644
--- a/metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
+++ b/metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keplerproject/luafilesystem/archive/v1_8_0.tar.gz -> luafilesystem-1.8.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=19beb87df8495c8af7c115cf8bf2fd56
diff --git a/metadata/md5-cache/dev-lua/luajson-1.3.4-r100 b/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
index e172fe74a1d0..9889618caaa2 100644
--- a/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
+++ b/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/harningt/luajson/archive/1.3.4.tar.gz -> luajson-1.3.4.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=e9450886a2f7b28d9934cfa14f404e7a
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100 b/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100
index f5dc3afe45c5..2b359034f136 100644
--- a/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100
+++ b/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/lualdap/lualdap/archive/v1.2.5.tar.gz -> lualdap-1.2.5.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=d74feb551ef30f49a691ee2b49096340
diff --git a/metadata/md5-cache/dev-lua/luaossl-20200709-r100 b/metadata/md5-cache/dev-lua/luaossl-20200709-r100
index 47b1e7eed5e4..1e5e19e25056 100644
--- a/metadata/md5-cache/dev-lua/luaossl-20200709-r100
+++ b/metadata/md5-cache/dev-lua/luaossl-20200709-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl !dev-lua/luasec lua_ta
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/wahern/luaossl/archive/rel-20200709.tar.gz -> luaossl-rel-20200709.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=aa7fbaa1d7cda1b36f36ee5631d90f66
diff --git a/metadata/md5-cache/dev-lua/luaposix-35.0-r101 b/metadata/md5-cache/dev-lua/luaposix-35.0-r101
index c8a7b89b4ef4..8e6de28ff96e 100644
--- a/metadata/md5-cache/dev-lua/luaposix-35.0-r101
+++ b/metadata/md5-cache/dev-lua/luaposix-35.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/luaposix/luaposix/archive/v35.0.tar.gz -> luaposix-35.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=11afe45c39e16c2c714c0546849921f1
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.5.0 b/metadata/md5-cache/dev-lua/luarocks-3.5.0
index 132dacc730f6..cb30b8b7700b 100644
--- a/metadata/md5-cache/dev-lua/luarocks-3.5.0
+++ b/metadata/md5-cache/dev-lua/luarocks-3.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://luarocks.org/releases/luarocks-3.5.0.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=f3bd1178a133d19bc2fbca7422baf0a5
diff --git a/metadata/md5-cache/dev-lua/luasec-0.9-r102 b/metadata/md5-cache/dev-lua/luasec-0.9-r102
index b8470e41aff5..ac0bdcd94c88 100644
--- a/metadata/md5-cache/dev-lua/luasec-0.9-r102
+++ b/metadata/md5-cache/dev-lua/luasec-0.9-r102
@@ -11,5 +11,5 @@ RDEPEND=dev-lua/luasocket[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targ
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v0.9.tar.gz -> luasec-0.9.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=e95869049e9dc6a48da1b57a797ba212
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
index ac91cfedbde4..233f82b885f1 100644
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a81139de9d13fb076260482dfe63052d
diff --git a/metadata/md5-cache/dev-lua/luassert-1.8.0-r101 b/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
index 64af6c85bf36..c0c60551180a 100644
--- a/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
+++ b/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/luassert/archive/v1.8.0.tar.gz -> luassert-1.8.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=2ddba3bca7f1c50f403ea29d3ab70c8a
diff --git a/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102 b/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
index 224661cd80c2..29a7143c334e 100644
--- a/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
+++ b/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
@@ -11,5 +11,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/o-lim/luasystem/archive/v0.2.1-0.tar.gz -> luasystem-0.2.1_p0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=8780785225a56dc7d95386bf0faa8cac
diff --git a/metadata/md5-cache/dev-lua/lutok-0.4-r10 b/metadata/md5-cache/dev-lua/lutok-0.4-r10
index de87a388a50a..fc03f3d561ca 100644
--- a/metadata/md5-cache/dev-lua/lutok-0.4-r10
+++ b/metadata/md5-cache/dev-lua/lutok-0.4-r10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=1a3aca0a2c3c07d4bc0c561f8270c1e2
diff --git a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r102 b/metadata/md5-cache/dev-lua/luv-1.32.0.0-r102
index db9b460f3aa3..a52e225b2315 100644
--- a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r102
+++ b/metadata/md5-cache/dev-lua/luv-1.32.0.0-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luvit/luv/archive/1.32.0-0.tar.gz -> luv-1.32.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> luv-lua-compat-0.10.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f5144c1d5d833d28323488e2e32f1f1
diff --git a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101 b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
index 5bee8470c170..158d2043b58b 100644
--- a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
+++ b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz -> mediator_lua-1.1.2_p0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=1aefc025803b21d142d81c2d1c36a1e3
diff --git a/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100 b/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
index 7a70bdeb0a45..843a25b37ec5 100644
--- a/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
+++ b/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://framagit.org/fperrad/lua-MessagePack/-/archive/18f316b3f62c02bf2b7a3096701780f78a4d2c67/lua-MessagePack-18f316b3f62c02bf2b7a3096701780f78a4d2c67.tar.gz -> messagepack-0.5.2_p20201025.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=31f9433af82c4bcd5379284d677d6103
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.8-r100 b/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
index c119580ac3e4..2eef3e7b99f1 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.8.tar.gz -> mpack-1.0.8.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=d10c3893b3c2849a95682d5f3c1fe5d7
diff --git a/metadata/md5-cache/dev-lua/penlight-1.9.2-r101 b/metadata/md5-cache/dev-lua/penlight-1.9.2-r101
index b6a50dbb957f..5fe0f3d7b7d2 100644
--- a/metadata/md5-cache/dev-lua/penlight-1.9.2-r101
+++ b/metadata/md5-cache/dev-lua/penlight-1.9.2-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Tieske/Penlight/archive/1.9.2.tar.gz -> penlight-1.9.2.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=afd461582906a4e68d58dbeb45393067
diff --git a/metadata/md5-cache/dev-lua/say-1.3_p1-r101 b/metadata/md5-cache/dev-lua/say-1.3_p1-r101
index 1a4d2999e2fa..005b24e1b27b 100644
--- a/metadata/md5-cache/dev-lua/say-1.3_p1-r101
+++ b/metadata/md5-cache/dev-lua/say-1.3_p1-r101
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=cca7568a60192d73eca2df4aa97718f8
diff --git a/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100 b/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
index fd332c95e8c0..8f498d64ae5b 100644
--- a/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
+++ b/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://github.com/LuaDist/toluapp/archive/b34075b76835b778bb6b2ce0aa224afd9d182887.tar.gz -> toluapp-1.0.93_p20190513.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3bbe997a3075f94171030cc4c078909
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-3.692 b/metadata/md5-cache/dev-perl/Lab-Measurement-3.740
similarity index 98%
rename from metadata/md5-cache/dev-perl/Lab-Measurement-3.692
rename to metadata/md5-cache/dev-perl/Lab-Measurement-3.740
index 99c0a86bea55..bd43cf04c678 100644
--- a/metadata/md5-cache/dev-perl/Lab-Measurement-3.692
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-3.740
@@ -10,6 +10,6 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AK/AKHUETTEL/Lab-Measurement-3.692.tar.gz
+SRC_URI=mirror://cpan/authors/id/A/AK/AKHUETTEL/Lab-Measurement-3.740.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d3b7b5cdb9eef8829534b7e9fb5ba6c3
+_md5_=436137251994fe26c35cb123fefc0314
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 1144a9e5d5c6..3dc8ec40eb46 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-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index dae0c31cca54..f9dc91b27480 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/pecl-http-3.2.4 b/metadata/md5-cache/dev-php/pecl-http-3.2.4
new file mode 100644
index 000000000000..123b1862ae0b
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-http-3.2.4
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-3? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.3[hash,session,iconv] ) php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.4[session,iconv] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=Extended HTTP Support for PHP
+EAPI=7
+HOMEPAGE=https://pecl.php.net/pecl_http
+IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 MIT
+RDEPEND=php_targets_php7-3? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.3[hash,session,iconv] ) php_targets_php7-4? ( app-arch/brotli:= dev-libs/libevent dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:7.4[session,iconv] ) php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/pecl_http-3.2.4.tgz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=2e5fdb76ec829d08e91add8275d8e84f
diff --git a/metadata/md5-cache/dev-php/pecl-http-4.0.0 b/metadata/md5-cache/dev-php/pecl-http-4.0.0
new file mode 100644
index 000000000000..d316f250d32d
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-http-4.0.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session,iconv] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=Extended HTTP Support for PHP
+EAPI=7
+HOMEPAGE=https://pecl.php.net/pecl_http
+IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 MIT
+RDEPEND=php_targets_php8-0? ( app-arch/brotli:= dev-libs/libevent >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:8.0[session,iconv] ) php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] ) php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=8
+SRC_URI=https://pecl.php.net/get/pecl_http-4.0.0.tgz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=0cf3c5d100ccf7738da4db6824662d84
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2eeb2f230a36..44ffa634b97f 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/PyICU-2.5 b/metadata/md5-cache/dev-python/PyICU-2.5
deleted file mode 100644
index 42cc41c5582b..000000000000
--- a/metadata/md5-cache/dev-python/PyICU-2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/icu:= >=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
-DEPEND=dev-libs/icu:=
-DESCRIPTION=Python bindings for dev-libs/icu
-EAPI=7
-HOMEPAGE=https://github.com/ovalhub/pyicu
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/icu:= python_targets_python3_7? ( dev-lang/python:3.7 ) python_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=mirror://pypi/P/PyICU/PyICU-2.5.tar.gz
-_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=2c1824f59b816a3e073ae597ea2914f4
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.2 b/metadata/md5-cache/dev-python/PyQt5-5.15.2
index 42a1c7708ab5..008157aca19b 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.2
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
 IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network networkauth opengl positioning printsupport sensors serialport sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns 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=GPL-3
 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/PyQt5-sip-4.19.23:=[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-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[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-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.15:5 ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) networkauth? ( network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.2.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=f462405b0da1a88ec21655c46dfd25ee
+_md5_=6065745fd63cd6104c941e4ed773191c
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23-r1
similarity index 99%
rename from metadata/md5-cache/dev-python/catkin_pkg-0.4.23
rename to metadata/md5-cache/dev-python/catkin_pkg-0.4.23-r1
index 38ad6261bea2..30984d1d54bf 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.23.tar.gz -> catkin_pkg-0.4.23-gh.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=e71d305426a21c605d7eadaa3ace4740
+_md5_=6ab9cb9dc6a8c81d7312cba782efc4d8
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-9999 b/metadata/md5-cache/dev-python/catkin_pkg-9999
index d6d064dc2d74..19c16ff0aeb0 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-9999
+++ b/metadata/md5-cache/dev-python/catkin_pkg-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=e71d305426a21c605d7eadaa3ace4740
+_md5_=6ab9cb9dc6a8c81d7312cba782efc4d8
diff --git a/metadata/md5-cache/dev-python/gevent-21.1.1 b/metadata/md5-cache/dev-python/gevent-21.1.2
similarity index 98%
rename from metadata/md5-cache/dev-python/gevent-21.1.1
rename to metadata/md5-cache/dev-python/gevent-21.1.2
index 8d863d465908..6b8d7689c7ee 100644
--- a/metadata/md5-cache/dev-python/gevent-21.1.1
+++ b/metadata/md5-cache/dev-python/gevent-21.1.2
@@ -11,6 +11,6 @@ RDEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= >=dev-p
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/g/gevent/gevent-21.1.1.tar.gz
+SRC_URI=mirror://pypi/g/gevent/gevent-21.1.2.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ab717582afd7c21d032ab30156114d7e
diff --git a/metadata/md5-cache/dev-python/humanfriendly-9.1 b/metadata/md5-cache/dev-python/humanfriendly-9.1
new file mode 100644
index 000000000000..242dfbaa5522
--- /dev/null
+++ b/metadata/md5-cache/dev-python/humanfriendly-9.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/capturer[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/coloredlogs[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/docutils[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/mock[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(-)] ) test? ( >=dev-python/pytest-4.5.0[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(-)] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Human friendly output for text interfaces using Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/humanfriendly/ https://github.com/xolox/python-humanfriendly/ https://humanfriendly.readthedocs.io/
+IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-9.1.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=018ba1599ba5abc71c7b6289d73f4bff
diff --git a/metadata/md5-cache/dev-python/ipy-1.01 b/metadata/md5-cache/dev-python/ipy-1.01
new file mode 100644
index 000000000000..d6990821d083
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipy-1.01
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Class and tools for handling of IPv4 and IPv6 addresses and networks
+EAPI=7
+HOMEPAGE=https://github.com/autocracy/python-ipy/wiki https://pypi.org/project/IPy/
+IUSE=examples python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~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 )
+SLOT=0
+SRC_URI=mirror://pypi/I/IPy/IPy-1.01.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=d0957c3ba6824bdbffb7743c7a8b45d4
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.13 b/metadata/md5-cache/dev-python/iso8601-0.1.13
new file mode 100644
index 000000000000..7e9e6c005ec2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple module to parse ISO 8601 dates
+EAPI=7
+HOMEPAGE=https://pypi.org/project/iso8601/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=MIT
+RDEPEND=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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.13.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=fcf9abf0838e13c182ccdae28aba2357
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.4 b/metadata/md5-cache/dev-python/pyyaml-5.4.1
similarity index 97%
rename from metadata/md5-cache/dev-python/pyyaml-5.4
rename to metadata/md5-cache/dev-python/pyyaml-5.4.1
index 4f1791d2caeb..0e8b58774572 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.4
+++ b/metadata/md5-cache/dev-python/pyyaml-5.4.1
@@ -11,6 +11,6 @@ RDEPEND=libyaml? ( dev-libs/libyaml:= ) python_targets_pypy3? ( >=dev-python/pyp
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/yaml/pyyaml/archive/5.4.tar.gz -> pyyaml-5.4.gh.tar.gz
+SRC_URI=https://github.com/yaml/pyyaml/archive/5.4.1.tar.gz -> pyyaml-5.4.1.gh.tar.gz
 _eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=e02b5ce1d610fcc78eb723b02431e609
diff --git a/metadata/md5-cache/dev-python/smartypants-2.0.1 b/metadata/md5-cache/dev-python/smartypants-2.0.1
new file mode 100644
index 000000000000..96b72008c243
--- /dev/null
+++ b/metadata/md5-cache/dev-python/smartypants-2.0.1
@@ -0,0 +1,14 @@
+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(-)] ) ) ) python_targets_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ASCII quote-dot-dash to HTML entity converter
+EAPI=7
+HOMEPAGE=https://pypi.python.org/pypi/smartypants/
+IUSE=doc python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/leohemsted/smartypants.py/archive/v2.0.1.tar.gz -> smartypants-2.0.1.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=9972a4dfd4f5cb2fcc3714e1875a7d08
diff --git a/metadata/md5-cache/dev-python/smartypants-9999 b/metadata/md5-cache/dev-python/smartypants-9999
new file mode 100644
index 000000000000..990bf2e672df
--- /dev/null
+++ b/metadata/md5-cache/dev-python/smartypants-9999
@@ -0,0 +1,13 @@
+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(-)] ) ) ) python_targets_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 prepare test unpack
+DESCRIPTION=ASCII quote-dot-dash to HTML entity converter
+EAPI=7
+HOMEPAGE=https://pypi.python.org/pypi/smartypants/
+IUSE=doc python_targets_python3_7 python_targets_python3_8
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_md5_=9972a4dfd4f5cb2fcc3714e1875a7d08
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 26275da91c3b..f254565a7638 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/ament_cmake_core-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.3
new file mode 100644
index 000000000000..ea316464e7f8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/ament_package dev-python/catkin_pkg
+DESCRIPTION=The core of the ament buildsystem in CMake
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/ament_package dev-python/catkin_pkg
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1742a4930e4ec056e16a3c306250314
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.3
new file mode 100644
index 000000000000..f67913db21fa
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4144640c777adc33dcb2c1f18c4ca214
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.3
new file mode 100644
index 000000000000..8f82b723ef7c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
+DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=93f5bd3b348ee030e2961a26b0683b3c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.3
new file mode 100644
index 000000000000..fed2e01dcd45
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d170a4f241e2665b6d7f8a1624b98292
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.3
new file mode 100644
index 000000000000..d5373c6582e6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9756046b24d366719bdfd42bd96eccb7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.3
new file mode 100644
index 000000000000..9d3e1d75b733
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=31648af8a3482fc9751987c116607f4b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.3
new file mode 100644
index 000000000000..8f58b9f9a350
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7607df8b79ce23b1b42cbb147b688a1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.3
new file mode 100644
index 000000000000..0d7db8ee44c6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+DESCRIPTION=Export targets to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b66eed2780ea92041b78a3dab28f72a9
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.3
new file mode 100644
index 000000000000..89a796e15ccd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=068b64aec0346820918dad2935d7f76b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.3
new file mode 100644
index 000000000000..9bb3c1831240
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c3f0f0bd5ffd1246eb63550e19c06c0
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.3
new file mode 100644
index 000000000000..fed2e01dcd45
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d170a4f241e2665b6d7f8a1624b98292
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.3
new file mode 100644
index 000000000000..ed9fa811fe42
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5eff9df04c51ee74739c25711ff7fb55
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.3
new file mode 100644
index 000000000000..e3ba900acb70
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=109aa01e99fd1e262f70479029dc6fd5
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.3
new file mode 100644
index 000000000000..026a6f59a889
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to use Python in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=96b2359020e254cbf065aa8d15dfb5fb
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.3
new file mode 100644
index 000000000000..04473fe808ee
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
+DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6844978602e98ee44524cb5a2819eef9
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.3
new file mode 100644
index 000000000000..a61e470b0bb3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_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(-)] dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_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=The ability to add tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97b9105113c38b4b77c4f8e9ce6d8ca8
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.3
new file mode 100644
index 000000000000..9e0056354550
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.3
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Override the exported package version in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ba0ba3be9c0547a38beb6dedf377410
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.10 b/metadata/md5-cache/dev-ros/audio_capture-0.3.10
new file mode 100644
index 000000000000..adb4e7b77434
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.10
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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.10.tar.gz -> audio_common-0.3.10.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=76d98f7ff61d9d28ea98a7c4a540db94
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.0 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.10
similarity index 69%
rename from metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.0
rename to metadata/md5-cache/dev-ros/audio_common_msgs-0.3.10
index 3ae5c99c6642..6698b48360fd 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.0
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) 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
+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/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
+HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_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(-)?] )
+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/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.10.tar.gz -> audio_common-0.3.10.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbf8c58cd2cf78c4a16c292da19d2928
+_md5_=81aa28caf785771f4651de5a33334da8
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.10 b/metadata/md5-cache/dev-ros/audio_play-0.3.10
new file mode 100644
index 000000000000..6167a0a0a42f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.10
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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.10.tar.gz -> audio_common-0.3.10.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d578e202896eba1b2f044e048a06de74
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
deleted file mode 100644
index 18de8992a9e2..000000000000
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_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	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d830e16d8397255ba1c20e283425b216
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.0 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.1
similarity index 98%
rename from metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.0
rename to metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.1
index 052f2be381bc..1fc4ece3d72b 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.1
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/i
 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.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d751238881dd797869ce4bc2aba58f4
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1 b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
deleted file mode 100644
index f4a553914d4a..000000000000
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_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	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d69a6460307608173fc1f79733d2c4f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.5.0 b/metadata/md5-cache/dev-ros/hector_geotiff-0.5.1
similarity index 98%
rename from metadata/md5-cache/dev-ros/hector_geotiff-0.5.0
rename to metadata/md5-cache/dev-ros/hector_geotiff-0.5.1
index 7ae34aaa2079..74656a563f44 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.5.1
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/
 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.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77f0003319233143a564cfedcaf1bcf5
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1 b/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.1
similarity index 71%
rename from metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
rename to metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.1
index c52321ff12b0..dbaa6d13c164 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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
+DESCRIPTION=Launch files for the hector_geotiff mapper
 EAPI=7
-HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
+HOMEPAGE=https://wiki.ros.org/hector_geotiff_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+RDEPEND=dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins dev-ros/hector_trajectory_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/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af4bd6a8cf4132a83050d6be43cc1116
+_md5_=d54b87399eda5ef651c723cc554bc41f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_launch-9999 b/metadata/md5-cache/dev-ros/hector_geotiff_launch-9999
new file mode 100644
index 000000000000..5775ce3e206c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_launch-9999
@@ -0,0 +1,15 @@
+BDEPEND=>=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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 the hector_geotiff mapper
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_geotiff_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+LICENSE=BSD
+PROPERTIES=live
+RDEPEND=dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins dev-ros/hector_trajectory_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	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d54b87399eda5ef651c723cc554bc41f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.1 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.1
new file mode 100644
index 000000000000..8f7517622774
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.1
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_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.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=762dc2da08aab35167f095e7f23bab02
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.0 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.1
similarity index 97%
rename from metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.0
rename to metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.1
index 69f95aa7d516..81e78b1bde7f 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.1
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_
 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.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=097236a64da572f4f226b97ab6ea439e
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.1
similarity index 57%
rename from metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
rename to metadata/md5-cache/dev-ros/hector_imu_tools-0.5.1
index 449743493cb2..eb8d1f46937d 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.1
@@ -1,9 +1,9 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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
+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_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
+HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_
 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
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a17eaa44ef1699ca20dd7943f1bcd6c6
+_md5_=f8a21cc233edc91962e2a76e73605a96
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.5.1 b/metadata/md5-cache/dev-ros/hector_map_server-0.5.1
new file mode 100644
index 000000000000..0dddff481f70
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.5.1
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_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.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=981df0031799a063b1b2725fe80bf1c7
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.5.1 b/metadata/md5-cache/dev-ros/hector_map_tools-0.5.1
new file mode 100644
index 000000000000..8e3327d11a5e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.5.1
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_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.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4f1a9b7a42c584537195510f906229b7
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.5.1 b/metadata/md5-cache/dev-ros/hector_mapping-0.5.1
new file mode 100644
index 000000000000..c7f3b0609dda
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.5.1
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) 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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_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.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=46ff9c591fc447dc94ad9182e4054806
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.1 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.1
new file mode 100644
index 000000000000..89e5f1a074b8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.1
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_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.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e6db26598bdd927ab93f4e21a41cfafa
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.1
similarity index 87%
rename from metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
rename to metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.1
index b5070daf8ab7..2274b66aa73b 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) 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(-)?] )
+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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_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 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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_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(-)?] )
+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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_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/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fc6876bc9317bd927b127f32204a198
+_md5_=5120d8c09439a4c0ce80830857fd4e69
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999 b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
index 5e590570b6a6..9203a47c91cb 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) 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(-)?] )
+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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_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 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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_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(-)?] )
+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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_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	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fc6876bc9317bd927b127f32204a198
+_md5_=5120d8c09439a4c0ce80830857fd4e69
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.0 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.1
similarity index 97%
rename from metadata/md5-cache/dev-ros/hector_slam_launch-0.5.0
rename to metadata/md5-cache/dev-ros/hector_slam_launch-0.5.1
index bb5c2d729842..ce0ea3a6a09e 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.1
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 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.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a94a66f5ba66d8bcb2ec0d0f1f81999e
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.1 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.1
new file mode 100644
index 000000000000..af94f5a46b40
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.1
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_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.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=32b7535850a4b5ed9046f5864d13c85d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 23372f4e20bf..ba9fdf96bd86 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/bcc-0.17.0-r100 b/metadata/md5-cache/dev-util/bcc-0.17.0-r100
index ee2ea390b651..bf466034609d 100644
--- a/metadata/md5-cache/dev-util/bcc-0.17.0-r100
+++ b/metadata/md5-cache/dev-util/bcc-0.17.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.17.0.tar.gz -> bcc-0.17.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f31cb7ad45db5dddd2b3fde64a4137dc
diff --git a/metadata/md5-cache/dev-util/bcc-0.18.0-r1 b/metadata/md5-cache/dev-util/bcc-0.18.0-r1
index 766d131463f7..fabc51030227 100644
--- a/metadata/md5-cache/dev-util/bcc-0.18.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.18.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.18.0.tar.gz -> bcc-0.18.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ffac1fdedafb57f751f11ad73760f59
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.37-r100 b/metadata/md5-cache/dev-util/geany-plugins-1.37-r100
index 5ef41b2e5489..b679a8077cb4 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.37-r100
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.37-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[gtk2=] !gtk2? ( x11-libs/gtk+:3 )
 REQUIRED_USE=gtk2? ( !markdown ) lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.37.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=5106a110c95e64d3d05852833268688d
diff --git a/metadata/md5-cache/dev-util/hermes-2.8 b/metadata/md5-cache/dev-util/hermes-2.8
index 961b157e21bd..89d2f6d2a877 100644
--- a/metadata/md5-cache/dev-util/hermes-2.8
+++ b/metadata/md5-cache/dev-util/hermes-2.8
@@ -10,5 +10,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TACC/Hermes/archive/2.8.tar.gz -> hermes-2.8.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=9ab0f5927b10123ba394d283addefcf8
diff --git a/metadata/md5-cache/dev-util/sysdig-0.27.1-r100 b/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
index 010b736ddc6c..cc913ce5445c 100644
--- a/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
+++ b/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93a8a8c8808882c22387d2e1ae64e889
diff --git a/metadata/md5-cache/dev-util/uftrace-0.9.4-r100 b/metadata/md5-cache/dev-util/uftrace-0.9.4-r100
index d083d430ed30..cdc1ad8e81e6 100644
--- a/metadata/md5-cache/dev-util/uftrace-0.9.4-r100
+++ b/metadata/md5-cache/dev-util/uftrace-0.9.4-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/namhyung/uftrace/archive/v0.9.4.tar.gz -> uftrace-0.9.4.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=38abf6cae9c21dbacc90c40ab24a2df5
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index b8673b054bc5..0d8c15cd9026 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/minetest-5.3.0-r100 b/metadata/md5-cache/games-action/minetest-5.3.0-r100
index e0c6cf3a0dbe..13ce91b1720f 100644
--- a/metadata/md5-cache/games-action/minetest-5.3.0-r100
+++ b/metadata/md5-cache/games-action/minetest-5.3.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( client server )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minetest/minetest/archive/5.3.0.tar.gz -> minetest-5.3.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ea6a0f7f0049b273f73791221e14903
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 61012676798c..643380741a5c 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/jvgs-0.5-r100 b/metadata/md5-cache/games-arcade/jvgs-0.5-r100
index 4bfa92d6db00..87f736249f52 100644
--- a/metadata/md5-cache/games-arcade/jvgs-0.5-r100
+++ b/metadata/md5-cache/games-arcade/jvgs-0.5-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) media-libs/libsdl[video]
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/jvgs/jvgs-0.5-src.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4521c84730597efd7933a8a3e732c56e
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index cb3cda97d62e..0e2b6def01f8 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/fceux-2.2.3-r100 b/metadata/md5-cache/games-emulation/fceux-2.2.3-r100
index 50e854392ac8..df4744f73407 100644
--- a/metadata/md5-cache/games-emulation/fceux-2.2.3-r100
+++ b/metadata/md5-cache/games-emulation/fceux-2.2.3-r100
@@ -11,5 +11,5 @@ RDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) media-libs/libsd
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fceultra/fceux-2.2.3.src.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=33ff779f0812a988d0b100194a9465b9
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 1fa35e1406b1..0ffe3c49bb80 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/love-0.7.2-r100 b/metadata/md5-cache/games-engines/love-0.7.2-r100
index ac1ea31c192d..1390f926d259 100644
--- a/metadata/md5-cache/games-engines/love-0.7.2-r100
+++ b/metadata/md5-cache/games-engines/love-0.7.2-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-games/phy
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0.7
 SRC_URI=https://github.com/love2d/love/releases/download/0.7.2/love-0.7.2-linux-src.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=10f7ba063f6d3b4563e25286ad25e59d
diff --git a/metadata/md5-cache/games-engines/love-0.8.0-r100 b/metadata/md5-cache/games-engines/love-0.8.0-r100
index 1b5a5d9ce938..d12ce68c99c8 100644
--- a/metadata/md5-cache/games-engines/love-0.8.0-r100
+++ b/metadata/md5-cache/games-engines/love-0.8.0-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-games/phy
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0.8
 SRC_URI=https://github.com/love2d/love/releases/download/0.8.0/love-0.8.0-linux-src.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=1aaf212d856523453a02655bf518a30e
diff --git a/metadata/md5-cache/games-engines/love-11.3-r100 b/metadata/md5-cache/games-engines/love-11.3-r100
index 0fe2735d733a..0dbcf47f2c71 100644
--- a/metadata/md5-cache/games-engines/love-11.3-r100
+++ b/metadata/md5-cache/games-engines/love-11.3-r100
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/love2d/love/releases/download/11.3/love-11.3-linux-src.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=771fbb30f04cf5c19ff95f0f7e98e9c5
diff --git a/metadata/md5-cache/games-engines/solarus-1.3.1-r100 b/metadata/md5-cache/games-engines/solarus-1.3.1-r100
index efa9ac47cba8..9acfe5797d09 100644
--- a/metadata/md5-cache/games-engines/solarus-1.3.1-r100
+++ b/metadata/md5-cache/games-engines/solarus-1.3.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=http://www.zelda-solarus.com/downloads/solarus/solarus-1.3.1-src.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a93bad80ae19ddfca894dd90ffa7971a
diff --git a/metadata/md5-cache/games-engines/stratagus-2.4.3-r100 b/metadata/md5-cache/games-engines/stratagus-2.4.3-r100
index eecee8d4b672..adfa01ef44b7 100644
--- a/metadata/md5-cache/games-engines/stratagus-2.4.3-r100
+++ b/metadata/md5-cache/games-engines/stratagus-2.4.3-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0
 SRC_URI=https://github.com/Wargus/stratagus/archive/v2.4.3.tar.gz -> stratagus-2.4.3.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ccff266d2e63f26474bd71bbbeab7c8
diff --git a/metadata/md5-cache/games-engines/stratagus-3.0.0-r100 b/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
index 98b5d7965afe..3e0568325813 100644
--- a/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
+++ b/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0/3
 SRC_URI=https://github.com/Wargus/stratagus/archive/v3.0.0.tar.gz -> stratagus-3.0.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f51ceff10498cea23fec34d717dd4aa1
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 352f04a6dae8..eb3d9b783506 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/fish-fillets-1.0.1-r100 b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
index 317f29db4432..5d68e7f896c2 100644
--- a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
+++ b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=media-libs/libsdl-1.2[s
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fillets/fillets-ng-1.0.1.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=9e053991489d68e6582005c1d37ce6de
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index c55365fb05a3..f5191b2bb5c3 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/crossfire-client-1.71.0-r100 b/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
index 12817ae9ee21..b765e6be5db3 100644
--- a/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
+++ b/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) media-libs/libpn
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/crossfire/crossfire-client-1.71.0.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=475889cd037ab56dc1b87eff506499e7
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
index 7a05c55beb21..6a72353a80b7 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 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	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07455aa2a04045d1e3d54aa7e746b93b
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
index 985e7dc3d8ad..743be186cd98 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 RESTRICT=test
 SLOT=0.25
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.25.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.25.svg
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b9397d728cb7519006790222ce5beb3
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
index 67a3df9784ed..92618020843a 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 RESTRICT=test
 SLOT=0.26
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.0/stone_soup-0.26.0.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7da87ccfa7f006d1f7139f1c0266402b
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index a789e4533daa..e7001b6d9ba8 100644
Binary files a/metadata/md5-cache/games-rpg/Manifest.gz and b/metadata/md5-cache/games-rpg/Manifest.gz differ
diff --git a/metadata/md5-cache/games-rpg/kqlives-0.99-r100 b/metadata/md5-cache/games-rpg/kqlives-0.99-r100
index d46f275d1f2e..3c7103beb746 100644
--- a/metadata/md5-cache/games-rpg/kqlives-0.99-r100
+++ b/metadata/md5-cache/games-rpg/kqlives-0.99-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=gnome-base/libglade-2.4
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/kqlives/kq-0.99.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=91a32e6e7a9cfcc3e0f353551d06f66d
diff --git a/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100 b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
index a535db1d86c3..ecbfc7d9c78c 100644
--- a/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
+++ b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/sumwars/sumwars-0.5.8-src.tar.bz2
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=247f0976c6e275fbb0d7abebb6c578fb
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 1bbb33ba7e23..8b9420fcd0be 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.64-r100 b/metadata/md5-cache/games-simulation/corsix-th-0.64-r100
index c8c9f6cbdcaf..cbda9aa97ff5 100644
--- a/metadata/md5-cache/games-simulation/corsix-th-0.64-r100
+++ b/metadata/md5-cache/games-simulation/corsix-th-0.64-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.64.tar.gz -> corsix-th-0.64.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=62772259ee50c41f611d2f2bd370698c
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index 214494596d25..67174e18a6e9 100644
Binary files a/metadata/md5-cache/games-sports/Manifest.gz and b/metadata/md5-cache/games-sports/Manifest.gz differ
diff --git a/metadata/md5-cache/games-sports/xmoto-0.6.1-r100 b/metadata/md5-cache/games-sports/xmoto-0.6.1-r100
index 0596069cd76c..8d1242767f8d 100644
--- a/metadata/md5-cache/games-sports/xmoto-0.6.1-r100
+++ b/metadata/md5-cache/games-sports/xmoto-0.6.1-r100
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-games/ode[double-precision=] lua_sing
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/xmoto/xmoto/archive/0.6.1.tar.gz -> xmoto-0.6.1.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c84301632f1444507c18ec39b09bca94
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 55428e10b6ad..d2d6474aee16 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/hedgewars-1.0.0-r100 b/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
index 1becc0d54b6e..d0adaf57fbbf 100644
--- a/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
+++ b/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-games/physfs-3.0.1
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-1.0.0.tar.bz2
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8788150f949678980d5c960867d1247c
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100 b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
index 3ca57c2f300c..a8bfea964abb 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
+++ b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ced6715bba5fad34bc8fb7d79d741a6c
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.13.0 b/metadata/md5-cache/games-strategy/megaglest-3.13.0
index 2513fedc602c..dcfff5deb7f9 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.13.0
+++ b/metadata/md5-cache/games-strategy/megaglest-3.13.0
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.13.0/megaglest-source-3.13.0.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=948a6b67a409aa1633cf0a8b5d83928e
diff --git a/metadata/md5-cache/games-strategy/naev-0.7.0-r100 b/metadata/md5-cache/games-strategy/naev-0.7.0-r100
index baaf0c404d1e..f5444b97bddb 100644
--- a/metadata/md5-cache/games-strategy/naev-0.7.0-r100
+++ b/metadata/md5-cache/games-strategy/naev-0.7.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://github.com/naev/naev/releases/download/v0.7.0/naev-0.7.0.tar.bz2 https://github.com/naev/naev/releases/download/v0.7.0/naev-0.7.0-ndata.zip
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b1c8ac68ff9b1d122a50584f544091a
diff --git a/metadata/md5-cache/games-strategy/openra-20190314-r100 b/metadata/md5-cache/games-strategy/openra-20190314-r100
index 870e377a2b0e..7094d4d8417b 100644
--- a/metadata/md5-cache/games-strategy/openra-20190314-r100
+++ b/metadata/md5-cache/games-strategy/openra-20190314-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/archive/release-20190314.tar.gz -> openra-20190314.tar.gz https://github.com/OpenRA/Eluant/releases/download/20160124/Eluant.dll -> Eluant-20160124.dll https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll.config -> OpenAL-CS-20151227.dll.config https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll -> OpenAL-CS-20151227.dll https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll.config -> SDL2-CS-20161223.dll.config https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll -> SDL2-CS-20161223.dll https://www.nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0 -> FuzzyLogicLibrary-1.2.0.zip https://www.nuget.org/api/v2/package/MaxMind.Db/2.0.0 -> MaxMind.Db-2.0.0.zip https://www.nuget.org/api/v2/package/Open.Nat/2.1.0 -> Open.Nat-2.1.0.zip https://www.nuget.org/api/v2/package/rix0rrr.BeaconLib/1.0.1 -> rix0rrr.BeaconLib-1.0.1.zip https://www.nuget.org/api/v2/package/SharpFont/4.0.1 -> SharpFont-4.0.1.zip https://www.nuget.org/api/v2/package/SharpZipLib/0.86.0 -> SharpZipLib-0.86.0.zip
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04e300ef4fdf409c3330a91e1a0dc722
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100 b/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
index 075c413c6fed..ea28d29c6bc5 100644
--- a/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
+++ b/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Return-To-The-Roots/s25client/archive/f0b97b120140c96bbeacae9c22633f899931db69.tar.gz -> s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> s25rttr-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> s25rttr-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> s25rttr-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f139b367018df5ef863a87f2d3d6ed55
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index f5bc0f3d1d5d..43db75a71d62 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/slade-3.1.12a-r100 b/metadata/md5-cache/games-util/slade-3.1.12a-r100
index c03f1e63c4c5..9821fb972e34 100644
--- a/metadata/md5-cache/games-util/slade-3.1.12a-r100
+++ b/metadata/md5-cache/games-util/slade-3.1.12a-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/sirjuddington/SLADE/archive/3.1.12a.tar.gz -> slade-3.1.12a.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b0c75844f0fde186e26249456761f4a
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index a0ef044ba492..0efc21f6a626 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/cantor-20.12.1 b/metadata/md5-cache/kde-apps/cantor-20.12.1
index 27cdcb861c77..968495aaf2ce 100644
--- a/metadata/md5-cache/kde-apps/cantor-20.12.1
+++ b/metadata/md5-cache/kde-apps/cantor-20.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.1/src/cantor-20.12.1.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=082ea43aa2771229a2fa74d70dd88857
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 84eb77019daa..67a8e29f68bb 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/imapfilter-2.6.16-r100 b/metadata/md5-cache/mail-filter/imapfilter-2.6.16-r100
index 1f8d5f022218..57e2d286af2f 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.6.16-r100
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.6.16-r100
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) de
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.6.16.tar.gz -> imapfilter-2.6.16.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=cb681027247d114e69545353c9cdd7c5
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.7.5 b/metadata/md5-cache/mail-filter/imapfilter-2.7.5
index 391df5ab5e5c..100d5a0ae8aa 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.7.5
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.7.5
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) de
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.7.5.tar.gz -> imapfilter-2.7.5.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=b7d7a30bd55cf8fae4c075cd1b017c3c
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26 b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
index d3db530f9d6f..b22edced0b79 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
+++ b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
@@ -12,5 +12,5 @@ REQUIRED_USE=sasl? ( ldap ) stats? ( opendbx ) querycache? ( berkdb ) lua? ( ^^
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/opendkim/opendkim-2.10.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	db-use	5b886219e6035ca01d8b1c58eba91679	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	db-use	5b886219e6035ca01d8b1c58eba91679	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cbc9a9dc4a268c9614ecb23360b48d05
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.6-r100 b/metadata/md5-cache/mail-filter/rspamd-2.6-r100
index bdebad99e9a8..f1cbf5d6695c 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.6-r100
+++ b/metadata/md5-cache/mail-filter/rspamd-2.6-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 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	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49fa424e278dfc4a463cd303cbcfdcd6
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.7-r100 b/metadata/md5-cache/mail-filter/rspamd-2.7-r100
index 8176ab9c7516..10f3e709f38b 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.7-r100
+++ b/metadata/md5-cache/mail-filter/rspamd-2.7-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.7.tar.gz -> rspamd-2.7.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a8e3c53e13d9f1986b6b54776ab1738
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 3e9d96056b5b..a7f16635a574 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) 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 ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a8e3c53e13d9f1986b6b54776ab1738
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index fb4b44a84555..78fec7027ea3 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/darktable-3.2.1-r1 b/metadata/md5-cache/media-gfx/darktable-3.2.1-r1
index 308124fe983a..7323f2059bc7 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.2.1-r1
+++ b/metadata/md5-cache/media-gfx/darktable-3.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml
 REQUIRED_USE=system-lua? ( lua ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.2.1/darktable-3.2.1.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual.pdf -> darktable-usermanual-3.0.0.pdf )
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59e56bc00df5225fcc11521b08c6b2aa
diff --git a/metadata/md5-cache/media-gfx/darktable-3.4.0-r1 b/metadata/md5-cache/media-gfx/darktable-3.4.0-r1
index 616a2bee54d5..20355fc219d6 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.4.0-r1
+++ b/metadata/md5-cache/media-gfx/darktable-3.4.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-3.4.0.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-usermanual.pdf -> darktable-usermanual-3.4.0.pdf )
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ee05decd81b52594afe45ec80823230
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index c12e5511f77d..04e79caffcd7 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e34e0ea1e50eaa5ede3629a9d1a7bd2d
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.5.1-r1 b/metadata/md5-cache/media-gfx/geeqie-1.5.1-r1
index eeb50d7d4359..11681b712c18 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.5.1-r1
+++ b/metadata/md5-cache/media-gfx/geeqie-1.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( m
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
 SRC_URI=http://www.geeqie.org/geeqie-1.5.1.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=551f3bc5c23b261f81fa2897426eb92f
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.6 b/metadata/md5-cache/media-gfx/geeqie-1.6
index 29438e8eb344..7df97c69e491 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.6
+++ b/metadata/md5-cache/media-gfx/geeqie-1.6
@@ -11,5 +11,5 @@ RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( m
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
 SRC_URI=http://www.geeqie.org/geeqie-1.6.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=350ec9c35f4c4a9d4b8e8038cf1ee524
diff --git a/metadata/md5-cache/media-gfx/geeqie-9999 b/metadata/md5-cache/media-gfx/geeqie-9999
index 2380cb76f70b..2e1b7481f339 100644
--- a/metadata/md5-cache/media-gfx/geeqie-9999
+++ b/metadata/md5-cache/media-gfx/geeqie-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2a3708030b50869238973c918c763c9
diff --git a/metadata/md5-cache/media-gfx/gimp-2.99.2-r100 b/metadata/md5-cache/media-gfx/gimp-2.99.2-r100
index f5e427c83c8f..50457d499232 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.99.2-r100
+++ b/metadata/md5-cache/media-gfx/gimp-2.99.2-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://gimp/v2.99/gimp-2.99.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1176a02f338fcf24f1d51b4d81f4b27
diff --git a/metadata/md5-cache/media-gfx/gimp-2.99.4 b/metadata/md5-cache/media-gfx/gimp-2.99.4
index 2a59c5fd3742..795c6c2ce77a 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.99.4
+++ b/metadata/md5-cache/media-gfx/gimp-2.99.4
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://gimp/v2.99/gimp-2.99.4.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae43972b4d7443a45e578826c324beab
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index 41acc3abf35d..739e03a373f1 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=debda03e046f4a5c699654666b32a7b7
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0.1 b/metadata/md5-cache/media-gfx/inkscape-1.0.1
index 6502727917a6..cf5e9299a948 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.0.1
+++ b/metadata/md5-cache/media-gfx/inkscape-1.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=SVG based generic vector-drawing program
 EAPI=7
 HOMEPAGE=https://inkscape.org/
 IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms openmp postscript spell static-libs svg2 visio wpg python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) 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_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
 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://inkscape.org/gallery/item/21571/inkscape-1.0.1.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ae54ec47a5b22a6041c9b396fc18179
+_md5_=59242ac3c018a642d99e2a9345d33ef7
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0-r1 b/metadata/md5-cache/media-gfx/inkscape-1.0.2
similarity index 96%
rename from metadata/md5-cache/media-gfx/inkscape-1.0-r1
rename to metadata/md5-cache/media-gfx/inkscape-1.0.2
index fc0c5a15631b..258b09b7ee0b 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.0-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-1.0.2
@@ -5,12 +5,12 @@ DESCRIPTION=SVG based generic vector-drawing program
 EAPI=7
 HOMEPAGE=https://inkscape.org/
 IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms openmp postscript spell static-libs svg2 visio wpg python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=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_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) 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_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://inkscape.org/gallery/item/18460/inkscape-1.0.tar.xz
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/media-gfx/inkscape/inkscape-1.0.2.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b11f617c7a871ade054710727846d1e0
+_md5_=4b6932b26b147e6eff49fad8f5b77895
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e5d0d3b7bc37..1dc3dbe5d837 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/libquvi-0.9.4-r100 b/metadata/md5-cache/media-libs/libquvi-0.9.4-r100
index 2142259a5b30..1211d6a91e9d 100644
--- a/metadata/md5-cache/media-libs/libquvi-0.9.4-r100
+++ b/metadata/md5-cache/media-libs/libquvi-0.9.4-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) >=dev-libs/gl
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/quvi/0.9/libquvi-0.9.4.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=faac823c1498173ace761d77d28c159f
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100 b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
index 3a7d9df62fd3..8262208b9e2d 100644
--- a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/quvi/libquvi-scripts-0.9.20131130.tar.xz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=9963793c2038ce6b0cafddd694c6e9c9
diff --git a/metadata/md5-cache/media-libs/mlt-6.24.0-r1 b/metadata/md5-cache/media-libs/mlt-6.24.0-r1
index bcd67ef6cb52..40b761734bb7 100644
--- a/metadata/md5-cache/media-libs/mlt-6.24.0-r1
+++ b/metadata/md5-cache/media-libs/mlt-6.24.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-
 REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.24.0/mlt-6.24.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=616a667ac877286f4d5c3decbe399b6e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ede54b122970..2a7ce0aae40b 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/aqualung-1.1-r101 b/metadata/md5-cache/media-sound/aqualung-1.1-r101
index 556f1db7954a..9a3d1245fa10 100644
--- a/metadata/md5-cache/media-sound/aqualung-1.1-r101
+++ b/metadata/md5-cache/media-sound/aqualung-1.1-r101
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/aqualung/releases/download/1.1/aqualung-1.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ce64ba1554c940beb4f2ee4ffc82972
diff --git a/metadata/md5-cache/media-sound/csound-6.15.0-r100 b/metadata/md5-cache/media-sound/csound-6.15.0-r100
index ba39d6505365..fa6561bce02b 100644
--- a/metadata/md5-cache/media-sound/csound-6.15.0-r100
+++ b/metadata/md5-cache/media-sound/csound-6.15.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit l
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.15.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_html.zip )
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb915f1520ca8525f9a22eee120df58b
diff --git a/metadata/md5-cache/media-sound/csound-9999 b/metadata/md5-cache/media-sound/csound-9999
index b5df56bf896b..447caa292fa2 100644
--- a/metadata/md5-cache/media-sound/csound-9999
+++ b/metadata/md5-cache/media-sound/csound-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate
 REQUIRED_USE=linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) cxx )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb915f1520ca8525f9a22eee120df58b
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 73de609df13b..f8b61f9d3f73 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/aegisub-3.2.2_p20160518-r101 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r101
index 989ab185a99c..fe809ed40ac7 100644
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r101
+++ b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio puls
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e06bf622cccae9c6fa165530fa86030
diff --git a/metadata/md5-cache/media-video/aegisub-9999 b/metadata/md5-cache/media-video/aegisub-9999
index 4e2d2d901a01..acfdfdcf9278 100644
--- a/metadata/md5-cache/media-video/aegisub-9999
+++ b/metadata/md5-cache/media-video/aegisub-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wx
 REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio pulseaudio )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b657619c434c41884c2d7a3c1ec9e699
diff --git a/metadata/md5-cache/media-video/mpv-0.33.0-r100 b/metadata/md5-cache/media-video/mpv-0.33.0-r100
index f75bd35d3f68..627957832941 100644
--- a/metadata/md5-cache/media-video/mpv-0.33.0-r100
+++ b/metadata/md5-cache/media-video/mpv-0.33.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.33.0.tar.gz -> mpv-0.33.0.tar.gz https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7038a37778acc479a9bce693be5b62d9
diff --git a/metadata/md5-cache/media-video/obs-studio-25.0.8-r100 b/metadata/md5-cache/media-video/obs-studio-25.0.8-r100
index d49b7adfb0f4..2e92bdefb63d 100644
--- a/metadata/md5-cache/media-video/obs-studio-25.0.8-r100
+++ b/metadata/md5-cache/media-video/obs-studio-25.0.8-r100
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtg
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/obsproject/obs-studio/archive/25.0.8.tar.gz -> obs-studio-25.0.8.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bb516b6e8ebabb20d1110a6ba6d68f7
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index 2b088bce87a4..19fde348fc31 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_7 ) )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fec8bab1f42895039a8c186078b6ba48
diff --git a/metadata/md5-cache/media-video/vlc-3.0.11.1-r101 b/metadata/md5-cache/media-video/vlc-3.0.11.1-r101
index 76e86f2ea750..c082e088164e 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.11.1-r101
+++ b/metadata/md5-cache/media-video/vlc-3.0.11.1-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.11.1/vlc-3.0.11.1.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=33e27ffd6bb2c3ccd9733837230c96df
diff --git a/metadata/md5-cache/media-video/vlc-3.0.12.1-r100 b/metadata/md5-cache/media-video/vlc-3.0.12.1-r100
index febd31146a6d..059beab5f00f 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.12.1-r100
+++ b/metadata/md5-cache/media-video/vlc-3.0.12.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.12.1/vlc-3.0-3.0.12.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97eea3c855ea1db962e0be0949f4f037
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index 947491493ee2..745e6eb5e28b 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -11,5 +11,5 @@ RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b60c4cba213c76eb238ef97e117983e
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 6f15ec72921b..8de4134d6931 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -11,5 +11,5 @@ RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/12-9
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6ab9f3d2f203c62e1e1918931e55704
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 9f196937de04..4adf09ba37ab 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/nmap-7.80-r2 b/metadata/md5-cache/net-analyzer/nmap-7.80-r2
index 9035d0e35253..80ecad2a9e92 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.80-r2
+++ b/metadata/md5-cache/net-analyzer/nmap-7.80-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.80.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1868dae011e1156b06989fce81f9b45
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.91-r1 b/metadata/md5-cache/net-analyzer/nmap-7.91-r1
index 74150c33057c..414af219031b 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.91-r1
+++ b/metadata/md5-cache/net-analyzer/nmap-7.91-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.91.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53c22e83be5691113dcb8e4d7068f9a7
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index bca1484f44fc..4e595f4218ae 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) )
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a35c3ba52a003f2115eb8ad6c00928a
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
index dff4eec031eb..b08ada76745b 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=694e50a89f6061d035fda309b45f4f6f
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100 b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
index fefe9d589f3b..10fea2b0b420 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 de
 REQUIRED_USE=!kernel_linux? ( !shared-rep ) open-appid? ( ^^ ( lua_single_target_luajit ) )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.16.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2ae0667770150d21c182b27b3a649c9a
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.1-r100 b/metadata/md5-cache/net-analyzer/suricata-6.0.1-r100
index 175e3e209fa1..da63b8290e25 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.1-r100
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3bda0abe7dd69cea5452a7d8259f9916
diff --git a/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100 b/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
index 59f9fa47f9ee..b6baca686f2a 100644
--- a/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
+++ b/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tracebox/tracebox/archive/v0.4.4.tar.gz -> tracebox-0.4.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=88e6f088ea3c393da9e17e1fd8c808a0
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100 b/metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100
index 5f1748bdeb76..126d5031dd59 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) p
 RESTRICT=test
 SLOT=0/3.4.2
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.2.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06d8c309b4d096f0ac8be8c1d9923a14
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index 90ab9e9e289d..52726dd42be9 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -11,5 +11,5 @@ RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) plugin-ifdemo? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0/99999999
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b3cb831874432e1c24c03a28d49f592
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 9f9541ee1313..eeb6149bbd1f 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20200913-r100 b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20200913-r100
index 5330a141b9bf..b1fcefd692a8 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20200913-r100
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20200913-r100
@@ -12,5 +12,5 @@ RDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) postgres? ( dev-
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/accel-ppp-1.12.0_p20200913.tar.bz2
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f730524ea3d52e30d0623d84d02e2753
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-9999 b/metadata/md5-cache/net-dialup/accel-ppp-9999
index 1301d09cc407..12e28d4dc215 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre dev-libs/openssl:0= kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e2d1265bd93c482f477f9b7c1912d29
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 894fb58f9861..c7be294c5a4e 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/dnsdist-1.5.1-r100 b/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
index 6ad4c57d0aab..2c1ba18e49b4 100644
--- a/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
+++ b/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.5.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ec34a9e2636e03bb125f9f37c64a7f17
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.82-r100 b/metadata/md5-cache/net-dns/dnsmasq-2.82-r100
index 4507ae21a6f2..47c9883f1a24 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.82-r100
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.82-r100
@@ -11,5 +11,5 @@ RDEPEND=acct-group/dnsmasq acct-user/dnsmasq dbus? ( sys-apps/dbus:= ) idn? ( !l
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.82.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61048ed4b5ffcc1e1b05e76ab7a57464
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.83-r101 b/metadata/md5-cache/net-dns/dnsmasq-2.83-r101
index 8ca845e7c6f8..3d798bb032a1 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.83-r101
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.83-r101
@@ -11,5 +11,5 @@ RDEPEND=acct-group/dnsmasq acct-user/dnsmasq dbus? ( sys-apps/dbus:= ) idn? ( !l
 REQUIRED_USE=dhcp-tools? ( dhcp ) dnssec? ( !nettlehash ) lua? ( script ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.83.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4727239213e197fb9811b1b43b999cde
diff --git a/metadata/md5-cache/net-dns/pdns-4.4.0-r100 b/metadata/md5-cache/net-dns/pdns-4.4.0-r100
index daa782b3151b..9c5cc27fcac1 100644
--- a/metadata/md5-cache/net-dns/pdns-4.4.0-r100
+++ b/metadata/md5-cache/net-dns/pdns-4.4.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.4.0.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=10ef013df8ee4d2feff16c7c7d94929e
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100 b/metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100
index 4d34c8123b5f..dec68d6c5ec7 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnstap? ( protobuf )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.4.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe1386ced3714260f7d08356b796bee7
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 960e276137da..55fd96df84db 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/prosody-0.11.7-r100 b/metadata/md5-cache/net-im/prosody-0.11.7-r100
index 45eeb5a5d086..9cb6866b7afd 100644
--- a/metadata/md5-cache/net-im/prosody-0.11.7-r100
+++ b/metadata/md5-cache/net-im/prosody-0.11.7-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( icu idn ) ^^ ( lua_single_target_luajit lua_single_target_lua5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://prosody.im/downloads/source/prosody-0.11.7.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=be034ba01d042463c1e3d85bda1a983b
diff --git a/metadata/md5-cache/net-im/swift-4.0.2-r102 b/metadata/md5-cache/net-im/swift-4.0.2-r102
index dbbf0ed5dbd0..b74aa22307a2 100644
--- a/metadata/md5-cache/net-im/swift-4.0.2-r102
+++ b/metadata/md5-cache/net-im/swift-4.0.2-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( icu idn ) lua? ( ^^ ( lua_single_target_luajit lua_single_targ
 RESTRICT=test
 SLOT=4/0
 SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=b2ee6a58d0bd94597f8802b703a3aa5d
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 5c5b238aad16..1b2a1f5b17c4 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/hexchat-2.14.3-r100 b/metadata/md5-cache/net-irc/hexchat-2.14.3-r100
index 91f0dbec8425..bc375e6814a3 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.3-r100
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.3-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.3.tar.xz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	meson	fdaf2a7b9376934c1c7ddbd32114defb	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	fdaf2a7b9376934c1c7ddbd32114defb	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96c38c4ac799e9ec3cbbe692a43f9efb
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 9a780107d3ea..c106e691d250 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) 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] ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	meson	fdaf2a7b9376934c1c7ddbd32114defb	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	fdaf2a7b9376934c1c7ddbd32114defb	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c751929b9d44025725afe8e7da287c32
diff --git a/metadata/md5-cache/net-irc/weechat-3.0-r100 b/metadata/md5-cache/net-irc/weechat-3.0-r100
index d054829bb572..11e85752fd68 100644
--- a/metadata/md5-cache/net-irc/weechat-3.0-r100
+++ b/metadata/md5-cache/net-irc/weechat-3.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-3.0.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7808e92aeb95ec33a7cc27c7818a1cf7
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index e497d23cb74d..1b1e4f5c2432 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zli
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7808e92aeb95ec33a7cc27c7818a1cf7
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index bad2841621f6..ded78a7bacc3 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/axtls-2.1.5-r100 b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
index f5dc3d641d72..5c585ddb02f3 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.5-r100
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8c895db48ac0543ecc0dd0a7f6fb0dc3
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 7121073f20b8..eec38069ff6e 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.13 b/metadata/md5-cache/net-mail/dovecot-2.3.13
index fbed16b8c091..829d8364fbd9 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.13
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.13
@@ -11,5 +11,5 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.13.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=e30df5e5b957ada223a5e3fcf1499107
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.13-r100 b/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
index fbed16b8c091..829d8364fbd9 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
@@ -11,5 +11,5 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.13.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=e30df5e5b957ada223a5e3fcf1499107
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.2.2 b/metadata/md5-cache/net-mail/ezmlm-idx-7.2.2
index a9fc2f82f248..19d9fa158070 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.2.2
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple yet powerful mailing list manager for qmail
 EAPI=7
 HOMEPAGE=https://untroubled.org/ezmlm
 IUSE=mysql postgres sqlite
-KEYWORDS=~alpha amd64 ~hppa ~mips ppc sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) virtual/qmail
 REQUIRED_USE=?? ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=https://untroubled.org/ezmlm/archive/7.2.2/ezmlm-idx-7.2.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6c286d6e0097ebe7f890a9285ef91599
+_md5_=14bcfdde1a66e8af5a40f79dfb2e6e41
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 7283e6454bfc..a068318ec04e 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/asterisk-13.38.1-r1 b/metadata/md5-cache/net-misc/asterisk-13.38.1-r1
index cf0baa8379b3..d3f3c2cc7857 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.1-r1
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.1.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=b83bbfb676ed39a2b35759cc1f6047ae
diff --git a/metadata/md5-cache/net-misc/asterisk-16.15.1-r1 b/metadata/md5-cache/net-misc/asterisk-16.15.1-r1
index 2241ec6d57ea..2c75673f486e 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.15.1-r1
+++ b/metadata/md5-cache/net-misc/asterisk-16.15.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.15.1.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=c5bb0ec3d7bfd09323ba7e650ca68634
diff --git a/metadata/md5-cache/net-misc/dhcpcd-8.1.9-r1 b/metadata/md5-cache/net-misc/dhcpcd-8.1.9-r1
index 7e6a4c2b5af8..b9ddc770f00a 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-8.1.9-r1
+++ b/metadata/md5-cache/net-misc/dhcpcd-8.1.9-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=7
 HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-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-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.1.9.tar.xz https://dev.gentoo.org/~polynomial-c/dhcpcd-8.1.9-patches-01.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=8ca8885f20411281b65bdcb26278a3fe
+_md5_=e517437184cab292c59c38505b4bad51
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 9e36d11ca04e..ccf5cf8b0a77 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/eiskaltdcpp-2.2.10-r100 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10-r100
index 70cfcb471b8c..a281f2ac58d7 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10-r100
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10-r100
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 dev-libs/boost:= dev-libs/openssl:0= sys-apps/attr sys-li
 REQUIRED_USE=?? ( json xmlrpc ) cli? ( ^^ ( json xmlrpc ) ) dbus? ( qt5 ) javascript? ( qt5 ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) spell? ( qt5 ) sqlite? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v2.2.10.tar.gz -> eiskaltdcpp-2.2.10.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e87863b0cf468a8724ef8ef533f0554
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999 b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
index de0c3311f6b3..d85f6c46fbed 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/bzip2 dev-libs/boost:= dev-libs/openssl:0= sys-apps/attr sys-libs/zlib virtual/libiconv virtual/libintl cli? ( dev-lang/perl dev-perl/Data-Dump dev-perl/Term-ShellUI virtual/perl-Getopt-Long json? ( dev-perl/JSON-RPC ) xmlrpc? ( dev-perl/RPC-XML ) ) daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango x11-themes/hicolor-icon-theme libcanberra? ( media-libs/libcanberra ) libnotify? ( x11-libs/libnotify ) ) idn? ( net-dns/libidn ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) javascript? ( dev-qt/qtdeclarative:5 dev-qt/qtscript:5 ) spell? ( app-text/aspell ) sqlite? ( dev-qt/qtsql:5[sqlite] ) ) upnp? ( net-libs/miniupnpc )
 REQUIRED_USE=?? ( json xmlrpc ) cli? ( ^^ ( json xmlrpc ) ) dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? ( gtk ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) spell? ( qt5 ) sqlite? ( qt5 )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7876951ac21e255a49e6786ad2f4fbc4
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 72fbcc42b1f4..60b2cbb1414b 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/trojan-1.16.0-r1 b/metadata/md5-cache/net-proxy/trojan-1.16.0-r1
index 6a582446828e..261071639cc9 100644
--- a/metadata/md5-cache/net-proxy/trojan-1.16.0-r1
+++ b/metadata/md5-cache/net-proxy/trojan-1.16.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 ) )
+DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) )
 DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
 EAPI=7
 HOMEPAGE=https://github.com/trojan-gfw/trojan
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.16.0.tar.gz -> trojan-1.16.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc46f37d0178e502d5e24f6cc9c89bec
+_md5_=0ffe62128bdc701d90617120b223588e
diff --git a/metadata/md5-cache/net-proxy/trojan-9999 b/metadata/md5-cache/net-proxy/trojan-9999
index 715c3b229803..c0b49ba3e632 100644
--- a/metadata/md5-cache/net-proxy/trojan-9999
+++ b/metadata/md5-cache/net-proxy/trojan-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 ) )
+DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) )
 DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
 EAPI=7
 HOMEPAGE=https://github.com/trojan-gfw/trojan
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-conn
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ded78bd60e1aee297b54ec5c079db2ef
+_md5_=06b4b52f78273d51b94d405b379e2bb1
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 589226099670..ed57ab0ed066 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/ament_cmake-1.0.3 b/metadata/md5-cache/ros-meta/ament_cmake-1.0.3
new file mode 100644
index 000000000000..39f160fa2ff7
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ament_cmake-1.0.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_version python_targets_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/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_version python_targets_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/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=The entry point package for the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_version python_targets_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/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9de918ead8c87d3cbbb52b3631aad1a5
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.3.10 b/metadata/md5-cache/ros-meta/audio_common-0.3.10
new file mode 100644
index 000000000000..1e73f806a999
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.10
@@ -0,0 +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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_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.10.tar.gz -> audio_common-0.3.10.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07d5f14f69e6cebcb6cbe752db2e1bf7
diff --git a/metadata/md5-cache/ros-meta/hector_slam-0.5.0 b/metadata/md5-cache/ros-meta/hector_slam-0.5.0
deleted file mode 100644
index 74c754fc9262..000000000000
--- a/metadata/md5-cache/ros-meta/hector_slam-0.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_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 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_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.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f4b173694920fdbe502160720f79b9e
diff --git a/metadata/md5-cache/ros-meta/hector_slam-0.4.1 b/metadata/md5-cache/ros-meta/hector_slam-0.5.1
similarity index 79%
rename from metadata/md5-cache/ros-meta/hector_slam-0.4.1
rename to metadata/md5-cache/ros-meta/hector_slam-0.5.1
index bf0f57551310..0e6f398524da 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-0.4.1
+++ b/metadata/md5-cache/ros-meta/hector_slam-0.5.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://wiki.ros.org/hector_slam https://github.com/tu-darmstadt-ros-pk
 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+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_geotiff_launch 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
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e54c2cd6802d678525c1ba6be8aa9700
+_md5_=5405bfb05f0383b8b31ef9a15cf734b5
diff --git a/metadata/md5-cache/ros-meta/hector_slam-9999 b/metadata/md5-cache/ros-meta/hector_slam-9999
index 9fae3e86cdcf..627c0746e50e 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-9999
+++ b/metadata/md5-cache/ros-meta/hector_slam-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://wiki.ros.org/hector_slam https://github.com/tu-darmstadt-ros-pk
 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+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_geotiff_launch 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	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e54c2cd6802d678525c1ba6be8aa9700
+_md5_=5405bfb05f0383b8b31ef9a15cf734b5
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index f9852d9daf0f..41f5823042f5 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/celestia-1.7.0_pre20200316-r100 b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
index f2aca96aeae1..acc083de42c9 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
+++ b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libfmt:= media-libs/glew:0= media-libs/libpng:0= sys-libs/zlib:
 REQUIRED_USE=|| ( glut qt5 ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/CelestiaProject/Celestia/archive/df508a0c597a3d96c1c039fa4a973e294021cfba.tar.gz -> celestia-1.7.0_pre20200316.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=665d97840627c5749ae5265abb0ce4c2
diff --git a/metadata/md5-cache/sci-astronomy/celestia-9999 b/metadata/md5-cache/sci-astronomy/celestia-9999
index f5026dd9918c..612b7d02773e 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-9999
+++ b/metadata/md5-cache/sci-astronomy/celestia-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libfmt:= media-libs/glew:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora )
 REQUIRED_USE=|| ( glut qt5 ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5fbf8c75800f345c70fcfa2af23a871e
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index c4db88b33292..c1d4e9881ee1 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/osm2pgsql-1.4.0-r100 b/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
index a58865f0a708..26e60a3c4b85 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/1.4.0.tar.gz -> osm2pgsql-1.4.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf3e0a46d8e986666d425b5873eded88
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999 b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
index 6c525812e303..e7220c5f47df 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj:= sys-li
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5cfea20bd6d7bcef0bd8db1c55ea1ae
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index ded554bae7af..2d6b8e5dc62a 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/armadillo-10.2.0 b/metadata/md5-cache/sci-libs/armadillo-10.2.0
new file mode 100644
index 000000000000..ae4f0f3e0240
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/armadillo-10.2.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) arpack? ( virtual/pkgconfig ) blas? ( virtual/pkgconfig ) hdf5? ( sci-libs/hdf5 ) lapack? ( virtual/pkgconfig ) mkl? ( sci-libs/mkl )
+DESCRIPTION=Streamlined C++ linear algebra library
+EAPI=7
+HOMEPAGE=http://arma.sourceforge.net/
+IUSE=arpack blas doc examples hdf5 lapack mkl superlu test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl )
+RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
+REQUIRED_USE=test? ( lapack )
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=mirror://sourceforge/arma/armadillo-10.2.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0fae2c62057a08ba6873bf1a9cc2542f
diff --git a/metadata/md5-cache/sci-libs/eccodes-2.18.0 b/metadata/md5-cache/sci-libs/eccodes-2.18.0
index f8478a20af05..fbb1b6d68f06 100644
--- a/metadata/md5-cache/sci-libs/eccodes-2.18.0
+++ b/metadata/md5-cache/sci-libs/eccodes-2.18.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-libs/zlib szip? ( sci-libs/szip ) netcdf? ( >=sci-libs/netcdf-4.2[hdf5] ) jpeg2k? ( >=media-libs/openjpeg-2:2 ) png? ( media-libs/libpng ) virtual/fortran
 REQUIRED_USE=fortran? ( !threads ( openmp ) ) openmp? ( !threads ( fortran ) ) threads? ( !fortran !openmp ) test? ( defs !memfs ) extra-test? ( test ) !test? ( memfs? ( python ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://confluence.ecmwf.int/download/attachments/45757960/eccodes-2.18.0-Source.tar.gz extra-test? ( http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz http://download.ecmwf.org/test-data/eccodes/data/mercator.grib2 )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17416cd2880c8ab76308ad8068416b09
+_md5_=6e34c05d0c85dfc3a3c59dacb56414da
diff --git a/metadata/md5-cache/sci-libs/libsc-2.2-r100 b/metadata/md5-cache/sci-libs/libsc-2.2-r100
index acd294cfb0d3..ca7047f2872e 100644
--- a/metadata/md5-cache/sci-libs/libsc-2.2-r100
+++ b/metadata/md5-cache/sci-libs/libsc-2.2-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=942f3c069ee92499e32479a6059afc02
diff --git a/metadata/md5-cache/sci-libs/libsc-9999 b/metadata/md5-cache/sci-libs/libsc-9999
index 1d8c05bfaa68..7bb9bb9a4636 100644
--- a/metadata/md5-cache/sci-libs/libsc-9999
+++ b/metadata/md5-cache/sci-libs/libsc-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0970064e9ad49f75cfe961eda3a63c06
diff --git a/metadata/md5-cache/sci-libs/p4est-2.2-r100 b/metadata/md5-cache/sci-libs/p4est-2.2-r100
index ea4b1984de4d..e89a6766f307 100644
--- a/metadata/md5-cache/sci-libs/p4est-2.2-r100
+++ b/metadata/md5-cache/sci-libs/p4est-2.2-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/p4est/archive/v2.2.tar.gz -> p4est-2.2.tar.gz https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39a0da183408f57cca7b89dcda4522ab
diff --git a/metadata/md5-cache/sci-libs/p4est-9999 b/metadata/md5-cache/sci-libs/p4est-9999
index 0d382063fb1a..d7846c0c2239 100644
--- a/metadata/md5-cache/sci-libs/p4est-9999
+++ b/metadata/md5-cache/sci-libs/p4est-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1186690a2594bb45b0214891f1341b91
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0-r100 b/metadata/md5-cache/sci-libs/plplot-5.15.0-r100
index 7e414ef23f35..6db76a7f3cd0 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0-r100
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) octave? ( test )
 SLOT=0/14
 SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74501773dff181d68a16255079e03a8a
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 73d59e1f4ae2..71e2e054dfd1 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/fityk-1.3.1-r100 b/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
index ce9606c94d07..74e34c54dbf7 100644
--- a/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
+++ b/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/wojdyr/fityk/releases/download/v1.3.1/fityk-1.3.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28bfd92b7cf704abc40d6eada11844fc
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
index 72322782c2e3..b4fa8d4c405e 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=982b11ff5d1a0f10e14a447c49aa6e21
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
index bdd551ef7fc7..1b22eb0c31a3 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=74a286b30fe31a8d30244d058fe3df1c
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5fc9ab6543f9..a525da9e0d8a 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/haveged-1.9.13 b/metadata/md5-cache/sys-apps/haveged-1.9.13
deleted file mode 100644
index dc1fede0983f..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.13
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=7
-HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux static-libs threads
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.13.tar.gz -> haveged-1.9.13.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=df97c114bf66bc237cdeb7475886317f
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.14 b/metadata/md5-cache/sys-apps/haveged-1.9.14-r1
similarity index 93%
rename from metadata/md5-cache/sys-apps/haveged-1.9.14
rename to metadata/md5-cache/sys-apps/haveged-1.9.14-r1
index 505259162beb..d3160dd1fc4f 100644
--- a/metadata/md5-cache/sys-apps/haveged-1.9.14
+++ b/metadata/md5-cache/sys-apps/haveged-1.9.14-r1
@@ -10,4 +10,4 @@ RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.14.tar.gz -> haveged-1.9.14.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=27abf4ee3db6fcbec146d48eee94215f
+_md5_=ea2e9f91ca3235ebd32d80d106f15a92
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.2-r1 b/metadata/md5-cache/sys-apps/haveged-1.9.2-r1
deleted file mode 100644
index 6ee0cf70f36d..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=6
-HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux static-libs
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ppc x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=http://www.issihosts.com/haveged/haveged-1.9.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=3a58d21d6f2f6e0269327b69107a38f2
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.8c b/metadata/md5-cache/sys-apps/haveged-1.9.8c-r1
similarity index 93%
rename from metadata/md5-cache/sys-apps/haveged-1.9.8c
rename to metadata/md5-cache/sys-apps/haveged-1.9.8c-r1
index 071b7b08eca1..fcb04cd27b54 100644
--- a/metadata/md5-cache/sys-apps/haveged-1.9.8c
+++ b/metadata/md5-cache/sys-apps/haveged-1.9.8c-r1
@@ -10,4 +10,4 @@ RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.8c.tar.gz -> haveged-1.9.8c.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
-_md5_=8aa487a33dbb4433ee3c2c0f06af87be
+_md5_=0e4d98205c50a1c1f5af3ebdb72e5b30
diff --git a/metadata/md5-cache/sys-apps/likwid-4.3.4 b/metadata/md5-cache/sys-apps/likwid-4.3.4
index 0dd56e4fa2e3..96d93e1d0f96 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.3.4
+++ b/metadata/md5-cache/sys-apps/likwid-4.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://ftp.fau.de/pub/likwid/likwid-4.3.4.tar.gz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	fortran-2	b4796813ccda91c9c0d3463fc90aa969	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	fortran-2	b4796813ccda91c9c0d3463fc90aa969	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=2e45d804ed79ec12750fd4e07c45bd5f
diff --git a/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100 b/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
index f57b443846f1..36709e2f6190 100644
--- a/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
+++ b/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/q/qcontrol/qcontrol_0.4.2.orig.tar.gz mirror://debian/pool/main/q/qcontrol/qcontrol_0.4.2-6.diff.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=ced61e3269313eaea9d8796efa3ffe14
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100 b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
index 4210e2595570..17d7fab8404b 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 dev-l
 REQUIRED_USE=input_devices_roccat_ryosmk? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) input_devices_roccat_ryosmkfx? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) input_devices_roccat_ryostkl? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.9.0.tar.bz2
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2fe4d87bba4d278e3d8de6bfa73521b0
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 4100414a6957..7ff08222c27e 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/ceph-14.2.15 b/metadata/md5-cache/sys-cluster/ceph-14.2.15
deleted file mode 100644
index 62a357878392..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/rocksdb:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_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=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~ppc64
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/rocksdb:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.15.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbbe3250189a9978cf17efe57452c082
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.15-r1 b/metadata/md5-cache/sys-cluster/ceph-14.2.15-r1
new file mode 100644
index 000000000000..36506ec8a3cf
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.15-r1
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= <dev-libs/rocksdb-6.15:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_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=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= <dev-libs/rocksdb-6.15:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.15.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8cba9dcad75f1ba6e7f307271b1930fd
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.16 b/metadata/md5-cache/sys-cluster/ceph-14.2.16
deleted file mode 100644
index e99fea7cd95c..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/rocksdb:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_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=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~ppc64
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/rocksdb:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.16.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bdb2fbdf0b7cd5e09bfaa08415b08fc
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.16-r1 b/metadata/md5-cache/sys-cluster/ceph-14.2.16-r1
new file mode 100644
index 000000000000..76b5690fb7f9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= <dev-libs/rocksdb-6.15:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( dev-libs/boost[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_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=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= <dev-libs/rocksdb-6.15:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( dev-libs/boost[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.16.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2e8b0c361b6f124bbe2bc66e87db549
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.8 b/metadata/md5-cache/sys-cluster/ceph-15.2.8
deleted file mode 100644
index 2cf2f19abd35..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-cpp/gflags:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/rocksdb:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( >=dev-libs/boost-1.72[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_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=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-cpp/gflags:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/rocksdb:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( >=dev-libs/boost-1.72[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.8.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed588d626d8744b267bd764f60c42535
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.8-r1 b/metadata/md5-cache/sys-cluster/ceph-15.2.8-r1
new file mode 100644
index 000000000000..9c55925b1569
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-cpp/gflags:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( >=dev-libs/boost-1.72[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_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=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-cpp/gflags:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( >=dev-libs/boost-1.72[threads,context,python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_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(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikit-learn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.8.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34e025383516f49a4facb51b62e3fa61
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r100 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r100
index 41217e08e5c8..c61e32af82cb 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r100
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2ca2d743eadc3506d16c099fed14b063
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 13b504149455..33070a9d3e40 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/mod_security-2.9.3-r100 b/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
index d2c33eb41dba..bfd924e8c5b8 100644
--- a/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
+++ b/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	autotools	9988ecbe04129214297a7bbf3d253710	depend.apache	94458fe4e9466f4803360408e60e11fd	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	autotools	9988ecbe04129214297a7bbf3d253710	depend.apache	94458fe4e9466f4803360408e60e11fd	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=8937cd00fca0b04524237048af4a8ee7
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index cc32fe7060e9..c3c5aadaa2fb 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/cgit-1.2.3-r100 b/metadata/md5-cache/www-apps/cgit-1.2.3-r100
index 62ea6dc7029c..d97157ad4e58 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.3-r100
+++ b/metadata/md5-cache/www-apps/cgit-1.2.3-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	webapp	1d03df021d958f89f4cc78e289d0b116
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	webapp	1d03df021d958f89f4cc78e289d0b116
 _md5_=d17e3128e3e85be47f5c598dfcfa9732
diff --git a/metadata/md5-cache/www-apps/cgit-9999 b/metadata/md5-cache/www-apps/cgit-9999
index 85e5a59245f3..eb2b549b041b 100644
--- a/metadata/md5-cache/www-apps/cgit-9999
+++ b/metadata/md5-cache/www-apps/cgit-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-group/cgit acct-user/cgit dev-vcs/git highlight? ( || ( dev-python/
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	webapp	1d03df021d958f89f4cc78e289d0b116
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	webapp	1d03df021d958f89f4cc78e289d0b116
 _md5_=34b8acee6fa1130dab69807eceb653e7
diff --git a/metadata/md5-cache/www-apps/piwigo-11.0.0 b/metadata/md5-cache/www-apps/piwigo-11.0.0
new file mode 100644
index 000000000000..5a33ac0fe745
--- /dev/null
+++ b/metadata/md5-cache/www-apps/piwigo-11.0.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=a photo gallery software for the web
+EAPI=7
+HOMEPAGE=http://piwigo.org/
+IUSE=+exif +gd imagemagick vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=imagemagick? ( virtual/imagemagick-tools ) dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli] >=virtual/mysql-5.0 virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( gd imagemagick )
+SLOT=11.0.0
+SRC_URI=http://piwigo.org/download/dlcounter.php?code=11.0.0 -> piwigo-11.0.0.zip
+_eclasses_=webapp	1d03df021d958f89f4cc78e289d0b116
+_md5_=849dc395fb08be3dd6e01471dd9cb935
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 1628ff5ca577..decb7c03956f 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/elinks-0.13.5-r100 b/metadata/md5-cache/www-client/elinks-0.13.5-r100
index b874b4f3050e..28d9fa40a2c0 100644
--- a/metadata/md5-cache/www-client/elinks-0.13.5-r100
+++ b/metadata/md5-cache/www-client/elinks-0.13.5-r100
@@ -11,5 +11,5 @@ RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 SLOT=0
 SRC_URI=https://github.com/rkd77/felinks/archive/v0.13.5.tar.gz -> elinks-0.13.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=e308f969882b846c440c5fb02c7aa4ed
diff --git a/metadata/md5-cache/www-client/elinks-9999 b/metadata/md5-cache/www-client/elinks-9999
index 3c38dde1ccf8..70f69ae5784e 100644
--- a/metadata/md5-cache/www-client/elinks-9999
+++ b/metadata/md5-cache/www-client/elinks-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	f630b6d8702353cdc13f2d4dd882e16e	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=0991448376b9331e0e89e440b4eaa619
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-89.0.4385.0 b/metadata/md5-cache/www-client/google-chrome-unstable-89.0.4389.9
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-unstable-89.0.4385.0
rename to metadata/md5-cache/www-client/google-chrome-unstable-89.0.4389.9
index 1eef842fd12c..7f98fb0e527f 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-89.0.4385.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-89.0.4389.9
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_89.0.4385.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_89.0.4389.9-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=903fcd0fc686d87f9cfee7f611b80e74
diff --git a/metadata/md5-cache/www-client/luakit-2.2.1-r100 b/metadata/md5-cache/www-client/luakit-2.2.1-r100
index abdf16a33053..ff50b8a9457a 100644
--- a/metadata/md5-cache/www-client/luakit-2.2.1-r100
+++ b/metadata/md5-cache/www-client/luakit-2.2.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luakit/luakit/archive/2.2.1.tar.gz -> luakit-2.2.1.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=048cc38680f9da4986a56416889b0124
diff --git a/metadata/md5-cache/www-client/luakit-9999 b/metadata/md5-cache/www-client/luakit-9999
index 07db9173bd51..c43c64a02fd3 100644
--- a/metadata/md5-cache/www-client/luakit-9999
+++ b/metadata/md5-cache/www-client/luakit-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 net-libs/webkit-gtk:4= x11-libs/gtk+:3 l
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93eae3a94199d6e5a9b8544c7e429f28
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 8812f27ca720..600af21813d3 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4385.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.9_alpha
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4385.0_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.9_alpha
index a826023bc85a..804591cb0ba9 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4385.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.9_alpha
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_89.0.4385.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_89.0.4389.9-1_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=3259de859b5903477401255248b093eb
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index e6a4699af4e5..46ef97398603 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/lighttpd-1.4.55-r100 b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
index 14ef5d7566c0..024d9539a759 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=kerberos? ( ssl !libressl ) lua? ( ^^ ( lua_single_target_lua5-1 lu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11b17dbcf263b1023be7a0dc77dee688
diff --git a/metadata/md5-cache/www-servers/nginx-1.19.6-r100 b/metadata/md5-cache/www-servers/nginx-1.19.6-r100
index 537702df3225..a9fbf9449e5c 100644
--- a/metadata/md5-cache/www-servers/nginx-1.19.6-r100
+++ b/metadata/md5-cache/www-servers/nginx-1.19.6-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_h
 RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.19.6.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.5.0.tar.gz -> njs-0.5.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.5.0.tar.gz -> njs-0.5.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c35d15dfd3b1b77633759945755c1e55
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100
index 87e2944cdd3a..e7e32b986d50 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) python-asyncio? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	65bb60d137e5a51f58ada69bf3f366da	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=347f510bf63c49ff8bd1c02fbf18b915
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index e410d6c5b819..6ee29f27f934 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/devilspie2-0.43-r100 b/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
index 1fc8e08605f3..40a4b1b9bba2 100644
--- a/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
+++ b/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.43-src.tar.gz
-_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=0732eab0cc40397af775ac70c25e7f75
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index b1299950f8a6..bbc52f0aabcc 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/gtk-engines-2.20.2-r100 b/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
index 434b88d2a3a6..7409dce197c7 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
+++ b/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1228f3a44b7330981c9e986fa04a6337
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 2e8468d99ed7..8550bbed50ab 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/awesome-4.3-r101 b/metadata/md5-cache/x11-wm/awesome-4.3-r101
index 311a7f5ebc96..ed6f0608052f 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.3-r101
+++ b/metadata/md5-cache/x11-wm/awesome-4.3-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.3.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8b6641eeb28317afed3ab5fd3141a5f
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index ecd5d47c2c18..21b01b436e86 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=109ae946d6ba0d91d6dbeff08ecdea59
diff --git a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100 b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
index dde3effca2bf..2b89f3acafde 100644
--- a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
+++ b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) xrandr? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/raboof/notion/archive/3-2015061300.tar.gz -> notion-3_p2015061300.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=72c4d9ecc074c3c5564901e84e43cb47
diff --git a/metadata/md5-cache/x11-wm/notion-9999 b/metadata/md5-cache/x11-wm/notion-9999
index 023cfaa2d2de..57865d5a7ec4 100644
--- a/metadata/md5-cache/x11-wm/notion-9999
+++ b/metadata/md5-cache/x11-wm/notion-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) xrandr? ( xinerama )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	1a94dc06d324bd0dab754e11abe6d27e
 _md5_=14f6b62be50d3d5389ff773075dba54d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0836ac39f0c8..fc9e118fb705 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Jan 2021 19:08:31 +0000
+Thu, 21 Jan 2021 05:08:27 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 32a9dc8edfb4..4fe32cee68ee 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -3391,6 +3391,14 @@
     <name>Undertakers</name>
     <url>https://wiki.gentoo.org/wiki/Project:Undertakers</url>
     <description>The Community Relations Undertakers project handles developer retirement, both when developers announce their retirement as well as due to developer inactivity.</description>
+    <member>
+      <email>bman@gentoo.org</email>
+      <name>Aaron Bauman</name>
+    </member>
+    <member>
+      <email>juippis@gentoo.org</email>
+      <name>Joonas Niilola</name>
+    </member>
     <member is-lead="1">
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 99e909315c0e..a9089f67aa53 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jan 20 07:08:31 PM UTC 2021
+Thu Jan 21 05:08:27 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c17b02745739..9d0c0eacbcd2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Jan 2021 19:30:01 +0000
+Thu, 21 Jan 2021 05:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index bd9ccbd01156..8717de08635c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-de3682de2408d613d22d7c6da160e5099bb24d17 1611169117 2021-01-20T18:58:37+00:00
+9f15ebb836abb3bf790420c6c21e4aab10cf0e4b 1611201684 2021-01-21T04:01:24+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8b1bf8940453..03ae36a608e2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1611169501 Wed 20 Jan 2021 07:05:01 PM UTC
+1611205501 Thu 21 Jan 2021 05:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 0836ac39f0c8..fc9e118fb705 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Jan 2021 19:08:31 +0000
+Thu, 21 Jan 2021 05:08:27 +0000
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4e2f1dcb204b..6ba0db72f31c 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild
index 7335166489fa..eb1061057763 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild
@@ -11,7 +11,8 @@ SRC_URI="https://untroubled.org/ezmlm/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+#KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86"
 IUSE="mysql postgres sqlite"
 
 DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8f4c20446ed5..9271fa01a42f 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
index 8f9d6190cf84..22216f9315b0 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
@@ -14,7 +14,7 @@ else
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz"
-	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"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 948328e482ae..afbbd6cee5ff 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/trojan/trojan-1.16.0-r1.ebuild b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
index 21f494f1364d..43966961b727 100644
--- a/net-proxy/trojan/trojan-1.16.0-r1.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit cmake python-any-r1 systemd
 
diff --git a/net-proxy/trojan/trojan-9999.ebuild b/net-proxy/trojan/trojan-9999.ebuild
index fd0888f198b4..bf515ed07305 100644
--- a/net-proxy/trojan/trojan-9999.ebuild
+++ b/net-proxy/trojan/trojan-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 EGIT_REPO_URI="https://github.com/trojan-gfw/trojan.git"
 
 inherit cmake git-r3 python-any-r1 systemd
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5c279e5f24fe..d39258878349 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index c3b496873f9a..b533938ec020 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -11,6 +11,7 @@ dev-util/ragel doc
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-01-19)
 # uchardet not stable/keyworded yet on this arch
+# bug #750032
 sys-apps/groff uchardet
 
 # Sam James <sam@gentoo.org> (2021-01-19)
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index ba207e5f35e2..ffbe9d4a6825 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-01-21)
+# media-gfx/transfig ends up pulling in Xorg
+# bug #766051
+dev-util/ragel doc
+
 # Matt Turner <mattst88@gentoo.org> (2020-12-31)
 # The following packages have no stable keywords on hppa:
 #           amqp: net-libs/rabbitmq
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 1c1d4ceb4c3a..95a617062979 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -3,6 +3,7 @@
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-01-19)
 # uchardet not stable/keyworded yet on this arch
+# bug #750032
 sys-apps/groff uchardet
 
 # Sam James <sam@gentoo.org> (2021-01-19)
diff --git a/profiles/features/prefix/standalone/package.use.mask b/profiles/features/prefix/standalone/package.use.mask
index ce9807b1bd24..6c81333b0b2a 100644
--- a/profiles/features/prefix/standalone/package.use.mask
+++ b/profiles/features/prefix/standalone/package.use.mask
@@ -3,6 +3,7 @@
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-01-19)
 # uchardet not stable/keyworded yet on this profile keyword
+# bug #750032
 sys-apps/groff uchardet
 
 # Benda Xu <heroxbd@gentoo.org> (2019-10-09)
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 3d7a5c314da3..aeb77a7f9160 100644
Binary files a/ros-meta/Manifest.gz and b/ros-meta/Manifest.gz differ
diff --git a/ros-meta/ament_cmake/Manifest b/ros-meta/ament_cmake/Manifest
index d4bd850b64bf..1dc2a3ed13a7 100644
--- a/ros-meta/ament_cmake/Manifest
+++ b/ros-meta/ament_cmake/Manifest
@@ -1,3 +1,4 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
+DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
diff --git a/ros-meta/ament_cmake/ament_cmake-1.0.3.ebuild b/ros-meta/ament_cmake/ament_cmake-1.0.3.ebuild
new file mode 100644
index 000000000000..e8230e9f74c7
--- /dev/null
+++ b/ros-meta/ament_cmake/ament_cmake-1.0.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The entry point package for the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_definitions
+	dev-ros/ament_cmake_export_dependencies
+	dev-ros/ament_cmake_export_include_directories
+	dev-ros/ament_cmake_export_interfaces
+	dev-ros/ament_cmake_export_libraries
+	dev-ros/ament_cmake_export_link_flags
+	dev-ros/ament_cmake_export_targets
+	dev-ros/ament_cmake_libraries
+	dev-ros/ament_cmake_python
+	dev-ros/ament_cmake_target_dependencies
+	dev-ros/ament_cmake_test[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_version
+	${PYTHON_DEPS}
+
+	dev-python/ament_package[${PYTHON_USEDEP}]
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+"
+# Last batch of deps above are transitive (from ament_cmake_core) but we need this to propagate proper deps
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_setup
+	cmake_src_configure
+}
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index e5ec34665571..371049e29aa3 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.3.10.tar.gz 191615 BLAKE2B 6d0247859099bda3c0edde109681364490654dbffb167a4aa252d7c1406dc8b77da6055d22b46b9fd0df10e3f8617b15544632ce1012d9a302c06a5732a217e6 SHA512 79a2bbc5cd9f837b9262d6a1a397b6bb5f2bf926959c44b05b6e2815862f0b32f430396cdf0f8960c9e5780fdfff3815285c037f82ca9b654c16c772fb732e66
 DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
 DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
 DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
diff --git a/ros-meta/audio_common/audio_common-0.3.10.ebuild b/ros-meta/audio_common/audio_common-0.3.10.ebuild
new file mode 100644
index 000000000000..9eb443937326
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.3.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with audio in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_capture
+	dev-ros/audio_common_msgs
+	dev-ros/audio_play
+"
+#	dev-ros/sound_play
+# https://bugs.gentoo.org/612980#c14
+
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/hector_slam/Manifest b/ros-meta/hector_slam/Manifest
index c13922877575..82bb9ffe5c37 100644
--- a/ros-meta/hector_slam/Manifest
+++ b/ros-meta/hector_slam/Manifest
@@ -1,2 +1 @@
-DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
-DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
+DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
diff --git a/ros-meta/hector_slam/hector_slam-0.4.1.ebuild b/ros-meta/hector_slam/hector_slam-0.4.1.ebuild
deleted file mode 100644
index 4052345c1101..000000000000
--- a/ros-meta/hector_slam/hector_slam-0.4.1.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
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="hector_mapping and related packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-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
-"
-DEPEND=""
diff --git a/ros-meta/hector_slam/hector_slam-0.5.0.ebuild b/ros-meta/hector_slam/hector_slam-0.5.1.ebuild
similarity index 95%
rename from ros-meta/hector_slam/hector_slam-0.5.0.ebuild
rename to ros-meta/hector_slam/hector_slam-0.5.1.ebuild
index a3dc5895471e..ad6e79ea1add 100644
--- a/ros-meta/hector_slam/hector_slam-0.5.0.ebuild
+++ b/ros-meta/hector_slam/hector_slam-0.5.1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	dev-ros/hector_marker_drawing
 	dev-ros/hector_trajectory_server
 	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_launch
 	dev-ros/hector_imu_attitude_to_tf
 	dev-ros/hector_mapping
 	dev-ros/hector_map_tools
diff --git a/ros-meta/hector_slam/hector_slam-9999.ebuild b/ros-meta/hector_slam/hector_slam-9999.ebuild
index 4052345c1101..ad6e79ea1add 100644
--- a/ros-meta/hector_slam/hector_slam-9999.ebuild
+++ b/ros-meta/hector_slam/hector_slam-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,7 @@ RDEPEND="
 	dev-ros/hector_marker_drawing
 	dev-ros/hector_trajectory_server
 	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_launch
 	dev-ros/hector_imu_attitude_to_tf
 	dev-ros/hector_mapping
 	dev-ros/hector_map_tools
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index dbf0d6767f5c..16fd314df567 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index b81f29c2eaee..d603294cedd1 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,2 +1,3 @@
+DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
 DIST armadillo-9.850.1.tar.xz 4715832 BLAKE2B 41256d8f54ec1f2d4f7cfdf58bd67e66cc2ffbe0f1daf259a4d76e0816d89708fa5528d57b244000393404108c8d0d613d03321f14e5653163d0c1cc6ec7e273 SHA512 b2b9f0290f8f39a687db71a02b127086d5ff22cee77fba5211da2ea8a8d8a5edc256b31b7fce8e98aa1955a84c63e488adcd22f8cd070015a6fcd4b4f1cb37c7
diff --git a/sci-libs/armadillo/armadillo-10.2.0.ebuild b/sci-libs/armadillo/armadillo-10.2.0.ebuild
new file mode 100644
index 000000000000..baaa3579072c
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-10.2.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lapack )"
+
+#	atlas? ( sci-libs/atlas[lapack] )
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( >=sci-libs/superlu-5.2 )
+"
+
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+"
+
+src_prepare() {
+	# avoid the automagic cmake macros...
+	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
+
+	# ... except for mkl, since without a license it's hard to figure out what to do there
+	if use mkl; then
+		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	else
+		mycmakeargs+=(
+			-DARPACK_FOUND=OFF
+		)
+	fi
+#	if use atlas; then
+#		local c=atlas-cblas l=atlas-clapack
+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+#		mycmakeargs+=(
+#			-DCBLAS_FOUND=ON
+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+#			-DCLAPACK_FOUND=ON
+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+#		)
+#	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	else
+		mycmakeargs+=(
+			-DBLAS_FOUND=OFF
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DDETECT_HDF5=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+			-DHDF5_INCLUDE_DIRS=/usr/include
+		)
+	else
+		mycmakeargs+=(
+			-DDETECT_HDF5=OFF
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	else
+		mycmakeargs+=(
+			-DLAPACK_FOUND=OFF
+		)
+	fi
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
+		)
+	else
+		mycmakeargs+=(
+			-DSuperLU_FOUND=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README.md
+	use doc && dodoc *pdf *html
+	if use examples; then
+		docinto /usr/share/doc/${PF}/examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/eccodes/eccodes-2.18.0.ebuild b/sci-libs/eccodes/eccodes-2.18.0.ebuild
index 82c91c14eef3..62965ad9e82e 100644
--- a/sci-libs/eccodes/eccodes-2.18.0.ebuild
+++ b/sci-libs/eccodes/eccodes-2.18.0.ebuild
@@ -41,6 +41,8 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 90ab3c59cf50..5ebbd59c40fe 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 32b8067283a0..cee8b42e254f 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,4 +1,2 @@
-DIST haveged-1.9.13.tar.gz 495737 BLAKE2B 5a8c154d27ca7dc71e7d34051a5e24ec2bd49be7a68175c351293958261083f2cfb0b318daaf005cc95f6a9b76664df63d4c41d28d4276f6906081d21097475a SHA512 dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576
 DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924
-DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
diff --git a/sys-apps/haveged/haveged-1.9.13.ebuild b/sys-apps/haveged/haveged-1.9.13.ebuild
deleted file mode 100644
index e312af7ae69d..000000000000
--- a/sys-apps/haveged/haveged-1.9.13.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
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.14.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
similarity index 94%
rename from sys-apps/haveged/haveged-1.9.14.ebuild
rename to sys-apps/haveged/haveged-1.9.14-r1.ebuild
index 92c901487af4..832568999fea 100644
--- a/sys-apps/haveged/haveged-1.9.14.ebuild
+++ b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
@@ -38,4 +38,6 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
 	insinto /etc
 	doins "${FILESDIR}"/haveged.conf
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-apps/haveged/haveged-1.9.2-r1.ebuild b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
deleted file mode 100644
index c3429c8d4723..000000000000
--- a/sys-apps/haveged/haveged-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc x86"
-IUSE="selinux static-libs"
-
-DEPEND=""
-RDEPEND="!<sys-apps/openrc-0.11.8
-		 selinux? ( sec-policy/selinux-entropyd )"
-
-# threads are broken right now, but eventually
-# we should add $(use_enable threads)
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--bindir=/usr/sbin \
-		--enable-nistest \
-		--disable-threads
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c-r1.ebuild
similarity index 91%
rename from sys-apps/haveged/haveged-1.9.8c.ebuild
rename to sys-apps/haveged/haveged-1.9.8c-r1.ebuild
index 52a76b0dcb25..8861599ce688 100644
--- a/sys-apps/haveged/haveged-1.9.8c.ebuild
+++ b/sys-apps/haveged/haveged-1.9.8c-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,4 +42,6 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
 	insinto /etc
 	doins "${FILESDIR}"/haveged.conf
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index cfcf757f5bca..ad2b8f895dde 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/ceph-14.2.15.ebuild b/sys-cluster/ceph/ceph-14.2.15-r1.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-14.2.15.ebuild
rename to sys-cluster/ceph/ceph-14.2.15-r1.ebuild
index cd7f6cfa6cbc..a73a21657f44 100644
--- a/sys-cluster/ceph/ceph-14.2.15.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ DEPEND="
 	app-shells/bash:0
 	app-misc/jq:=
 	dev-libs/crypto++:=
-	dev-libs/rocksdb:=
+	<dev-libs/rocksdb-6.15:=
 	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
 	dev-libs/libnl:3=
diff --git a/sys-cluster/ceph/ceph-14.2.16.ebuild b/sys-cluster/ceph/ceph-14.2.16-r1.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-14.2.16.ebuild
rename to sys-cluster/ceph/ceph-14.2.16-r1.ebuild
index bbb85722f3b3..c7c4212b02df 100644
--- a/sys-cluster/ceph/ceph-14.2.16.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.16-r1.ebuild
@@ -44,7 +44,7 @@ DEPEND="
 	app-shells/bash:0
 	app-misc/jq:=
 	dev-libs/crypto++:=
-	dev-libs/rocksdb:=
+	<dev-libs/rocksdb-6.15:=
 	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
 	dev-libs/libnl:3=
@@ -92,7 +92,7 @@ DEPEND="
 		openssl? ( dev-libs/openssl:= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
+	system-boost? ( dev-libs/boost[threads,context,python,${PYTHON_USEDEP}] )
 	xfs? ( sys-fs/xfsprogs:= )
 	zfs? ( sys-fs/zfs:= )
 	${PYTHON_DEPS}
diff --git a/sys-cluster/ceph/ceph-15.2.8.ebuild b/sys-cluster/ceph/ceph-15.2.8-r1.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-15.2.8.ebuild
rename to sys-cluster/ceph/ceph-15.2.8-r1.ebuild
index 61eb326db490..e187922e6083 100644
--- a/sys-cluster/ceph/ceph-15.2.8.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,7 @@ DEPEND="
 	dev-libs/libfmt:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
-	dev-libs/rocksdb:=
+	<dev-libs/rocksdb-6.15:=
 	dev-libs/xmlsec:=[!openssl?,!libressl?]
 	dev-cpp/yaml-cpp:=
 	dev-libs/nss:=
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index a440bbf2fbad..61826872eecb 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index 99de152d320e..f88b9a27a886 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1 +1,2 @@
+DIST piwigo-11.0.0.zip 17686353 BLAKE2B ea9425c70aa4d3febf93b473393e551b05955b8248c1e710fd49af50bf112e99902b14ac3a90e63e0651602b5005a7bb2f0f7e5a8e71fea8589fc369045399f0 SHA512 833b2daa8d0f71dc2a38647b11df3fed41d76451dae43fd32ef9e785b057d29fc11407c1c69233da895051de400b10e1d07395824ec71615146852b938bc963c
 DIST piwigo-2.10.2.zip 17391322 BLAKE2B 9982b398b8f3ead6bb5e70b34508d868e2a7440c1fe2d066f659d1a04e90f3239af0b63c2bcdc2fa250edab216acd155d5201d2634c30b275008f25bd0a5e7d0 SHA512 b75359a5ca1fd863de766eaf46dee64fc36482162fd1013bb95fd98553ae1135f9eafd584929a8d0f4dd074e9231978e84917e557de328786c6060098ab3734b
diff --git a/www-apps/piwigo/piwigo-11.0.0.ebuild b/www-apps/piwigo/piwigo-11.0.0.ebuild
new file mode 100644
index 000000000000..978f3b237a3f
--- /dev/null
+++ b/www-apps/piwigo/piwigo-11.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="http://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="
+	imagemagick? ( virtual/imagemagick-tools )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+BDEPEND="app-arch/unzip"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 403afbe60a6e..ce930537d512 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 1e75ef69b7c0..57e09706102b 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_89.0.4385.0-1_amd64.deb 78021836 BLAKE2B a6f35c29f52c3c0f8b6138a7bd3611883a2346727951359f6769512b487bdb9bfd6b471d4dd69cea378b63bc09c604e98db17e93b5dd05cfcac136024389f489 SHA512 1b095943af8d53c1e45a8fb599b70f25536adf0db4339e84b5a332ef69d441953d8bed50a043effc4a0b2eb37cfac5b0e371b6bc23ca6e0b8aa73c54a295094a
+DIST google-chrome-unstable_89.0.4389.9-1_amd64.deb 75091524 BLAKE2B 325478b65c6cd278e4ca1fc140c58a0f1af2958cd6a585e4d7082d7b626ad294a7268a89609c8a3f7fb2cf0594091a6c5aec41439d8fb93fab66af00d58312e2 SHA512 63ec8573cefcd9639ed7869157eb2419645b3e4a957f116339ff2d448620cc20f8dc3ccd58082fde7c4e513e5dcd1d9b7eb93bc418bac6c87f3790d00a1beeb0
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-89.0.4385.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-89.0.4389.9.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-89.0.4385.0.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-89.0.4389.9.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 15e5ebf1d02f..41fe56adcd2c 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index b2011176cae5..5b6143b6f0a9 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-beta_88.0.4324.96-1_amd64.deb 72789708 BLAKE2B 59c51a403e28e6e84d4faf8b65b208eb38f83d794370bf17ffebbf834e55ccfeaa6b773c329e2334cf59b9611a1593712996a458101b9edcd70b33c61e6bcf04 SHA512 389bb17d2ed18628fb61979c3c06f4cfbaa963ed6a33d6648e887aaf5dca4131f7160242b38b8c6846e7068b1f4c38d9409f1df91eaa3c98efce1e9141b03eb6
 DIST google-chrome-stable_88.0.4324.96-1_amd64.deb 72800524 BLAKE2B 42e207e5472715d4477b354aa9816c6ccf28856caac4bcd11344be158b44376d55d95ff355f07a03d681a148ecbb6c61b6795947479112a9305229ed3f6186f6 SHA512 6ee29f4ad5c8dcec70b1d18eb80e57fb4fd1b543f032e83bd50350bc8f903a7930a9f68c381d8659a235d310f3faa00bcae81e1e025135164648d2f48ed9f588
-DIST google-chrome-unstable_89.0.4385.0-1_amd64.deb 78021836 BLAKE2B a6f35c29f52c3c0f8b6138a7bd3611883a2346727951359f6769512b487bdb9bfd6b471d4dd69cea378b63bc09c604e98db17e93b5dd05cfcac136024389f489 SHA512 1b095943af8d53c1e45a8fb599b70f25536adf0db4339e84b5a332ef69d441953d8bed50a043effc4a0b2eb37cfac5b0e371b6bc23ca6e0b8aa73c54a295094a
+DIST google-chrome-unstable_89.0.4389.9-1_amd64.deb 75091524 BLAKE2B 325478b65c6cd278e4ca1fc140c58a0f1af2958cd6a585e4d7082d7b626ad294a7268a89609c8a3f7fb2cf0594091a6c5aec41439d8fb93fab66af00d58312e2 SHA512 63ec8573cefcd9639ed7869157eb2419645b3e4a957f116339ff2d448620cc20f8dc3ccd58082fde7c4e513e5dcd1d9b7eb93bc418bac6c87f3790d00a1beeb0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4385.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.9_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4385.0_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.9_alpha.ebuild