diff --git a/Manifest.files.gz b/Manifest.files.gz
index 82544713d07e..14e869128363 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index b4a50b83f08b..751ef3fe45a6 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/axtls/Manifest b/acct-group/axtls/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/axtls/axtls-0.ebuild b/acct-group/axtls/axtls-0.ebuild
new file mode 100644
index 000000000000..4534ecf5b634
--- /dev/null
+++ b/acct-group/axtls/axtls-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-libs/axtls"
+
+ACCT_GROUP_ID="147"
diff --git a/acct-group/axtls/metadata.xml b/acct-group/axtls/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/axtls/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/badvpn/Manifest b/acct-group/badvpn/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/badvpn/badvpn-0.ebuild b/acct-group/badvpn/badvpn-0.ebuild
new file mode 100644
index 000000000000..75a69db4196e
--- /dev/null
+++ b/acct-group/badvpn/badvpn-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/badvpn"
+
+ACCT_GROUP_ID="116"
diff --git a/acct-group/badvpn/metadata.xml b/acct-group/badvpn/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/badvpn/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/beanstalk/Manifest b/acct-group/beanstalk/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/beanstalk/beanstalk-0.ebuild b/acct-group/beanstalk/beanstalk-0.ebuild
new file mode 100644
index 000000000000..2fd201660183
--- /dev/null
+++ b/acct-group/beanstalk/beanstalk-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/beanstalkd"
+
+ACCT_GROUP_ID="137"
diff --git a/acct-group/beanstalk/metadata.xml b/acct-group/beanstalk/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/acct-group/beanstalk/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/acct-group/bitflu/Manifest b/acct-group/bitflu/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/bitflu/bitflu-0.ebuild b/acct-group/bitflu/bitflu-0.ebuild
new file mode 100644
index 000000000000..b0544d2346e2
--- /dev/null
+++ b/acct-group/bitflu/bitflu-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/bitflu"
+
+ACCT_GROUP_ID="148"
diff --git a/acct-group/bitflu/metadata.xml b/acct-group/bitflu/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/bitflu/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/burrow_exporter/Manifest b/acct-group/burrow_exporter/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/burrow_exporter/burrow_exporter-0.ebuild b/acct-group/burrow_exporter/burrow_exporter-0.ebuild
new file mode 100644
index 000000000000..2999dfc0ea12
--- /dev/null
+++ b/acct-group/burrow_exporter/burrow_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/burrow_exporter"
+
+ACCT_GROUP_ID="96"
diff --git a/acct-group/burrow_exporter/metadata.xml b/acct-group/burrow_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/burrow_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/cockroach/Manifest b/acct-group/cockroach/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/cockroach/cockroach-0.ebuild b/acct-group/cockroach/cockroach-0.ebuild
new file mode 100644
index 000000000000..7f9e3bf019d1
--- /dev/null
+++ b/acct-group/cockroach/cockroach-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/cockroach"
+
+ACCT_GROUP_ID="110"
diff --git a/acct-group/cockroach/metadata.xml b/acct-group/cockroach/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/cockroach/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/cron/Manifest b/acct-group/cron/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/cron/cron-0.ebuild b/acct-group/cron/cron-0.ebuild
new file mode 100644
index 000000000000..84116177ac0d
--- /dev/null
+++ b/acct-group/cron/cron-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/cronbase"
+
+ACCT_GROUP_ID="16"
diff --git a/acct-group/cron/metadata.xml b/acct-group/cron/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/cron/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/dbskkd/Manifest b/acct-group/dbskkd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/dbskkd/dbskkd-0.ebuild b/acct-group/dbskkd/dbskkd-0.ebuild
new file mode 100644
index 000000000000..84040068089f
--- /dev/null
+++ b/acct-group/dbskkd/dbskkd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-i18n/dbskkd-cdb"
+
+ACCT_GROUP_ID="146"
diff --git a/acct-group/dbskkd/metadata.xml b/acct-group/dbskkd/metadata.xml
new file mode 100644
index 000000000000..6f2ca22da233
--- /dev/null
+++ b/acct-group/dbskkd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cjk@gentoo.org
+ Cjk
+
+
diff --git a/acct-group/drone/Manifest b/acct-group/drone/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/drone/drone-0.ebuild b/acct-group/drone/drone-0.ebuild
new file mode 100644
index 000000000000..7e4e2c35ad8b
--- /dev/null
+++ b/acct-group/drone/drone-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/drone"
+
+ACCT_GROUP_ID="112"
diff --git a/acct-group/drone/metadata.xml b/acct-group/drone/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/drone/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/elasticsearch_exporter/Manifest b/acct-group/elasticsearch_exporter/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0.ebuild
new file mode 100644
index 000000000000..b28c7b674996
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/elasticsearch_exporter"
+
+ACCT_GROUP_ID="98"
diff --git a/acct-group/elasticsearch_exporter/metadata.xml b/acct-group/elasticsearch_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/fcron/Manifest b/acct-group/fcron/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/fcron/fcron-0.ebuild b/acct-group/fcron/fcron-0.ebuild
new file mode 100644
index 000000000000..2eb3684b77bf
--- /dev/null
+++ b/acct-group/fcron/fcron-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/fcron"
+
+ACCT_GROUP_ID="120"
diff --git a/acct-group/fcron/metadata.xml b/acct-group/fcron/metadata.xml
new file mode 100644
index 000000000000..891fc5d08472
--- /dev/null
+++ b/acct-group/fcron/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/firebird/Manifest b/acct-group/firebird/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/firebird/firebird-0.ebuild b/acct-group/firebird/firebird-0.ebuild
new file mode 100644
index 000000000000..4494d9646e31
--- /dev/null
+++ b/acct-group/firebird/firebird-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/firebird"
+
+ACCT_GROUP_ID="450"
diff --git a/acct-group/firebird/metadata.xml b/acct-group/firebird/metadata.xml
new file mode 100644
index 000000000000..278489a3490c
--- /dev/null
+++ b/acct-group/firebird/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ office@gentoo.org
+
+
diff --git a/acct-group/fluentd/Manifest b/acct-group/fluentd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/fluentd/fluentd-0.ebuild b/acct-group/fluentd/fluentd-0.ebuild
new file mode 100644
index 000000000000..377320d79ee7
--- /dev/null
+++ b/acct-group/fluentd/fluentd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/fluentd"
+
+ACCT_GROUP_ID="93"
diff --git a/acct-group/fluentd/metadata.xml b/acct-group/fluentd/metadata.xml
new file mode 100644
index 000000000000..85700153bc09
--- /dev/null
+++ b/acct-group/fluentd/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
+ ruby@gentoo.org
+ Gentoo Ruby Project
+
+
diff --git a/acct-group/foldingathome/Manifest b/acct-group/foldingathome/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/foldingathome/foldingathome-0.ebuild b/acct-group/foldingathome/foldingathome-0.ebuild
new file mode 100644
index 000000000000..216461c86938
--- /dev/null
+++ b/acct-group/foldingathome/foldingathome-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sci-biology/foldingathome"
+
+ACCT_GROUP_ID="128"
diff --git a/acct-group/foldingathome/metadata.xml b/acct-group/foldingathome/metadata.xml
new file mode 100644
index 000000000000..8417d1580d40
--- /dev/null
+++ b/acct-group/foldingathome/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ sci-biology@gentoo.org
+ Gentoo Biology Project
+
+
diff --git a/acct-group/gauth/Manifest b/acct-group/gauth/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/gauth/gauth-0.ebuild b/acct-group/gauth/gauth-0.ebuild
new file mode 100644
index 000000000000..31dc4549fa33
--- /dev/null
+++ b/acct-group/gauth/gauth-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/google-authenticator-wrappers"
+
+ACCT_GROUP_ID="138"
diff --git a/acct-group/gauth/metadata.xml b/acct-group/gauth/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/acct-group/gauth/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ mgorny@gentoo.org
+ Michał Górny
+
+
diff --git a/acct-group/gopherd/Manifest b/acct-group/gopherd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/gopherd/gopherd-0.ebuild b/acct-group/gopherd/gopherd-0.ebuild
new file mode 100644
index 000000000000..7c433e9e43e0
--- /dev/null
+++ b/acct-group/gopherd/gopherd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/geomyidae"
+
+ACCT_GROUP_ID="132"
diff --git a/acct-group/gopherd/metadata.xml b/acct-group/gopherd/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/acct-group/gopherd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ pinkbyte@gentoo.org
+ Sergey Popov
+
+
diff --git a/acct-group/grok_exporter/Manifest b/acct-group/grok_exporter/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/grok_exporter/grok_exporter-0.ebuild b/acct-group/grok_exporter/grok_exporter-0.ebuild
new file mode 100644
index 000000000000..ff2c696b3fb0
--- /dev/null
+++ b/acct-group/grok_exporter/grok_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/grok_exporter"
+
+ACCT_GROUP_ID="104"
diff --git a/acct-group/grok_exporter/metadata.xml b/acct-group/grok_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/grok_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/h2o/Manifest b/acct-group/h2o/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/h2o/h2o-0.ebuild b/acct-group/h2o/h2o-0.ebuild
new file mode 100644
index 000000000000..210bbacb211f
--- /dev/null
+++ b/acct-group/h2o/h2o-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/h2o"
+
+ACCT_GROUP_ID="141"
diff --git a/acct-group/h2o/metadata.xml b/acct-group/h2o/metadata.xml
new file mode 100644
index 000000000000..7ffc4339bc56
--- /dev/null
+++ b/acct-group/h2o/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ hattya@gentoo.org
+ Akinori Hattori
+
+
diff --git a/acct-group/haclient/Manifest b/acct-group/haclient/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/haclient/haclient-0.ebuild b/acct-group/haclient/haclient-0.ebuild
new file mode 100644
index 000000000000..26dcd63c48e7
--- /dev/null
+++ b/acct-group/haclient/haclient-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/cluster-glue"
+
+ACCT_GROUP_ID="204"
diff --git a/acct-group/haclient/metadata.xml b/acct-group/haclient/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-group/haclient/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cluster@gentoo.org
+ Gentoo Cluster Project
+
+
diff --git a/acct-group/icecast/Manifest b/acct-group/icecast/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/icecast/icecast-0.ebuild b/acct-group/icecast/icecast-0.ebuild
new file mode 100644
index 000000000000..8e91828cfb66
--- /dev/null
+++ b/acct-group/icecast/icecast-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/icecast"
+
+ACCT_GROUP_ID="131"
diff --git a/acct-group/icecast/metadata.xml b/acct-group/icecast/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-group/icecast/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ polynomial-c@gentoo.org
+ Lars Wendler
+
+
diff --git a/acct-group/icecream/Manifest b/acct-group/icecream/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/icecream/icecream-0.ebuild b/acct-group/icecream/icecream-0.ebuild
new file mode 100644
index 000000000000..08f8a89a7b97
--- /dev/null
+++ b/acct-group/icecream/icecream-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-devel/icecream"
+
+ACCT_GROUP_ID="145"
diff --git a/acct-group/icecream/metadata.xml b/acct-group/icecream/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-group/icecream/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cluster@gentoo.org
+ Gentoo Cluster Project
+
+
diff --git a/acct-group/karma/Manifest b/acct-group/karma/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/karma/karma-0.ebuild b/acct-group/karma/karma-0.ebuild
new file mode 100644
index 000000000000..1631d655b6bf
--- /dev/null
+++ b/acct-group/karma/karma-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/karma-bin"
+
+ACCT_GROUP_ID="118"
diff --git a/acct-group/karma/metadata.xml b/acct-group/karma/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/karma/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/lightdm/Manifest b/acct-group/lightdm/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/lightdm/lightdm-0.ebuild b/acct-group/lightdm/lightdm-0.ebuild
new file mode 100644
index 000000000000..eeedf50e22a1
--- /dev/null
+++ b/acct-group/lightdm/lightdm-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/lightdm"
+
+ACCT_GROUP_ID="134"
diff --git a/acct-group/lightdm/metadata.xml b/acct-group/lightdm/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-group/lightdm/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ polynomial-c@gentoo.org
+ Lars Wendler
+
+
diff --git a/acct-group/monkeyd/Manifest b/acct-group/monkeyd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/monkeyd/metadata.xml b/acct-group/monkeyd/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/monkeyd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/monkeyd/monkeyd-0.ebuild b/acct-group/monkeyd/monkeyd-0.ebuild
new file mode 100644
index 000000000000..6869bd2a7451
--- /dev/null
+++ b/acct-group/monkeyd/monkeyd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/monkeyd"
+
+ACCT_GROUP_ID="149"
diff --git a/acct-group/munge/Manifest b/acct-group/munge/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/munge/metadata.xml b/acct-group/munge/metadata.xml
new file mode 100644
index 000000000000..8bf4b5f36954
--- /dev/null
+++ b/acct-group/munge/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cluster@gentoo.org
+ Gentoo Cluster Project
+
+
diff --git a/acct-group/munge/munge-0.ebuild b/acct-group/munge/munge-0.ebuild
new file mode 100644
index 000000000000..d51744087c22
--- /dev/null
+++ b/acct-group/munge/munge-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-auth/munge"
+
+ACCT_GROUP_ID="144"
diff --git a/acct-group/nginx/Manifest b/acct-group/nginx/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/nginx/metadata.xml b/acct-group/nginx/metadata.xml
new file mode 100644
index 000000000000..a32d600f949d
--- /dev/null
+++ b/acct-group/nginx/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
+
diff --git a/acct-group/nginx/nginx-0.ebuild b/acct-group/nginx/nginx-0.ebuild
new file mode 100644
index 000000000000..3377bb72a49b
--- /dev/null
+++ b/acct-group/nginx/nginx-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/nginx"
+
+ACCT_GROUP_ID="82"
diff --git a/acct-group/nm-openconnect/Manifest b/acct-group/nm-openconnect/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/nm-openconnect/metadata.xml b/acct-group/nm-openconnect/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/acct-group/nm-openconnect/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
diff --git a/acct-group/nm-openconnect/nm-openconnect-0.ebuild b/acct-group/nm-openconnect/nm-openconnect-0.ebuild
new file mode 100644
index 000000000000..cf11b4322042
--- /dev/null
+++ b/acct-group/nm-openconnect/nm-openconnect-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openconnect"
+
+ACCT_GROUP_ID="142"
diff --git a/acct-group/nm-openvpn/Manifest b/acct-group/nm-openvpn/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/nm-openvpn/metadata.xml b/acct-group/nm-openvpn/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/acct-group/nm-openvpn/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
diff --git a/acct-group/nm-openvpn/nm-openvpn-0.ebuild b/acct-group/nm-openvpn/nm-openvpn-0.ebuild
new file mode 100644
index 000000000000..2c34fcd00534
--- /dev/null
+++ b/acct-group/nm-openvpn/nm-openvpn-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/networkmanager-openvpn"
+
+ACCT_GROUP_ID="143"
diff --git a/acct-group/partimag/Manifest b/acct-group/partimag/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/partimag/metadata.xml b/acct-group/partimag/metadata.xml
new file mode 100644
index 000000000000..4eb20a048df2
--- /dev/null
+++ b/acct-group/partimag/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ base-system@gentoo.org
+ Gentoo Base System
+
+
diff --git a/acct-group/partimag/partimag-0.ebuild b/acct-group/partimag/partimag-0.ebuild
new file mode 100644
index 000000000000..15a7d3eb6b96
--- /dev/null
+++ b/acct-group/partimag/partimag-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-block/partimage"
+
+ACCT_GROUP_ID="91"
diff --git a/acct-group/pgagent/Manifest b/acct-group/pgagent/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/pgagent/metadata.xml b/acct-group/pgagent/metadata.xml
new file mode 100644
index 000000000000..711734ad7566
--- /dev/null
+++ b/acct-group/pgagent/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ pgsql-bugs@gentoo.org
+ PostgreSQL and Related Package Development
+
+
diff --git a/acct-group/pgagent/pgagent-0.ebuild b/acct-group/pgagent/pgagent-0.ebuild
new file mode 100644
index 000000000000..a5716bd1cb4d
--- /dev/null
+++ b/acct-group/pgagent/pgagent-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/pgagent"
+
+ACCT_GROUP_ID="135"
diff --git a/acct-group/pushgateway/Manifest b/acct-group/pushgateway/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/pushgateway/metadata.xml b/acct-group/pushgateway/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/acct-group/pushgateway/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zmedico@gentoo.org
+ Zac Medico
+
+
diff --git a/acct-group/pushgateway/pushgateway-0.ebuild b/acct-group/pushgateway/pushgateway-0.ebuild
new file mode 100644
index 000000000000..c064f6390f10
--- /dev/null
+++ b/acct-group/pushgateway/pushgateway-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/pushgateway"
+
+ACCT_GROUP_ID="288"
diff --git a/acct-group/rabbitmq/Manifest b/acct-group/rabbitmq/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/rabbitmq/metadata.xml b/acct-group/rabbitmq/metadata.xml
new file mode 100644
index 000000000000..69bc0ccc3d1f
--- /dev/null
+++ b/acct-group/rabbitmq/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ ultrabug@gentoo.org
+ Ultrabug
+
+
diff --git a/acct-group/rabbitmq/rabbitmq-0.ebuild b/acct-group/rabbitmq/rabbitmq-0.ebuild
new file mode 100644
index 000000000000..58c6c1ee1b21
--- /dev/null
+++ b/acct-group/rabbitmq/rabbitmq-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/rabbitmq-server"
+
+ACCT_GROUP_ID="121"
diff --git a/acct-group/rabbitmq_exporter/Manifest b/acct-group/rabbitmq_exporter/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/rabbitmq_exporter/metadata.xml b/acct-group/rabbitmq_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
new file mode 100644
index 000000000000..bd882d0b8866
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/rabbitmq_exporter"
+
+ACCT_GROUP_ID="107"
diff --git a/acct-group/rbot/Manifest b/acct-group/rbot/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/rbot/metadata.xml b/acct-group/rbot/metadata.xml
new file mode 100644
index 000000000000..eb1e47f2edfb
--- /dev/null
+++ b/acct-group/rbot/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ ruby@gentoo.org
+ Gentoo Ruby Project
+
+
diff --git a/acct-group/rbot/rbot-0.ebuild b/acct-group/rbot/rbot-0.ebuild
new file mode 100644
index 000000000000..2e26e14ae37f
--- /dev/null
+++ b/acct-group/rbot/rbot-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-irc/rbot"
+
+ACCT_GROUP_ID="129"
diff --git a/acct-group/reg/Manifest b/acct-group/reg/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/reg/metadata.xml b/acct-group/reg/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/reg/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/reg/reg-0.ebuild b/acct-group/reg/reg-0.ebuild
new file mode 100644
index 000000000000..2c729ac8231a
--- /dev/null
+++ b/acct-group/reg/reg-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-emulation/reg"
+
+ACCT_GROUP_ID="94"
diff --git a/acct-group/registry/Manifest b/acct-group/registry/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/registry/metadata.xml b/acct-group/registry/metadata.xml
new file mode 100644
index 000000000000..9a7ba2ff3c46
--- /dev/null
+++ b/acct-group/registry/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ zmedico@gentoo.org
+
+
diff --git a/acct-group/registry/registry-0.ebuild b/acct-group/registry/registry-0.ebuild
new file mode 100644
index 000000000000..1c05abd01b75
--- /dev/null
+++ b/acct-group/registry/registry-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-emulation/docker-registry"
+
+ACCT_GROUP_ID="295"
diff --git a/acct-group/resin/Manifest b/acct-group/resin/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/resin/metadata.xml b/acct-group/resin/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/acct-group/resin/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ java@gentoo.org
+ Java
+
+
diff --git a/acct-group/resin/resin-0.ebuild b/acct-group/resin/resin-0.ebuild
new file mode 100644
index 000000000000..110eae9c3c1a
--- /dev/null
+++ b/acct-group/resin/resin-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/resin"
+
+ACCT_GROUP_ID="140"
diff --git a/acct-group/roccat/Manifest b/acct-group/roccat/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/roccat/metadata.xml b/acct-group/roccat/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-group/roccat/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ polynomial-c@gentoo.org
+ Lars Wendler
+
+
diff --git a/acct-group/roccat/roccat-0.ebuild b/acct-group/roccat/roccat-0.ebuild
new file mode 100644
index 000000000000..8c8638f0a4e2
--- /dev/null
+++ b/acct-group/roccat/roccat-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-apps/roccat-tools"
+
+ACCT_GROUP_ID="203"
diff --git a/acct-group/ros/Manifest b/acct-group/ros/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/ros/metadata.xml b/acct-group/ros/metadata.xml
new file mode 100644
index 000000000000..74ced8bea005
--- /dev/null
+++ b/acct-group/ros/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ ros@gentoo.org
+ Gentoo ROS Project
+
+
diff --git a/acct-group/ros/ros-0.ebuild b/acct-group/ros/ros-0.ebuild
new file mode 100644
index 000000000000..373c97151c4e
--- /dev/null
+++ b/acct-group/ros/ros-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-ros/roslaunch"
+
+ACCT_GROUP_ID="130"
diff --git a/acct-group/rt/Manifest b/acct-group/rt/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/rt/metadata.xml b/acct-group/rt/metadata.xml
new file mode 100644
index 000000000000..b5bf61d42076
--- /dev/null
+++ b/acct-group/rt/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ titanofold@gentoo.org
+ Aaron W. Swenson
+
+
+ web-apps@gentoo.org
+ Gentoo Webapps
+
+
diff --git a/acct-group/rt/rt-0.ebuild b/acct-group/rt/rt-0.ebuild
new file mode 100644
index 000000000000..460d0c3d7dcc
--- /dev/null
+++ b/acct-group/rt/rt-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/rt"
+
+ACCT_GROUP_ID="126"
diff --git a/acct-group/rundeck/Manifest b/acct-group/rundeck/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/rundeck/metadata.xml b/acct-group/rundeck/metadata.xml
new file mode 100644
index 000000000000..141fcf81ab49
--- /dev/null
+++ b/acct-group/rundeck/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
+ java@gentoo.org
+ Gentoo Java team
+
+
diff --git a/acct-group/rundeck/rundeck-0.ebuild b/acct-group/rundeck/rundeck-0.ebuild
new file mode 100644
index 000000000000..9a51c176b28f
--- /dev/null
+++ b/acct-group/rundeck/rundeck-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/rundeck-bin"
+
+ACCT_GROUP_ID="109"
diff --git a/acct-group/snmp_exporter/Manifest b/acct-group/snmp_exporter/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/snmp_exporter/metadata.xml b/acct-group/snmp_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/snmp_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/snmp_exporter/snmp_exporter-0.ebuild b/acct-group/snmp_exporter/snmp_exporter-0.ebuild
new file mode 100644
index 000000000000..52cf4f2d532e
--- /dev/null
+++ b/acct-group/snmp_exporter/snmp_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/snmp_exporter"
+
+ACCT_GROUP_ID="108"
diff --git a/acct-group/speech/Manifest b/acct-group/speech/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/speech/metadata.xml b/acct-group/speech/metadata.xml
new file mode 100644
index 000000000000..5614581ab26a
--- /dev/null
+++ b/acct-group/speech/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ williamh@gentoo.org
+
+
+ accessibility@gentoo.org
+ Gentoo Accessibility Project
+
+
+ sound@gentoo.org
+ Gentoo Sound project
+
+
diff --git a/acct-group/speech/speech-0.ebuild b/acct-group/speech/speech-0.ebuild
new file mode 100644
index 000000000000..2910ead7862d
--- /dev/null
+++ b/acct-group/speech/speech-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-accessibility/eflite"
+
+ACCT_GROUP_ID="202"
diff --git a/acct-group/subsonic/Manifest b/acct-group/subsonic/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/subsonic/metadata.xml b/acct-group/subsonic/metadata.xml
new file mode 100644
index 000000000000..76f45cdee0f4
--- /dev/null
+++ b/acct-group/subsonic/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ perfinion@gentoo.org
+ Jason Zaman
+
+
diff --git a/acct-group/subsonic/subsonic-0.ebuild b/acct-group/subsonic/subsonic-0.ebuild
new file mode 100644
index 000000000000..95e9e9317296
--- /dev/null
+++ b/acct-group/subsonic/subsonic-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/subsonic-bin"
+
+ACCT_GROUP_ID="136"
diff --git a/acct-group/thttpd/Manifest b/acct-group/thttpd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/thttpd/metadata.xml b/acct-group/thttpd/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/thttpd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/thttpd/thttpd-0.ebuild b/acct-group/thttpd/thttpd-0.ebuild
new file mode 100644
index 000000000000..f30403a01946
--- /dev/null
+++ b/acct-group/thttpd/thttpd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/thttpd"
+
+ACCT_GROUP_ID="155"
diff --git a/acct-group/trickster/Manifest b/acct-group/trickster/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/trickster/metadata.xml b/acct-group/trickster/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/trickster/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/trickster/trickster-0.ebuild b/acct-group/trickster/trickster-0.ebuild
new file mode 100644
index 000000000000..fa5e88995312
--- /dev/null
+++ b/acct-group/trickster/trickster-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/trickster"
+
+ACCT_GROUP_ID="119"
diff --git a/acct-group/uwsgi_exporter/Manifest b/acct-group/uwsgi_exporter/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/uwsgi_exporter/metadata.xml b/acct-group/uwsgi_exporter/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/acct-group/uwsgi_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zmedico@gentoo.org
+ Zac Medico
+
+
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
new file mode 100644
index 000000000000..4c7c20d457ec
--- /dev/null
+++ b/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/uwsgi_exporter"
+
+ACCT_GROUP_ID="289"
diff --git a/acct-group/vacation/Manifest b/acct-group/vacation/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/vacation/metadata.xml b/acct-group/vacation/metadata.xml
new file mode 100644
index 000000000000..b5bf61d42076
--- /dev/null
+++ b/acct-group/vacation/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ titanofold@gentoo.org
+ Aaron W. Swenson
+
+
+ web-apps@gentoo.org
+ Gentoo Webapps
+
+
diff --git a/acct-group/vacation/vacation-0.ebuild b/acct-group/vacation/vacation-0.ebuild
new file mode 100644
index 000000000000..94ef2caa53ed
--- /dev/null
+++ b/acct-group/vacation/vacation-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/postfixadmin"
+
+ACCT_GROUP_ID="125"
diff --git a/acct-group/vdr/Manifest b/acct-group/vdr/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/vdr/metadata.xml b/acct-group/vdr/metadata.xml
new file mode 100644
index 000000000000..984a01fab265
--- /dev/null
+++ b/acct-group/vdr/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ vdr@gentoo.org
+ Gentoo VDR Project
+
+
diff --git a/acct-group/vdr/vdr-0.ebuild b/acct-group/vdr/vdr-0.ebuild
new file mode 100644
index 000000000000..2aab79f2bb69
--- /dev/null
+++ b/acct-group/vdr/vdr-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-tv/gentoo-vdr-scripts"
+
+ACCT_GROUP_ID="92"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 34bafbe7f96f..d9ec634c0cf5 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 633a7379b6f3..f248977fbbf8 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1 +1,2 @@
DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
+DIST starpu-1.3.8.tar.gz 12895856 BLAKE2B f04096b03d5c035fb9cc6c193a482bfe9cd348c2245ac9e5cc22ad7595f8bd61ee71d7734c6e10db227c4185fc5719d3de804d82639ce0446b923ecb5c0c4249 SHA512 cd1a8c0246d91c6d405576329222292577282fa175201c758a9d5bd75d827ff59c7e2d9418082ffd5f14a26272fef449eed4a34778d0376d44c3594a2033849a
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index a75f91f978ac..858987550d06 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://starpu.gforge.inria.fr/"
SRC_URI="https://gforge.inria.fr/frs/download.php/file/37744/${P}.tar.gz"
LICENSE="LGPL-2.1"
-SLOT="0/8"
+SLOT="0/5"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="
diff --git a/dev-libs/starpu/starpu-1.3.8.ebuild b/dev-libs/starpu/starpu-1.3.8.ebuild
new file mode 100644
index 000000000000..059437fc1efe
--- /dev/null
+++ b/dev-libs/starpu/starpu-1.3.8.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+FORTRAN_STANDARD=90
+
+inherit autotools cuda fortran-2 toolchain-funcs
+
+DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
+HOMEPAGE="https://starpu.gitlabpages.inria.fr/"
+SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="
+ blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
+ openmp spinlock-check static-libs test valgrind
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ sci-mathematics/glpk:0=
+ >=sys-apps/hwloc-2.3.0:0=
+ blas? ( virtual/blas )
+ cuda? ( dev-util/nvidia-cuda-toolkit
+ x11-drivers/nvidia-drivers )
+ fftw? ( sci-libs/fftw:3.0= )
+ hdf5? ( sci-libs/hdf5:0= )
+ mpi? ( virtual/mpi )
+ opencl? ( virtual/opencl )
+ opengl? ( media-libs/freeglut:0= )
+ valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen virtual/latex-base )
+"
+
+src_prepare() {
+ default
+
+ sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
+ sed -i -e 's/-O3//g;s/-D_FORTIFY_SOURCE=1//g' configure.ac || die
+ eautoreconf
+
+ use cuda && cuda_src_prepare
+}
+
+src_configure() {
+ use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+
+ econf \
+ $(use mpi && use_enable test mpi-check) \
+ $(use_enable cuda) \
+ $(use_enable doc build-doc) \
+ $(use_enable doc build-doc-pdf) \
+ $(use_enable fftw starpufft) \
+ $(use_enable fortran) \
+ $(use_enable hdf5) \
+ $(use_enable mpi) \
+ $(use_enable opencl) \
+ $(use_enable opengl opengl-render) \
+ $(use_enable openmp) \
+ $(use_enable spinlock-check) \
+ $(use_enable static-libs static) \
+ $(use_enable valgrind) \
+ $(use_with mpi mpicc "$(type -P mpicc)") \
+ --disable-build-examples \
+ --disable-debug \
+ --disable-fstack-protector-all \
+ --disable-full-gdb-information
+}
+
+src_test() {
+ MAKEOPTS='-j1' default
+}
+
+src_install() {
+ default
+ use doc && dodoc -r doc/doxygen/*.pdf doc/doxygen/html
+ use examples && dodoc -r examples
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ba816161149e..baf603ce29c1 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch b/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch
new file mode 100644
index 000000000000..8f9fde6bdd79
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch
@@ -0,0 +1,12 @@
+diff -urNp labltk-8.06.10-orig/browser/typecheck.ml labltk-8.06.10-dwok/browser/typecheck.ml
+--- labltk-8.06.10-orig/browser/typecheck.ml 2020-08-25 07:50:47.000000000 +0200
++++ labltk-8.06.10-dwok/browser/typecheck.ml 2021-02-26 01:55:00.000000000 +0100
+@@ -116,7 +116,7 @@ let f txt =
+ List.iter psl ~f:
+ begin function
+ Ptop_def pstr ->
+- let str, sign, _names, env' = Typemod.type_structure !env pstr in
++ let str, sign, _names, env' = Typemod.type_structure !env pstr Location.none in
+ txt.structure <- txt.structure @ str.str_items;
+ txt.signature <- txt.signature @ sign;
+ env := env'
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
index 10d78bc548ad..6acd06b500f4 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
+ "${FILESDIR}"/${P}-this-expression-has-type.patch
)
src_configure() {
diff --git a/dev-perl/Gtk3-ImageView/metadata.xml b/dev-perl/Gtk3-ImageView/metadata.xml
index 74cc4507df14..237c897ba8a1 100644
--- a/dev-perl/Gtk3-ImageView/metadata.xml
+++ b/dev-perl/Gtk3-ImageView/metadata.xml
@@ -14,6 +14,7 @@
Gentoo Perl Project
+ carygravel/gtk3-imageview
Gtk3-ImageView
Gtk3::ImageView
Gtk3::ImageView::Tool
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 56ca78448eab..57fa50adc7f6 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 18d4c1fec87b..78d0da6ed428 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/pyls-black/Manifest b/dev-python/pyls-black/Manifest
deleted file mode 100644
index a35ed3557d9d..000000000000
--- a/dev-python/pyls-black/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
-DIST pyls-black-0.4.7.gh.tar.gz 5166 BLAKE2B 46ed7dc96b9f3b70edd1923133b39169b37f0d2d909bed41742690920dd7ea9b935dfa17b8d8f8ab43d9e3b3e18a99811c015ae5506e950e8775df8a34c79a83 SHA512 a68861a8283ab9118fa0a5bad6a751d5ece422813de12c98eba624d97742cf3f4e0b02d3afa43fb129bac00c54b9b2702bafd590d2d1489bd4af773ee68db7b3
diff --git a/dev-python/pyls-black/metadata.xml b/dev-python/pyls-black/metadata.xml
deleted file mode 100644
index 7b06e078f1b6..000000000000
--- a/dev-python/pyls-black/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- pyls-black
- rupert/pyls-black
-
-
-
- andrewammerlaan@gentoo.org
- Andrew Ammerlaan
-
-
diff --git a/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild b/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
deleted file mode 100644
index ed69ccf14ff8..000000000000
--- a/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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 distutils-r1
-
-DESCRIPTION="Black plugin for the Python Language Server"
-HOMEPAGE="https://github.com/rupert/pyls-black
- https://pypi.org/project/pyls-black/"
-SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- dev-python/python-language-server[${PYTHON_USEDEP}]
- ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/python-language-server[${PYTHON_USEDEP}]
- >=dev-python/black-21[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
deleted file mode 100644
index 32c97cef70ea..000000000000
--- a/dev-python/python-jsonrpc-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
deleted file mode 100644
index b639d69bbd04..000000000000
--- a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/test_streams.py b/test/test_streams.py
-index 6985aec..9e64489 100644
---- a/test/test_streams.py
-+++ b/test/test_streams.py
-@@ -119,6 +119,7 @@ def test_writer_bad_message(wfile, writer):
- hour=1,
- minute=1,
- second=1,
-+ tzinfo=datetime.timezone.utc
- ))
-
- assert wfile.getvalue() in [
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
deleted file mode 100644
index cc81d1f0619e..000000000000
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- andrewammerlaan@gentoo.org
- Andrew Ammerlaan
-
-
- python-jsonrpc-server
-
-
-
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
deleted file mode 100644
index f19ac1fc6571..000000000000
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
-HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pycodestyle[${PYTHON_USEDEP}]
-)"
-
-RDEPEND=">=dev-python/ujson-3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-fix-test-with-ujson-3-and-up.patch" )
-
-python_prepare_all() {
- # Remove pytest-cov dep
- sed -i -e '0,/addopts/I!d' setup.cfg || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-keyutils/Manifest b/dev-python/python-keyutils/Manifest
new file mode 100644
index 000000000000..db74414ead22
--- /dev/null
+++ b/dev-python/python-keyutils/Manifest
@@ -0,0 +1 @@
+DIST python-keyutils-0.6.tar.gz 45427 BLAKE2B b62a1194bad87fe42c658c0603ff236e8e5594e8d19dbf8b29bac5b2ef5b3c6a6d19eae3d529c9408e06802c883fad365d41d27c656776a4994b58a43b8bf1fc SHA512 e282d553a644d9b38c6256e027ee553a123bf21e4222491e22699ca5bc5041dedc4e9a9a8c1bafa44985f3b1d5fafd85ded9ed5332b6d94d6c62f3fa6bcb6d0d
diff --git a/dev-python/python-keyutils/metadata.xml b/dev-python/python-keyutils/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/dev-python/python-keyutils/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ bkohler@gentoo.org
+ Ben Kohler
+
+
diff --git a/dev-python/python-keyutils/python-keyutils-0.6.ebuild b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
new file mode 100644
index 000000000000..3934da52194c
--- /dev/null
+++ b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A set of python bindings for keyutils"
+HOMEPAGE="https://github.com/sassoftware/python-keyutils/"
+SRC_URI="https://github.com/sassoftware/python-keyutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ default
+ sed -i -e '/pytest-runner/d' setup.py || die
+}
+
+python_test() {
+ ln -s "${S}"/test "${BUILD_DIR}"/test || die
+ cd "${BUILD_DIR}" || die
+ distutils-r1_python_test
+}
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
deleted file mode 100644
index 153f27d97f38..000000000000
--- a/dev-python/python-language-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
diff --git a/dev-python/python-language-server/files/pyls-fix-test_folding.patch b/dev-python/python-language-server/files/pyls-fix-test_folding.patch
deleted file mode 100644
index 6980053bf48a..000000000000
--- a/dev-python/python-language-server/files/pyls-fix-test_folding.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2d3c52c7b9debd73073650d22a3aa6e86d5491aa Mon Sep 17 00:00:00 2001
-From: Ben Greiner
-Date: Thu, 1 Apr 2021 21:33:38 +0200
-Subject: [PATCH 2/2] TST: accept folding of decorator parameters in Python 3.9
-
----
- test/plugins/test_folding.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/test/plugins/test_folding.py b/test/plugins/test_folding.py
-index 05f0cdd8..91ac0f3b 100644
---- a/test/plugins/test_folding.py
-+++ b/test/plugins/test_folding.py
-@@ -1,11 +1,11 @@
- # Copyright 2019 Palantir Technologies, Inc.
-
-+import sys
- from textwrap import dedent
-
- from pyls import uris
--from pyls.workspace import Document
- from pyls.plugins.folding import pyls_folding_range
--
-+from pyls.workspace import Document
-
- DOC_URI = uris.from_fs_path(__file__)
- DOC = dedent("""
-@@ -146,6 +146,10 @@ def test_folding(workspace):
- {'startLine': 62, 'endLine': 63},
- {'startLine': 64, 'endLine': 65},
- {'startLine': 67, 'endLine': 68}]
-+ if sys.version_info[:2] >= (3, 9):
-+ # the argument list of the decorator is also folded in Python >= 3.9
-+ expected.insert(4, {'startLine': 9, 'endLine': 10})
-+
- assert ranges == expected
-
-
diff --git a/dev-python/python-language-server/files/pyls-jedi-18.patch b/dev-python/python-language-server/files/pyls-jedi-18.patch
deleted file mode 100644
index 1410f3a81dd7..000000000000
--- a/dev-python/python-language-server/files/pyls-jedi-18.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 40afab312a6bf0dcd620c82e59555ea2967aacdf Mon Sep 17 00:00:00 2001
-From: bnavigator
-Date: Tue, 5 Jan 2021 01:17:33 +0100
-Subject: [PATCH 1/2] bump jedi compatibility: compare to Path-like object
-
----
- pyls/plugins/symbols.py | 2 +-
- setup.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 6468dd83..69a09fe9 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -37,7 +37,7 @@ def pyls_document_symbols(config, document):
- not sym_full_name.startswith('__main__')):
- continue
-
-- if _include_def(d) and document.path == d.module_path:
-+ if _include_def(d) and os.path.samefile(document.path, d.module_path):
- tuple_range = _tuple_range(d)
- if tuple_range in exclude:
- continue
-diff --git a/setup.py b/setup.py
-index 12782990..99d2b312 100755
---- a/setup.py
-+++ b/setup.py
-@@ -10,7 +10,7 @@
- 'configparser; python_version<"3.0"',
- 'future>=0.14.0; python_version<"3"',
- 'backports.functools_lru_cache; python_version<"3.2"',
-- 'jedi>=0.17.2,<0.18.0',
-+ 'jedi>=0.17.2,<0.19.0',
- 'python-jsonrpc-server>=0.4.0',
- 'pluggy',
- 'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"',
-
-From e442467312fe967bff5f893b7e3f92da133182c8 Mon Sep 17 00:00:00 2001
-From: bnavigator
-Date: Tue, 5 Jan 2021 01:37:25 +0100
-Subject: [PATCH 2/2] Curse you Python 2 on Windows: os.path.samefile not
- implemented
-
----
- pyls/plugins/symbols.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 69a09fe9..ef8e7fb8 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -36,8 +36,14 @@ def pyls_document_symbols(config, document):
- if (not sym_full_name.startswith(module_name) and
- not sym_full_name.startswith('__main__')):
- continue
--
-- if _include_def(d) and os.path.samefile(document.path, d.module_path):
-+ try:
-+ docismodule = os.path.samefile(document.path, d.module_path)
-+ except AttributeError:
-+ # Python 2 on Windows has no .samefile, but then these are
-+ # strings for sure
-+ docismodule = document.path == d.module_path
-+
-+ if _include_def(d) and docismodule:
- tuple_range = _tuple_range(d)
- if tuple_range in exclude:
- continue
diff --git a/dev-python/python-language-server/files/pyls-numpy-1.20.patch b/dev-python/python-language-server/files/pyls-numpy-1.20.patch
deleted file mode 100644
index ab1c5032ff46..000000000000
--- a/dev-python/python-language-server/files/pyls-numpy-1.20.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 48f5eca25c2da064bcc9aa0fefb5de525bec618f Mon Sep 17 00:00:00 2001
-From: Ben Greiner
-Date: Tue, 30 Mar 2021 20:20:08 +0200
-Subject: [PATCH 1/3] don't test np.sin hover for numpy 1.20
-
----
- test/plugins/test_hover.py | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/plugins/test_hover.py b/test/plugins/test_hover.py
-index 2302b865..f36bcb29 100644
---- a/test/plugins/test_hover.py
-+++ b/test/plugins/test_hover.py
-@@ -46,9 +46,13 @@ def test_numpy_hover(workspace):
- contents = 'NumPy\n=====\n\nProvides\n'
- assert contents in pyls_hover(doc, numpy_hov_position_3)['contents'][0]
-
-- contents = 'Trigonometric sine, element-wise.\n\n'
-- assert contents in pyls_hover(
-- doc, numpy_sin_hov_position)['contents'][0]
-+ # https://github.com/davidhalter/jedi/issues/1746
-+ import numpy as np
-+
-+ if np.lib.NumpyVersion(np.__version__) < '1.20.0':
-+ contents = 'Trigonometric sine, element-wise.\n\n'
-+ assert contents in pyls_hover(
-+ doc, numpy_sin_hov_position)['contents'][0]
-
-
- def test_hover(workspace):
-
-From 3ee06dac069e27edf6231651ae27bff78ae8aaff Mon Sep 17 00:00:00 2001
-From: Ben Greiner
-Date: Tue, 30 Mar 2021 20:21:20 +0200
-Subject: [PATCH 2/3] test snippet support with builtin instead of numpy
-
----
- test/plugins/test_completion.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
-index 247c2c23..91df89cb 100644
---- a/test/plugins/test_completion.py
-+++ b/test/plugins/test_completion.py
-@@ -216,14 +216,14 @@ def test_completion_with_class_objects(config, workspace):
-
-
- def test_snippet_parsing(config, workspace):
-- doc = 'import numpy as np\nnp.logical_and'
-- completion_position = {'line': 1, 'character': 14}
-+ doc = 'divmod'
-+ completion_position = {'line': 0, 'character': 6}
- doc = Document(DOC_URI, workspace, doc)
- config.capabilities['textDocument'] = {
- 'completion': {'completionItem': {'snippetSupport': True}}}
- config.update({'plugins': {'jedi_completion': {'include_params': True}}})
- completions = pyls_jedi_completions(config, doc, completion_position)
-- out = 'logical_and(${1:x1}, ${2:x2})$0'
-+ out = 'divmod(${1:a}, ${2:b})$0'
- assert completions[0]['insertText'] == out
-
-
-
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
deleted file mode 100644
index 46b054f2ca60..000000000000
--- a/dev-python/python-language-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- andrewammerlaan@gentoo.org
- Andrew Ammerlaan
-
-
-
- python-language-server
-
-
diff --git a/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild b/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
deleted file mode 100644
index 19de44f065be..000000000000
--- a/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
- test? (
- dev-python/autopep8[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
- =dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
- =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
- dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
- >=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
- =dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/ujson-3[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}/pyls-fix-test_folding.patch"
- "${FILESDIR}/pyls-numpy-1.20.patch"
- "${FILESDIR}/pyls-jedi-18.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # remove pytest-cov dep
- sed -i -e '0,/addopts/I!d' setup.cfg || die
-
- # allow the use of jedi-18
- sed -i -e 's/jedi<0.18.0/jedi<0.19.0/g' python_language_server.egg-info/requires.txt || die
-
- distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
- optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
- optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
- optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
- optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
- optfeature "Python docstring style checker" dev-python/pydocstyle
- optfeature "Passive checker for Python programs" dev-python/pyflakes
- optfeature "Python code static checker" dev-python/pylint
- optfeature "Python refactoring library" dev-python/rope
- optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 82f27f21b506..c24b4a0c8165 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/mage/Manifest b/dev-util/mage/Manifest
new file mode 100644
index 000000000000..590850c53f2f
--- /dev/null
+++ b/dev-util/mage/Manifest
@@ -0,0 +1 @@
+DIST mage-1.11.0.tar.gz 8795144 BLAKE2B 20e0934cc8a4cdf91586d4883c69e2040a6b67e440429bbbb23e4d35ca5a6d33bf34d0e9419f35e5bf273074cf9577a2ba61251b91d3cea619fba6c4cbe13007 SHA512 dd4e0764f6567250a70461f7b040cc5725f59a4b375aa85f1b4f0a8a9c1738ec4fc5f1a078349f34e655229397b0431c88ecd54603c281440a23a81e949cf9a4
diff --git a/dev-util/mage/mage-1.11.0.ebuild b/dev-util/mage/mage-1.11.0.ebuild
new file mode 100644
index 000000000000..b589b5b0780b
--- /dev/null
+++ b/dev-util/mage/mage-1.11.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="make/rake like tool using go"
+HOMEPAGE="https://magefile.org"
+SRC_URI="https://github.com/magefile/mage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+ GOBIN="${S}/bin" go run bootstrap.go || die "build failed"
+}
+
+src_install() {
+dobin bin/mage
+}
diff --git a/dev-util/mage/metadata.xml b/dev-util/mage/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-util/mage/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index e337ef3d1dd6..9c917851264d 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kwave/files/kwave-21.04.1-gcc11.patch b/kde-apps/kwave/files/kwave-21.04.1-gcc11.patch
deleted file mode 100644
index cc2e8218cf1b..000000000000
--- a/kde-apps/kwave/files/kwave-21.04.1-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/plugins/codec_wav/WavDecoder.cpp b/plugins/codec_wav/WavDecoder.cpp
-index 9430404..2390c08 100644
---- a/plugins/codec_wav/WavDecoder.cpp
-+++ b/plugins/codec_wav/WavDecoder.cpp
-@@ -18,6 +18,7 @@
- #include "config.h"
- #include
- #include
-+#include
-
- #include
-
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index b8c010858a93..0c4baa62b715 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/xlog/files/xlog-2.0.13-desktop-update.patch b/media-radio/xlog/files/xlog-2.0.13-desktop-update.patch
deleted file mode 100644
index cf834e13ec7c..000000000000
--- a/media-radio/xlog/files/xlog-2.0.13-desktop-update.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- configure.ac.orig 2007-11-06 15:49:25.000000000 -0800
-+++ configure.ac 2007-11-06 15:51:22.000000000 -0800
-@@ -48,6 +48,7 @@
- AH_TEMPLATE([HAVE_LC_MESSAGES], [])
- AH_TEMPLATE([HAVE_STPCPY], [])
-
-+dnl MIME update
- AC_ARG_ENABLE(mime-update,
- [ --enable-mime-update update the mime database],
- [case "${enableval}" in
-@@ -63,6 +64,21 @@
- echo "disabled updating of the mime database"
- fi
-
-+dnl Desktop update
-+AC_ARG_ENABLE(desktop-update,
-+[ --enable-desktop-update update the desktop database],
-+[case "${enableval}" in
-+ yes) desk_update=true ;;
-+ no) desk_update=false ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-desk-update) ;;
-+esac],[desk_update=false])
-+AM_CONDITIONAL(DESKUPDATE, test x$desk_update = xtrue)
-+
-+if test "x${desk_update}" != "xfalse"; then
-+ echo "enabled updating of the desktop database"
-+else
-+ echo "disabled updating of the desktop database"
-+fi
-
- AC_OUTPUT([po/Makefile.in
- Makefile
---- data/desktop/Makefile.am.orig 2007-11-06 15:47:51.000000000 -0800
-+++ data/desktop/Makefile.am 2007-11-06 15:48:16.000000000 -0800
-@@ -5,12 +5,16 @@
-
- EXTRA_DIST = $(DESKTOP_FILES)
-
-+if DESKUPDATE
- install-data-hook:
- if HAVE_DESKTOP
- $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)$(datadir)/applications"
- endif
-+endif
-
-+if DESKUPDATE
- uninstall-hook:
- if HAVE_DESKTOP
- $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)$(datadir)/applications"
- endif
-+endif
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 32701f741daa..c9a02ee0d18d 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 3de2c6669258..d2d37554aa47 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Jul 2021 18:09:04 +0000
+Wed, 14 Jul 2021 21:09:06 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3de2c6669258..6c45f70a5586 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Jul 2021 18:09:04 +0000
+Wed, 14 Jul 2021 21:09:07 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9a0d76570fe4..83fe8e295014 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 832076c480bd..a23ef7af11a9 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/axtls-0 b/metadata/md5-cache/acct-group/axtls-0
new file mode 100644
index 000000000000..a8189b1679dc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/axtls-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-libs/axtls
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=dc367e60f51dd7e43359750bec5c5d04
diff --git a/metadata/md5-cache/acct-group/badvpn-0 b/metadata/md5-cache/acct-group/badvpn-0
new file mode 100644
index 000000000000..417d22d152ab
--- /dev/null
+++ b/metadata/md5-cache/acct-group/badvpn-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/badvpn
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=61dec2aa6c1078629b87c0bc0491afde
diff --git a/metadata/md5-cache/acct-group/beanstalk-0 b/metadata/md5-cache/acct-group/beanstalk-0
new file mode 100644
index 000000000000..b89292a626b4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/beanstalk-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/beanstalkd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=20575dd90ceb0ec27c5a4b641c2c144c
diff --git a/metadata/md5-cache/acct-group/bitflu-0 b/metadata/md5-cache/acct-group/bitflu-0
new file mode 100644
index 000000000000..e2b1beac1594
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bitflu-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-p2p/bitflu
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=8cf2ae9469d7240140821a3bc9b55726
diff --git a/metadata/md5-cache/acct-group/burrow_exporter-0 b/metadata/md5-cache/acct-group/burrow_exporter-0
new file mode 100644
index 000000000000..e77a8c57c7c1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/burrow_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/burrow_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=5fbd3b973c38d56280f9f743d057cae3
diff --git a/metadata/md5-cache/acct-group/cockroach-0 b/metadata/md5-cache/acct-group/cockroach-0
new file mode 100644
index 000000000000..72e2e8e47429
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cockroach-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/cockroach
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=66f7da19c3d7d8a55f6ce74acd14d344
diff --git a/metadata/md5-cache/acct-group/cron-0 b/metadata/md5-cache/acct-group/cron-0
new file mode 100644
index 000000000000..77d2d08a1cd1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cron-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/cronbase
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=f95ae7fb5167a41e3c0c48f91bb639e6
diff --git a/metadata/md5-cache/acct-group/dbskkd-0 b/metadata/md5-cache/acct-group/dbskkd-0
new file mode 100644
index 000000000000..83726d9e43ea
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dbskkd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-i18n/dbskkd-cdb
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=8a89ed1add86532209d1fd7e45ad43ab
diff --git a/metadata/md5-cache/acct-group/drone-0 b/metadata/md5-cache/acct-group/drone-0
new file mode 100644
index 000000000000..89ea5c030b1c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/drone-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-util/drone
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=553bbe639516091a183834334745a759
diff --git a/metadata/md5-cache/acct-group/elasticsearch_exporter-0 b/metadata/md5-cache/acct-group/elasticsearch_exporter-0
new file mode 100644
index 000000000000..b553549cbeaa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/elasticsearch_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/elasticsearch_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=6f03103450216336fafd9a3193ca2715
diff --git a/metadata/md5-cache/acct-group/fcron-0 b/metadata/md5-cache/acct-group/fcron-0
new file mode 100644
index 000000000000..b2018629895f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fcron-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/fcron
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ec67655d6dea6f914dfcde637d3ba0e6
diff --git a/metadata/md5-cache/acct-group/firebird-0 b/metadata/md5-cache/acct-group/firebird-0
new file mode 100644
index 000000000000..99bb630767e0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/firebird-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/firebird
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=98ba81a633525e097e4da384e5073592
diff --git a/metadata/md5-cache/acct-group/fluentd-0 b/metadata/md5-cache/acct-group/fluentd-0
new file mode 100644
index 000000000000..366607799dc4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fluentd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/fluentd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=fb59ad84b4c5ca664223cd1ac552a363
diff --git a/metadata/md5-cache/acct-group/foldingathome-0 b/metadata/md5-cache/acct-group/foldingathome-0
new file mode 100644
index 000000000000..04292d9a14a8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/foldingathome-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sci-biology/foldingathome
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=0cde01ea6a2d8c9cd2cf3f8a9a92f297
diff --git a/metadata/md5-cache/acct-group/gauth-0 b/metadata/md5-cache/acct-group/gauth-0
new file mode 100644
index 000000000000..8777dd6e6efb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gauth-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-auth/google-authenticator-wrappers
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ec1021f72f47ec3bdc9138455b6f2ec4
diff --git a/metadata/md5-cache/acct-group/gopherd-0 b/metadata/md5-cache/acct-group/gopherd-0
new file mode 100644
index 000000000000..bae580566bba
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gopherd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/geomyidae
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ce1c211c6ae847481daa3aa9519717a0
diff --git a/metadata/md5-cache/acct-group/grok_exporter-0 b/metadata/md5-cache/acct-group/grok_exporter-0
new file mode 100644
index 000000000000..0e28791a0fa8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/grok_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/grok_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=87baa22bef03e7a6173552e0b909d62f
diff --git a/metadata/md5-cache/acct-group/h2o-0 b/metadata/md5-cache/acct-group/h2o-0
new file mode 100644
index 000000000000..b6a5336a30e9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/h2o-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/h2o
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4a84b01e2971202a92807c67a8eed975
diff --git a/metadata/md5-cache/acct-group/haclient-0 b/metadata/md5-cache/acct-group/haclient-0
new file mode 100644
index 000000000000..7d317757a041
--- /dev/null
+++ b/metadata/md5-cache/acct-group/haclient-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-cluster/cluster-glue
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=e8c9006c8133f5547390297ee87ec4af
diff --git a/metadata/md5-cache/acct-group/icecast-0 b/metadata/md5-cache/acct-group/icecast-0
new file mode 100644
index 000000000000..5873a83c3c75
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icecast-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/icecast
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=95cb7ebe9f2c38367630c8d2020a6653
diff --git a/metadata/md5-cache/acct-group/icecream-0 b/metadata/md5-cache/acct-group/icecream-0
new file mode 100644
index 000000000000..7c72f44bd2dd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icecream-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-devel/icecream
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=9ce1bdeb0490c71db009e4b8d05656aa
diff --git a/metadata/md5-cache/acct-group/karma-0 b/metadata/md5-cache/acct-group/karma-0
new file mode 100644
index 000000000000..8b3716775810
--- /dev/null
+++ b/metadata/md5-cache/acct-group/karma-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/karma-bin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=58fcc43bee645083bc6dd2f5f1bc071f
diff --git a/metadata/md5-cache/acct-group/lightdm-0 b/metadata/md5-cache/acct-group/lightdm-0
new file mode 100644
index 000000000000..0e1296f74608
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lightdm-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for x11-misc/lightdm
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=2c0eda5c611d02aea2c99ff133f063e6
diff --git a/metadata/md5-cache/acct-group/monkeyd-0 b/metadata/md5-cache/acct-group/monkeyd-0
new file mode 100644
index 000000000000..533e64e20053
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monkeyd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/monkeyd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4c53e5082a920b16acd70700eddc8b94
diff --git a/metadata/md5-cache/acct-group/munge-0 b/metadata/md5-cache/acct-group/munge-0
new file mode 100644
index 000000000000..98708cf5d42f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/munge-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-auth/munge
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=f4271f090e2d7c3b9daaaa7b2dcfc250
diff --git a/metadata/md5-cache/acct-group/nginx-0 b/metadata/md5-cache/acct-group/nginx-0
new file mode 100644
index 000000000000..567777ff26a3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nginx-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/nginx
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=d3f3453dc446afb11de512b9272602e3
diff --git a/metadata/md5-cache/acct-group/nm-openconnect-0 b/metadata/md5-cache/acct-group/nm-openconnect-0
new file mode 100644
index 000000000000..a2db410d9057
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nm-openconnect-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/networkmanager-openconnect
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=828688dff44247448fcb77741ca82c4b
diff --git a/metadata/md5-cache/acct-group/nm-openvpn-0 b/metadata/md5-cache/acct-group/nm-openvpn-0
new file mode 100644
index 000000000000..7d7547cfcf85
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nm-openvpn-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/networkmanager-openvpn
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=435972a37aa86bf93a159432669be8c0
diff --git a/metadata/md5-cache/acct-group/partimag-0 b/metadata/md5-cache/acct-group/partimag-0
new file mode 100644
index 000000000000..7e9b37ed2dea
--- /dev/null
+++ b/metadata/md5-cache/acct-group/partimag-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-block/partimage
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=12723f90b0bdbdf5e48fb61ea23328d7
diff --git a/metadata/md5-cache/acct-group/pgagent-0 b/metadata/md5-cache/acct-group/pgagent-0
new file mode 100644
index 000000000000..30de880aa012
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pgagent-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/pgagent
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b724096dd1af210d584316579db9a1c3
diff --git a/metadata/md5-cache/acct-group/pushgateway-0 b/metadata/md5-cache/acct-group/pushgateway-0
new file mode 100644
index 000000000000..0ff831b87b6a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pushgateway-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/pushgateway
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=973610429b1d0fb6c58b43deca928160
diff --git a/metadata/md5-cache/acct-group/rabbitmq-0 b/metadata/md5-cache/acct-group/rabbitmq-0
new file mode 100644
index 000000000000..bfa1dfe9321e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rabbitmq-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/rabbitmq-server
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ab4b417278e62a735f425076f9415f59
diff --git a/metadata/md5-cache/acct-group/rabbitmq_exporter-0 b/metadata/md5-cache/acct-group/rabbitmq_exporter-0
new file mode 100644
index 000000000000..57755703d795
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rabbitmq_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/rabbitmq_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ed80fb06b0243b2988e1ab851e9827d0
diff --git a/metadata/md5-cache/acct-group/rbot-0 b/metadata/md5-cache/acct-group/rbot-0
new file mode 100644
index 000000000000..a993b75582c7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rbot-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-irc/rbot
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=6f094ee834ca494e4b37de9f3ef04c2d
diff --git a/metadata/md5-cache/acct-group/reg-0 b/metadata/md5-cache/acct-group/reg-0
new file mode 100644
index 000000000000..14d0608eb734
--- /dev/null
+++ b/metadata/md5-cache/acct-group/reg-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-emulation/reg
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=12772411b799aecfff1e5e723682503e
diff --git a/metadata/md5-cache/acct-group/registry-0 b/metadata/md5-cache/acct-group/registry-0
new file mode 100644
index 000000000000..a548a5605112
--- /dev/null
+++ b/metadata/md5-cache/acct-group/registry-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-emulation/docker-registry
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=36e4c3c5d50d9da693964a070b708bdd
diff --git a/metadata/md5-cache/acct-group/resin-0 b/metadata/md5-cache/acct-group/resin-0
new file mode 100644
index 000000000000..88dad98dc6f2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/resin-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/resin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=6df35c594caae444f4fa40b95650ca02
diff --git a/metadata/md5-cache/acct-group/roccat-0 b/metadata/md5-cache/acct-group/roccat-0
new file mode 100644
index 000000000000..6ad05e30f28f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/roccat-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-apps/roccat-tools
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=04a2c0506ba3b5a25ece67ff0c907b7a
diff --git a/metadata/md5-cache/acct-group/ros-0 b/metadata/md5-cache/acct-group/ros-0
new file mode 100644
index 000000000000..6b572b5b68c6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ros-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-ros/roslaunch
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=156f21246830c23452022b4cb5562758
diff --git a/metadata/md5-cache/acct-group/rt-0 b/metadata/md5-cache/acct-group/rt-0
new file mode 100644
index 000000000000..a09fbc425500
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rt-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/rt
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=5a515f03b0e23782b419ad2035de1b46
diff --git a/metadata/md5-cache/acct-group/rundeck-0 b/metadata/md5-cache/acct-group/rundeck-0
new file mode 100644
index 000000000000..5052c8d3665d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rundeck-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/rundeck-bin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=67809b37284cdfca7bdda2e10180be9b
diff --git a/metadata/md5-cache/acct-group/snmp_exporter-0 b/metadata/md5-cache/acct-group/snmp_exporter-0
new file mode 100644
index 000000000000..dbb8d55d6c2a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/snmp_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/snmp_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=51beb02be8623452b80e8860639fcb6b
diff --git a/metadata/md5-cache/acct-group/speech-0 b/metadata/md5-cache/acct-group/speech-0
new file mode 100644
index 000000000000..fedcd321da62
--- /dev/null
+++ b/metadata/md5-cache/acct-group/speech-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-accessibility/eflite
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=57849aac139c47948ff691c235cc4aa1
diff --git a/metadata/md5-cache/acct-group/subsonic-0 b/metadata/md5-cache/acct-group/subsonic-0
new file mode 100644
index 000000000000..7bfada569f92
--- /dev/null
+++ b/metadata/md5-cache/acct-group/subsonic-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/subsonic-bin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b432ae97f685dd50347a0f56cfc88160
diff --git a/metadata/md5-cache/acct-group/thttpd-0 b/metadata/md5-cache/acct-group/thttpd-0
new file mode 100644
index 000000000000..bb46804af846
--- /dev/null
+++ b/metadata/md5-cache/acct-group/thttpd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/thttpd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=56cb00c84de67a6080110a569e0a2506
diff --git a/metadata/md5-cache/acct-group/trickster-0 b/metadata/md5-cache/acct-group/trickster-0
new file mode 100644
index 000000000000..2f7232fae39f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/trickster-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/trickster
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=a3c348cc69eb3da6e13665dbce8f49ee
diff --git a/metadata/md5-cache/acct-group/uwsgi_exporter-0 b/metadata/md5-cache/acct-group/uwsgi_exporter-0
new file mode 100644
index 000000000000..afd86541a396
--- /dev/null
+++ b/metadata/md5-cache/acct-group/uwsgi_exporter-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/uwsgi_exporter
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=fc7a036f684f9e4995ce90094a6672fb
diff --git a/metadata/md5-cache/acct-group/vacation-0 b/metadata/md5-cache/acct-group/vacation-0
new file mode 100644
index 000000000000..7628fc3ff7f8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vacation-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/postfixadmin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=7441efdb18b7361bb94c6172dc07899e
diff --git a/metadata/md5-cache/acct-group/vdr-0 b/metadata/md5-cache/acct-group/vdr-0
new file mode 100644
index 000000000000..bafaa3958e88
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vdr-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-tv/gentoo-vdr-scripts
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group d12e466819e60dedccac935746c2b151 user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=7698beee80f16ce28921cecdf4e053e0
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6fa919c0f4b3..c0e722febf40 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/starpu-1.2.6-r1 b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
index caea04499d0e..dd8f9b019977 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
+++ b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
@@ -8,7 +8,7 @@ KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86
LICENSE=LGPL-2.1
RDEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
RESTRICT=!test? ( test )
-SLOT=0/8
+SLOT=0/5
SRC_URI=https://gforge.inria.fr/frs/download.php/file/37744/starpu-1.2.6.tar.gz
_eclasses_=autotools 2a36908d5f63f41614b450a2459567da cuda c2f1b334711bbbf2130f339636dc7515 desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 fortran-2 3cec34b0def864e87677d8b2b1c370b8 gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 97566c1a256d07b00848aa767e38a352 preserve-libs dbc9f8d2d49c66467bc327fddd8317bd strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa vcs-clean b690a7e9b6c497cf59326a7545df4283 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=5c52a74d07d5e268e344697938f06d48
+_md5_=168cc6cb4d5e0ad50dcbabe765c81185
diff --git a/metadata/md5-cache/dev-libs/starpu-1.3.8 b/metadata/md5-cache/dev-libs/starpu-1.3.8
new file mode 100644
index 000000000000..4e1f30f5ec4f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/starpu-1.3.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) sys-devel/gnuconfig >=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=configure install prepare setup test
+DEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
+DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
+EAPI=7
+HOMEPAGE=https://starpu.gitlabpages.inria.fr/
+IUSE=blas cuda doc examples fftw fortran hdf5 mpi opencl opengl openmp spinlock-check static-libs test valgrind
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
+SLOT=0/7
+SRC_URI=https://files.inria.fr/starpu/starpu-1.3.8/starpu-1.3.8.tar.gz
+_eclasses_=autotools 2a36908d5f63f41614b450a2459567da cuda c2f1b334711bbbf2130f339636dc7515 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 fortran-2 3cec34b0def864e87677d8b2b1c370b8 gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e multilib 97566c1a256d07b00848aa767e38a352 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=500bf5595755872f66b21cccb7fa8003
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 2ec7ed5bc70a..fa64137e3fbb 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.10 b/metadata/md5-cache/dev-ml/labltk-8.06.10
index e79a833fc531..fc0425929d7e 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.10
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.10
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[
SLOT=0/8.06.10
SRC_URI=https://github.com/garrigue/labltk/archive/8.06.10.tar.gz -> labltk-8.06.10.tar.gz
_eclasses_=findlib 1470b3b78030acb2c8fcd04414f4c611
-_md5_=0f521f98630df1ac61c2e220f05d8783
+_md5_=bd18ffcba3e130203c43457c322db736
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 56068df3654e..3a307a54456a 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/pyls-black-0.4.6-r1 b/metadata/md5-cache/dev-python/pyls-black-0.4.6-r1
deleted file mode 100644
index d0aa4cd2b65d..000000000000
--- a/metadata/md5-cache/dev-python/pyls-black-0.4.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Black plugin for the Python Language Server
-EAPI=7
-HOMEPAGE=https://github.com/rupert/pyls-black https://pypi.org/project/pyls-black/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rupert/pyls-black/archive/v0.4.6.tar.gz -> pyls-black-0.4.6-gh.tar.gz
-_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=add276a838e9904a733ce4473ea07ae4
diff --git a/metadata/md5-cache/dev-python/pyls-black-0.4.7 b/metadata/md5-cache/dev-python/pyls-black-0.4.7
deleted file mode 100644
index 7152a04352cf..000000000000
--- a/metadata/md5-cache/dev-python/pyls-black-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/black-21[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Black plugin for the Python Language Server
-EAPI=7
-HOMEPAGE=https://github.com/rupert/pyls-black https://pypi.org/project/pyls-black/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/black-21[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_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_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rupert/pyls-black/archive/v0.4.7.tar.gz -> pyls-black-0.4.7.gh.tar.gz
-_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d44b1c0718aec8fb9836ae73d4ea9d8
diff --git a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1 b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
deleted file mode 100644
index 4159d189a7ff..000000000000
--- a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python 2 and 3 asynchronous JSON RPC server
-EAPI=7
-HOMEPAGE=https://github.com/palantir/python-jsonrpc-server
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-jsonrpc-server/python-jsonrpc-server-0.4.0.tar.gz
-_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=12ece748a0aca074f5f1351383b18cc4
diff --git a/metadata/md5-cache/dev-python/python-keyutils-0.6 b/metadata/md5-cache/dev-python/python-keyutils-0.6
new file mode 100644
index 000000000000..b7d6bda32f52
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-keyutils-0.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-apps/keyutils >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/keyutils
+DESCRIPTION=A set of python bindings for keyutils
+EAPI=8
+HOMEPAGE=https://github.com/sassoftware/python-keyutils/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/keyutils python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sassoftware/python-keyutils/archive/refs/tags/0.6.tar.gz -> python-keyutils-0.6.tar.gz
+_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b5ff6eb0beca62b5e328094e72057368
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1 b/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1
deleted file mode 100644
index d989d060ba7d..000000000000
--- a/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=An implementation of the Language Server Protocol for Python
-EAPI=7
-HOMEPAGE=https://github.com/palantir/python-language-server
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.36.2.tar.gz
-_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b optfeature cc13a38ea4d26565e83ef21d58bcd4ab python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ffd2db41567c8f552e1e602cd548f5d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4433d0a2ed02..47036026f75d 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/mage-1.11.0 b/metadata/md5-cache/dev-util/mage-1.11.0
new file mode 100644
index 000000000000..c48049f806f7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mage-1.11.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=make/rake like tool using go
+EAPI=7
+HOMEPAGE=https://magefile.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/magefile/mage/archive/v1.11.0.tar.gz -> mage-1.11.0.tar.gz
+_eclasses_=go-module 8aabf8812bab7a6f07e7a32958c505ef
+_md5_=9fec69034ff802169b1228dc71aa7a5f
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 2c832b1bf90e..1aa46dabdf74 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/kapacitor-1.4.1-r1 b/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
deleted file mode 100644
index b2974a0ac855..000000000000
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Monitoring, processing and alerting on time series data
-EAPI=6
-HOMEPAGE=https://www.influxdata.com
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/influxdata/kapacitor/archive/v1.4.1.tar.gz -> kapacitor-1.4.1.tar.gz
-_eclasses_=golang-base b8fb27dacacea08140c53857f439fc7d golang-build 91472d4e18894e738c69b415e236a664 golang-vcs-snapshot ff485cabd3f37b060f110b0be95092ec multilib 97566c1a256d07b00848aa767e38a352 systemd c846b9e02ac8293bfc9ca38a195c2a18 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/net-analyzer/kapacitor-1.5.1 b/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
deleted file mode 100644
index 9abf1169ca03..000000000000
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Monitoring, processing and alerting on time series data
-EAPI=6
-HOMEPAGE=https://www.influxdata.com
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/influxdata/kapacitor/archive/v1.5.1.tar.gz -> kapacitor-1.5.1.tar.gz
-_eclasses_=golang-base b8fb27dacacea08140c53857f439fc7d golang-build 91472d4e18894e738c69b415e236a664 golang-vcs-snapshot ff485cabd3f37b060f110b0be95092ec multilib 97566c1a256d07b00848aa767e38a352 systemd c846b9e02ac8293bfc9ca38a195c2a18 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 4fc201212fbc..0ab89ca184bd 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/udev-249-r1 b/metadata/md5-cache/sys-fs/udev-249-r1
index 9ceeb03b13ec..ebbb79408164 100644
--- a/metadata/md5-cache/sys-fs/udev-249-r1
+++ b/metadata/md5-cache/sys-fs/udev-249-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
DEFINED_PHASES=compile configure install postinst prepare setup test
DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz
_eclasses_=bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 linux-info 7e8ed4c6a1d136fb291c52386f996c2c meson 5bc3f1b890f90cc00cf1d1dddc10233e meson-multilib c640b1d57ff5b687118b1e1038e30ecb multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multilib-build effd4508d5e8209273d82d8f67ee93a0 multilib-minimal 7187f259f207bf5b69e4ff01498a7269 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-any-r1 901d9e22c7a848a1196502edf060f330 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa udev 26207b5d4f4708920b9fcb7302d94068 usr-ldscript 6ae04038b0001994e6be364ffc1c0156
-_md5_=8868c63a27c1e343e8933ff58181832e
+_md5_=51078b0bea954618def6473b2de9e147
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 0fb7dfab01a4..343fd0a45e79 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
@@ -12,4 +12,4 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
RESTRICT=test
SLOT=0
_eclasses_=bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 git-r3 cc875b0c1e9b3bdac1af0f82f3ba29da linux-info 7e8ed4c6a1d136fb291c52386f996c2c meson 5bc3f1b890f90cc00cf1d1dddc10233e meson-multilib c640b1d57ff5b687118b1e1038e30ecb multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multilib-build effd4508d5e8209273d82d8f67ee93a0 multilib-minimal 7187f259f207bf5b69e4ff01498a7269 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-any-r1 901d9e22c7a848a1196502edf060f330 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa udev 26207b5d4f4708920b9fcb7302d94068 usr-ldscript 6ae04038b0001994e6be364ffc1c0156
-_md5_=70518e542b1b359e1c33b8100be328f8
+_md5_=446c8cd322a8ac6a9b604351525cd8f8
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1 b/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1
new file mode 100644
index 000000000000..dbb7faa01405
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udiskie-2.3.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-fs/udisks:2 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-text/asciidoc dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=An automatic disk mounting service using udisks
+EAPI=8
+HOMEPAGE=https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-fs/udisks:2 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/udiskie/udiskie-2.3.3.tar.gz
+_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa xdg-utils 27f9a2f19502b925ac117bd657aa2979
+_md5_=df47fab614a4250528d51c68ad63447e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 68a868f484c9..14818451d9f4 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-5.10.17 b/metadata/md5-cache/sys-kernel/linux-docs-5.10.50
similarity index 88%
rename from metadata/md5-cache/sys-kernel/linux-docs-5.10.17
rename to metadata/md5-cache/sys-kernel/linux-docs-5.10.50
index a94503b0a346..36d55c016a2c 100644
--- a/metadata/md5-cache/sys-kernel/linux-docs-5.10.17
+++ b/metadata/md5-cache/sys-kernel/linux-docs-5.10.50
@@ -3,9 +3,11 @@ DEFINED_PHASES=compile install prepare setup
DESCRIPTION=Developer documentation generated from the Linux kernel
EAPI=7
HOMEPAGE=https://www.kernel.org/
+IUSE=graphviz
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=GPL-2
+RDEPEND=graphviz? ( media-gfx/graphviz )
SLOT=0
SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multilib 97566c1a256d07b00848aa767e38a352 python-any-r1 901d9e22c7a848a1196502edf060f330 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f3e0be147f1f6074b9669c8c2d2f36cf
+_md5_=ad4adf95a98b0ff6e818649323801b3e
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 6bf155d5bf1d..165b0040b207 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r2 b/metadata/md5-cache/sys-libs/glibc-2.33-r2
new file mode 100644
index 000000000000..983a7d67783c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DESCRIPTION=GNU libc C library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-4.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
+_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 gnuconfig 262062cef0ba4f22b397193da514a350 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b prefix d04f14b297013ad1410550c0757f14f8 python-any-r1 901d9e22c7a848a1196502edf060f330 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd c846b9e02ac8293bfc9ca38a195c2a18 tmpfiles 5cd6e8cf3288d5b19ff8b5c78c7e3e31 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=2a00ff5e6a8aa775612de5f96b6e1166
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1
new file mode 100644
index 000000000000..5171bfc8813a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.23-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-apps/findutils test? ( || ( ( dev-lang/python:3.10 dev-python/passlib[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/passlib[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/passlib[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
+DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
+EAPI=7
+HOMEPAGE=https://github.com/besser82/libxcrypt
+IUSE=+compat split-usr +static-libs system test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ public-domain BSD BSD-2
+RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
+REQUIRED_USE=split-usr? ( system )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.23-autotools.tar.xz
+_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multilib-build effd4508d5e8209273d82d8f67ee93a0 multilib-minimal 7187f259f207bf5b69e4ff01498a7269 python-any-r1 901d9e22c7a848a1196502edf060f330 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
+_md5_=adedd146598dbae50f6d98b4906979d2
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3de2c6669258..6c45f70a5586 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Jul 2021 18:09:04 +0000
+Wed, 14 Jul 2021 21:09:07 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ef8422b4e73f..e580dc5faf90 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jul 14 06:09:04 PM UTC 2021
+Wed Jul 14 09:09:06 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 50e66f35ea87..45e1c17874d1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Jul 2021 18:30:01 +0000
+Wed, 14 Jul 2021 21:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 5f2ac73af7e9..150abbcc3a27 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e66a799d899c05cc0be28468b51206c533a6b471 1626285391 2021-07-14T17:56:31+00:00
+121fe1ef2a7536970641a63ae26ca8c42dddbdd5 1626296006 2021-07-14T20:53:26+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index bba13d6625a5..08cf2b8dd772 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1626285901 Wed 14 Jul 2021 06:05:01 PM UTC
+1626296701 Wed 14 Jul 2021 09:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3de2c6669258..d2d37554aa47 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Jul 2021 18:09:04 +0000
+Wed, 14 Jul 2021 21:09:06 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3402e6e565e4..26c7b09d1f34 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/kapacitor/Manifest b/net-analyzer/kapacitor/Manifest
index ed51e89c0feb..e84886f6f4f4 100644
--- a/net-analyzer/kapacitor/Manifest
+++ b/net-analyzer/kapacitor/Manifest
@@ -1,3 +1 @@
-DIST kapacitor-1.4.1.tar.gz 7543899 BLAKE2B 142ea7899be3728d2e857a83beebb8ff32dae6b7a71097de1474878a1728c6597937d03a828746af2464d6406ae80796b11579a10baacb66843bd535f971d940 SHA512 315e01e97f6a89afbbd0e36c17ee64d2744bc8ccce2e318f17ad5fba75599fdc55c303069c32aed07ba73c8ba9cdbacdb76c7ffe0c81681c1ef0be0ba405802e
-DIST kapacitor-1.5.1.tar.gz 5668659 BLAKE2B 5caf7a51945d84010f25dcbe198d4a1b7fc21f2ef7036a0489d6274212068937942f0490637a11ab05399d3a95ec1d96f3d42f0a2b3e3b7b4ff1377ef1e220e6 SHA512 6e25f89d9b75c6c14350a189be7bcd4210a331025a4bd0a8fa363dee8abbe8c582013a9c3020e638e9490ded12d70212963dc01bd3570395412641e2911d93f5
DIST kapacitor-1.5.5.tar.gz 5708426 BLAKE2B 432d24f3bbe0f42e36b881e0c709cebd96dd3674ddf752f6a25cfb333108c903073b887e12d630d6c9e33a77b1256ea090cfe216cd9eb30b9bee53c48b7ab154 SHA512 34a2577a9c6f069ab8f747b9bd2f80f941bbedcccd740c24ec9f308804ec259e78cf14c924fcee3315b6f9f7f59adb9c50aedf06587898b8a0fb54f721d79212
diff --git a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild b/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild
deleted file mode 100644
index dd499480fbdd..000000000000
--- a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/kapacitor
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
- enewgroup kapacitor
- enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor
-}
-
-src_compile() {
- pushd "src/${EGO_PN}" > /dev/null || die
- set -- env GOPATH="${S}" go build -v -work -x ./...
- echo "$@"
- "$@" || die "compile failed"
- popd > /dev/null
-}
-
-src_install() {
- pushd "src/${EGO_PN}" > /dev/null || die
- set -- env GOPATH="${S}" go install -v -work -x ./...
- echo "$@"
- "$@" || die
- dobin "${S}"/bin/kapacitor{,d}
- insinto /etc/kapacitor
-doins etc/kapacitor/kapacitor.conf
-keepdir /etc/kapacitor/load
- insinto /etc/logrotate.d
- doins etc/logrotate.d/kapacitor
- systemd_dounit scripts/kapacitor.service
- keepdir /var/log/kapacitor
- fowners kapacitor:kapacitor /var/log/kapacitor
- newconfd "${FILESDIR}"/kapacitor.confd kapacitor
- newinitd "${FILESDIR}"/kapacitor.rc kapacitor
- popd > /dev/null || die
-}
diff --git a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild b/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild
deleted file mode 100644
index dd499480fbdd..000000000000
--- a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/kapacitor
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
- enewgroup kapacitor
- enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor
-}
-
-src_compile() {
- pushd "src/${EGO_PN}" > /dev/null || die
- set -- env GOPATH="${S}" go build -v -work -x ./...
- echo "$@"
- "$@" || die "compile failed"
- popd > /dev/null
-}
-
-src_install() {
- pushd "src/${EGO_PN}" > /dev/null || die
- set -- env GOPATH="${S}" go install -v -work -x ./...
- echo "$@"
- "$@" || die
- dobin "${S}"/bin/kapacitor{,d}
- insinto /etc/kapacitor
-doins etc/kapacitor/kapacitor.conf
-keepdir /etc/kapacitor/load
- insinto /etc/logrotate.d
- doins etc/logrotate.d/kapacitor
- systemd_dounit scripts/kapacitor.service
- keepdir /var/log/kapacitor
- fowners kapacitor:kapacitor /var/log/kapacitor
- newconfd "${FILESDIR}"/kapacitor.confd kapacitor
- newinitd "${FILESDIR}"/kapacitor.rc kapacitor
- popd > /dev/null || die
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index fab5ef80b48d..6866df099de4 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
deleted file mode 100644
index b728cc28cb15..000000000000
--- a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# from https://trac.i2p2.de/ticket/2770
-From ceb0749e0d5c3c496b4a91bc3a9d3b5e296fc456 Mon Sep 17 00:00:00 2001
-From: zzz
-Date: Wed, 2 Sep 2020 15:57:04 +0000
-Subject: [PATCH] Util: Fix decompression of compressed zero bytes (ticket
- #2770)
-
----
- core/java/src/net/i2p/data/DataHelper.java | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
-index aaa47797c3..39f766e6fa 100644
---- a/core/java/src/net/i2p/data/DataHelper.java
-+++ b/core/java/src/net/i2p/data/DataHelper.java
-@@ -1902,7 +1902,8 @@ public static String unescapeHTML(String escaped) {
- */
- public static byte[] decompress(byte orig[], int offset, int length) throws IOException {
- if (orig == null) return orig;
-- if (length < 23)
-+ // normal overhead is 23 bytes, but a compress of zero bytes is 20 bytes
-+ if (length < 20)
- throw new IOException("length");
- if (length < 65559 && orig[offset + 10] == 0x01)
- return zeroDecompress(orig, offset, length);
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index dc48feb9236a..23cc11d05516 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez/files/69-btattach-bcm.rules b/net-wireless/bluez/files/69-btattach-bcm.rules
deleted file mode 100644
index dfe8d1e785c8..000000000000
--- a/net-wireless/bluez/files/69-btattach-bcm.rules
+++ /dev/null
@@ -1,33 +0,0 @@
-# Some devices have a bluetooth HCI connected to an uart, these needs to be
-# setup by calling btattach. The systemd btattach-bcm.service takes care of
-# this. These udev rules hardware-activate that service when necessary.
-#
-# For now this only suports ACPI enumerated Broadcom BT HCIs.
-# This has been tested on Bay and Cherry Trail devices with both ACPI and
-# PCI enumerated UARTs.
-
-# Note we check for the platform device not for the acpi device, because
-# some DSDTs list multiple bluetooth adapters, but only some (or none)
-# are enabled. Only enabled adapters get a platform device created.
-ACTION!="add", GOTO="btattach_bcm_rules_end"
-SUBSYSTEM!="platform", GOTO="btattach_bcm_rules_end"
-
-KERNEL=="BCM2E1A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E39:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3D:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E3F:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E40:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E54:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E55:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E64:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E65:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E67:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E71:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7B:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7C:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E7E:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E95:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-KERNEL=="BCM2E96:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service"
-
-LABEL="btattach_bcm_rules_end"
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r4 b/net-wireless/bluez/files/bluetooth-init.d-r4
deleted file mode 100644
index e69c66867fa0..000000000000
--- a/net-wireless/bluez/files/bluetooth-init.d-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/bluetoothd.pid"
-command="/usr/libexec/bluetooth/bluetoothd"
-command_background=1
-
-depend() {
- after coldplug
- need dbus localmount hostname
-}
diff --git a/net-wireless/bluez/files/btattach-bcm-service.sh b/net-wireless/bluez/files/btattach-bcm-service.sh
deleted file mode 100644
index c7f8b1784679..000000000000
--- a/net-wireless/bluez/files/btattach-bcm-service.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Simple shell script to wait for the tty for an uart using BT HCI to show up
-# and then invoke btattach with the right parameters, this is intended to be
-# invoked from a hardware-activated systemd service
-#
-# For now this only suports ACPI enumerated Broadcom BT HCIs.
-# This has been tested on Bay and Cherry Trail devices with both ACPI and
-# PCI enumerated UARTs.
-#
-# Note the kernel bt developers are working on solving this entirely in the
-# kernel, so it is not worth the trouble to write something better then this.
-
-BT_DEV="/sys/bus/platform/devices/$1"
-BT_DEV="$(readlink -f $BT_DEV)"
-UART_DEV="$(dirname $BT_DEV)"
-
-# Stupid GPD-pocket has USB BT with id 0000:0000, but still claims to have
-# an uart attached bt
-if [ "$1" = "BCM2E7E:00" ] && lsusb | grep -q "ID 0000:0000"; then
- exit 0
-fi
-
-while [ ! -d "$UART_DEV/tty" ]; do
- sleep .2
-done
-
-TTY="$(ls $UART_DEV/tty)"
-
-exec btattach --bredr "/dev/$TTY" -P bcm
diff --git a/net-wireless/bluez/files/btattach-bcm_at.service b/net-wireless/bluez/files/btattach-bcm_at.service
deleted file mode 100644
index 1e7c7dbe582e..000000000000
--- a/net-wireless/bluez/files/btattach-bcm_at.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=btattach for Broadcom devices
-
-[Service]
-Type=simple
-ExecStart=/usr/libexec/bluetooth/btattach-bcm-service.sh %I
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e7aa7aa188d6..451e9b1186e5 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index c5f17dc2b352..f00d84a10780 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -39,6 +39,8 @@ app-editors/emacs gconf m17n-lib xwidgets
app-crypt/heimdal afs
# - MANY, to be reviewed
dev-cpp/eigen doc test
+# - sci-libs/hdf5
+dev-libs/starpu hdf5
# - dev-python/pygraphviz & sci-libs/gdal, dev-python/pandas
dev-python/networkx extras pandas
# - sys-cluster/ceph
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index eb7bc3a9dd50..aa66e55ed5b5 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -91,12 +91,12 @@ sys-libs/libcxx libcxxabi
# the flag.
sys-kernel/vanilla-kernel initramfs
-# Sergei Trofimovich (2019-11-06)
+# Andreas K. Hüttel (2021-07-14)
# Upstream plans to drop libcrypt.so.1/crypt.h from glibc
# distribution and rely on external providers like libxcrypt.
-# Gentoo will follow suit but today we are not yet ready.
-# Unmask at your risk. Bug #699422 tracks the effort.
-sys-libs/glibc crypt
+# Here we are following that path too.
+=sys-libs/libxcrypt-4.4.23-r1 system compat
# Matt Turner (2019-09-01)
# =sci-libs/pastix-6.0.0 cuda int64 metis mpi starpu
+# invocation of MPI_FINALIZE.
+>=sci-libs/pastix-6.0.0 cuda int64 metis mpi
# Alfredo Tupone (2021-06-27)
# lto does not work on dev-lang/gnat-gpl-2021
@@ -287,10 +286,12 @@ dev-python/statsmodels doc
# broken static-linking in glibc and maybe others
>app-shells/mksh-57-r1 static
-# Patrick McLean (2019-11-07)
-# Collides with sys-libc/glibc[crypt]
-# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
-sys-libs/libxcrypt split-usr system
+# Andreas K. Hüttel (2021-07-14)
+# Upstream plans to drop libcrypt.so.1/crypt.h from glibc
+# distribution and rely on external providers like libxcrypt.
+# Here we are following that path too.
+>=sys-libs/glibc-2.33-r2 crypt
+ (2019-10-05)
# net-libs/openslp is being removed.
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 2cdc63f8b852..d8d887a8fe5c 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Andreas K. Hüttel (2021-07-14)
+# Mask the libxcrypt-based virtual
+~virtual/libcrypt-2
+
# David Seifert (2021-02-08)
# nvidia-drivers only works against glibc.
x11-drivers/nvidia-drivers
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force
index c26a7ba83f24..da728fcc47ae 100644
--- a/profiles/features/musl/package.use.force
+++ b/profiles/features/musl/package.use.force
@@ -1,6 +1,10 @@
# Copyright 1999-2018 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
+# Andreas K. Hüttel (2021-07-14)
+# Do not force system install for libxcrypt here
+>=sys-libs/libxcrypt-4.4.23-r1 -system -compat
+
# Force system-libevent use flag on mozilla packages, since the building of
# bundled libevent cannot accomodate a system without sysctl.h
# See bug 574830 for more info.
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index afdd59ca5f50..58cd6477116c 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors.
# Distributed under the terms of the GNU General Public License v2
+# Andreas K. Hüttel
+# Restore mask here that is gone elsewhere
+sys-libs/libxcrypt split-usr system
+
# James Le Cuirot (2020-05-16)
# execinfo.h is required for debug.
dev-games/cegui debug
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
index fe51d352f2f1..ba157ac6b0c5 100644
--- a/profiles/features/uclibc/package.mask
+++ b/profiles/features/uclibc/package.mask
@@ -5,6 +5,10 @@ sys-libs/musl
sys-libs/glibc
sys-libs/pam
+# Andreas K. Hüttel (2021-07-14)
+# Mask the libxcrypt-based virtual
+~virtual/libcrypt-2
+
# Ionen Wolkens (2021-07-09)
# Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)
sys-apps/systemd-tmpfiles
diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force
new file mode 100644
index 000000000000..82ca48bfea6c
--- /dev/null
+++ b/profiles/features/uclibc/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 2021 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas K. Hüttel (2021-07-14)
+# Do not force system install for libxcrypt here
+>=sys-libs/libxcrypt-4.4.23-r1 -system -compat
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
index 1c6069c30db8..b3f8a9ebe24a 100644
--- a/profiles/features/uclibc/package.use.mask
+++ b/profiles/features/uclibc/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Andreas K. Hüttel
+# Restore mask here that is gone elsewhere
+sys-libs/libxcrypt split-usr system
+
# Anthony G. Basile
# sanitize is broken on at least all hardened uclibc
sys-devel/gcc sanitize
diff --git a/profiles/package.mask b/profiles/package.mask
index 6a20d46213ba..e19794fcc058 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
#--- END OF EXAMPLES ---
+# John Helmert III (2021-07-14)
+# Dead upstream, unfixed security issue.
+# Removal on 2021-08-13. Bugs #755896, #781467.
+net-proxy/polipo
+
# Marek Szuba (2021-07-14)
# New, considerably refactored major version with a new build system.
# Masked for further testing.
@@ -319,29 +324,6 @@ sys-apps/rescan-scsi-bus
# Removal on 2021-07-15.
media-sound/sc2mpd
-# Andrew Ammerlaan (2021-06-14)
-# The original Python Language Server by Palantir is no longer actively
-# developed [1]. Development on a language server for Python is continued by
-# the Spyder IDE community under a new name and in a new package. To continue
-# using pyls, please switch to the maintained forks [2]:
-# dev-python/python-language-server --> dev-python/python-lsp-server
-# dev-python/python-jsonrpc-server --> dev-python/python-lsp-jsonrpc
-# dev-python/pyls-black --> dev-python/python-lsp-black
-# -
-# Note that dev-python/pyls-spyder has already switched to the new language
-# server as of version 0.4.0. Users of the Spyder IDE will automatically
-# switch to the new language server when upgrading to version 4.2.5-r1 or
-# 5.0.4-r1. Manual adjustments to the settings may be required in certain
-# configurations [3].
-# -
-# Masked for removal in 30 days (2021-07-14).
-# [1] https://github.com/palantir/python-language-server/issues/935
-# [2] https://bugs.gentoo.org/795924
-# [3] https://bugs.gentoo.org/783615
-dev-python/python-language-server
-dev-python/python-jsonrpc-server
-dev-python/pyls-black
-
# Volkmar W. Pogatzki (2021-06-14)
# DeprecatedDep jre-1.3, upstream dead,removal in 30 days
# see bug: https://bugs.gentoo.org/787410
@@ -651,11 +633,6 @@ kde-apps/kdebase-meta:5
# Mask for testing revdeps.
>=dev-games/mygui-3.4.0
-# Patrick McLean (2020-02-07)
-# Mask until sys-libs/libxcrypt[system] is unmasked
-# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
-~virtual/libcrypt-2
-
# Lars Wendler (2019-11-14)
# Breaks archives containing relative paths
# when being called with --no-absolute-filenames
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 3e6e12efaad2..a8eee4fe5b76 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/udev/udev-249-r1.ebuild b/sys-fs/udev/udev-249-r1.ebuild
index 52595ad4a4e8..412b8abefde7 100644
--- a/sys-fs/udev/udev-249-r1.ebuild
+++ b/sys-fs/udev/udev-249-r1.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
"
COMMON_DEPEND="
>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
@@ -71,6 +72,10 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND=">=sys-apps/hwids-20140304[udev]
>=sys-fs/udev-init-scripts-34"
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
if [[ ${MERGE_TYPE} != buildonly ]] ; then
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 6a9acda5e0ff..889f61023243 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
"
COMMON_DEPEND="
>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
@@ -71,6 +72,10 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND=">=sys-apps/hwids-20140304[udev]
>=sys-fs/udev-init-scripts-34"
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
if [[ ${MERGE_TYPE} != buildonly ]] ; then
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
diff --git a/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild b/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..b03588a5d916
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ sys-fs/udisks:2"
+DEPEND="app-text/asciidoc
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+ default
+
+ distutils-r1_src_prepare
+}
+
+src_compile() {
+ distutils-r1_src_compile
+ emake -C doc
+}
+
+src_install() {
+ distutils-r1_src_install
+ doman doc/${PN}.8
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f2cac41291a2..be2ad6d8e169 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/linux-docs/linux-docs-5.10.17.ebuild b/sys-kernel/linux-docs/linux-docs-5.10.50.ebuild
similarity index 93%
rename from sys-kernel/linux-docs/linux-docs-5.10.17.ebuild
rename to sys-kernel/linux-docs/linux-docs-5.10.50.ebuild
index bd48e869dd87..cbc47ead1f0c 100644
--- a/sys-kernel/linux-docs/linux-docs-5.10.17.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-5.10.50.ebuild
@@ -18,10 +18,10 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
+IUSE="graphviz"
DEPEND=""
-RDEPEND=""
+RDEPEND="graphviz? ( media-gfx/graphviz )"
BDEPEND="${PYTHON_DEPS}
dev-python/sphinx
dev-python/sphinx_rtd_theme
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index c7a9c258f61c..ed5d33d63b95 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/glibc-2.33-r2.ebuild b/sys-libs/glibc/glibc-2.33-r2.ebuild
new file mode 100644
index 000000000000..5e971e697fef
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.33-r2.ebuild
@@ -0,0 +1,1520 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+TMPFILES_OPTIONAL=1
+
+inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \
+ multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=4
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+ SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20201208
+
+LOCALE_GEN_VER=2.10
+
+SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+# CTARGET - machine that will target the binaries
+# CHOST - machine that will host the binaries
+# CBUILD - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+# CBUILD = CHOST = CTARGET - native build/install
+# CBUILD != (CHOST = CTARGET) - cross-compile a native build
+# (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler
+# For install paths:
+# CHOST = CTARGET - install into /
+# CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+# arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+# enumeration: bug #697910. This is quite subtle:
+# * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+# * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+# via 'ps_pglobal_lookup' symbol defined in gdb.
+# * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+# known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+# (unexported) is used to sanity check compatibility before enabling
+# debugging.
+# Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+# * normal 'strip' command trims '.symtab'
+# Thus our main goal here is to prevent 'libpthread.so.0' from
+# losing it's '.symtab' entries.
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=app-misc/pax-utils-0.1.10
+ sys-devel/bison
+ doc? ( sys-apps/texinfo )
+ !compile-locales? (
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ )
+"
+COMMON_DEPEND="
+ gd? ( media-libs/gd:2= )
+ nscd? ( selinux? (
+ audit? ( sys-process/audit )
+ caps? ( sys-libs/libcap )
+ ) )
+ suid? ( caps? ( sys-libs/libcap ) )
+ selinux? ( sys-libs/libselinux )
+ systemtap? ( dev-util/systemtap )
+ !=net-dns/libidn2-2.3.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ sys-apps/grep
+ virtual/awk
+ sys-apps/gentoo-functions
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+ BDEPEND+=" !headers-only? (
+ >=${CATEGORY}/binutils-2.27
+ >=${CATEGORY}/gcc-6
+ )"
+ [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+ BDEPEND+="
+ >=sys-devel/binutils-2.27
+ >=sys-devel/gcc-6
+ "
+ DEPEND+=" virtual/os-headers "
+ RDEPEND+="
+ >=net-dns/libidn2-2.3.0
+ vanilla? ( !sys-libs/timezone-data )
+ "
+ PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+ # 9) Failures of unknown origin
+ tst-latepthread
+
+ # buggy test, assumes /dev/ and /dev/null on a single filesystem
+ # 'mount --bind /dev/null /chroot/dev/null' breaks it.
+ # https://sourceware.org/PR25909
+ tst-support_descriptors
+
+ # Flaky test, known to fail occasionally:
+ # https://sourceware.org/PR19329
+ # https://bugs.gentoo.org/719674#c12
+ tst-stack4
+)
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+ is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+ is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+ is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+ echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+ if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+ ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+ if tc-is-cross-compiler ; then
+ ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+ if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+ local header_path=$(echo '#include ' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+ ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+ fi
+ fi
+ fi
+ echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+ echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+ echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+ echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+ local ret save_cflags=${CFLAGS}
+ CFLAGS+=" $1"
+ shift
+
+ pushd "${T}" >/dev/null
+
+ rm -f glibc-test*
+ printf '%b' "$*" > glibc-test.c
+
+ # Most of the time CC is already set, but not in early sanity checks.
+ nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}"
+ ret=$?
+
+ popd >/dev/null
+
+ CFLAGS=${save_cflags}
+ return ${ret}
+}
+
+do_run_test() {
+ local ret
+
+ if [[ ${MERGE_TYPE} == "binary" ]] ; then
+ # ignore build failures when installing a binary package #324685
+ do_compile_test "" "$@" 2>/dev/null || return 0
+ else
+ if ! do_compile_test "" "$@" ; then
+ ewarn "Simple build failed ... assuming this is desired #324685"
+ return 0
+ fi
+ fi
+
+ pushd "${T}" >/dev/null
+
+ ./glibc-test
+ ret=$?
+ rm -f glibc-test*
+
+ popd >/dev/null
+
+ return ${ret}
+}
+
+setup_target_flags() {
+ # This largely mucks with compiler flags. None of which should matter
+ # when building up just the headers.
+ just_headers && return 0
+
+ case $(tc-arch) in
+ x86)
+ # -march needed for #185404 #199334
+ # TODO: When creating the first glibc cross-compile, this test will
+ # always fail as it does a full link which in turn requires glibc.
+ # Probably also applies when changing multilib profile settings (e.g.
+ # enabling x86 when the profile was amd64-only previously).
+ # We could change main to _start and pass -nostdlib here so that we
+ # only test the gcc code compilation. Or we could do a compile and
+ # then look for the symbol via scanelf.
+ if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+ local t=${CTARGET_OPT:-${CTARGET}}
+ t=${t%%-*}
+ filter-flags '-march=*'
+ export CFLAGS="-march=${t} ${CFLAGS}"
+ einfo "Auto adding -march=${t} to CFLAGS #185404"
+ fi
+ ;;
+ amd64)
+ # -march needed for #185404 #199334
+ # TODO: See cross-compile issues listed above for x86.
+ [[ ${ABI} == x86 ]] &&
+ if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+ local t=${CTARGET_OPT:-${CTARGET}}
+ t=${t%%-*}
+ # Normally the target is x86_64-xxx, so turn that into the -march that
+ # gcc actually accepts. #528708
+ [[ ${t} == "x86_64" ]] && t="x86-64"
+ filter-flags '-march=*'
+ # ugly, ugly, ugly. ugly.
+ CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+ export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+ einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+ fi
+ ;;
+ mips)
+ # The mips abi cannot support the GNU style hashes. #233233
+ filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+ ;;
+ ppc|ppc64)
+ # Many arch-specific implementations do not work on ppc with
+ # cache-block not equal to 128 bytes. This breaks memset:
+ # https://sourceware.org/PR26522
+ # https://bugs.gentoo.org/737996
+ # Use default -mcpu=. For ppc it means non-multiarch setup.
+ filter-flags '-mcpu=*'
+ ;;
+ sparc)
+ # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though.
+ filter-flags "-fcall-used-g7"
+ append-flags "-fcall-used-g6"
+
+ local cpu
+ case ${CTARGET} in
+ sparc64-*)
+ cpu="sparc64"
+ case $(get-flag mcpu) in
+ v9)
+ # We need to force at least v9a because the base build doesn't
+ # work with just v9.
+ # https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+ append-flags "-Wa,-xarch=v9a"
+ ;;
+ esac
+ ;;
+ sparc-*)
+ case $(get-flag mcpu) in
+ v8|supersparc|hypersparc|leon|leon3)
+ cpu="sparcv8"
+ ;;
+ *)
+ cpu="sparcv9"
+ ;;
+ esac
+ ;;
+ esac
+ [[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+ ;;
+ esac
+}
+
+setup_flags() {
+ # Make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
+
+ # Store our CFLAGS because it's changed depending on which CTARGET
+ # we are building when pulling glibc on a multilib profile
+ CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+ CFLAGS=${CFLAGS_BASE}
+ CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+ CXXFLAGS=${CXXFLAGS_BASE}
+ ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+ ASFLAGS=${ASFLAGS_BASE}
+
+ # Allow users to explicitly avoid flag sanitization via
+ # USE=custom-cflags.
+ if ! use custom-cflags; then
+ # Over-zealous CFLAGS can often cause problems. What may work for one
+ # person may not work for another. To avoid a large influx of bugs
+ # relating to failed builds, we strip most CFLAGS out to ensure as few
+ # problems as possible.
+ strip-flags
+ # Lock glibc at -O2; we want to be conservative here.
+ filter-flags '-O?'
+ append-flags -O2
+ fi
+ strip-unsupported-flags
+ filter-flags -m32 -m64 '-mabi=*'
+
+ # glibc aborts if rpath is set by LDFLAGS
+ filter-ldflags '-Wl,-rpath=*'
+
+ # ld can't use -r & --relax at the same time, bug #788901
+ # https://sourceware.org/PR27837
+ filter-ldflags '-Wl,--relax'
+
+ # #492892
+ filter-flags -frecord-gcc-switches
+
+ unset CBUILD_OPT CTARGET_OPT
+ if use multilib ; then
+ CTARGET_OPT=$(get_abi_CTARGET)
+ [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+ fi
+
+ setup_target_flags
+
+ if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+ CBUILD_OPT=${CTARGET_OPT}
+ fi
+
+ # glibc's headers disallow -O0 and fail at build time:
+ # include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+ replace-flags -O0 -O1
+
+ filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+ # Archs that can use TLS (Thread Local Storage)
+ case $(tc-arch) in
+ x86)
+ # requires i486 or better #106556
+ [[ ${CTARGET} == i[4567]86* ]] && return 0
+ return 1
+ ;;
+ esac
+ return 0
+}
+
+want__thread() {
+ want_tls || return 1
+
+ # For some reason --with-tls --with__thread is causing segfaults on sparc32.
+ [[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+ [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+ # only test gcc -- can't test linking yet
+ tc-has-tls -c ${CTARGET}
+ WANT__THREAD=$?
+
+ return ${WANT__THREAD}
+}
+
+use_multiarch() {
+ # Allow user to disable runtime arch detection in multilib.
+ use multiarch || return 1
+ # Make sure binutils is new enough to support indirect functions,
+ # #336792. This funky sed supports gold and bfd linkers.
+ local bver nver
+ bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+ case $(tc-arch ${CTARGET}) in
+ amd64|x86) nver="2.20" ;;
+ arm) nver="2.22" ;;
+ hppa) nver="2.23" ;;
+ ppc|ppc64) nver="2.20" ;;
+ # ifunc support was added in 2.23, but glibc also needs
+ # machinemode which is in 2.24.
+ s390) nver="2.24" ;;
+ sparc) nver="2.21" ;;
+ *) return 1 ;;
+ esac
+ ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+ # silly users
+ unset LD_RUN_PATH
+ unset LD_ASSUME_KERNEL
+
+ if is_crosscompile || tc-is-cross-compiler ; then
+ multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+ if ! use multilib ; then
+ MULTILIB_ABIS=${DEFAULT_ABI}
+ else
+ MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+ fi
+
+ # If the user has CFLAGS_ in their make.conf, use that,
+ # and fall back on CFLAGS.
+ local VAR=CFLAGS_${CTARGET//[-.]/_}
+ CFLAGS=${!VAR-${CFLAGS}}
+ einfo " $(printf '%15s' 'Manual CFLAGS:') ${CFLAGS}"
+ fi
+
+ setup_flags
+
+ export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+ if just_headers ; then
+ # Avoid mixing host's CC and target's CFLAGS_${ABI}:
+ # At this bootstrap stage we have only binutils for
+ # target but not compiler yet.
+ einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+ return 0
+ fi
+ local VAR=CFLAGS_${ABI}
+ # We need to export CFLAGS with abi information in them because glibc's
+ # configure script checks CFLAGS for some targets (like mips). Keep
+ # around the original clean value to avoid appending multiple ABIs on
+ # top of each other.
+ : ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
+ export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+ einfo " $(printf '%15s' 'Manual CC:') ${CC}"
+}
+
+foreach_abi() {
+ setup_env
+
+ local ret=0
+ local abilist=""
+ if use multilib ; then
+ abilist=$(get_install_abis)
+ else
+ abilist=${DEFAULT_ABI}
+ fi
+ local -x ABI
+ for ABI in ${abilist:-default} ; do
+ setup_env
+ einfo "Running $1 for ABI ${ABI}"
+ $1
+ : $(( ret |= $? ))
+ done
+ return ${ret}
+}
+
+glibc_banner() {
+ local b="Gentoo ${PVR}"
+ [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+ echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+ uname -r
+ return $?
+}
+
+g_KV_major() {
+ [[ -z $1 ]] && return 1
+ local KV=$@
+ echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+ [[ -z $1 ]] && return 1
+ local KV=$@
+ KV=${KV#*.}
+ echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+ [[ -z $1 ]] && return 1
+ local KV=$@
+ KV=${KV#*.*.}
+ echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+ [[ -z $1 ]] && return 1
+ local KV_MAJOR=$(g_KV_major "$1")
+ local KV_MINOR=$(g_KV_minor "$1")
+ local KV_MICRO=$(g_KV_micro "$1")
+ local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+ # We make version 2.2.0 the minimum version we will handle as
+ # a sanity check ... if its less, we fail ...
+ if [[ ${KV_int} -ge 131584 ]] ; then
+ echo "${KV_int}"
+ return 0
+ fi
+ return 1
+}
+
+g_int_to_KV() {
+ local version=$1 major minor micro
+ major=$((version / 65536))
+ minor=$(((version % 65536) / 256))
+ micro=$((version % 256))
+ echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+ [[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+ eend $?
+}
+
+get_kheader_version() {
+ printf '#include \nLINUX_VERSION_CODE\n' | \
+ $(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+ tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+ # Prevent native builds from downgrading
+ if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+ [[ -z ${ROOT} ]] && \
+ [[ ${CBUILD} == ${CHOST} ]] && \
+ [[ ${CHOST} == ${CTARGET} ]] ; then
+
+ # The high rev # is to allow people to downgrade between -r#
+ # versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+ # should be fine. Hopefully we never actually use a r# this
+ # high.
+ if has_version ">${CATEGORY}/${P}-r10000" ; then
+ eerror "Sanity check to keep you from breaking your system:"
+ eerror " Downgrading glibc is not supported and a sure way to destruction."
+ [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+ fi
+
+ if ! do_run_test '#include \n#include \nint main(){return syscall(1000)!=-1;}\n' ; then
+ eerror "Your old kernel is broken. You need to update it to a newer"
+ eerror "version as syscall() will break. See bug 279260."
+ die "Old and broken kernel."
+ fi
+ fi
+
+ # Users have had a chance to phase themselves, time to give em the boot
+ if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+ eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+ eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+ die "Lazy upgrader detected"
+ fi
+
+ if [[ ${CTARGET} == i386-* ]] ; then
+ eerror "i386 CHOSTs are no longer supported."
+ eerror "Chances are you don't actually want/need i386."
+ eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+ die "Please fix your CHOST"
+ fi
+
+ if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+ ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+ ewarn "This will result in a 50% performance penalty when running with a 32bit"
+ ewarn "hypervisor, which is probably not what you want."
+ fi
+
+ # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+ # we test for...
+ if ! is_crosscompile ; then
+ if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+ ebegin "Checking that IA32 emulation is enabled in the running kernel"
+ echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+ local STAT
+ if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+ "${T}/check-ia32-emulation.elf32"
+ STAT=$?
+ else
+ # Don't fail here to allow single->multi ABI switch
+ # or recover from breakage like bug #646424
+ ewarn "Failed to compile the ABI test. Broken host glibc?"
+ STAT=0
+ fi
+ rm -f "${T}/check-ia32-emulation.elf32"
+ eend $STAT
+ [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+ fi
+
+ fi
+
+ # When we actually have to compile something...
+ if ! just_headers ; then
+ ebegin "Checking gcc for __thread support"
+ if ! eend $(want__thread ; echo $?) ; then
+ echo
+ eerror "Could not find a gcc that supports the __thread directive!"
+ eerror "Please update your binutils/gcc and try again."
+ die "No __thread support in gcc!"
+ fi
+
+ if [[ ${CTARGET} == *-linux* ]] ; then
+ local run_kv build_kv want_kv
+
+ run_kv=$(g_get_running_KV)
+ build_kv=$(g_int_to_KV $(get_kheader_version))
+ want_kv=${MIN_KERN_VER}
+
+ if ! is_crosscompile && ! tc-is-cross-compiler ; then
+ # Building fails on an non-supporting kernel
+ ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+ if ! eend_KV ${run_kv} ${want_kv} ; then
+ echo
+ eerror "You need a kernel of at least ${want_kv}!"
+ die "Kernel version too low!"
+ fi
+ fi
+
+ ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+ if ! eend_KV ${build_kv} ${want_kv} ; then
+ echo
+ eerror "You need linux-headers of at least ${want_kv}!"
+ die "linux-headers version too low!"
+ fi
+ fi
+ fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+ # All the checks...
+ einfo "Checking general environment sanity."
+ sanity_prechecks
+}
+
+pkg_setup() {
+ # see bug 682570
+ [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+ # Consistency is not guaranteed between pkg_ and src_ ...
+ sanity_prechecks
+
+ use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+ setup_env
+
+ if [[ ${PV} == 9999* ]] ; then
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+ EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+ git-r3_src_unpack
+ mv patches-git/9999 patches || die
+
+ EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+ EGIT_CHECKOUT_DIR=${S}
+ git-r3_src_unpack
+ else
+ unpack ${P}.tar.xz
+
+ cd "${WORKDIR}" || die
+ unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+ fi
+
+ cd "${WORKDIR}" || die
+ unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+}
+
+src_prepare() {
+ local patchsetname
+ if ! use vanilla ; then
+ if [[ ${PV} == 9999* ]] ; then
+ patchsetname="from git master"
+ else
+ patchsetname="${RELEASE_VER}-${PATCH_VER}"
+ fi
+ einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
+ eapply "${WORKDIR}"/patches
+ einfo "Done."
+ fi
+
+ default
+
+ gnuconfig_update
+
+ cd "${WORKDIR}"
+ find . -name configure -exec touch {} +
+
+ # move the external locale-gen to its old place
+ mkdir extra || die
+ mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
+
+ eprefixify extra/locale/locale-gen
+
+ # Fix permissions on some of the scripts.
+ chmod u+x "${S}"/scripts/*.sh
+
+ cd "${S}"
+}
+
+glibc_do_configure() {
+ # Glibc does not work with gold (for various reasons) #269274.
+ tc-ld-disable-gold
+
+ # CXX isnt handled by the multilib system, so if we dont unset here
+ # we accumulate crap across abis
+ unset CXX
+
+ einfo "Configuring glibc for nptl"
+
+ if use doc ; then
+ export MAKEINFO=makeinfo
+ else
+ export MAKEINFO=/dev/null
+ fi
+
+ local v
+ for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM READELF; do
+ einfo " $(printf '%15s' ${v}:) ${!v}"
+ done
+
+ # CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+ # To build .S (assembly) files with the same ABI-specific flags
+ # upstream currently recommends adding CFLAGS to CC/CXX:
+ # https://sourceware.org/PR23273
+ # Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+ # and breaks multiarch support. See 659030#c3 for an example.
+ # The glibc configure script doesn't properly use LDFLAGS all the time.
+ export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+ einfo " $(printf '%15s' 'Manual CC:') ${CC}"
+
+ # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+ export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+ if is_crosscompile; then
+ # Assume worst-case bootstrap: glibc is buil first time
+ # when ${CTARGET}-g++ is not available yet. We avoid
+ # building auxiliary programs that require C++: bug #683074
+ # It should not affect final result.
+ export libc_cv_cxx_link_ok=no
+ # The line above has the same effect. We set CXX explicitly
+ # to make build logs less confusing.
+ export CXX=
+ fi
+ einfo " $(printf '%15s' 'Manual CXX:') ${CXX}"
+
+ # Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+ # can't detect them automatically due to ${CHOST} mismatch and fallbacks
+ # to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+ export NM="$(tc-getNM ${CTARGET})"
+ export READELF="$(tc-getREADELF ${CTARGET})"
+ einfo " $(printf '%15s' 'Manual NM:') ${NM}"
+ einfo " $(printf '%15s' 'Manual READELF:') ${READELF}"
+
+ echo
+
+ local myconf=()
+
+ case ${CTARGET} in
+ m68k*)
+ # setjmp() is not compatible with stack protection:
+ # https://sourceware.org/PR24202
+ myconf+=( --enable-stack-protector=no )
+ ;;
+ *)
+ # Use '=strong' instead of '=all' to protect only functions
+ # worth protecting from stack smashes.
+ # '=all' is also known to have a problem in IFUNC resolution
+ # tests: https://sourceware.org/PR25680, bug #712356.
+ myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+ ;;
+ esac
+ myconf+=( --enable-stackguard-randomization )
+
+ # Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+ # is not robust enough to detect proper support:
+ # https://bugs.gentoo.org/641216
+ # https://sourceware.org/PR22634#c0
+ case $(tc-arch ${CTARGET}) in
+ # Keep whitelist of targets where autodetection mostly works.
+ amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+ # Blacklist everywhere else
+ *) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+ esac
+
+ # Enable Intel Control-flow Enforcement Technology on amd64 if requested
+ case ${CTARGET} in
+ x86_64-*) myconf+=( $(use_enable cet) ) ;;
+ *) ;;
+ esac
+
+ [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+ myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+ # Since SELinux support is only required for nscd, only enable it if:
+ # 1. USE selinux
+ # 2. only for the primary ABI on multilib systems
+ # 3. Not a crosscompile
+ if ! is_crosscompile && use selinux ; then
+ if use multilib ; then
+ if is_final_abi ; then
+ myconf+=( --with-selinux )
+ else
+ myconf+=( --without-selinux )
+ fi
+ else
+ myconf+=( --with-selinux )
+ fi
+ else
+ myconf+=( --without-selinux )
+ fi
+
+ # Force a few tests where we always know the answer but
+ # configure is incapable of finding it.
+ if is_crosscompile ; then
+ export \
+ libc_cv_c_cleanup=yes \
+ libc_cv_forced_unwind=yes
+ fi
+
+ myconf+=(
+ --without-cvs
+ --disable-werror
+ --enable-bind-now
+ --build=${CBUILD_OPT:-${CBUILD}}
+ --host=${CTARGET_OPT:-${CTARGET}}
+ $(use_enable profile)
+ $(use_with gd)
+ --with-headers=$(build_eprefix)$(alt_build_headers)
+ --prefix="$(host_eprefix)/usr"
+ --sysconfdir="$(host_eprefix)/etc"
+ --localstatedir="$(host_eprefix)/var"
+ --libdir='$(prefix)'/$(get_libdir)
+ --mandir='$(prefix)'/share/man
+ --infodir='$(prefix)'/share/info
+ --libexecdir='$(libdir)'/misc/glibc
+ --with-bugurl=https://bugs.gentoo.org/
+ --with-pkgversion="$(glibc_banner)"
+ $(use_enable crypt)
+ $(use_multiarch || echo --disable-multi-arch)
+ $(use_enable static-pie)
+ $(use_enable systemtap)
+ $(use_enable nscd)
+
+ # locale data is arch-independent
+ # https://bugs.gentoo.org/753740
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+ # -march= option tricks build system to infer too
+ # high ISA level: https://sourceware.org/PR27318
+ libc_cv_include_x86_isa_level=no
+ # Explicit override of https://sourceware.org/PR27991
+ # exposes a bug in glibc's configure:
+ # https://sourceware.org/PR27991
+ libc_cv_have_x86_lahf_sahf=no
+ libc_cv_have_x86_movbe=no
+
+ ${EXTRA_ECONF}
+ )
+
+ # We rely on sys-libs/timezone-data for timezone tools normally.
+ myconf+=( $(use_enable vanilla timezone-tools) )
+
+ # These libs don't have configure flags.
+ ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+ ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+ # There is no configure option for this and we need to export it
+ # since the glibc build will re-run configure on itself
+ export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+ export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+ # We take care of patching our binutils to use both hash styles,
+ # and many people like to force gnu hash style only, so disable
+ # this overriding check. #347761
+ export libc_cv_hashstyle=no
+
+ local builddir=$(builddir nptl)
+ mkdir -p "${builddir}"
+ cd "${builddir}"
+ set -- "${S}"/configure "${myconf[@]}"
+ echo "$@"
+ "$@" || die "failed to configure glibc"
+
+ # ia64 static cross-compilers are a pita in so much that they
+ # can't produce static ELFs (as the libgcc.a is broken). so
+ # disable building of the programs for those targets if it
+ # doesn't work.
+ # XXX: We could turn this into a compiler test, but ia64 is
+ # the only one that matters, so this should be fine for now.
+ if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+ sed -i '1i+link-static = touch $@' config.make
+ fi
+
+ # If we're trying to migrate between ABI sets, we need
+ # to lie and use a local copy of gcc. Like if the system
+ # is built with MULTILIB_ABIS="amd64 x86" but we want to
+ # add x32 to it, gcc/glibc don't yet support x32.
+ #
+ if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+ echo 'main(){}' > "${T}"/test.c
+ if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+ sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+ fi
+ fi
+}
+
+glibc_headers_configure() {
+ export ABI=default
+
+ local builddir=$(builddir "headers")
+ mkdir -p "${builddir}"
+ cd "${builddir}"
+
+ # if we don't have a compiler yet, we can't really test it now ...
+ # hopefully they don't affect header generation, so let's hope for
+ # the best here ...
+ local v vars=(
+ ac_cv_header_cpuid_h=yes
+ libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+ libc_cv_asm_cfi_directives=yes
+ libc_cv_broken_visibility_attribute=no
+ libc_cv_c_cleanup=yes
+ libc_cv_compiler_powerpc64le_binary128_ok=yes
+ libc_cv_forced_unwind=yes
+ libc_cv_gcc___thread=yes
+ libc_cv_mlong_double_128=yes
+ libc_cv_mlong_double_128ibm=yes
+ libc_cv_ppc_machine=yes
+ libc_cv_ppc_rel16=yes
+ libc_cv_predef_fortify_source=no
+ libc_cv_target_power8_ok=yes
+ libc_cv_visibility_attribute=yes
+ libc_cv_z_combreloc=yes
+ libc_cv_z_execstack=yes
+ libc_cv_z_initfirst=yes
+ libc_cv_z_nodelete=yes
+ libc_cv_z_nodlopen=yes
+ libc_cv_z_relro=yes
+ libc_mips_abi=${ABI}
+ libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+ # These libs don't have configure flags.
+ ac_cv_lib_audit_audit_log_user_avc_message=no
+ ac_cv_lib_cap_cap_init=no
+ )
+
+ einfo "Forcing cached settings:"
+ for v in "${vars[@]}" ; do
+ einfo " ${v}"
+ export ${v}
+ done
+
+ local headers_only_arch_CPPFLAGS=()
+
+ # Blow away some random CC settings that screw things up. #550192
+ if [[ -d ${S}/sysdeps/mips ]]; then
+ pushd "${S}"/sysdeps/mips >/dev/null
+ sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+ sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+ # Force the mips ABI to the default. This is OK because the set of
+ # installed headers in this phase is the same between the 3 ABIs.
+ # If this ever changes, this hack will break, but that's unlikely
+ # as glibc discourages that behavior.
+ # https://crbug.com/647033
+ sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+ popd >/dev/null
+ fi
+
+ case ${CTARGET} in
+ riscv*)
+ # RISC-V interrogates the compiler to determine which target to
+ # build. If building the headers then we don't strictly need a
+ # RISC-V compiler, so the built-in definitions that are provided
+ # along with all RISC-V compiler might not exist. This causes
+ # glibc's RISC-V preconfigure script to blow up. Since we're just
+ # building the headers any value will actually work here, so just
+ # pick the standard one (rv64g/lp64d) to make the build scripts
+ # happy for now -- the headers are all the same anyway so it
+ # doesn't matter.
+ headers_only_arch_CPPFLAGS+=(
+ -D__riscv_xlen=64
+ -D__riscv_flen=64
+ -D__riscv_float_abi_double=1
+ -D__riscv_atomic=1
+ ) ;;
+ esac
+
+ local myconf=()
+ myconf+=(
+ --disable-sanity-checks
+ --enable-hacker-mode
+ --without-cvs
+ --disable-werror
+ --enable-bind-now
+ --build=${CBUILD_OPT:-${CBUILD}}
+ --host=${CTARGET_OPT:-${CTARGET}}
+ --with-headers=$(build_eprefix)$(alt_build_headers)
+ --prefix="$(host_eprefix)/usr"
+ ${EXTRA_ECONF}
+ )
+
+ # Nothing is compiled here which would affect the headers for the target.
+ # So forcing CC/CFLAGS is sane.
+ local headers_only_CC=$(tc-getBUILD_CC)
+ local headers_only_CFLAGS="-O1 -pipe"
+ local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+ local headers_only_LDFLAGS=""
+ set -- "${S}"/configure "${myconf[@]}"
+ echo \
+ "CC=${headers_only_CC}" \
+ "CFLAGS=${headers_only_CFLAGS}" \
+ "CPPFLAGS=${headers_only_CPPFLAGS}" \
+ "LDFLAGS=${headers_only_LDFLAGS}" \
+ "$@"
+ CC=${headers_only_CC} \
+ CFLAGS=${headers_only_CFLAGS} \
+ CPPFLAGS=${headers_only_CPPFLAGS} \
+ LDFLAGS="" \
+ "$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+ if just_headers ; then
+ glibc_headers_configure
+ else
+ glibc_do_configure nptl
+ fi
+}
+
+src_configure() {
+ foreach_abi do_src_configure
+}
+
+do_src_compile() {
+ emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+ if just_headers ; then
+ return
+ fi
+
+ foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+ cd "$(builddir nptl)"
+
+ local myxfailparams=""
+ if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+ for myt in ${XFAIL_TEST_LIST[@]} ; do
+ myxfailparams+="test-xfail-${myt}=yes "
+ done
+ fi
+
+ # sandbox does not understand unshare() and prevents
+ # writes to /proc/, which makes many tests fail
+
+ SANDBOX_ON=0 LD_PRELOAD= emake ${myxfailparams} check
+}
+
+do_src_test() {
+ local ret=0
+
+ glibc_src_test
+ : $(( ret |= $? ))
+
+ return ${ret}
+}
+
+src_test() {
+ if just_headers ; then
+ return
+ fi
+
+ # Give tests more time to complete.
+ export TIMEOUTFACTOR=5
+
+ foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+ # if the host locales.gen contains no entries, we'll install everything
+ local root="$1"
+ local inplace=""
+
+ if [[ "${root}" == "--inplace-glibc" ]] ; then
+ inplace="--inplace-glibc"
+ root="$2"
+ fi
+
+ local locale_list="${root}/etc/locale.gen"
+
+ pushd "${ED}"/$(get_libdir) >/dev/null
+
+ if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+ [[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+ locale_list="${root}/usr/share/i18n/SUPPORTED"
+ fi
+
+ set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+ --destdir "${root}"
+ echo "$@"
+ "$@"
+
+ popd >/dev/null
+}
+
+glibc_do_src_install() {
+ local builddir=$(builddir nptl)
+ cd "${builddir}"
+
+ emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+ # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+ # which come without headers etc. Only needed for binary packages since the
+ # external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+ find "${D}" -name "libnsl.a" -delete
+ find "${D}" -name "libnsl.so" -delete
+
+ # Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+ # to infer upstream version:
+ # '#define VERSION "2.26.90"' -> '2.26.90'
+ local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+ # Avoid stripping binaries not targeted by ${CHOST}. Or else
+ # ${CHOST}-strip would break binaries build for ${CTARGET}.
+ is_crosscompile && dostrip -x /
+ # gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+ # See Note [Disable automatic stripping]
+ dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+
+ if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+ # Move versioned .a file out of libdir to evade portage QA checks
+ # instead of using gen_usr_ldscript(). We fix ldscript as:
+ # "GROUP ( /usr/lib64/libm-.a ..." -> "GROUP ( /usr/lib64/glibc-/libm-.a ..."
+ sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+ dodir $(alt_usrlibdir)/${P}
+ mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+ fi
+
+ # We'll take care of the cache ourselves
+ rm -f "${ED}"/etc/ld.so.cache
+
+ # Everything past this point just needs to be done once ...
+ is_final_abi || return 0
+
+ # Make sure the non-native interp can be found on multilib systems even
+ # if the main library set isn't installed into the right place. Maybe
+ # we should query the active gcc for info instead of hardcoding it ?
+ local i ldso_abi ldso_name
+ local ldso_abi_list=(
+ # x86
+ amd64 /lib64/ld-linux-x86-64.so.2
+ x32 /libx32/ld-linux-x32.so.2
+ x86 /lib/ld-linux.so.2
+ # mips
+ o32 /lib/ld.so.1
+ n32 /lib32/ld.so.1
+ n64 /lib64/ld.so.1
+ # powerpc
+ ppc /lib/ld.so.1
+ # riscv
+ ilp32d /lib/ld-linux-riscv32-ilp32d.so.1
+ ilp32 /lib/ld-linux-riscv32-ilp32.so.1
+ lp64d /lib/ld-linux-riscv64-lp64d.so.1
+ lp64 /lib/ld-linux-riscv64-lp64.so.1
+ # s390
+ s390 /lib/ld.so.1
+ s390x /lib/ld64.so.1
+ # sparc
+ sparc32 /lib/ld-linux.so.2
+ sparc64 /lib64/ld-linux.so.2
+ )
+ case $(tc-endian) in
+ little)
+ ldso_abi_list+=(
+ # arm
+ arm64 /lib/ld-linux-aarch64.so.1
+ # ELFv2 (glibc does not support ELFv1 on LE)
+ ppc64 /lib64/ld64.so.2
+ )
+ ;;
+ big)
+ ldso_abi_list+=(
+ # arm
+ arm64 /lib/ld-linux-aarch64_be.so.1
+ # ELFv1 (glibc does not support ELFv2 on BE)
+ ppc64 /lib64/ld64.so.1
+ )
+ ;;
+ esac
+ if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+ dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+ fi
+ for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+ ldso_abi=${ldso_abi_list[i]}
+ has ${ldso_abi} $(get_install_abis) || continue
+
+ ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+ if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+ dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+ fi
+ done
+
+ # In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+ # the runtime loader name, see also https://xkcd.com/927/
+ # Normally, in Gentoo one should never come across executables that require this.
+ # However, binary commercial packages are known to adhere to weird practices.
+ # https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+ local lsb_ldso_name native_ldso_name lsb_ldso_abi
+ local lsb_ldso_abi_list=(
+ # x86
+ amd64 ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
+ )
+ for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+ lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+ native_ldso_name=${lsb_ldso_abi_list[i+1]}
+ lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+ has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+ if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+ dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+ fi
+ done
+
+ # With devpts under Linux mounted properly, we do not need the pt_chown
+ # binary to be setuid. This is because the default owners/perms will be
+ # exactly what we want.
+ if ! use suid ; then
+ find "${ED}" -name pt_chown -exec chmod -s {} +
+ fi
+
+ #################################################################
+ # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+ # Make sure we install some symlink hacks so that when we build
+ # a 2nd stage cross-compiler, gcc finds the target system
+ # headers correctly. See gcc/doc/gccinstall.info
+ if is_crosscompile ; then
+ # We need to make sure that /lib and /usr/lib always exists.
+ # gcc likes to use relative paths to get to its multilibs like
+ # /usr/lib/../lib64/. So while we don't install any files into
+ # /usr/lib/, we do need it to exist.
+ keepdir $(alt_prefix)/lib
+ keepdir $(alt_prefix)/usr/lib
+
+ dosym usr/include $(alt_prefix)/sys-include
+ return 0
+ fi
+
+ # Files for Debian-style locale updating
+ dodir /usr/share/i18n
+ sed \
+ -e "/^#/d" \
+ -e "/SUPPORTED-LOCALES=/d" \
+ -e "s: \\\\::g" -e "s:/: :g" \
+ "${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+ || die "generating /usr/share/i18n/SUPPORTED failed"
+ cd "${WORKDIR}"/extra/locale
+ dosbin locale-gen
+ doman *.[0-8]
+ insinto /etc
+ doins locale.gen
+
+ keepdir /usr/lib/locale
+
+ cd "${S}"
+
+ # Install misc network config files
+ insinto /etc
+ doins posix/gai.conf nss/nsswitch.conf
+
+ # Gentoo-specific
+ newins "${FILESDIR}"/host.conf-1 host.conf
+
+ if use nscd ; then
+ doins nscd/nscd.conf
+
+ newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+ local nscd_args=(
+ -e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+ )
+
+ sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+ systemd_dounit nscd/nscd.service
+ newtmpfiles nscd/nscd.tmpfiles nscd.conf
+ fi
+
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+ doenvd "${T}"/00glibc
+
+ for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+ [[ -s ${d} ]] && dodoc ${d}
+ done
+ dodoc -r ChangeLog.old
+
+ # Prevent overwriting of the /etc/localtime symlink. We'll handle the
+ # creation of the "factory" symlink in pkg_postinst().
+ rm -f "${ED}"/etc/localtime
+
+ # Generate all locales if this is a native build as locale generation
+ if use compile-locales && ! is_crosscompile ; then
+ run_locale_gen --inplace-glibc "${ED}/"
+ sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+ fi
+}
+
+glibc_headers_install() {
+ local builddir=$(builddir "headers")
+ cd "${builddir}"
+ emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+ insinto $(alt_headers)/gnu
+ doins "${S}"/include/gnu/stubs.h
+
+ # Make sure we install the sys-include symlink so that when
+ # we build a 2nd stage cross-compiler, gcc finds the target
+ # system headers correctly. See gcc/doc/gccinstall.info
+ dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+ if just_headers ; then
+ export ABI=default
+ glibc_headers_install
+ return
+ fi
+
+ foreach_abi glibc_do_src_install
+
+ if ! use static-libs ; then
+ einfo "Not installing static glibc libraries"
+ find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+ fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail. Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+ cd / #228809
+
+ # We enter ${ED} so to avoid trouble if the path contains
+ # special characters; for instance if the path contains the
+ # colon character (:), then the linker will try to split it
+ # and look for the libraries in an unexpected place. This can
+ # lead to unsafe code execution if the generated prefix is
+ # within a world-writable directory.
+ # (e.g. /var/tmp/portage:${HOSTNAME})
+ pushd "${ED}"/$(get_libdir) >/dev/null
+
+ local x striptest
+ for x in cal date env free ls true uname uptime ; do
+ x=$(type -p ${x})
+ [[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+ striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+ case ${striptest} in
+ *"statically linked"*) continue;;
+ *"ASCII text"*) continue;;
+ esac
+ # We need to clear the locale settings as the upgrade might want
+ # incompatible locale data. This test is not for verifying that.
+ LC_ALL=C \
+ ./ld-*.so --library-path . ${x} > /dev/null \
+ || die "simple run test (${x}) failed"
+ done
+
+ popd >/dev/null
+}
+
+pkg_preinst() {
+ # nothing to do if just installing headers
+ just_headers && return
+
+ # prepare /etc/ld.so.conf.d/ for files
+ mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+ # Default /etc/hosts.conf:multi to on for systems with small dbs.
+ if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+ sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+ einfo "Defaulting /etc/host.conf:multi to on"
+ fi
+
+ [[ -n ${ROOT} ]] && return 0
+ [[ -d ${ED}/$(get_libdir) ]] || return 0
+ [[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+ if [[ -L ${EROOT}/usr/lib/locale ]]; then
+ # Help portage migrate this to a directory
+ # https://bugs.gentoo.org/753740
+ rm "${EROOT}"/usr/lib/locale || die
+ fi
+}
+
+pkg_postinst() {
+ # nothing to do if just installing headers
+ just_headers && return
+
+ if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+ # Generate fastloading iconv module configuration file.
+ "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+ fi
+
+ if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+ use compile-locales || run_locale_gen "${EROOT}/"
+ fi
+
+ # Check for sanity of /etc/nsswitch.conf, take 2
+ if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+ local entry
+ for entry in passwd group shadow; do
+ if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+ ewarn ""
+ ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+ ewarn "removed from glibc and is now provided by the package"
+ ewarn " sys-auth/libnss-nis"
+ ewarn "Install it now to keep your NIS setup working."
+ ewarn ""
+ fi
+ done
+ fi
+}
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
new file mode 100644
index 000000000000..d03062b4d64a
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild python-any-r1 multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+ inherit autotools
+ SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+else
+ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat split-usr +static-libs system test"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+DEPEND="system? (
+ elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
+ !sys-libs/musl
+ )"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl
+ sys-apps/findutils
+ test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+ has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=(
+ $(usex compat 'xcrypt_compat' '')
+ xcrypt_nocompat
+ )
+
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # WARNING: Please read on bumping or applying patches!
+ #
+ # There are two circular dependencies to be aware of:
+ # 1)
+ # if we're bootstrapping configure and makefiles:
+ # libxcrypt -> automake -> perl -> libxcrypt
+ #
+ # mitigation:
+ # toolchain@ manually runs `make dist` after running autoconf + `./configure`
+ # and the ebuild uses that.
+ # (Don't include the pre-generated Perl artefacts.)
+ #
+ # solution for future:
+ # Upstream are working on producing `make dist` tarballs.
+ # https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+ #
+ # 2)
+ # configure *unconditionally* needs Perl at build time to generate
+ # a list of enabled algorithms based on the set passed to `configure`:
+ # libxcrypt -> perl -> libxcrypt
+ #
+ # mitigation:
+ # None at the moment.
+ #
+ # solution for future:
+ # Not possible right now. Upstream intend on depending on Perl for further
+ # configuration options.
+ # https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+ #
+ # Therefore, on changes (inc. bumps):
+ # * You must check whether upstream have started providing tarballs with bootstrapped
+ # auto{conf,make};
+ #
+ # * diff the build system changes!
+ #
+ if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+ # Facilitate our split variant build for compat + non-compat
+ eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xclibdir() {
+ printf -- "%s/%s/%s\n" \
+ "$(usex split-usr '' '/usr')" \
+ "$(get_libdir)" \
+ "$(usex system '' 'xcrypt')"
+}
+
+multilib_src_configure() {
+ local -a myconf=(
+ --disable-werror
+ --libdir=$(get_xclibdir)
+ --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+ --includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
+ )
+
+ case "${MULTIBUILD_ID}" in
+ xcrypt_compat-*)
+ myconf+=(
+ --disable-static
+ --disable-xcrypt-compat-files
+ --enable-obsolete-api=yes
+ )
+ ;;
+ xcrypt_nocompat-*)
+ myconf+=(
+ --enable-obsolete-api=no
+ $(use_enable static-libs static)
+ )
+ ;;
+ *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+ esac
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+ multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+ emake check
+}
+
+src_test() {
+ multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+ multibuild_foreach_variant multilib-minimal_src_install
+
+ (
+ shopt -s failglob || die "failglob failed"
+
+ # Make sure our man pages do not collide with glibc or man-pages.
+ for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
+ mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+ || die "mv failed"
+ done
+ ) || die "failglob error"
+
+ # Remove useless stuff from installation
+ find "${D}"/usr/share/doc/${PF} -type l -delete || die
+ find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ # Don't install the libcrypt.so symlink for the "compat" version
+ case "${MULTIBUILD_ID}" in
+ xcrypt_compat-*)
+ rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+ || die "failed to remove extra compat libraries"
+ ;;
+ xcrypt_nocompat-*)
+ if use split-usr; then
+ (
+ if use static-libs; then
+ # .a files are installed to /$(get_libdir) by default
+ # Move static libraries to /usr prefix or portage will abort
+ shopt -s nullglob || die "failglob failed"
+ static_libs=( "${ED}"/$(get_xclibdir)/*.a )
+
+ if [[ -n ${static_libs[*]} ]]; then
+ dodir "/usr/$(get_xclibdir)"
+ mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \
+ || die "Moving static libs failed"
+ fi
+ fi
+
+ if use system; then
+ # Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+ # to allow linker to correctly find shared libraries.
+ shopt -s failglob || die "failglob failed"
+
+ for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
+ lib_file_basename="$(basename "${lib_file}")"
+ lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+ dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
+ done
+
+ rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
+ fi
+ )
+ fi
+ ;;
+ *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+ esac
+}