diff --git a/Manifest.files.gz b/Manifest.files.gz
index c4ab02b25f1a..a1eb3549e204 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 10d15cb32e93..ad6eb969afe2 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/_cron-failure/_cron-failure-0-r1.ebuild b/acct-group/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..037c180ae1e4
--- /dev/null
+++ b/acct-group/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/systemd-cron failure emails"
+
+ACCT_GROUP_ID="520"
diff --git a/acct-group/_cron-failure/_cron-failure-0.ebuild b/acct-group/_cron-failure/_cron-failure-0.ebuild
deleted file mode 100644
index b453d5218442..000000000000
--- a/acct-group/_cron-failure/_cron-failure-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-process/systemd-cron failure emails"
-
-ACCT_GROUP_ID="520"
diff --git a/acct-group/adm/adm-0-r1.ebuild b/acct-group/adm/adm-0-r1.ebuild
deleted file mode 100644
index 7aecab7fd00e..000000000000
--- a/acct-group/adm/adm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=4
diff --git a/acct-group/adm/adm-0-r2.ebuild b/acct-group/adm/adm-0-r2.ebuild
new file mode 100644
index 000000000000..3e0853baca96
--- /dev/null
+++ b/acct-group/adm/adm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=4
diff --git a/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild b/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild
new file mode 100644
index 000000000000..afe329ac705f
--- /dev/null
+++ b/acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/aerospike-amc-community"
+
+ACCT_GROUP_ID="210"
diff --git a/acct-group/aerospike-amc/aerospike-amc-0.ebuild b/acct-group/aerospike-amc/aerospike-amc-0.ebuild
deleted file mode 100644
index a3028d0e5a2a..000000000000
--- a/acct-group/aerospike-amc/aerospike-amc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/aerospike-amc-community"
-
-ACCT_GROUP_ID="210"
diff --git a/acct-group/airdcppd/airdcppd-0-r1.ebuild b/acct-group/airdcppd/airdcppd-0-r1.ebuild
deleted file mode 100644
index a88d85d58cfb..000000000000
--- a/acct-group/airdcppd/airdcppd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/airdcpp-webclient"
-ACCT_GROUP_ID=464
diff --git a/acct-group/airdcppd/airdcppd-0-r2.ebuild b/acct-group/airdcppd/airdcppd-0-r2.ebuild
new file mode 100644
index 000000000000..6021954f07fc
--- /dev/null
+++ b/acct-group/airdcppd/airdcppd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/airdcpp-webclient"
+ACCT_GROUP_ID=464
diff --git a/acct-group/alertmanager/alertmanager-0-r1.ebuild b/acct-group/alertmanager/alertmanager-0-r1.ebuild
new file mode 100644
index 000000000000..da84d7d1fed2
--- /dev/null
+++ b/acct-group/alertmanager/alertmanager-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=294
diff --git a/acct-group/alertmanager/alertmanager-0.ebuild b/acct-group/alertmanager/alertmanager-0.ebuild
deleted file mode 100644
index 4530d830ec25..000000000000
--- a/acct-group/alertmanager/alertmanager-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=294
diff --git a/acct-group/amanda/amanda-0-r1.ebuild b/acct-group/amanda/amanda-0-r1.ebuild
new file mode 100644
index 000000000000..3eb2c5b3a0da
--- /dev/null
+++ b/acct-group/amanda/amanda-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=362
diff --git a/acct-group/amanda/amanda-0.ebuild b/acct-group/amanda/amanda-0.ebuild
deleted file mode 100644
index d8599a25ff3f..000000000000
--- a/acct-group/amanda/amanda-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=362
diff --git a/acct-group/amavis/amavis-0-r1.ebuild b/acct-group/amavis/amavis-0-r1.ebuild
deleted file mode 100644
index cd30c60aee3e..000000000000
--- a/acct-group/amavis/amavis-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=333
-DESCRIPTION="Group for mail-filter/amavisd-new"
diff --git a/acct-group/amavis/amavis-0-r2.ebuild b/acct-group/amavis/amavis-0-r2.ebuild
new file mode 100644
index 000000000000..f34143344b41
--- /dev/null
+++ b/acct-group/amavis/amavis-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=333
+DESCRIPTION="Group for mail-filter/amavisd-new"
diff --git a/acct-group/amule/amule-0-r1.ebuild b/acct-group/amule/amule-0-r1.ebuild
deleted file mode 100644
index 354dc87a1194..000000000000
--- a/acct-group/amule/amule-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/amule"
-ACCT_GROUP_ID=468
diff --git a/acct-group/amule/amule-0-r2.ebuild b/acct-group/amule/amule-0-r2.ebuild
new file mode 100644
index 000000000000..dda4974ede76
--- /dev/null
+++ b/acct-group/amule/amule-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/amule"
+ACCT_GROUP_ID=468
diff --git a/acct-group/android/android-0-r1.ebuild b/acct-group/android/android-0-r1.ebuild
new file mode 100644
index 000000000000..5698fc27e4ab
--- /dev/null
+++ b/acct-group/android/android-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
+
+ACCT_GROUP_ID="174"
diff --git a/acct-group/android/android-0.ebuild b/acct-group/android/android-0.ebuild
deleted file mode 100644
index 5730672b8d65..000000000000
--- a/acct-group/android/android-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-util/android-{ndk,sdk-update-manager}"
-
-ACCT_GROUP_ID="174"
diff --git a/acct-group/anope/anope-0-r1.ebuild b/acct-group/anope/anope-0-r1.ebuild
deleted file mode 100644
index 4249c83403d3..000000000000
--- a/acct-group/anope/anope-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for Anope IRC services"
-ACCT_GROUP_ID=417
diff --git a/acct-group/anope/anope-0-r2.ebuild b/acct-group/anope/anope-0-r2.ebuild
new file mode 100644
index 000000000000..42de5736718e
--- /dev/null
+++ b/acct-group/anope/anope-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for Anope IRC services"
+ACCT_GROUP_ID=417
diff --git a/acct-group/apache/apache-0-r2.ebuild b/acct-group/apache/apache-0-r2.ebuild
deleted file mode 100644
index 90328f8c2836..000000000000
--- a/acct-group/apache/apache-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=81
diff --git a/acct-group/apache/apache-0-r3.ebuild b/acct-group/apache/apache-0-r3.ebuild
new file mode 100644
index 000000000000..1f54198838fd
--- /dev/null
+++ b/acct-group/apache/apache-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=81
diff --git a/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
new file mode 100644
index 000000000000..74d54239c6fc
--- /dev/null
+++ b/acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=319
diff --git a/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild b/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild
deleted file mode 100644
index ef6e2c653c52..000000000000
--- a/acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=319
diff --git a/acct-group/argus/argus-0-r1.ebuild b/acct-group/argus/argus-0-r1.ebuild
new file mode 100644
index 000000000000..2a586410a682
--- /dev/null
+++ b/acct-group/argus/argus-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/argus"
+
+ACCT_GROUP_ID=383
diff --git a/acct-group/argus/argus-0.ebuild b/acct-group/argus/argus-0.ebuild
deleted file mode 100644
index 0d846593c0f3..000000000000
--- a/acct-group/argus/argus-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/argus"
-
-ACCT_GROUP_ID=383
diff --git a/acct-group/arpwatch/arpwatch-0-r1.ebuild b/acct-group/arpwatch/arpwatch-0-r1.ebuild
new file mode 100644
index 000000000000..3763a50ff43b
--- /dev/null
+++ b/acct-group/arpwatch/arpwatch-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/arpwatch"
+
+ACCT_GROUP_ID="170"
diff --git a/acct-group/arpwatch/arpwatch-0.ebuild b/acct-group/arpwatch/arpwatch-0.ebuild
deleted file mode 100644
index c232fe3a362c..000000000000
--- a/acct-group/arpwatch/arpwatch-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-analyzer/arpwatch"
-
-ACCT_GROUP_ID="170"
diff --git a/acct-group/artifactory/artifactory-0-r1.ebuild b/acct-group/artifactory/artifactory-0-r1.ebuild
new file mode 100644
index 000000000000..3441d692774f
--- /dev/null
+++ b/acct-group/artifactory/artifactory-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-util/artifactory-bin"
+
+ACCT_GROUP_ID="264"
diff --git a/acct-group/artifactory/artifactory-0.ebuild b/acct-group/artifactory/artifactory-0.ebuild
deleted file mode 100644
index 6f1227123b88..000000000000
--- a/acct-group/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-util/artifactory-bin"
-
-ACCT_GROUP_ID="264"
diff --git a/acct-group/aspnet/aspnet-0-r1.ebuild b/acct-group/aspnet/aspnet-0-r1.ebuild
new file mode 100644
index 000000000000..c879ec8f038b
--- /dev/null
+++ b/acct-group/aspnet/aspnet-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=216
diff --git a/acct-group/aspnet/aspnet-0.ebuild b/acct-group/aspnet/aspnet-0.ebuild
deleted file mode 100644
index 58a850a8bb9c..000000000000
--- a/acct-group/aspnet/aspnet-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=216
diff --git a/acct-group/asterisk/asterisk-0-r1.ebuild b/acct-group/asterisk/asterisk-0-r1.ebuild
deleted file mode 100644
index 62ec5a2f5b02..000000000000
--- a/acct-group/asterisk/asterisk-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for asterisk"
-ACCT_GROUP_ID=242
diff --git a/acct-group/asterisk/asterisk-0-r2.ebuild b/acct-group/asterisk/asterisk-0-r2.ebuild
new file mode 100644
index 000000000000..da68978223d3
--- /dev/null
+++ b/acct-group/asterisk/asterisk-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for asterisk"
+ACCT_GROUP_ID=242
diff --git a/acct-group/at/at-0-r1.ebuild b/acct-group/at/at-0-r1.ebuild
new file mode 100644
index 000000000000..aec9d092feb7
--- /dev/null
+++ b/acct-group/at/at-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=246
diff --git a/acct-group/at/at-0.ebuild b/acct-group/at/at-0.ebuild
deleted file mode 100644
index 1dc36b11c23b..000000000000
--- a/acct-group/at/at-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=246
diff --git a/acct-group/atheme-services/atheme-services-0-r1.ebuild b/acct-group/atheme-services/atheme-services-0-r1.ebuild
deleted file mode 100644
index 75014bfbb485..000000000000
--- a/acct-group/atheme-services/atheme-services-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Atheme IRC services"
-ACCT_GROUP_ID=412
diff --git a/acct-group/atheme-services/atheme-services-0-r2.ebuild b/acct-group/atheme-services/atheme-services-0-r2.ebuild
new file mode 100644
index 000000000000..ff1b39f3444c
--- /dev/null
+++ b/acct-group/atheme-services/atheme-services-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Atheme IRC services"
+ACCT_GROUP_ID=412
diff --git a/acct-group/audio/audio-0-r1.ebuild b/acct-group/audio/audio-0-r1.ebuild
deleted file mode 100644
index ee027720bf31..000000000000
--- a/acct-group/audio/audio-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=18
diff --git a/acct-group/audio/audio-0-r2.ebuild b/acct-group/audio/audio-0-r2.ebuild
new file mode 100644
index 000000000000..112b264b30ad
--- /dev/null
+++ b/acct-group/audio/audio-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=18
diff --git a/acct-group/automatic/automatic-0-r1.ebuild b/acct-group/automatic/automatic-0-r1.ebuild
new file mode 100644
index 000000000000..60432b0cf093
--- /dev/null
+++ b/acct-group/automatic/automatic-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=338
diff --git a/acct-group/automatic/automatic-0.ebuild b/acct-group/automatic/automatic-0.ebuild
deleted file mode 100644
index c8e6c5c405c5..000000000000
--- a/acct-group/automatic/automatic-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=338
diff --git a/acct-group/automx2/automx2-0-r1.ebuild b/acct-group/automx2/automx2-0-r1.ebuild
deleted file mode 100644
index 59c8977b5fe7..000000000000
--- a/acct-group/automx2/automx2-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/automx2"
-ACCT_GROUP_ID=437
diff --git a/acct-group/automx2/automx2-0-r2.ebuild b/acct-group/automx2/automx2-0-r2.ebuild
new file mode 100644
index 000000000000..4a38f233a8b9
--- /dev/null
+++ b/acct-group/automx2/automx2-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/automx2"
+ACCT_GROUP_ID=437
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild
deleted file mode 100644
index 6d912cd47ce4..000000000000
--- a/acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for avahi-autoipd"
-ACCT_GROUP_ID=62
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild
new file mode 100644
index 000000000000..02b2443648a7
--- /dev/null
+++ b/acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for avahi-autoipd"
+ACCT_GROUP_ID=62
diff --git a/acct-group/avahi/avahi-0-r1.ebuild b/acct-group/avahi/avahi-0-r1.ebuild
deleted file mode 100644
index 6602136b24a2..000000000000
--- a/acct-group/avahi/avahi-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for avahi"
-ACCT_GROUP_ID=61
diff --git a/acct-group/avahi/avahi-0-r2.ebuild b/acct-group/avahi/avahi-0-r2.ebuild
new file mode 100644
index 000000000000..0b24f601736e
--- /dev/null
+++ b/acct-group/avahi/avahi-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for avahi"
+ACCT_GROUP_ID=61
diff --git a/acct-group/axtls/axtls-0-r1.ebuild b/acct-group/axtls/axtls-0-r1.ebuild
new file mode 100644
index 000000000000..bf1a8f22259f
--- /dev/null
+++ b/acct-group/axtls/axtls-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/axtls-0.ebuild b/acct-group/axtls/axtls-0.ebuild
deleted file mode 100644
index 4534ecf5b634..000000000000
--- a/acct-group/axtls/axtls-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/backuppc/backuppc-0-r1.ebuild b/acct-group/backuppc/backuppc-0-r1.ebuild
new file mode 100644
index 000000000000..3297ead3270f
--- /dev/null
+++ b/acct-group/backuppc/backuppc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-backup/backuppc"
+
+ACCT_GROUP_ID="282"
diff --git a/acct-group/backuppc/backuppc-0.ebuild b/acct-group/backuppc/backuppc-0.ebuild
deleted file mode 100644
index 8adafc19f9be..000000000000
--- a/acct-group/backuppc/backuppc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-backup/backuppc"
-
-ACCT_GROUP_ID="282"
diff --git a/acct-group/bacula/bacula-0-r1.ebuild b/acct-group/bacula/bacula-0-r1.ebuild
deleted file mode 100644
index 399d999796de..000000000000
--- a/acct-group/bacula/bacula-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the bacula backup system"
-ACCT_GROUP_ID=273
diff --git a/acct-group/bacula/bacula-0-r2.ebuild b/acct-group/bacula/bacula-0-r2.ebuild
new file mode 100644
index 000000000000..dc252476093c
--- /dev/null
+++ b/acct-group/bacula/bacula-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the bacula backup system"
+ACCT_GROUP_ID=273
diff --git a/acct-group/bareos/bareos-0-r1.ebuild b/acct-group/bareos/bareos-0-r1.ebuild
deleted file mode 100644
index f839b3044908..000000000000
--- a/acct-group/bareos/bareos-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the bareos network backup suite"
-ACCT_GROUP_ID=403
diff --git a/acct-group/bareos/bareos-0-r2.ebuild b/acct-group/bareos/bareos-0-r2.ebuild
new file mode 100644
index 000000000000..82834b64fcac
--- /dev/null
+++ b/acct-group/bareos/bareos-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the bareos network backup suite"
+ACCT_GROUP_ID=403
diff --git a/acct-group/beanstalk/beanstalk-0-r1.ebuild b/acct-group/beanstalk/beanstalk-0-r1.ebuild
new file mode 100644
index 000000000000..8587963e6d4a
--- /dev/null
+++ b/acct-group/beanstalk/beanstalk-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/beanstalk-0.ebuild b/acct-group/beanstalk/beanstalk-0.ebuild
deleted file mode 100644
index 2fd201660183..000000000000
--- a/acct-group/beanstalk/beanstalk-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/bedrock/bedrock-0-r1.ebuild b/acct-group/bedrock/bedrock-0-r1.ebuild
deleted file mode 100644
index 409365438231..000000000000
--- a/acct-group/bedrock/bedrock-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minecraft Bedrock server"
-
-ACCT_GROUP_ID="485"
diff --git a/acct-group/bedrock/bedrock-0-r2.ebuild b/acct-group/bedrock/bedrock-0-r2.ebuild
new file mode 100644
index 000000000000..65b2c6db2dbb
--- /dev/null
+++ b/acct-group/bedrock/bedrock-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft Bedrock server"
+
+ACCT_GROUP_ID="485"
diff --git a/acct-group/biboumi/biboumi-0-r1.ebuild b/acct-group/biboumi/biboumi-0-r1.ebuild
new file mode 100644
index 000000000000..2696a03b0ceb
--- /dev/null
+++ b/acct-group/biboumi/biboumi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=508
diff --git a/acct-group/biboumi/biboumi-0.ebuild b/acct-group/biboumi/biboumi-0.ebuild
deleted file mode 100644
index 14c409597792..000000000000
--- a/acct-group/biboumi/biboumi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=508
diff --git a/acct-group/bind_exporter/bind_exporter-0-r1.ebuild b/acct-group/bind_exporter/bind_exporter-0-r1.ebuild
deleted file mode 100644
index 94f94a51727a..000000000000
--- a/acct-group/bind_exporter/bind_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=276
diff --git a/acct-group/bind_exporter/bind_exporter-0-r2.ebuild b/acct-group/bind_exporter/bind_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..37141abf1c02
--- /dev/null
+++ b/acct-group/bind_exporter/bind_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=276
diff --git a/acct-group/bird/bird-0-r1.ebuild b/acct-group/bird/bird-0-r1.ebuild
new file mode 100644
index 000000000000..d409ead353b0
--- /dev/null
+++ b/acct-group/bird/bird-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+# TCP port 179, but 179 is already used by acct-group/_bgpd
+ACCT_GROUP_ID=180
diff --git a/acct-group/bird/bird-0.ebuild b/acct-group/bird/bird-0.ebuild
deleted file mode 100644
index 174e87b87bf9..000000000000
--- a/acct-group/bird/bird-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-# TCP port 179, but 179 is already used by acct-group/_bgpd
-ACCT_GROUP_ID=180
diff --git a/acct-group/bitcoin/bitcoin-0-r1.ebuild b/acct-group/bitcoin/bitcoin-0-r1.ebuild
deleted file mode 100644
index cc0bf22ffe01..000000000000
--- a/acct-group/bitcoin/bitcoin-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for users with access to system-wide Bitcoin services"
-ACCT_GROUP_ID=483
diff --git a/acct-group/bitcoin/bitcoin-0-r2.ebuild b/acct-group/bitcoin/bitcoin-0-r2.ebuild
new file mode 100644
index 000000000000..a29293fcef17
--- /dev/null
+++ b/acct-group/bitcoin/bitcoin-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for users with access to system-wide Bitcoin services"
+ACCT_GROUP_ID=483
diff --git a/acct-group/bitflu/bitflu-0-r1.ebuild b/acct-group/bitflu/bitflu-0-r1.ebuild
new file mode 100644
index 000000000000..8009fbfbedcc
--- /dev/null
+++ b/acct-group/bitflu/bitflu-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/bitflu-0.ebuild b/acct-group/bitflu/bitflu-0.ebuild
deleted file mode 100644
index b0544d2346e2..000000000000
--- a/acct-group/bitflu/bitflu-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/bitlbee/bitlbee-0-r1.ebuild b/acct-group/bitlbee/bitlbee-0-r1.ebuild
deleted file mode 100644
index cfecdbf5c9ff..000000000000
--- a/acct-group/bitlbee/bitlbee-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=407
diff --git a/acct-group/bitlbee/bitlbee-0-r2.ebuild b/acct-group/bitlbee/bitlbee-0-r2.ebuild
new file mode 100644
index 000000000000..93485a39696f
--- /dev/null
+++ b/acct-group/bitlbee/bitlbee-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=407
diff --git a/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..8e1e5e73db5f
--- /dev/null
+++ b/acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=293
diff --git a/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild b/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild
deleted file mode 100644
index 71d2888a2d22..000000000000
--- a/acct-group/blackbox_exporter/blackbox_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=293
diff --git a/acct-group/boinc/boinc-0-r1.ebuild b/acct-group/boinc/boinc-0-r1.ebuild
new file mode 100644
index 000000000000..cad1c8d097f6
--- /dev/null
+++ b/acct-group/boinc/boinc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-misc/boinc"
+ACCT_GROUP_ID=352
diff --git a/acct-group/boinc/boinc-0.ebuild b/acct-group/boinc/boinc-0.ebuild
deleted file mode 100644
index dc46c8eba7b2..000000000000
--- a/acct-group/boinc/boinc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sci-misc/boinc"
-ACCT_GROUP_ID=352
diff --git a/acct-group/brlapi/brlapi-0-r1.ebuild b/acct-group/brlapi/brlapi-0-r1.ebuild
new file mode 100644
index 000000000000..752469ce1198
--- /dev/null
+++ b/acct-group/brlapi/brlapi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=507
diff --git a/acct-group/brlapi/brlapi-0.ebuild b/acct-group/brlapi/brlapi-0.ebuild
deleted file mode 100644
index 07af6c150bd9..000000000000
--- a/acct-group/brlapi/brlapi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=507
diff --git a/acct-group/brltty/brltty-0-r1.ebuild b/acct-group/brltty/brltty-0-r1.ebuild
new file mode 100644
index 000000000000..73c11e0c07cf
--- /dev/null
+++ b/acct-group/brltty/brltty-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=506
diff --git a/acct-group/brltty/brltty-0.ebuild b/acct-group/brltty/brltty-0.ebuild
deleted file mode 100644
index 5cc5694d6f9c..000000000000
--- a/acct-group/brltty/brltty-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=506
diff --git a/acct-group/buildbot/buildbot-0-r1.ebuild b/acct-group/buildbot/buildbot-0-r1.ebuild
deleted file mode 100644
index 850f789f93b5..000000000000
--- a/acct-group/buildbot/buildbot-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Buildbot program group"
-ACCT_GROUP_ID=393
-SLOT="0"
diff --git a/acct-group/buildbot/buildbot-0-r2.ebuild b/acct-group/buildbot/buildbot-0-r2.ebuild
new file mode 100644
index 000000000000..b58d336eef9c
--- /dev/null
+++ b/acct-group/buildbot/buildbot-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Buildbot program group"
+ACCT_GROUP_ID=393
+SLOT="0"
diff --git a/acct-group/bumblebee/bumblebee-0-r1.ebuild b/acct-group/bumblebee/bumblebee-0-r1.ebuild
new file mode 100644
index 000000000000..316fc9ef3427
--- /dev/null
+++ b/acct-group/bumblebee/bumblebee-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=380
diff --git a/acct-group/bumblebee/bumblebee-0.ebuild b/acct-group/bumblebee/bumblebee-0.ebuild
deleted file mode 100644
index 03a72dbe9273..000000000000
--- a/acct-group/bumblebee/bumblebee-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=380
diff --git a/acct-group/burp/burp-0-r1.ebuild b/acct-group/burp/burp-0-r1.ebuild
deleted file mode 100644
index bd9aeb045577..000000000000
--- a/acct-group/burp/burp-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the app-backup/burp server"
-ACCT_GROUP_ID=498
diff --git a/acct-group/burp/burp-0-r2.ebuild b/acct-group/burp/burp-0-r2.ebuild
new file mode 100644
index 000000000000..474fe04b5889
--- /dev/null
+++ b/acct-group/burp/burp-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the app-backup/burp server"
+ACCT_GROUP_ID=498
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild
deleted file mode 100644
index 07d9e98d095e..000000000000
--- a/acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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="502"
diff --git a/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild b/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..49197343c68a
--- /dev/null
+++ b/acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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="502"
diff --git a/acct-group/cadvisor/cadvisor-0-r1.ebuild b/acct-group/cadvisor/cadvisor-0-r1.ebuild
deleted file mode 100644
index c44d82f6164a..000000000000
--- a/acct-group/cadvisor/cadvisor-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=427
diff --git a/acct-group/cadvisor/cadvisor-0-r2.ebuild b/acct-group/cadvisor/cadvisor-0-r2.ebuild
new file mode 100644
index 000000000000..12ee15aed64f
--- /dev/null
+++ b/acct-group/cadvisor/cadvisor-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=427
diff --git a/acct-group/cancd/cancd-0-r1.ebuild b/acct-group/cancd/cancd-0-r1.ebuild
new file mode 100644
index 000000000000..46428de1cae0
--- /dev/null
+++ b/acct-group/cancd/cancd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the CA NetConsole Daemon"
+
+ACCT_GROUP_ID="213"
diff --git a/acct-group/cancd/cancd-0.ebuild b/acct-group/cancd/cancd-0.ebuild
deleted file mode 100644
index cb378da029ab..000000000000
--- a/acct-group/cancd/cancd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 the CA NetConsole Daemon"
-
-ACCT_GROUP_ID="213"
diff --git a/acct-group/carbon/carbon-0-r1.ebuild b/acct-group/carbon/carbon-0-r1.ebuild
deleted file mode 100644
index 09ccc3c9f002..000000000000
--- a/acct-group/carbon/carbon-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=230
diff --git a/acct-group/carbon/carbon-0-r2.ebuild b/acct-group/carbon/carbon-0-r2.ebuild
new file mode 100644
index 000000000000..e84b103f0d05
--- /dev/null
+++ b/acct-group/carbon/carbon-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=230
diff --git a/acct-group/cdrom/cdrom-0-r1.ebuild b/acct-group/cdrom/cdrom-0-r1.ebuild
deleted file mode 100644
index 8d402a923a38..000000000000
--- a/acct-group/cdrom/cdrom-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=19
diff --git a/acct-group/cdrom/cdrom-0-r2.ebuild b/acct-group/cdrom/cdrom-0-r2.ebuild
new file mode 100644
index 000000000000..74979bf5d8cb
--- /dev/null
+++ b/acct-group/cdrom/cdrom-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=19
diff --git a/acct-group/ceph/ceph-0-r1.ebuild b/acct-group/ceph/ceph-0-r1.ebuild
deleted file mode 100644
index de5898482a6f..000000000000
--- a/acct-group/ceph/ceph-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=267
diff --git a/acct-group/ceph/ceph-0-r2.ebuild b/acct-group/ceph/ceph-0-r2.ebuild
new file mode 100644
index 000000000000..5ad28791f8d9
--- /dev/null
+++ b/acct-group/ceph/ceph-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=267
diff --git a/acct-group/cgit/cgit-0-r1.ebuild b/acct-group/cgit/cgit-0-r1.ebuild
new file mode 100644
index 000000000000..73dd86cc52dc
--- /dev/null
+++ b/acct-group/cgit/cgit-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=197
diff --git a/acct-group/cgit/cgit-0.ebuild b/acct-group/cgit/cgit-0.ebuild
deleted file mode 100644
index 750e7188cdb7..000000000000
--- a/acct-group/cgit/cgit-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=197
diff --git a/acct-group/chronograf/chronograf-0-r1.ebuild b/acct-group/chronograf/chronograf-0-r1.ebuild
deleted file mode 100644
index 38259347814a..000000000000
--- a/acct-group/chronograf/chronograf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=344
diff --git a/acct-group/chronograf/chronograf-0-r2.ebuild b/acct-group/chronograf/chronograf-0-r2.ebuild
new file mode 100644
index 000000000000..b653b69c5f32
--- /dev/null
+++ b/acct-group/chronograf/chronograf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=344
diff --git a/acct-group/cinder/cinder-0-r1.ebuild b/acct-group/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index d57b97378c77..000000000000
--- a/acct-group/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=442
diff --git a/acct-group/cinder/cinder-0-r2.ebuild b/acct-group/cinder/cinder-0-r2.ebuild
new file mode 100644
index 000000000000..a0016660fffe
--- /dev/null
+++ b/acct-group/cinder/cinder-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=442
diff --git a/acct-group/clair/clair-0-r1.ebuild b/acct-group/clair/clair-0-r1.ebuild
deleted file mode 100644
index 8a34e5dbb5d1..000000000000
--- a/acct-group/clair/clair-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=307
diff --git a/acct-group/clair/clair-0-r2.ebuild b/acct-group/clair/clair-0-r2.ebuild
new file mode 100644
index 000000000000..e9ba2bbad69a
--- /dev/null
+++ b/acct-group/clair/clair-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=307
diff --git a/acct-group/clamav/clamav-0-r1.ebuild b/acct-group/clamav/clamav-0-r1.ebuild
deleted file mode 100644
index 30e86e6753f4..000000000000
--- a/acct-group/clamav/clamav-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=435
diff --git a/acct-group/clamav/clamav-0-r2.ebuild b/acct-group/clamav/clamav-0-r2.ebuild
new file mode 100644
index 000000000000..b41166d96ada
--- /dev/null
+++ b/acct-group/clamav/clamav-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=435
diff --git a/acct-group/cntlm/cntlm-0-r1.ebuild b/acct-group/cntlm/cntlm-0-r1.ebuild
new file mode 100644
index 000000000000..745f398c94b5
--- /dev/null
+++ b/acct-group/cntlm/cntlm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/cntlm"
+
+ACCT_GROUP_ID="255"
diff --git a/acct-group/cntlm/cntlm-0.ebuild b/acct-group/cntlm/cntlm-0.ebuild
deleted file mode 100644
index 38671db40f18..000000000000
--- a/acct-group/cntlm/cntlm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/cntlm"
-
-ACCT_GROUP_ID="255"
diff --git a/acct-group/cockroach/cockroach-0-r1.ebuild b/acct-group/cockroach/cockroach-0-r1.ebuild
new file mode 100644
index 000000000000..c0d4c9ca4dbb
--- /dev/null
+++ b/acct-group/cockroach/cockroach-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/cockroach-0.ebuild b/acct-group/cockroach/cockroach-0.ebuild
deleted file mode 100644
index 7f9e3bf019d1..000000000000
--- a/acct-group/cockroach/cockroach-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/collectd/collectd-0-r1.ebuild b/acct-group/collectd/collectd-0-r1.ebuild
new file mode 100644
index 000000000000..8ff3458b3df8
--- /dev/null
+++ b/acct-group/collectd/collectd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="collectd program group"
+
+ACCT_GROUP_ID=440
diff --git a/acct-group/collectd/collectd-0.ebuild b/acct-group/collectd/collectd-0.ebuild
deleted file mode 100644
index 273a23b32ea2..000000000000
--- a/acct-group/collectd/collectd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="collectd program group"
-
-ACCT_GROUP_ID=440
diff --git a/acct-group/colord/colord-0-r1.ebuild b/acct-group/colord/colord-0-r1.ebuild
new file mode 100644
index 000000000000..1758aa8ec47b
--- /dev/null
+++ b/acct-group/colord/colord-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=350
diff --git a/acct-group/colord/colord-0.ebuild b/acct-group/colord/colord-0.ebuild
deleted file mode 100644
index da6555c53bfa..000000000000
--- a/acct-group/colord/colord-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=350
diff --git a/acct-group/consul-template/consul-template-0-r1.ebuild b/acct-group/consul-template/consul-template-0-r1.ebuild
deleted file mode 100644
index 45bea6e5f696..000000000000
--- a/acct-group/consul-template/consul-template-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=408
diff --git a/acct-group/consul-template/consul-template-0-r2.ebuild b/acct-group/consul-template/consul-template-0-r2.ebuild
new file mode 100644
index 000000000000..e8c79f811996
--- /dev/null
+++ b/acct-group/consul-template/consul-template-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=408
diff --git a/acct-group/consul/consul-0-r1.ebuild b/acct-group/consul/consul-0-r1.ebuild
deleted file mode 100644
index 615defa305de..000000000000
--- a/acct-group/consul/consul-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=411
diff --git a/acct-group/consul/consul-0-r2.ebuild b/acct-group/consul/consul-0-r2.ebuild
new file mode 100644
index 000000000000..b7dac9bca6c3
--- /dev/null
+++ b/acct-group/consul/consul-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=411
diff --git a/acct-group/consul_exporter/consul_exporter-0-r1.ebuild b/acct-group/consul_exporter/consul_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..c77db8b3a594
--- /dev/null
+++ b/acct-group/consul_exporter/consul_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=278
diff --git a/acct-group/consul_exporter/consul_exporter-0.ebuild b/acct-group/consul_exporter/consul_exporter-0.ebuild
deleted file mode 100644
index b9e245ce5510..000000000000
--- a/acct-group/consul_exporter/consul_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=278
diff --git a/acct-group/coredns/coredns-0-r1.ebuild b/acct-group/coredns/coredns-0-r1.ebuild
new file mode 100644
index 000000000000..a182b8feb18d
--- /dev/null
+++ b/acct-group/coredns/coredns-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/coredns"
+
+ACCT_GROUP_ID="312"
diff --git a/acct-group/coredns/coredns-0.ebuild b/acct-group/coredns/coredns-0.ebuild
deleted file mode 100644
index 9d29330416d4..000000000000
--- a/acct-group/coredns/coredns-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-dns/coredns"
-
-ACCT_GROUP_ID="312"
diff --git a/acct-group/croc/croc-0-r1.ebuild b/acct-group/croc/croc-0-r1.ebuild
new file mode 100644
index 000000000000..79aff7a7f494
--- /dev/null
+++ b/acct-group/croc/croc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/croc"
+ACCT_GROUP_ID=310
diff --git a/acct-group/croc/croc-0.ebuild b/acct-group/croc/croc-0.ebuild
deleted file mode 100644
index 544469aa859c..000000000000
--- a/acct-group/croc/croc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/croc"
-ACCT_GROUP_ID=310
diff --git a/acct-group/cron/cron-0-r1.ebuild b/acct-group/cron/cron-0-r1.ebuild
new file mode 100644
index 000000000000..84142b621a23
--- /dev/null
+++ b/acct-group/cron/cron-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/cron-0.ebuild b/acct-group/cron/cron-0.ebuild
deleted file mode 100644
index 84116177ac0d..000000000000
--- a/acct-group/cron/cron-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/crontab/crontab-0-r1.ebuild b/acct-group/crontab/crontab-0-r1.ebuild
new file mode 100644
index 000000000000..d50789d7615d
--- /dev/null
+++ b/acct-group/crontab/crontab-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=460
diff --git a/acct-group/crontab/crontab-0.ebuild b/acct-group/crontab/crontab-0.ebuild
deleted file mode 100644
index d8765962fb79..000000000000
--- a/acct-group/crontab/crontab-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=460
diff --git a/acct-group/cvmfs/cvmfs-0-r1.ebuild b/acct-group/cvmfs/cvmfs-0-r1.ebuild
deleted file mode 100644
index 1fcae7e51f98..000000000000
--- a/acct-group/cvmfs/cvmfs-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the CernVM-FS network file system"
-ACCT_GROUP_ID=268
diff --git a/acct-group/cvmfs/cvmfs-0-r2.ebuild b/acct-group/cvmfs/cvmfs-0-r2.ebuild
new file mode 100644
index 000000000000..201f3329a7b2
--- /dev/null
+++ b/acct-group/cvmfs/cvmfs-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the CernVM-FS network file system"
+ACCT_GROUP_ID=268
diff --git a/acct-group/davfs2/davfs2-0-r1.ebuild b/acct-group/davfs2/davfs2-0-r1.ebuild
deleted file mode 100644
index c7a375eb1319..000000000000
--- a/acct-group/davfs2/davfs2-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=420
diff --git a/acct-group/davfs2/davfs2-0-r2.ebuild b/acct-group/davfs2/davfs2-0-r2.ebuild
new file mode 100644
index 000000000000..8e919d778a20
--- /dev/null
+++ b/acct-group/davfs2/davfs2-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=420
diff --git a/acct-group/dbmail/dbmail-0-r1.ebuild b/acct-group/dbmail/dbmail-0-r1.ebuild
new file mode 100644
index 000000000000..98ef2242b546
--- /dev/null
+++ b/acct-group/dbmail/dbmail-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=365
diff --git a/acct-group/dbmail/dbmail-0.ebuild b/acct-group/dbmail/dbmail-0.ebuild
deleted file mode 100644
index 761317e9bd0e..000000000000
--- a/acct-group/dbmail/dbmail-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=365
diff --git a/acct-group/dbskkd/dbskkd-0-r1.ebuild b/acct-group/dbskkd/dbskkd-0-r1.ebuild
new file mode 100644
index 000000000000..b657171d9527
--- /dev/null
+++ b/acct-group/dbskkd/dbskkd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/dbskkd-0.ebuild b/acct-group/dbskkd/dbskkd-0.ebuild
deleted file mode 100644
index 84040068089f..000000000000
--- a/acct-group/dbskkd/dbskkd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/ddclient/ddclient-0-r1.ebuild b/acct-group/ddclient/ddclient-0-r1.ebuild
deleted file mode 100644
index 778bf4cbe572..000000000000
--- a/acct-group/ddclient/ddclient-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the dynamic DNS client"
-
-ACCT_GROUP_ID="487"
diff --git a/acct-group/ddclient/ddclient-0-r2.ebuild b/acct-group/ddclient/ddclient-0-r2.ebuild
new file mode 100644
index 000000000000..635e8d6f55ff
--- /dev/null
+++ b/acct-group/ddclient/ddclient-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the dynamic DNS client"
+
+ACCT_GROUP_ID="487"
diff --git a/acct-group/defang/defang-0-r1.ebuild b/acct-group/defang/defang-0-r1.ebuild
new file mode 100644
index 000000000000..07fb25a22c25
--- /dev/null
+++ b/acct-group/defang/defang-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/mimedefang"
+
+ACCT_GROUP_ID="181"
diff --git a/acct-group/defang/defang-0.ebuild b/acct-group/defang/defang-0.ebuild
deleted file mode 100644
index aab0765fabfa..000000000000
--- a/acct-group/defang/defang-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 mail-filter/mimedefang"
-
-ACCT_GROUP_ID="181"
diff --git a/acct-group/dehydrated/dehydrated-0-r1.ebuild b/acct-group/dehydrated/dehydrated-0-r1.ebuild
new file mode 100644
index 000000000000..bd6fc5074d0f
--- /dev/null
+++ b/acct-group/dehydrated/dehydrated-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="dehydrated program group"
+
+ACCT_GROUP_ID=361
diff --git a/acct-group/dehydrated/dehydrated-0.ebuild b/acct-group/dehydrated/dehydrated-0.ebuild
deleted file mode 100644
index 4edd9bf28a24..000000000000
--- a/acct-group/dehydrated/dehydrated-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="dehydrated program group"
-
-ACCT_GROUP_ID=361
diff --git a/acct-group/deluge/deluge-0-r1.ebuild b/acct-group/deluge/deluge-0-r1.ebuild
deleted file mode 100644
index 7f9e1bf27888..000000000000
--- a/acct-group/deluge/deluge-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=454
diff --git a/acct-group/deluge/deluge-0-r2.ebuild b/acct-group/deluge/deluge-0-r2.ebuild
new file mode 100644
index 000000000000..b6fabbb0d9ee
--- /dev/null
+++ b/acct-group/deluge/deluge-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=454
diff --git a/acct-group/dhcp/dhcp-0-r1.ebuild b/acct-group/dhcp/dhcp-0-r1.ebuild
deleted file mode 100644
index 5b54d2ecdd85..000000000000
--- a/acct-group/dhcp/dhcp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=300
diff --git a/acct-group/dhcp/dhcp-0-r2.ebuild b/acct-group/dhcp/dhcp-0-r2.ebuild
new file mode 100644
index 000000000000..ae3d106df1b4
--- /dev/null
+++ b/acct-group/dhcp/dhcp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=300
diff --git a/acct-group/dhcpcd/dhcpcd-0-r1.ebuild b/acct-group/dhcpcd/dhcpcd-0-r1.ebuild
deleted file mode 100644
index 47af5f206833..000000000000
--- a/acct-group/dhcpcd/dhcpcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=303
diff --git a/acct-group/dhcpcd/dhcpcd-0-r2.ebuild b/acct-group/dhcpcd/dhcpcd-0-r2.ebuild
new file mode 100644
index 000000000000..358823c53a84
--- /dev/null
+++ b/acct-group/dhcpcd/dhcpcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=303
diff --git a/acct-group/dialout/dialout-0-r1.ebuild b/acct-group/dialout/dialout-0-r1.ebuild
deleted file mode 100644
index 3c1316aa585a..000000000000
--- a/acct-group/dialout/dialout-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=20
diff --git a/acct-group/dialout/dialout-0-r2.ebuild b/acct-group/dialout/dialout-0-r2.ebuild
new file mode 100644
index 000000000000..b83a88cc096f
--- /dev/null
+++ b/acct-group/dialout/dialout-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=20
diff --git a/acct-group/dictd/dictd-0-r1.ebuild b/acct-group/dictd/dictd-0-r1.ebuild
new file mode 100644
index 000000000000..30250bf20c3c
--- /dev/null
+++ b/acct-group/dictd/dictd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for app-text/dictd"
+
+ACCT_GROUP_ID=381
diff --git a/acct-group/dictd/dictd-0.ebuild b/acct-group/dictd/dictd-0.ebuild
deleted file mode 100644
index e20464ee6fd1..000000000000
--- a/acct-group/dictd/dictd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for app-text/dictd"
-
-ACCT_GROUP_ID=381
diff --git a/acct-group/dirsrv/dirsrv-0-r1.ebuild b/acct-group/dirsrv/dirsrv-0-r1.ebuild
new file mode 100644
index 000000000000..44e24def6561
--- /dev/null
+++ b/acct-group/dirsrv/dirsrv-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-nds/389-ds-base"
+ACCT_GROUP_ID=346
diff --git a/acct-group/dirsrv/dirsrv-0.ebuild b/acct-group/dirsrv/dirsrv-0.ebuild
deleted file mode 100644
index 14eb4d7fac5b..000000000000
--- a/acct-group/dirsrv/dirsrv-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-nds/389-ds-base"
-ACCT_GROUP_ID=346
diff --git a/acct-group/disk/disk-0-r1.ebuild b/acct-group/disk/disk-0-r1.ebuild
deleted file mode 100644
index a5568d65c049..000000000000
--- a/acct-group/disk/disk-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=6
diff --git a/acct-group/disk/disk-0-r2.ebuild b/acct-group/disk/disk-0-r2.ebuild
new file mode 100644
index 000000000000..1eb22b9bbbb5
--- /dev/null
+++ b/acct-group/disk/disk-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=6
diff --git a/acct-group/distcc/distcc-1-r1.ebuild b/acct-group/distcc/distcc-1-r1.ebuild
new file mode 100644
index 000000000000..7c650651a234
--- /dev/null
+++ b/acct-group/distcc/distcc-1-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=240
diff --git a/acct-group/distcc/distcc-1.ebuild b/acct-group/distcc/distcc-1.ebuild
deleted file mode 100644
index d26894412994..000000000000
--- a/acct-group/distcc/distcc-1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=240
diff --git a/acct-group/dnrd/dnrd-0-r1.ebuild b/acct-group/dnrd/dnrd-0-r1.ebuild
new file mode 100644
index 000000000000..235dbfcf78c0
--- /dev/null
+++ b/acct-group/dnrd/dnrd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnrd"
+
+ACCT_GROUP_ID="262"
diff --git a/acct-group/dnrd/dnrd-0.ebuild b/acct-group/dnrd/dnrd-0.ebuild
deleted file mode 100644
index bba06a48da25..000000000000
--- a/acct-group/dnrd/dnrd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/dnrd"
-
-ACCT_GROUP_ID="262"
diff --git a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
deleted file mode 100644
index afd6951e3873..000000000000
--- a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/dnscrypt-proxy"
-ACCT_GROUP_ID=353
diff --git a/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..0d10d9fd64b4
--- /dev/null
+++ b/acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/dnscrypt-proxy"
+ACCT_GROUP_ID=353
diff --git a/acct-group/dnsdist/dnsdist-0-r1.ebuild b/acct-group/dnsdist/dnsdist-0-r1.ebuild
deleted file mode 100644
index df9b403bed38..000000000000
--- a/acct-group/dnsdist/dnsdist-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for net-dns/dnsdist"
-
-ACCT_GROUP_ID="414"
diff --git a/acct-group/dnsdist/dnsdist-0-r2.ebuild b/acct-group/dnsdist/dnsdist-0-r2.ebuild
new file mode 100644
index 000000000000..573f371e6d0c
--- /dev/null
+++ b/acct-group/dnsdist/dnsdist-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/dnsdist"
+
+ACCT_GROUP_ID="414"
diff --git a/acct-group/dnsmasq/dnsmasq-0-r1.ebuild b/acct-group/dnsmasq/dnsmasq-0-r1.ebuild
deleted file mode 100644
index d765927def05..000000000000
--- a/acct-group/dnsmasq/dnsmasq-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq/dnsmasq-0-r2.ebuild b/acct-group/dnsmasq/dnsmasq-0-r2.ebuild
new file mode 100644
index 000000000000..e41841312803
--- /dev/null
+++ b/acct-group/dnsmasq/dnsmasq-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=275
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
deleted file mode 100644
index e075766a9c4e..000000000000
--- a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=274
diff --git a/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..2568d8d50be2
--- /dev/null
+++ b/acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=274
diff --git a/acct-group/docker/docker-0-r1.ebuild b/acct-group/docker/docker-0-r1.ebuild
deleted file mode 100644
index a448b78e40fb..000000000000
--- a/acct-group/docker/docker-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=48
diff --git a/acct-group/docker/docker-0-r2.ebuild b/acct-group/docker/docker-0-r2.ebuild
new file mode 100644
index 000000000000..e59205efc4c2
--- /dev/null
+++ b/acct-group/docker/docker-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=48
diff --git a/acct-group/docker_auth/docker_auth-0-r1.ebuild b/acct-group/docker_auth/docker_auth-0-r1.ebuild
deleted file mode 100644
index 15cb331e003c..000000000000
--- a/acct-group/docker_auth/docker_auth-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=345
diff --git a/acct-group/docker_auth/docker_auth-0-r2.ebuild b/acct-group/docker_auth/docker_auth-0-r2.ebuild
new file mode 100644
index 000000000000..d3f082ccbf0d
--- /dev/null
+++ b/acct-group/docker_auth/docker_auth-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=345
diff --git a/acct-group/dovecot/dovecot-0-r1.ebuild b/acct-group/dovecot/dovecot-0-r1.ebuild
deleted file mode 100644
index 3b37f1a2ebd6..000000000000
--- a/acct-group/dovecot/dovecot-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=76
diff --git a/acct-group/dovecot/dovecot-0-r2.ebuild b/acct-group/dovecot/dovecot-0-r2.ebuild
new file mode 100644
index 000000000000..b79d8d933cfe
--- /dev/null
+++ b/acct-group/dovecot/dovecot-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=76
diff --git a/acct-group/dovenull/dovenull-0-r1.ebuild b/acct-group/dovenull/dovenull-0-r1.ebuild
deleted file mode 100644
index f6c9f1011d06..000000000000
--- a/acct-group/dovenull/dovenull-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=74
diff --git a/acct-group/dovenull/dovenull-0-r2.ebuild b/acct-group/dovenull/dovenull-0-r2.ebuild
new file mode 100644
index 000000000000..dfd9f8ee494c
--- /dev/null
+++ b/acct-group/dovenull/dovenull-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=74
diff --git a/acct-group/drone/drone-0-r1.ebuild b/acct-group/drone/drone-0-r1.ebuild
new file mode 100644
index 000000000000..c02ad8cb13d8
--- /dev/null
+++ b/acct-group/drone/drone-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/drone-0.ebuild b/acct-group/drone/drone-0.ebuild
deleted file mode 100644
index 7e4e2c35ad8b..000000000000
--- a/acct-group/drone/drone-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/ejabberd/ejabberd-0-r1.ebuild b/acct-group/ejabberd/ejabberd-0-r1.ebuild
new file mode 100644
index 000000000000..ec6a736d7bb1
--- /dev/null
+++ b/acct-group/ejabberd/ejabberd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-im/ejabberd"
+
+ACCT_GROUP_ID=114
diff --git a/acct-group/ejabberd/ejabberd-0.ebuild b/acct-group/ejabberd/ejabberd-0.ebuild
deleted file mode 100644
index 7d4a216908f8..000000000000
--- a/acct-group/ejabberd/ejabberd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-im/ejabberd"
-
-ACCT_GROUP_ID=114
diff --git a/acct-group/elasticsearch/elasticsearch-0-r1.ebuild b/acct-group/elasticsearch/elasticsearch-0-r1.ebuild
deleted file mode 100644
index 7232aa799576..000000000000
--- a/acct-group/elasticsearch/elasticsearch-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Elasticsearch program group"
-ACCT_GROUP_ID=183
diff --git a/acct-group/elasticsearch/elasticsearch-0-r2.ebuild b/acct-group/elasticsearch/elasticsearch-0-r2.ebuild
new file mode 100644
index 000000000000..f9c57569df5f
--- /dev/null
+++ b/acct-group/elasticsearch/elasticsearch-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Elasticsearch program group"
+ACCT_GROUP_ID=183
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
deleted file mode 100644
index 65fdefebaf47..000000000000
--- a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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="501"
diff --git a/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..eb80176af463
--- /dev/null
+++ b/acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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="501"
diff --git a/acct-group/energi3/energi3-0-r1.ebuild b/acct-group/energi3/energi3-0-r1.ebuild
new file mode 100644
index 000000000000..0d5f2564832b
--- /dev/null
+++ b/acct-group/energi3/energi3-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide net-p2p/energi3"
+ACCT_GROUP_ID=218
diff --git a/acct-group/energi3/energi3-0.ebuild b/acct-group/energi3/energi3-0.ebuild
deleted file mode 100644
index d844c7679002..000000000000
--- a/acct-group/energi3/energi3-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide net-p2p/energi3"
-ACCT_GROUP_ID=218
diff --git a/acct-group/epam/epam-0-r1.ebuild b/acct-group/epam/epam-0-r1.ebuild
new file mode 100644
index 000000000000..6df502deb6a8
--- /dev/null
+++ b/acct-group/epam/epam-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ejabberd's epam functionality"
+ACCT_GROUP_ID=418
diff --git a/acct-group/epam/epam-0.ebuild b/acct-group/epam/epam-0.ebuild
deleted file mode 100644
index 7909cc2a4393..000000000000
--- a/acct-group/epam/epam-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ejabberd's epam functionality"
-ACCT_GROUP_ID=418
diff --git a/acct-group/epmd/epmd-0-r1.ebuild b/acct-group/epmd/epmd-0-r1.ebuild
deleted file mode 100644
index 69ad9f1cad2b..000000000000
--- a/acct-group/epmd/epmd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Erlang Portmapper Daemon"
-ACCT_GROUP_ID=335
diff --git a/acct-group/epmd/epmd-0-r2.ebuild b/acct-group/epmd/epmd-0-r2.ebuild
new file mode 100644
index 000000000000..f954ffee5a68
--- /dev/null
+++ b/acct-group/epmd/epmd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Erlang Portmapper Daemon"
+ACCT_GROUP_ID=335
diff --git a/acct-group/err/err-0-r1.ebuild b/acct-group/err/err-0-r1.ebuild
new file mode 100644
index 000000000000..961861c84779
--- /dev/null
+++ b/acct-group/err/err-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=325
diff --git a/acct-group/err/err-0.ebuild b/acct-group/err/err-0.ebuild
deleted file mode 100644
index c1dcd9ca10c8..000000000000
--- a/acct-group/err/err-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=325
diff --git a/acct-group/etcd/etcd-0-r1.ebuild b/acct-group/etcd/etcd-0-r1.ebuild
deleted file mode 100644
index 841bf1ab43ea..000000000000
--- a/acct-group/etcd/etcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=426
diff --git a/acct-group/etcd/etcd-0-r2.ebuild b/acct-group/etcd/etcd-0-r2.ebuild
new file mode 100644
index 000000000000..0cfe9ef27461
--- /dev/null
+++ b/acct-group/etcd/etcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=426
diff --git a/acct-group/exabgp/exabgp-0-r1.ebuild b/acct-group/exabgp/exabgp-0-r1.ebuild
deleted file mode 100644
index ef1948f17efa..000000000000
--- a/acct-group/exabgp/exabgp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=316
diff --git a/acct-group/exabgp/exabgp-0-r2.ebuild b/acct-group/exabgp/exabgp-0-r2.ebuild
new file mode 100644
index 000000000000..273ddc242928
--- /dev/null
+++ b/acct-group/exabgp/exabgp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=316
diff --git a/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild b/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild
new file mode 100644
index 000000000000..d23e375c5f63
--- /dev/null
+++ b/acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-dns/ez-ipupdate"
+
+ACCT_GROUP_ID="261"
diff --git a/acct-group/ez-ipupd/ez-ipupd-0.ebuild b/acct-group/ez-ipupd/ez-ipupd-0.ebuild
deleted file mode 100644
index d37dce72a2cc..000000000000
--- a/acct-group/ez-ipupd/ez-ipupd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-dns/ez-ipupdate"
-
-ACCT_GROUP_ID="261"
diff --git a/acct-group/fax/fax-0-r1.ebuild b/acct-group/fax/fax-0-r1.ebuild
new file mode 100644
index 000000000000..67affdc2830a
--- /dev/null
+++ b/acct-group/fax/fax-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dialup/mgetty"
+
+ACCT_GROUP_ID="320"
diff --git a/acct-group/fax/fax-0.ebuild b/acct-group/fax/fax-0.ebuild
deleted file mode 100644
index 2e9923179f3e..000000000000
--- a/acct-group/fax/fax-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-dialup/mgetty"
-
-ACCT_GROUP_ID="320"
diff --git a/acct-group/fcron/fcron-0-r1.ebuild b/acct-group/fcron/fcron-0-r1.ebuild
new file mode 100644
index 000000000000..56134814b301
--- /dev/null
+++ b/acct-group/fcron/fcron-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/fcron-0.ebuild b/acct-group/fcron/fcron-0.ebuild
deleted file mode 100644
index 2eb3684b77bf..000000000000
--- a/acct-group/fcron/fcron-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/fdm/fdm-0-r1.ebuild b/acct-group/fdm/fdm-0-r1.ebuild
new file mode 100644
index 000000000000..f1e02f57ad2d
--- /dev/null
+++ b/acct-group/fdm/fdm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fdm"
+
+ACCT_GROUP_ID="248"
diff --git a/acct-group/fdm/fdm-0.ebuild b/acct-group/fdm/fdm-0.ebuild
deleted file mode 100644
index 135f04656589..000000000000
--- a/acct-group/fdm/fdm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/fdm"
-
-ACCT_GROUP_ID="248"
diff --git a/acct-group/fetchmail/fetchmail-0-r1.ebuild b/acct-group/fetchmail/fetchmail-0-r1.ebuild
deleted file mode 100644
index 03f13d37300d..000000000000
--- a/acct-group/fetchmail/fetchmail-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/fetchmail"
-ACCT_GROUP_ID=124
diff --git a/acct-group/fetchmail/fetchmail-0-r2.ebuild b/acct-group/fetchmail/fetchmail-0-r2.ebuild
new file mode 100644
index 000000000000..f08ca98e37a3
--- /dev/null
+++ b/acct-group/fetchmail/fetchmail-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fetchmail"
+ACCT_GROUP_ID=124
diff --git a/acct-group/fhem/fhem-0-r1.ebuild b/acct-group/fhem/fhem-0-r1.ebuild
deleted file mode 100644
index 166e07ec2cf1..000000000000
--- a/acct-group/fhem/fhem-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the FHEM perl server for house automation"
-
-ACCT_GROUP_ID="491"
diff --git a/acct-group/fhem/fhem-0-r2.ebuild b/acct-group/fhem/fhem-0-r2.ebuild
new file mode 100644
index 000000000000..7bc0d371f660
--- /dev/null
+++ b/acct-group/fhem/fhem-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the FHEM perl server for house automation"
+
+ACCT_GROUP_ID="491"
diff --git a/acct-group/fingerprint/fingerprint-0-r1.ebuild b/acct-group/fingerprint/fingerprint-0-r1.ebuild
deleted file mode 100644
index 0df6a20dbd2b..000000000000
--- a/acct-group/fingerprint/fingerprint-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=243
diff --git a/acct-group/fingerprint/fingerprint-0-r2.ebuild b/acct-group/fingerprint/fingerprint-0-r2.ebuild
new file mode 100644
index 000000000000..9d6861472560
--- /dev/null
+++ b/acct-group/fingerprint/fingerprint-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=243
diff --git a/acct-group/firebird/firebird-0-r1.ebuild b/acct-group/firebird/firebird-0-r1.ebuild
deleted file mode 100644
index b2d2f28d7ea3..000000000000
--- a/acct-group/firebird/firebird-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-db/firebird"
-
-ACCT_GROUP_ID="450"
diff --git a/acct-group/firebird/firebird-0-r2.ebuild b/acct-group/firebird/firebird-0-r2.ebuild
new file mode 100644
index 000000000000..e107349d26d0
--- /dev/null
+++ b/acct-group/firebird/firebird-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-db/firebird"
+
+ACCT_GROUP_ID="450"
diff --git a/acct-group/flatpak/flatpak-0-r1.ebuild b/acct-group/flatpak/flatpak-0-r1.ebuild
new file mode 100644
index 000000000000..e90888ab5ece
--- /dev/null
+++ b/acct-group/flatpak/flatpak-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=313
diff --git a/acct-group/flatpak/flatpak-0.ebuild b/acct-group/flatpak/flatpak-0.ebuild
deleted file mode 100644
index 4b028c888d26..000000000000
--- a/acct-group/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=313
diff --git a/acct-group/floppy/floppy-0.ebuild b/acct-group/floppy/floppy-0-r1.ebuild
similarity index 100%
rename from acct-group/floppy/floppy-0.ebuild
rename to acct-group/floppy/floppy-0-r1.ebuild
diff --git a/acct-group/flows/flows-0-r1.ebuild b/acct-group/flows/flows-0-r1.ebuild
new file mode 100644
index 000000000000..b6a26f2afa24
--- /dev/null
+++ b/acct-group/flows/flows-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/flow-tools"
+
+ACCT_GROUP_ID=384
diff --git a/acct-group/flows/flows-0.ebuild b/acct-group/flows/flows-0.ebuild
deleted file mode 100644
index 50f9c311d004..000000000000
--- a/acct-group/flows/flows-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/flow-tools"
-
-ACCT_GROUP_ID=384
diff --git a/acct-group/fluentd/fluentd-0-r1.ebuild b/acct-group/fluentd/fluentd-0-r1.ebuild
deleted file mode 100644
index 0f86473d11b6..000000000000
--- a/acct-group/fluentd/fluentd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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="504"
diff --git a/acct-group/fluentd/fluentd-0-r2.ebuild b/acct-group/fluentd/fluentd-0-r2.ebuild
new file mode 100644
index 000000000000..bad64bdcd72a
--- /dev/null
+++ b/acct-group/fluentd/fluentd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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="504"
diff --git a/acct-group/foldingathome/foldingathome-0-r1.ebuild b/acct-group/foldingathome/foldingathome-0-r1.ebuild
new file mode 100644
index 000000000000..d2ce82965e69
--- /dev/null
+++ b/acct-group/foldingathome/foldingathome-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/foldingathome-0.ebuild b/acct-group/foldingathome/foldingathome-0.ebuild
deleted file mode 100644
index 216461c86938..000000000000
--- a/acct-group/foldingathome/foldingathome-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/fp-multiuser/fp-multiuser-0-r1.ebuild b/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild
new file mode 100644
index 000000000000..6379f4551c43
--- /dev/null
+++ b/acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-vpn/fp-multiuser"
+
+ACCT_GROUP_ID="318"
diff --git a/acct-group/fp-multiuser/fp-multiuser-0.ebuild b/acct-group/fp-multiuser/fp-multiuser-0.ebuild
deleted file mode 100644
index a7bd7bb71f26..000000000000
--- a/acct-group/fp-multiuser/fp-multiuser-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/fp-multiuser"
-
-ACCT_GROUP_ID="318"
diff --git a/acct-group/freenet/freenet-0-r1.ebuild b/acct-group/freenet/freenet-0-r1.ebuild
new file mode 100644
index 000000000000..8fb8e574f0d2
--- /dev/null
+++ b/acct-group/freenet/freenet-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/freenet"
+ACCT_GROUP_ID=105
diff --git a/acct-group/freenet/freenet-0.ebuild b/acct-group/freenet/freenet-0.ebuild
deleted file mode 100644
index c09fe1ee67e3..000000000000
--- a/acct-group/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/freenet"
-ACCT_GROUP_ID=105
diff --git a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..17fa5738728a
--- /dev/null
+++ b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=228
diff --git a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild b/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
deleted file mode 100644
index 1ecaeb6a6b08..000000000000
--- a/acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=228
diff --git a/acct-group/frr/frr-0-r1.ebuild b/acct-group/frr/frr-0-r1.ebuild
new file mode 100644
index 000000000000..ca45782773ab
--- /dev/null
+++ b/acct-group/frr/frr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=371
diff --git a/acct-group/frr/frr-0.ebuild b/acct-group/frr/frr-0.ebuild
deleted file mode 100644
index 42177f13c3a9..000000000000
--- a/acct-group/frr/frr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=371
diff --git a/acct-group/ftp/ftp-0-r1.ebuild b/acct-group/ftp/ftp-0-r1.ebuild
deleted file mode 100644
index 9c11d486fc4a..000000000000
--- a/acct-group/ftp/ftp-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="File Transfer Protocol server user"
-ACCT_GROUP_ID=21
diff --git a/acct-group/ftp/ftp-0-r2.ebuild b/acct-group/ftp/ftp-0-r2.ebuild
new file mode 100644
index 000000000000..cba479f59ede
--- /dev/null
+++ b/acct-group/ftp/ftp-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="File Transfer Protocol server user"
+ACCT_GROUP_ID=21
diff --git a/acct-group/ftpproxy/ftpproxy-0-r1.ebuild b/acct-group/ftpproxy/ftpproxy-0-r1.ebuild
new file mode 100644
index 000000000000..b0c7b700f6d3
--- /dev/null
+++ b/acct-group/ftpproxy/ftpproxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-ftp/frox"
+
+ACCT_GROUP_ID="182"
diff --git a/acct-group/ftpproxy/ftpproxy-0.ebuild b/acct-group/ftpproxy/ftpproxy-0.ebuild
deleted file mode 100644
index 66b993575afe..000000000000
--- a/acct-group/ftpproxy/ftpproxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-ftp/frox"
-
-ACCT_GROUP_ID="182"
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild
deleted file mode 100644
index d6fc81af1798..000000000000
--- a/acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=232
diff --git a/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild b/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild
new file mode 100644
index 000000000000..1061d5c2843d
--- /dev/null
+++ b/acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=232
diff --git a/acct-group/gamemode/gamemode-0-r1.ebuild b/acct-group/gamemode/gamemode-0-r1.ebuild
new file mode 100644
index 000000000000..6de84c33acde
--- /dev/null
+++ b/acct-group/gamemode/gamemode-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
+ACCT_GROUP_ID=385
diff --git a/acct-group/gamemode/gamemode-0.ebuild b/acct-group/gamemode/gamemode-0.ebuild
deleted file mode 100644
index addb5e4d722e..000000000000
--- a/acct-group/gamemode/gamemode-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
-ACCT_GROUP_ID=385
diff --git a/acct-group/gamestat/gamestat-0-r1.ebuild b/acct-group/gamestat/gamestat-0-r1.ebuild
deleted file mode 100644
index 8b641548584a..000000000000
--- a/acct-group/gamestat/gamestat-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for shared high-score and game state files"
-ACCT_GROUP_ID=36
diff --git a/acct-group/gamestat/gamestat-0-r2.ebuild b/acct-group/gamestat/gamestat-0-r2.ebuild
new file mode 100644
index 000000000000..bd9da8d91185
--- /dev/null
+++ b/acct-group/gamestat/gamestat-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for shared high-score and game state files"
+ACCT_GROUP_ID=36
diff --git a/acct-group/gatling/gatling-0-r1.ebuild b/acct-group/gatling/gatling-0-r1.ebuild
deleted file mode 100644
index 54710451d35d..000000000000
--- a/acct-group/gatling/gatling-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=364  # matches acct-user/gatling
diff --git a/acct-group/gatling/gatling-0-r2.ebuild b/acct-group/gatling/gatling-0-r2.ebuild
new file mode 100644
index 000000000000..d7970f0e4edd
--- /dev/null
+++ b/acct-group/gatling/gatling-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=364  # matches acct-user/gatling
diff --git a/acct-group/gauth/gauth-0-r1.ebuild b/acct-group/gauth/gauth-0-r1.ebuild
new file mode 100644
index 000000000000..7ffd2ea24153
--- /dev/null
+++ b/acct-group/gauth/gauth-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/gauth-0.ebuild b/acct-group/gauth/gauth-0.ebuild
deleted file mode 100644
index 31dc4549fa33..000000000000
--- a/acct-group/gauth/gauth-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/gdm/gdm-0-r1.ebuild b/acct-group/gdm/gdm-0-r1.ebuild
new file mode 100644
index 000000000000..5a31412ae683
--- /dev/null
+++ b/acct-group/gdm/gdm-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=32
diff --git a/acct-group/gdm/gdm-0.ebuild b/acct-group/gdm/gdm-0.ebuild
deleted file mode 100644
index 2d82aac6f39d..000000000000
--- a/acct-group/gdm/gdm-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=32
diff --git a/acct-group/geneweb/geneweb-0-r1.ebuild b/acct-group/geneweb/geneweb-0-r1.ebuild
deleted file mode 100644
index e68d95f8c291..000000000000
--- a/acct-group/geneweb/geneweb-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for geneweb daemon"
-
-ACCT_GROUP_ID=467
diff --git a/acct-group/geneweb/geneweb-0-r2.ebuild b/acct-group/geneweb/geneweb-0-r2.ebuild
new file mode 100644
index 000000000000..fc4063c85e29
--- /dev/null
+++ b/acct-group/geneweb/geneweb-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for geneweb daemon"
+
+ACCT_GROUP_ID=467
diff --git a/acct-group/geoclue/geoclue-0-r1.ebuild b/acct-group/geoclue/geoclue-0-r1.ebuild
new file mode 100644
index 000000000000..a1d04d1f7011
--- /dev/null
+++ b/acct-group/geoclue/geoclue-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=351
diff --git a/acct-group/geoclue/geoclue-0.ebuild b/acct-group/geoclue/geoclue-0.ebuild
deleted file mode 100644
index 7f96f9de46d6..000000000000
--- a/acct-group/geoclue/geoclue-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=351
diff --git a/acct-group/gerbera/gerbera-0-r1.ebuild b/acct-group/gerbera/gerbera-0-r1.ebuild
deleted file mode 100644
index f23b0d544613..000000000000
--- a/acct-group/gerbera/gerbera-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Gerbera UPnP Media Server group"
-ACCT_GROUP_ID=429
diff --git a/acct-group/gerbera/gerbera-0-r2.ebuild b/acct-group/gerbera/gerbera-0-r2.ebuild
new file mode 100644
index 000000000000..f275c9a42550
--- /dev/null
+++ b/acct-group/gerbera/gerbera-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Gerbera UPnP Media Server group"
+ACCT_GROUP_ID=429
diff --git a/acct-group/git/git-0-r1.ebuild b/acct-group/git/git-0-r1.ebuild
deleted file mode 100644
index 21737c5dcdfe..000000000000
--- a/acct-group/git/git-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=196
diff --git a/acct-group/git/git-0-r2.ebuild b/acct-group/git/git-0-r2.ebuild
new file mode 100644
index 000000000000..6e7351ce4f3c
--- /dev/null
+++ b/acct-group/git/git-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=196
diff --git a/acct-group/github-exporter/github-exporter-0-r1.ebuild b/acct-group/github-exporter/github-exporter-0-r1.ebuild
new file mode 100644
index 000000000000..96f651982fa4
--- /dev/null
+++ b/acct-group/github-exporter/github-exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=238
diff --git a/acct-group/github-exporter/github-exporter-0.ebuild b/acct-group/github-exporter/github-exporter-0.ebuild
deleted file mode 100644
index e8bc30acd2f7..000000000000
--- a/acct-group/github-exporter/github-exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=238
diff --git a/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild b/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild
new file mode 100644
index 000000000000..9d26a29b7c61
--- /dev/null
+++ b/acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=510
diff --git a/acct-group/gitlab-runner/gitlab-runner-1.ebuild b/acct-group/gitlab-runner/gitlab-runner-1.ebuild
deleted file mode 100644
index 7a63620aefd8..000000000000
--- a/acct-group/gitlab-runner/gitlab-runner-1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=510
diff --git a/acct-group/gkrellmd/gkrellmd-0-r1.ebuild b/acct-group/gkrellmd/gkrellmd-0-r1.ebuild
deleted file mode 100644
index b906a9c72ece..000000000000
--- a/acct-group/gkrellmd/gkrellmd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=221
diff --git a/acct-group/gkrellmd/gkrellmd-0-r2.ebuild b/acct-group/gkrellmd/gkrellmd-0-r2.ebuild
new file mode 100644
index 000000000000..41c6b529035b
--- /dev/null
+++ b/acct-group/gkrellmd/gkrellmd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=221
diff --git a/acct-group/glance/glance-0-r1.ebuild b/acct-group/glance/glance-0-r1.ebuild
deleted file mode 100644
index 88a844125280..000000000000
--- a/acct-group/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=443
diff --git a/acct-group/glance/glance-0-r2.ebuild b/acct-group/glance/glance-0-r2.ebuild
new file mode 100644
index 000000000000..cac90772ccf0
--- /dev/null
+++ b/acct-group/glance/glance-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=443
diff --git a/acct-group/gluster/gluster-0-r1.ebuild b/acct-group/gluster/gluster-0-r1.ebuild
deleted file mode 100644
index d79d97827530..000000000000
--- a/acct-group/gluster/gluster-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=416
diff --git a/acct-group/gluster/gluster-0-r2.ebuild b/acct-group/gluster/gluster-0-r2.ebuild
new file mode 100644
index 000000000000..d385d3e780c2
--- /dev/null
+++ b/acct-group/gluster/gluster-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=416
diff --git a/acct-group/gns3/gns3-0-r1.ebuild b/acct-group/gns3/gns3-0-r1.ebuild
new file mode 100644
index 000000000000..f3d20c0d3135
--- /dev/null
+++ b/acct-group/gns3/gns3-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=522
diff --git a/acct-group/gns3/gns3-0.ebuild b/acct-group/gns3/gns3-0.ebuild
deleted file mode 100644
index e4605b5610ef..000000000000
--- a/acct-group/gns3/gns3-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=522
diff --git a/acct-group/gnump3d/gnump3d-0-r1.ebuild b/acct-group/gnump3d/gnump3d-0-r1.ebuild
new file mode 100644
index 000000000000..c8f2f001be9d
--- /dev/null
+++ b/acct-group/gnump3d/gnump3d-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/gnump3d"
+
+ACCT_GROUP_ID="160"
diff --git a/acct-group/gnump3d/gnump3d-0.ebuild b/acct-group/gnump3d/gnump3d-0.ebuild
deleted file mode 100644
index 3c4504e2ac75..000000000000
--- a/acct-group/gnump3d/gnump3d-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/gnump3d"
-
-ACCT_GROUP_ID="160"
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
new file mode 100644
index 000000000000..a1b538246fef
--- /dev/null
+++ b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="281"
diff --git a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild b/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
deleted file mode 100644
index e70168f79161..000000000000
--- a/acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_GROUP_ID="281"
diff --git a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild
new file mode 100644
index 000000000000..11ab8a2ea439
--- /dev/null
+++ b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_GROUP_ID="373"
diff --git a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild b/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild
deleted file mode 100644
index bc56160394b8..000000000000
--- a/acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_GROUP_ID="373"
diff --git a/acct-group/goaccess/goaccess-0-r1.ebuild b/acct-group/goaccess/goaccess-0-r1.ebuild
new file mode 100644
index 000000000000..5b8bc4733418
--- /dev/null
+++ b/acct-group/goaccess/goaccess-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=523
diff --git a/acct-group/goaccess/goaccess-0.ebuild b/acct-group/goaccess/goaccess-0.ebuild
deleted file mode 100644
index e8027df04f52..000000000000
--- a/acct-group/goaccess/goaccess-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=523
diff --git a/acct-group/gopher/gopher-0-r1.ebuild b/acct-group/gopher/gopher-0-r1.ebuild
new file mode 100644
index 000000000000..7e9fe881ffdf
--- /dev/null
+++ b/acct-group/gopher/gopher-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=287
diff --git a/acct-group/gopher/gopher-0.ebuild b/acct-group/gopher/gopher-0.ebuild
deleted file mode 100644
index ea85d8185e0c..000000000000
--- a/acct-group/gopher/gopher-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=287
diff --git a/acct-group/gopherd/gopherd-0-r1.ebuild b/acct-group/gopherd/gopherd-0-r1.ebuild
new file mode 100644
index 000000000000..6f3afeff7650
--- /dev/null
+++ b/acct-group/gopherd/gopherd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/gopherd-0.ebuild b/acct-group/gopherd/gopherd-0.ebuild
deleted file mode 100644
index 7c433e9e43e0..000000000000
--- a/acct-group/gopherd/gopherd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/gpib/gpib-0-r1.ebuild b/acct-group/gpib/gpib-0-r1.ebuild
deleted file mode 100644
index 88caead90e5e..000000000000
--- a/acct-group/gpib/gpib-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=409
diff --git a/acct-group/gpib/gpib-0-r2.ebuild b/acct-group/gpib/gpib-0-r2.ebuild
new file mode 100644
index 000000000000..e278818e44db
--- /dev/null
+++ b/acct-group/gpib/gpib-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=409
diff --git a/acct-group/gpio/gpio-0-r1.ebuild b/acct-group/gpio/gpio-0-r1.ebuild
new file mode 100644
index 000000000000..1a45b51a4b61
--- /dev/null
+++ b/acct-group/gpio/gpio-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="225"
diff --git a/acct-group/gpio/gpio-0.ebuild b/acct-group/gpio/gpio-0.ebuild
deleted file mode 100644
index 9f8e9a3621d1..000000000000
--- a/acct-group/gpio/gpio-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="225"
diff --git a/acct-group/grafana/grafana-0-r1.ebuild b/acct-group/grafana/grafana-0-r1.ebuild
deleted file mode 100644
index ab11061926b1..000000000000
--- a/acct-group/grafana/grafana-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="grafana program group"
-
-ACCT_GROUP_ID=389
diff --git a/acct-group/grafana/grafana-0-r2.ebuild b/acct-group/grafana/grafana-0-r2.ebuild
new file mode 100644
index 000000000000..e217b4d7a405
--- /dev/null
+++ b/acct-group/grafana/grafana-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="grafana program group"
+
+ACCT_GROUP_ID=389
diff --git a/acct-group/graylog/graylog-0-r1.ebuild b/acct-group/graylog/graylog-0-r1.ebuild
deleted file mode 100644
index 23ff1b46e12a..000000000000
--- a/acct-group/graylog/graylog-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Graylog program group"
-ACCT_GROUP_ID=478
diff --git a/acct-group/graylog/graylog-0-r2.ebuild b/acct-group/graylog/graylog-0-r2.ebuild
new file mode 100644
index 000000000000..b59addc0d545
--- /dev/null
+++ b/acct-group/graylog/graylog-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Graylog program group"
+ACCT_GROUP_ID=478
diff --git a/acct-group/greetd/greetd-0-r1.ebuild b/acct-group/greetd/greetd-0-r1.ebuild
deleted file mode 100644
index defd4a7f1809..000000000000
--- a/acct-group/greetd/greetd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=396
-DESCRIPTION="Group for gui-libs/greetd"
diff --git a/acct-group/greetd/greetd-0-r2.ebuild b/acct-group/greetd/greetd-0-r2.ebuild
new file mode 100644
index 000000000000..ae697d32110a
--- /dev/null
+++ b/acct-group/greetd/greetd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=396
+DESCRIPTION="Group for gui-libs/greetd"
diff --git a/acct-group/grok_exporter/grok_exporter-0-r1.ebuild b/acct-group/grok_exporter/grok_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..7667a6a11b48
--- /dev/null
+++ b/acct-group/grok_exporter/grok_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/grok_exporter-0.ebuild b/acct-group/grok_exporter/grok_exporter-0.ebuild
deleted file mode 100644
index ff2c696b3fb0..000000000000
--- a/acct-group/grok_exporter/grok_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/groonga/groonga-0-r1.ebuild b/acct-group/groonga/groonga-0-r1.ebuild
new file mode 100644
index 000000000000..f99308dcac3b
--- /dev/null
+++ b/acct-group/groonga/groonga-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-text/groonga"
+
+ACCT_GROUP_ID="266"
diff --git a/acct-group/groonga/groonga-0.ebuild b/acct-group/groonga/groonga-0.ebuild
deleted file mode 100644
index 347d9c9825d7..000000000000
--- a/acct-group/groonga/groonga-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-text/groonga"
-
-ACCT_GROUP_ID="266"
diff --git a/acct-group/gvm/gvm-0-r1.ebuild b/acct-group/gvm/gvm-0-r1.ebuild
deleted file mode 100644
index 1416f062f155..000000000000
--- a/acct-group/gvm/gvm-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Greenbone vulnerability management program group"
-ACCT_GROUP_ID=495
diff --git a/acct-group/gvm/gvm-0-r2.ebuild b/acct-group/gvm/gvm-0-r2.ebuild
new file mode 100644
index 000000000000..281c7f93aae0
--- /dev/null
+++ b/acct-group/gvm/gvm-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Greenbone vulnerability management program group"
+ACCT_GROUP_ID=495
diff --git a/acct-group/h2o/h2o-0-r1.ebuild b/acct-group/h2o/h2o-0-r1.ebuild
new file mode 100644
index 000000000000..49b355695982
--- /dev/null
+++ b/acct-group/h2o/h2o-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/h2o-0.ebuild b/acct-group/h2o/h2o-0.ebuild
deleted file mode 100644
index 210bbacb211f..000000000000
--- a/acct-group/h2o/h2o-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/haclient/haclient-0-r1.ebuild b/acct-group/haclient/haclient-0-r1.ebuild
new file mode 100644
index 000000000000..b9d4dd667d26
--- /dev/null
+++ b/acct-group/haclient/haclient-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/haclient-0.ebuild b/acct-group/haclient/haclient-0.ebuild
deleted file mode 100644
index 26dcd63c48e7..000000000000
--- a/acct-group/haclient/haclient-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/haproxy/haproxy-0-r1.ebuild b/acct-group/haproxy/haproxy-0-r1.ebuild
deleted file mode 100644
index 230356aa82f1..000000000000
--- a/acct-group/haproxy/haproxy-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=188
diff --git a/acct-group/haproxy/haproxy-0-r2.ebuild b/acct-group/haproxy/haproxy-0-r2.ebuild
new file mode 100644
index 000000000000..857a2e2f134f
--- /dev/null
+++ b/acct-group/haproxy/haproxy-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=188
diff --git a/acct-group/havp/havp-0-r1.ebuild b/acct-group/havp/havp-0-r2.ebuild
similarity index 100%
rename from acct-group/havp/havp-0-r1.ebuild
rename to acct-group/havp/havp-0-r2.ebuild
diff --git a/acct-group/headscale/headscale-0-r1.ebuild b/acct-group/headscale/headscale-0-r1.ebuild
new file mode 100644
index 000000000000..a1ad07a64135
--- /dev/null
+++ b/acct-group/headscale/headscale-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=514
diff --git a/acct-group/headscale/headscale-0.ebuild b/acct-group/headscale/headscale-0.ebuild
deleted file mode 100644
index 73623757f6d6..000000000000
--- a/acct-group/headscale/headscale-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=514
diff --git a/acct-group/heat/heat-0-r1.ebuild b/acct-group/heat/heat-0-r1.ebuild
deleted file mode 100644
index d3e6b1b93a80..000000000000
--- a/acct-group/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=444
diff --git a/acct-group/heat/heat-0-r2.ebuild b/acct-group/heat/heat-0-r2.ebuild
new file mode 100644
index 000000000000..44b33bd9def9
--- /dev/null
+++ b/acct-group/heat/heat-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=444
diff --git a/acct-group/hsqldb/hsqldb-0-r1.ebuild b/acct-group/hsqldb/hsqldb-0-r1.ebuild
new file mode 100644
index 000000000000..4fd2909bb0a0
--- /dev/null
+++ b/acct-group/hsqldb/hsqldb-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for hsqldb"
+ACCT_GROUP_ID=217
diff --git a/acct-group/hsqldb/hsqldb-0.ebuild b/acct-group/hsqldb/hsqldb-0.ebuild
deleted file mode 100644
index 041bb24be52a..000000000000
--- a/acct-group/hsqldb/hsqldb-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for hsqldb"
-ACCT_GROUP_ID=217
diff --git a/acct-group/http/http-0-r1.ebuild b/acct-group/http/http-0-r1.ebuild
new file mode 100644
index 000000000000..a91ed39f6dc9
--- /dev/null
+++ b/acct-group/http/http-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=297
diff --git a/acct-group/http/http-0.ebuild b/acct-group/http/http-0.ebuild
deleted file mode 100644
index 6e855875b1d8..000000000000
--- a/acct-group/http/http-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=297
diff --git a/acct-group/i2c/i2c-0-r1.ebuild b/acct-group/i2c/i2c-0-r1.ebuild
new file mode 100644
index 000000000000..2ada0a64d487
--- /dev/null
+++ b/acct-group/i2c/i2c-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="226"
diff --git a/acct-group/i2c/i2c-0.ebuild b/acct-group/i2c/i2c-0.ebuild
deleted file mode 100644
index 9318389c592c..000000000000
--- a/acct-group/i2c/i2c-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="226"
diff --git a/acct-group/i2p/i2p-0-r1.ebuild b/acct-group/i2p/i2p-0-r1.ebuild
deleted file mode 100644
index 9fa033395b17..000000000000
--- a/acct-group/i2p/i2p-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide net-vpn/i2p"
-ACCT_GROUP_ID=471
diff --git a/acct-group/i2p/i2p-0-r2.ebuild b/acct-group/i2p/i2p-0-r2.ebuild
new file mode 100644
index 000000000000..47ed7781c511
--- /dev/null
+++ b/acct-group/i2p/i2p-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide net-vpn/i2p"
+ACCT_GROUP_ID=471
diff --git a/acct-group/i2pd/i2pd-0-r1.ebuild b/acct-group/i2pd/i2pd-0-r1.ebuild
deleted file mode 100644
index 2258cde77ad8..000000000000
--- a/acct-group/i2pd/i2pd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-vpn/i2pd server"
-ACCT_GROUP_ID=470
diff --git a/acct-group/i2pd/i2pd-0-r2.ebuild b/acct-group/i2pd/i2pd-0-r2.ebuild
new file mode 100644
index 000000000000..e823550e39c3
--- /dev/null
+++ b/acct-group/i2pd/i2pd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-vpn/i2pd server"
+ACCT_GROUP_ID=470
diff --git a/acct-group/icecast/icecast-0-r1.ebuild b/acct-group/icecast/icecast-0-r1.ebuild
new file mode 100644
index 000000000000..eb7e463046f7
--- /dev/null
+++ b/acct-group/icecast/icecast-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/icecast-0.ebuild b/acct-group/icecast/icecast-0.ebuild
deleted file mode 100644
index 8e91828cfb66..000000000000
--- a/acct-group/icecast/icecast-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/icecream/icecream-0-r1.ebuild b/acct-group/icecream/icecream-0-r1.ebuild
new file mode 100644
index 000000000000..898cf5518a04
--- /dev/null
+++ b/acct-group/icecream/icecream-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/icecream-0.ebuild b/acct-group/icecream/icecream-0.ebuild
deleted file mode 100644
index 08f8a89a7b97..000000000000
--- a/acct-group/icecream/icecream-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/ices/ices-0-r1.ebuild b/acct-group/ices/ices-0-r1.ebuild
new file mode 100644
index 000000000000..59690dd46fd6
--- /dev/null
+++ b/acct-group/ices/ices-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ices"
+
+ACCT_GROUP_ID="162"
diff --git a/acct-group/ices/ices-0.ebuild b/acct-group/ices/ices-0.ebuild
deleted file mode 100644
index 0efbe032797f..000000000000
--- a/acct-group/ices/ices-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/ices"
-
-ACCT_GROUP_ID="162"
diff --git a/acct-group/icinga/icinga-0-r1.ebuild b/acct-group/icinga/icinga-0-r1.ebuild
deleted file mode 100644
index f14f8c10b01a..000000000000
--- a/acct-group/icinga/icinga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=457
diff --git a/acct-group/icinga/icinga-0-r2.ebuild b/acct-group/icinga/icinga-0-r2.ebuild
new file mode 100644
index 000000000000..9d84d81f4cc4
--- /dev/null
+++ b/acct-group/icinga/icinga-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=457
diff --git a/acct-group/icingacmd/icingacmd-0-r1.ebuild b/acct-group/icingacmd/icingacmd-0-r1.ebuild
deleted file mode 100644
index 342794ce41e0..000000000000
--- a/acct-group/icingacmd/icingacmd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=458
diff --git a/acct-group/icingacmd/icingacmd-0-r2.ebuild b/acct-group/icingacmd/icingacmd-0-r2.ebuild
new file mode 100644
index 000000000000..9ed75a172c3b
--- /dev/null
+++ b/acct-group/icingacmd/icingacmd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=458
diff --git a/acct-group/icingaweb2/icingaweb2-0-r1.ebuild b/acct-group/icingaweb2/icingaweb2-0-r1.ebuild
deleted file mode 100644
index e2660fdb4be5..000000000000
--- a/acct-group/icingaweb2/icingaweb2-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=241
diff --git a/acct-group/icingaweb2/icingaweb2-0-r2.ebuild b/acct-group/icingaweb2/icingaweb2-0-r2.ebuild
new file mode 100644
index 000000000000..0f7977916325
--- /dev/null
+++ b/acct-group/icingaweb2/icingaweb2-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=241
diff --git a/acct-group/inadyn/inadyn-0.ebuild b/acct-group/inadyn/inadyn-0-r1.ebuild
similarity index 100%
rename from acct-group/inadyn/inadyn-0.ebuild
rename to acct-group/inadyn/inadyn-0-r1.ebuild
diff --git a/acct-group/influxdb/influxdb-0-r1.ebuild b/acct-group/influxdb/influxdb-0-r1.ebuild
deleted file mode 100644
index 8b693e17a672..000000000000
--- a/acct-group/influxdb/influxdb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=342
diff --git a/acct-group/influxdb/influxdb-0-r2.ebuild b/acct-group/influxdb/influxdb-0-r2.ebuild
new file mode 100644
index 000000000000..035b6cd5fcc9
--- /dev/null
+++ b/acct-group/influxdb/influxdb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=342
diff --git a/acct-group/input/input-0-r1.ebuild b/acct-group/input/input-0-r1.ebuild
deleted file mode 100644
index 9ef06e8444a4..000000000000
--- a/acct-group/input/input-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=97
diff --git a/acct-group/input/input-0-r2.ebuild b/acct-group/input/input-0-r2.ebuild
new file mode 100644
index 000000000000..966d8ca0658c
--- /dev/null
+++ b/acct-group/input/input-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=97
diff --git a/acct-group/inspircd/inspircd-0-r1.ebuild b/acct-group/inspircd/inspircd-0-r1.ebuild
deleted file mode 100644
index 6d4c94d302ac..000000000000
--- a/acct-group/inspircd/inspircd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-# Port 6667 % 500
-ACCT_GROUP_ID=167
diff --git a/acct-group/inspircd/inspircd-0-r2.ebuild b/acct-group/inspircd/inspircd-0-r2.ebuild
new file mode 100644
index 000000000000..4c056457ee4e
--- /dev/null
+++ b/acct-group/inspircd/inspircd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+# Port 6667 % 500
+ACCT_GROUP_ID=167
diff --git a/acct-group/ipfs/ipfs-0-r1.ebuild b/acct-group/ipfs/ipfs-0-r1.ebuild
deleted file mode 100644
index 503f9d4c1a2f..000000000000
--- a/acct-group/ipfs/ipfs-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-p2p/go-ipfs-bin server"
-ACCT_GROUP_ID=484
diff --git a/acct-group/ipfs/ipfs-0-r2.ebuild b/acct-group/ipfs/ipfs-0-r2.ebuild
new file mode 100644
index 000000000000..6328588e24e3
--- /dev/null
+++ b/acct-group/ipfs/ipfs-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/go-ipfs-bin server"
+ACCT_GROUP_ID=484
diff --git a/acct-group/ipsec/ipsec-0-r1.ebuild b/acct-group/ipsec/ipsec-0-r1.ebuild
new file mode 100644
index 000000000000..8a31b9f0e9c9
--- /dev/null
+++ b/acct-group/ipsec/ipsec-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="ipsec (strongswan) program group"
+
+ACCT_GROUP_ID=199
diff --git a/acct-group/ipsec/ipsec-0.ebuild b/acct-group/ipsec/ipsec-0.ebuild
deleted file mode 100644
index d0716459d75e..000000000000
--- a/acct-group/ipsec/ipsec-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="ipsec (strongswan) program group"
-
-ACCT_GROUP_ID=199
diff --git a/acct-group/ipsentinel/ipsentinel-0-r1.ebuild b/acct-group/ipsentinel/ipsentinel-0-r1.ebuild
new file mode 100644
index 000000000000..eb3389f4a1e8
--- /dev/null
+++ b/acct-group/ipsentinel/ipsentinel-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/ip-sentinel"
+
+ACCT_GROUP_ID="163"
diff --git a/acct-group/ipsentinel/ipsentinel-0.ebuild b/acct-group/ipsentinel/ipsentinel-0.ebuild
deleted file mode 100644
index 0ab3a10e014b..000000000000
--- a/acct-group/ipsentinel/ipsentinel-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/ip-sentinel"
-
-ACCT_GROUP_ID="163"
diff --git a/acct-group/iroffer/iroffer-0-r1.ebuild b/acct-group/iroffer/iroffer-0-r1.ebuild
new file mode 100644
index 000000000000..f25bc31a520d
--- /dev/null
+++ b/acct-group/iroffer/iroffer-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=187
diff --git a/acct-group/iroffer/iroffer-0.ebuild b/acct-group/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 2e3c37129e70..000000000000
--- a/acct-group/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=187
diff --git a/acct-group/jellyfin/jellyfin-0-r1.ebuild b/acct-group/jellyfin/jellyfin-0-r1.ebuild
new file mode 100644
index 000000000000..b2f88b650218
--- /dev/null
+++ b/acct-group/jellyfin/jellyfin-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=518
diff --git a/acct-group/jellyfin/jellyfin-0.ebuild b/acct-group/jellyfin/jellyfin-0.ebuild
deleted file mode 100644
index 9d952362cfe2..000000000000
--- a/acct-group/jellyfin/jellyfin-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=518
diff --git a/acct-group/jenkins/jenkins-0-r1.ebuild b/acct-group/jenkins/jenkins-0-r1.ebuild
new file mode 100644
index 000000000000..887aa8613518
--- /dev/null
+++ b/acct-group/jenkins/jenkins-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Jenkins program group"
+
+ACCT_GROUP_ID=473
diff --git a/acct-group/jenkins/jenkins-0.ebuild b/acct-group/jenkins/jenkins-0.ebuild
deleted file mode 100644
index c90523f69b2b..000000000000
--- a/acct-group/jenkins/jenkins-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Jenkins program group"
-
-ACCT_GROUP_ID=473
diff --git a/acct-group/kafka/kafka-0-r1.ebuild b/acct-group/kafka/kafka-0-r1.ebuild
deleted file mode 100644
index 6d08891db8e6..000000000000
--- a/acct-group/kafka/kafka-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=425
diff --git a/acct-group/kafka/kafka-0-r2.ebuild b/acct-group/kafka/kafka-0-r2.ebuild
new file mode 100644
index 000000000000..738fbb5b48da
--- /dev/null
+++ b/acct-group/kafka/kafka-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=425
diff --git a/acct-group/kapacitor/kapacitor-0-r1.ebuild b/acct-group/kapacitor/kapacitor-0-r1.ebuild
deleted file mode 100644
index 3e998f71108a..000000000000
--- a/acct-group/kapacitor/kapacitor-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=343
diff --git a/acct-group/kapacitor/kapacitor-0-r2.ebuild b/acct-group/kapacitor/kapacitor-0-r2.ebuild
new file mode 100644
index 000000000000..3a84f7bcd450
--- /dev/null
+++ b/acct-group/kapacitor/kapacitor-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=343
diff --git a/acct-group/karma/karma-0-r1.ebuild b/acct-group/karma/karma-0-r1.ebuild
new file mode 100644
index 000000000000..68555d5c9381
--- /dev/null
+++ b/acct-group/karma/karma-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/karma-0.ebuild b/acct-group/karma/karma-0.ebuild
deleted file mode 100644
index 1631d655b6bf..000000000000
--- a/acct-group/karma/karma-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/keystone/keystone-0-r1.ebuild b/acct-group/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 06d95b537d6f..000000000000
--- a/acct-group/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=445
diff --git a/acct-group/keystone/keystone-0-r2.ebuild b/acct-group/keystone/keystone-0-r2.ebuild
new file mode 100644
index 000000000000..d477d0ca866f
--- /dev/null
+++ b/acct-group/keystone/keystone-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=445
diff --git a/acct-group/kibana/kibana-0-r1.ebuild b/acct-group/kibana/kibana-0-r1.ebuild
deleted file mode 100644
index 936486fe4773..000000000000
--- a/acct-group/kibana/kibana-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Kibana program group"
-ACCT_GROUP_ID=269
diff --git a/acct-group/kibana/kibana-0-r2.ebuild b/acct-group/kibana/kibana-0-r2.ebuild
new file mode 100644
index 000000000000..61a710122e7e
--- /dev/null
+++ b/acct-group/kibana/kibana-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Kibana program group"
+ACCT_GROUP_ID=269
diff --git a/acct-group/kismet/kismet-0-r1.ebuild b/acct-group/kismet/kismet-0-r1.ebuild
deleted file mode 100644
index cd8df0799bdb..000000000000
--- a/acct-group/kismet/kismet-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="net-wireless/kismet"
-ACCT_GROUP_ID="388"
diff --git a/acct-group/kismet/kismet-0-r2.ebuild b/acct-group/kismet/kismet-0-r2.ebuild
new file mode 100644
index 000000000000..f06dfe9ab2bc
--- /dev/null
+++ b/acct-group/kismet/kismet-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="net-wireless/kismet"
+ACCT_GROUP_ID="388"
diff --git a/acct-group/kmem/kmem-0-r1.ebuild b/acct-group/kmem/kmem-0-r1.ebuild
deleted file mode 100644
index b07239c3b2ab..000000000000
--- a/acct-group/kmem/kmem-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=9
diff --git a/acct-group/kmem/kmem-0-r2.ebuild b/acct-group/kmem/kmem-0-r2.ebuild
new file mode 100644
index 000000000000..68e5fd412c4a
--- /dev/null
+++ b/acct-group/kmem/kmem-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=9
diff --git a/acct-group/knot-resolver/knot-resolver-0-r1.ebuild b/acct-group/knot-resolver/knot-resolver-0-r1.ebuild
new file mode 100644
index 000000000000..cd9132400076
--- /dev/null
+++ b/acct-group/knot-resolver/knot-resolver-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=525
diff --git a/acct-group/knot-resolver/knot-resolver-0.ebuild b/acct-group/knot-resolver/knot-resolver-0.ebuild
deleted file mode 100644
index e786894a7da9..000000000000
--- a/acct-group/knot-resolver/knot-resolver-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=525
diff --git a/acct-group/knot/knot-0-r1.ebuild b/acct-group/knot/knot-0-r1.ebuild
deleted file mode 100644
index f35128d81950..000000000000
--- a/acct-group/knot/knot-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=53
diff --git a/acct-group/knot/knot-0-r2.ebuild b/acct-group/knot/knot-0-r2.ebuild
new file mode 100644
index 000000000000..227d7be2e8aa
--- /dev/null
+++ b/acct-group/knot/knot-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=53
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild
deleted file mode 100644
index 52abae9b534e..000000000000
--- a/acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=432
diff --git a/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild b/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild
new file mode 100644
index 000000000000..e314e709eba1
--- /dev/null
+++ b/acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=432
diff --git a/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild
deleted file mode 100644
index 7fc976b63174..000000000000
--- a/acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=433
diff --git a/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild b/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild
new file mode 100644
index 000000000000..763c1ac5a255
--- /dev/null
+++ b/acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=433
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild
deleted file mode 100644
index 1b61e2a92b1f..000000000000
--- a/acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=434
diff --git a/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild b/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild
new file mode 100644
index 000000000000..9b3c883ca810
--- /dev/null
+++ b/acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=434
diff --git a/acct-group/kvm/kvm-0-r1.ebuild b/acct-group/kvm/kvm-0-r1.ebuild
deleted file mode 100644
index eadc9b037d32..000000000000
--- a/acct-group/kvm/kvm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=78
diff --git a/acct-group/kvm/kvm-0-r2.ebuild b/acct-group/kvm/kvm-0-r2.ebuild
new file mode 100644
index 000000000000..125d57ad0b93
--- /dev/null
+++ b/acct-group/kvm/kvm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=78
diff --git a/acct-group/ldap/ldap-0-r1.ebuild b/acct-group/ldap/ldap-0-r1.ebuild
new file mode 100644
index 000000000000..f90c3a827f8c
--- /dev/null
+++ b/acct-group/ldap/ldap-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=439
diff --git a/acct-group/ldap/ldap-0.ebuild b/acct-group/ldap/ldap-0.ebuild
deleted file mode 100644
index 88f92a325683..000000000000
--- a/acct-group/ldap/ldap-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=439
diff --git a/acct-group/libreoffice/libreoffice-0-r1.ebuild b/acct-group/libreoffice/libreoffice-0-r1.ebuild
new file mode 100644
index 000000000000..8d9a73b20e9f
--- /dev/null
+++ b/acct-group/libreoffice/libreoffice-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="512"
diff --git a/acct-group/libreoffice/libreoffice-0.ebuild b/acct-group/libreoffice/libreoffice-0.ebuild
deleted file mode 100644
index bf052171998d..000000000000
--- a/acct-group/libreoffice/libreoffice-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="512"
diff --git a/acct-group/libvirt/libvirt-0-r1.ebuild b/acct-group/libvirt/libvirt-0-r1.ebuild
deleted file mode 100644
index d9d2709c5851..000000000000
--- a/acct-group/libvirt/libvirt-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=79
diff --git a/acct-group/libvirt/libvirt-0-r2.ebuild b/acct-group/libvirt/libvirt-0-r2.ebuild
new file mode 100644
index 000000000000..b3143725a005
--- /dev/null
+++ b/acct-group/libvirt/libvirt-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=79
diff --git a/acct-group/lightdm/lightdm-0-r1.ebuild b/acct-group/lightdm/lightdm-0-r1.ebuild
deleted file mode 100644
index e2adc778ff71..000000000000
--- a/acct-group/lightdm/lightdm-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for x11-misc/lightdm"
-
-ACCT_GROUP_ID="134"
diff --git a/acct-group/lightdm/lightdm-0-r2.ebuild b/acct-group/lightdm/lightdm-0-r2.ebuild
new file mode 100644
index 000000000000..45f3a67230aa
--- /dev/null
+++ b/acct-group/lightdm/lightdm-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/lightdm"
+
+ACCT_GROUP_ID="134"
diff --git a/acct-group/lighttpd/lighttpd-0-r1.ebuild b/acct-group/lighttpd/lighttpd-0-r1.ebuild
deleted file mode 100644
index 16dac2e24281..000000000000
--- a/acct-group/lighttpd/lighttpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=302
diff --git a/acct-group/lighttpd/lighttpd-0-r2.ebuild b/acct-group/lighttpd/lighttpd-0-r2.ebuild
new file mode 100644
index 000000000000..044328ed7179
--- /dev/null
+++ b/acct-group/lighttpd/lighttpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=302
diff --git a/acct-group/litecoin/litecoin-0-r1.ebuild b/acct-group/litecoin/litecoin-0-r1.ebuild
new file mode 100644
index 000000000000..f04bbe6599ef
--- /dev/null
+++ b/acct-group/litecoin/litecoin-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-p2p/litecoind"
+
+ACCT_GROUP_ID="256"
diff --git a/acct-group/litecoin/litecoin-0.ebuild b/acct-group/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 05549b4b53e9..000000000000
--- a/acct-group/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/litecoind"
-
-ACCT_GROUP_ID="256"
diff --git a/acct-group/lldpd/lldpd-0-r1.ebuild b/acct-group/lldpd/lldpd-0-r1.ebuild
deleted file mode 100644
index 7482f9b79142..000000000000
--- a/acct-group/lldpd/lldpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=315
diff --git a/acct-group/lldpd/lldpd-0-r2.ebuild b/acct-group/lldpd/lldpd-0-r2.ebuild
new file mode 100644
index 000000000000..de42bfe44bdf
--- /dev/null
+++ b/acct-group/lldpd/lldpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=315
diff --git a/acct-group/locate/locate-0-r1.ebuild b/acct-group/locate/locate-0-r1.ebuild
deleted file mode 100644
index 59071dc6b158..000000000000
--- a/acct-group/locate/locate-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=245
diff --git a/acct-group/locate/locate-0-r2.ebuild b/acct-group/locate/locate-0-r2.ebuild
new file mode 100644
index 000000000000..6cd73ba39ad5
--- /dev/null
+++ b/acct-group/locate/locate-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=245
diff --git a/acct-group/logcheck/logcheck-0-r1.ebuild b/acct-group/logcheck/logcheck-0-r1.ebuild
new file mode 100644
index 000000000000..8bba51bbeaf3
--- /dev/null
+++ b/acct-group/logcheck/logcheck-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/logcheck"
+
+ACCT_GROUP_ID="284"
diff --git a/acct-group/logcheck/logcheck-0.ebuild b/acct-group/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 13e5e4692590..000000000000
--- a/acct-group/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/logcheck"
-
-ACCT_GROUP_ID="284"
diff --git a/acct-group/logstash/logstash-0-r1.ebuild b/acct-group/logstash/logstash-0-r1.ebuild
deleted file mode 100644
index 8253d88b5c0d..000000000000
--- a/acct-group/logstash/logstash-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Logstash program group"
-ACCT_GROUP_ID=270
diff --git a/acct-group/logstash/logstash-0-r2.ebuild b/acct-group/logstash/logstash-0-r2.ebuild
new file mode 100644
index 000000000000..42641f69f967
--- /dev/null
+++ b/acct-group/logstash/logstash-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Logstash program group"
+ACCT_GROUP_ID=270
diff --git a/acct-group/logsurfer/logsurfer-0-r1.ebuild b/acct-group/logsurfer/logsurfer-0-r1.ebuild
new file mode 100644
index 000000000000..3d292f5966bc
--- /dev/null
+++ b/acct-group/logsurfer/logsurfer-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/logsurfer"
+
+ACCT_GROUP_ID="249"
diff --git a/acct-group/logsurfer/logsurfer-0.ebuild b/acct-group/logsurfer/logsurfer-0.ebuild
deleted file mode 100644
index eedfe2f2838e..000000000000
--- a/acct-group/logsurfer/logsurfer-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/logsurfer"
-
-ACCT_GROUP_ID="249"
diff --git a/acct-group/lp/lp-0-r1.ebuild b/acct-group/lp/lp-0-r1.ebuild
deleted file mode 100644
index 9af7c058ba87..000000000000
--- a/acct-group/lp/lp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=7
diff --git a/acct-group/lp/lp-0-r2.ebuild b/acct-group/lp/lp-0-r2.ebuild
new file mode 100644
index 000000000000..618f81be25b3
--- /dev/null
+++ b/acct-group/lp/lp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=7
diff --git a/acct-group/lpadmin/lpadmin-0-r1.ebuild b/acct-group/lpadmin/lpadmin-0-r1.ebuild
deleted file mode 100644
index 3eede12f4ab7..000000000000
--- a/acct-group/lpadmin/lpadmin-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=106
diff --git a/acct-group/lpadmin/lpadmin-0-r2.ebuild b/acct-group/lpadmin/lpadmin-0-r2.ebuild
new file mode 100644
index 000000000000..4ef70c955560
--- /dev/null
+++ b/acct-group/lpadmin/lpadmin-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=106
diff --git a/acct-group/lxc/lxc-0-r1.ebuild b/acct-group/lxc/lxc-0-r1.ebuild
new file mode 100644
index 000000000000..32280b0d00db
--- /dev/null
+++ b/acct-group/lxc/lxc-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=358
+DESCRIPTION="Group for app-containers/lxc"
diff --git a/acct-group/lxc/lxc-0.ebuild b/acct-group/lxc/lxc-0.ebuild
deleted file mode 100644
index 5a4d8a9ffcdc..000000000000
--- a/acct-group/lxc/lxc-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=358
-DESCRIPTION="Group for app-containers/lxc"
diff --git a/acct-group/lxd/lxd-0-r1.ebuild b/acct-group/lxd/lxd-0-r1.ebuild
deleted file mode 100644
index 4277214c445a..000000000000
--- a/acct-group/lxd/lxd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=402
-DESCRIPTION="Group for app-containers/lxd"
diff --git a/acct-group/lxd/lxd-0-r2.ebuild b/acct-group/lxd/lxd-0-r2.ebuild
new file mode 100644
index 000000000000..3d00c2969023
--- /dev/null
+++ b/acct-group/lxd/lxd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=402
+DESCRIPTION="Group for app-containers/lxd"
diff --git a/acct-group/mail/mail-0-r1.ebuild b/acct-group/mail/mail-0-r1.ebuild
deleted file mode 100644
index 009cc32b854b..000000000000
--- a/acct-group/mail/mail-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Mail program group"
-ACCT_GROUP_ID=12
diff --git a/acct-group/mail/mail-0-r2.ebuild b/acct-group/mail/mail-0-r2.ebuild
new file mode 100644
index 000000000000..4d07cc2e2645
--- /dev/null
+++ b/acct-group/mail/mail-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Mail program group"
+ACCT_GROUP_ID=12
diff --git a/acct-group/man/man-0-r1.ebuild b/acct-group/man/man-0-r1.ebuild
deleted file mode 100644
index 77c58e22ae04..000000000000
--- a/acct-group/man/man-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=15
diff --git a/acct-group/man/man-0-r2.ebuild b/acct-group/man/man-0-r2.ebuild
new file mode 100644
index 000000000000..c14861bca27c
--- /dev/null
+++ b/acct-group/man/man-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=15
diff --git a/acct-group/maradns/maradns-0-r1.ebuild b/acct-group/maradns/maradns-0-r1.ebuild
deleted file mode 100644
index 95932e13cd11..000000000000
--- a/acct-group/maradns/maradns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=99
diff --git a/acct-group/maradns/maradns-0-r2.ebuild b/acct-group/maradns/maradns-0-r2.ebuild
new file mode 100644
index 000000000000..9886574c2705
--- /dev/null
+++ b/acct-group/maradns/maradns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=99
diff --git a/acct-group/memcached/memcached-0-r1.ebuild b/acct-group/memcached/memcached-0-r1.ebuild
deleted file mode 100644
index 02291b5e7a48..000000000000
--- a/acct-group/memcached/memcached-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=441
diff --git a/acct-group/memcached/memcached-0-r2.ebuild b/acct-group/memcached/memcached-0-r2.ebuild
new file mode 100644
index 000000000000..efcdd1096125
--- /dev/null
+++ b/acct-group/memcached/memcached-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=441
diff --git a/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild b/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..5e8edc6f6f93
--- /dev/null
+++ b/acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=234
diff --git a/acct-group/memcached_exporter/memcached_exporter-0.ebuild b/acct-group/memcached_exporter/memcached_exporter-0.ebuild
deleted file mode 100644
index 294122b7d637..000000000000
--- a/acct-group/memcached_exporter/memcached_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=234
diff --git a/acct-group/messagebus/messagebus-0-r1.ebuild b/acct-group/messagebus/messagebus-0-r1.ebuild
deleted file mode 100644
index 3e335b806835..000000000000
--- a/acct-group/messagebus/messagebus-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=101
diff --git a/acct-group/messagebus/messagebus-0-r2.ebuild b/acct-group/messagebus/messagebus-0-r2.ebuild
new file mode 100644
index 000000000000..c4ee2ee50216
--- /dev/null
+++ b/acct-group/messagebus/messagebus-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=101
diff --git a/acct-group/mgraph/mgraph-0-r1.ebuild b/acct-group/mgraph/mgraph-0-r1.ebuild
new file mode 100644
index 000000000000..77e91ef55a0e
--- /dev/null
+++ b/acct-group/mgraph/mgraph-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/mailgraph"
+ACCT_GROUP_ID=376
diff --git a/acct-group/mgraph/mgraph-0.ebuild b/acct-group/mgraph/mgraph-0.ebuild
deleted file mode 100644
index 04e2463215b2..000000000000
--- a/acct-group/mgraph/mgraph-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/mailgraph"
-ACCT_GROUP_ID=376
diff --git a/acct-group/milter-regex/milter-regex-0-r1.ebuild b/acct-group/milter-regex/milter-regex-0-r1.ebuild
deleted file mode 100644
index 0cf264ba6eb6..000000000000
--- a/acct-group/milter-regex/milter-regex-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/milter-regex"
-ACCT_GROUP_ID=438
diff --git a/acct-group/milter-regex/milter-regex-0-r2.ebuild b/acct-group/milter-regex/milter-regex-0-r2.ebuild
new file mode 100644
index 000000000000..5a6247c9190c
--- /dev/null
+++ b/acct-group/milter-regex/milter-regex-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/milter-regex"
+ACCT_GROUP_ID=438
diff --git a/acct-group/minbif/minbif-0-r1.ebuild b/acct-group/minbif/minbif-0-r1.ebuild
new file mode 100644
index 000000000000..364bc0f1d192
--- /dev/null
+++ b/acct-group/minbif/minbif-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-im/minbif"
+
+ACCT_GROUP_ID="260"
diff --git a/acct-group/minbif/minbif-0.ebuild b/acct-group/minbif/minbif-0.ebuild
deleted file mode 100644
index f5157fcd399b..000000000000
--- a/acct-group/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-im/minbif"
-
-ACCT_GROUP_ID="260"
diff --git a/acct-group/minecraft/minecraft-0-r1.ebuild b/acct-group/minecraft/minecraft-0-r1.ebuild
deleted file mode 100644
index c09dd13e6cbc..000000000000
--- a/acct-group/minecraft/minecraft-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minecraft server"
-
-ACCT_GROUP_ID="490"
diff --git a/acct-group/minecraft/minecraft-0-r2.ebuild b/acct-group/minecraft/minecraft-0-r2.ebuild
new file mode 100644
index 000000000000..2d3d01a8778e
--- /dev/null
+++ b/acct-group/minecraft/minecraft-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft server"
+
+ACCT_GROUP_ID="490"
diff --git a/acct-group/minetest/minetest-0-r1.ebuild b/acct-group/minetest/minetest-0-r1.ebuild
deleted file mode 100644
index 7a81fdf38907..000000000000
--- a/acct-group/minetest/minetest-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Minetest server"
-
-ACCT_GROUP_ID="480"
diff --git a/acct-group/minetest/minetest-0-r2.ebuild b/acct-group/minetest/minetest-0-r2.ebuild
new file mode 100644
index 000000000000..0ab3add9768c
--- /dev/null
+++ b/acct-group/minetest/minetest-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minetest server"
+
+ACCT_GROUP_ID="480"
diff --git a/acct-group/minidlna/minidlna-0-r1.ebuild b/acct-group/minidlna/minidlna-0-r1.ebuild
new file mode 100644
index 000000000000..0bd234023279
--- /dev/null
+++ b/acct-group/minidlna/minidlna-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=339
diff --git a/acct-group/minidlna/minidlna-0.ebuild b/acct-group/minidlna/minidlna-0.ebuild
deleted file mode 100644
index b6f116a6d174..000000000000
--- a/acct-group/minidlna/minidlna-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=339
diff --git a/acct-group/minio/minio-0-r1.ebuild b/acct-group/minio/minio-0-r1.ebuild
new file mode 100644
index 000000000000..803a65bb10f2
--- /dev/null
+++ b/acct-group/minio/minio-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=309
diff --git a/acct-group/minio/minio-0.ebuild b/acct-group/minio/minio-0.ebuild
deleted file mode 100644
index 692376c4968f..000000000000
--- a/acct-group/minio/minio-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=309
diff --git a/acct-group/mogile/mogile-0-r1.ebuild b/acct-group/mogile/mogile-0-r1.ebuild
new file mode 100644
index 000000000000..fae6fd78811d
--- /dev/null
+++ b/acct-group/mogile/mogile-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MogileFS group"
+ACCT_GROUP_ID=231
diff --git a/acct-group/mogile/mogile-0.ebuild b/acct-group/mogile/mogile-0.ebuild
deleted file mode 100644
index 7774948b6b0c..000000000000
--- a/acct-group/mogile/mogile-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MogileFS group"
-ACCT_GROUP_ID=231
diff --git a/acct-group/mongodb/mongodb-0-r1.ebuild b/acct-group/mongodb/mongodb-0-r1.ebuild
deleted file mode 100644
index 72c2f3ebbfbd..000000000000
--- a/acct-group/mongodb/mongodb-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MongoDB program group"
-ACCT_GROUP_ID=481
diff --git a/acct-group/mongodb/mongodb-0-r2.ebuild b/acct-group/mongodb/mongodb-0-r2.ebuild
new file mode 100644
index 000000000000..edfa300f4fe1
--- /dev/null
+++ b/acct-group/mongodb/mongodb-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MongoDB program group"
+ACCT_GROUP_ID=481
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..be67ddc21397
--- /dev/null
+++ b/acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=277
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
deleted file mode 100644
index 946813661ba4..000000000000
--- a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=277
diff --git a/acct-group/monitorix/monitorix-0-r1.ebuild b/acct-group/monitorix/monitorix-0-r1.ebuild
deleted file mode 100644
index f3a179de66cd..000000000000
--- a/acct-group/monitorix/monitorix-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Monitorix system tool group"
-ACCT_GROUP_ID=401
diff --git a/acct-group/monitorix/monitorix-0-r2.ebuild b/acct-group/monitorix/monitorix-0-r2.ebuild
new file mode 100644
index 000000000000..54384a731a69
--- /dev/null
+++ b/acct-group/monitorix/monitorix-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Monitorix system tool group"
+ACCT_GROUP_ID=401
diff --git a/acct-group/monkeyd/monkeyd-0-r1.ebuild b/acct-group/monkeyd/monkeyd-0-r1.ebuild
new file mode 100644
index 000000000000..e27300e4a43b
--- /dev/null
+++ b/acct-group/monkeyd/monkeyd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/monkeyd/monkeyd-0.ebuild b/acct-group/monkeyd/monkeyd-0.ebuild
deleted file mode 100644
index 6869bd2a7451..000000000000
--- a/acct-group/monkeyd/monkeyd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/monkeysphere/monkeysphere-0-r1.ebuild b/acct-group/monkeysphere/monkeysphere-0-r1.ebuild
deleted file mode 100644
index dbbab8a361de..000000000000
--- a/acct-group/monkeysphere/monkeysphere-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="monkeysphere program group"
-
-ACCT_GROUP_ID=390
diff --git a/acct-group/monkeysphere/monkeysphere-0-r2.ebuild b/acct-group/monkeysphere/monkeysphere-0-r2.ebuild
new file mode 100644
index 000000000000..a0ff0762a9af
--- /dev/null
+++ b/acct-group/monkeysphere/monkeysphere-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="monkeysphere program group"
+
+ACCT_GROUP_ID=390
diff --git a/acct-group/mosquitto/mosquitto-0-r1.ebuild b/acct-group/mosquitto/mosquitto-0-r1.ebuild
deleted file mode 100644
index 7c23d70d81c7..000000000000
--- a/acct-group/mosquitto/mosquitto-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the mosquitto MQTT broker"
-ACCT_GROUP_ID=482
diff --git a/acct-group/mosquitto/mosquitto-0-r2.ebuild b/acct-group/mosquitto/mosquitto-0-r2.ebuild
new file mode 100644
index 000000000000..791a2328f351
--- /dev/null
+++ b/acct-group/mosquitto/mosquitto-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the mosquitto MQTT broker"
+ACCT_GROUP_ID=482
diff --git a/acct-group/motion/motion-0-r1.ebuild b/acct-group/motion/motion-0-r1.ebuild
deleted file mode 100644
index 596311157273..000000000000
--- a/acct-group/motion/motion-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=395
diff --git a/acct-group/motion/motion-0-r2.ebuild b/acct-group/motion/motion-0-r2.ebuild
new file mode 100644
index 000000000000..e62c9b8e5c62
--- /dev/null
+++ b/acct-group/motion/motion-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=395
diff --git a/acct-group/msmtpd/msmtpd-0-r1.ebuild b/acct-group/msmtpd/msmtpd-0-r1.ebuild
deleted file mode 100644
index 42d6078fc96f..000000000000
--- a/acct-group/msmtpd/msmtpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=222
diff --git a/acct-group/msmtpd/msmtpd-0-r2.ebuild b/acct-group/msmtpd/msmtpd-0-r2.ebuild
new file mode 100644
index 000000000000..de4f2dbcb1d5
--- /dev/null
+++ b/acct-group/msmtpd/msmtpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=222
diff --git a/acct-group/munge/munge-0-r1.ebuild b/acct-group/munge/munge-0-r1.ebuild
new file mode 100644
index 000000000000..fbd452f5355a
--- /dev/null
+++ b/acct-group/munge/munge-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/munge/munge-0.ebuild b/acct-group/munge/munge-0.ebuild
deleted file mode 100644
index d51744087c22..000000000000
--- a/acct-group/munge/munge-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/munin/munin-0-r1.ebuild b/acct-group/munin/munin-0-r1.ebuild
deleted file mode 100644
index 0a7dafb4a9d9..000000000000
--- a/acct-group/munin/munin-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=177
diff --git a/acct-group/munin/munin-0-r2.ebuild b/acct-group/munin/munin-0-r2.ebuild
new file mode 100644
index 000000000000..dd3de035605f
--- /dev/null
+++ b/acct-group/munin/munin-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=177
diff --git a/acct-group/murmur/murmur-0-r1.ebuild b/acct-group/murmur/murmur-0-r1.ebuild
deleted file mode 100644
index 301727364fea..000000000000
--- a/acct-group/murmur/murmur-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=122
diff --git a/acct-group/murmur/murmur-0-r2.ebuild b/acct-group/murmur/murmur-0-r2.ebuild
new file mode 100644
index 000000000000..a7bf8b136eeb
--- /dev/null
+++ b/acct-group/murmur/murmur-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=122
diff --git a/acct-group/mysql/mysql-0-r1.ebuild b/acct-group/mysql/mysql-0-r1.ebuild
deleted file mode 100644
index 872b4a6bb7d8..000000000000
--- a/acct-group/mysql/mysql-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="MySQL program group"
-ACCT_GROUP_ID=60
-SLOT="0"
diff --git a/acct-group/mysql/mysql-0-r2.ebuild b/acct-group/mysql/mysql-0-r2.ebuild
new file mode 100644
index 000000000000..c3f6923ca9ce
--- /dev/null
+++ b/acct-group/mysql/mysql-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MySQL program group"
+ACCT_GROUP_ID=60
+SLOT="0"
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild
deleted file mode 100644
index 4b0688ae2798..000000000000
--- a/acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=308
diff --git a/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild b/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..6abb65361f3a
--- /dev/null
+++ b/acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=308
diff --git a/acct-group/mythtv/mythtv-0-r1.ebuild b/acct-group/mythtv/mythtv-0-r1.ebuild
deleted file mode 100644
index ef82259b7b02..000000000000
--- a/acct-group/mythtv/mythtv-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Mythtv mythbackend server/deamon group"
-
-ACCT_GROUP_ID=117
diff --git a/acct-group/mythtv/mythtv-0-r2.ebuild b/acct-group/mythtv/mythtv-0-r2.ebuild
new file mode 100644
index 000000000000..1bae0b27c841
--- /dev/null
+++ b/acct-group/mythtv/mythtv-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Mythtv mythbackend server/deamon group"
+
+ACCT_GROUP_ID=117
diff --git a/acct-group/nagios/nagios-0-r1.ebuild b/acct-group/nagios/nagios-0-r1.ebuild
deleted file mode 100644
index 4d2ee9d295ea..000000000000
--- a/acct-group/nagios/nagios-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=436
diff --git a/acct-group/nagios/nagios-0-r2.ebuild b/acct-group/nagios/nagios-0-r2.ebuild
new file mode 100644
index 000000000000..57bd2f5d883b
--- /dev/null
+++ b/acct-group/nagios/nagios-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=436
diff --git a/acct-group/named/named-0-r1.ebuild b/acct-group/named/named-0-r1.ebuild
deleted file mode 100644
index fb6bcdd96000..000000000000
--- a/acct-group/named/named-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=40
diff --git a/acct-group/named/named-0-r2.ebuild b/acct-group/named/named-0-r2.ebuild
new file mode 100644
index 000000000000..ddeeb7029d58
--- /dev/null
+++ b/acct-group/named/named-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=40
diff --git a/acct-group/netbox/netbox-0-r1.ebuild b/acct-group/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 84d5f36743b9..000000000000
--- a/acct-group/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=431
diff --git a/acct-group/netbox/netbox-0-r2.ebuild b/acct-group/netbox/netbox-0-r2.ebuild
new file mode 100644
index 000000000000..4043cbd07462
--- /dev/null
+++ b/acct-group/netbox/netbox-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=431
diff --git a/acct-group/netdata/netdata-0-r1.ebuild b/acct-group/netdata/netdata-0-r1.ebuild
deleted file mode 100644
index 7cb3b1013662..000000000000
--- a/acct-group/netdata/netdata-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=290
diff --git a/acct-group/netdata/netdata-0-r2.ebuild b/acct-group/netdata/netdata-0-r2.ebuild
new file mode 100644
index 000000000000..38db03ef5a1b
--- /dev/null
+++ b/acct-group/netdata/netdata-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=290
diff --git a/acct-group/netdev/netdev-0-r1.ebuild b/acct-group/netdev/netdev-0-r1.ebuild
deleted file mode 100644
index 9dbe3bcb29fb..000000000000
--- a/acct-group/netdev/netdev-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for netdev (avahi)"
-ACCT_GROUP_ID=64
diff --git a/acct-group/netdev/netdev-0-r2.ebuild b/acct-group/netdev/netdev-0-r2.ebuild
new file mode 100644
index 000000000000..8841c2494070
--- /dev/null
+++ b/acct-group/netdev/netdev-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for netdev (avahi)"
+ACCT_GROUP_ID=64
diff --git a/acct-group/netperf/netperf-0-r1.ebuild b/acct-group/netperf/netperf-0-r1.ebuild
new file mode 100644
index 000000000000..eed641e94964
--- /dev/null
+++ b/acct-group/netperf/netperf-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/netperf"
+
+ACCT_GROUP_ID="168"
diff --git a/acct-group/netperf/netperf-0.ebuild b/acct-group/netperf/netperf-0.ebuild
deleted file mode 100644
index f4a3499b161f..000000000000
--- a/acct-group/netperf/netperf-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-analyzer/netperf"
-
-ACCT_GROUP_ID="168"
diff --git a/acct-group/neutron/neutron-0-r1.ebuild b/acct-group/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 90ea9e731a2d..000000000000
--- a/acct-group/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=446
diff --git a/acct-group/neutron/neutron-0-r2.ebuild b/acct-group/neutron/neutron-0-r2.ebuild
new file mode 100644
index 000000000000..d8a95c80e8a1
--- /dev/null
+++ b/acct-group/neutron/neutron-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=446
diff --git a/acct-group/nginx-unit/nginx-unit-0.ebuild b/acct-group/nginx-unit/nginx-unit-0-r1.ebuild
similarity index 100%
rename from acct-group/nginx-unit/nginx-unit-0.ebuild
rename to acct-group/nginx-unit/nginx-unit-0-r1.ebuild
diff --git a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
deleted file mode 100644
index 07125df90248..000000000000
--- a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=354
diff --git a/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..392a6c4025f1
--- /dev/null
+++ b/acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=354
diff --git a/acct-group/nginx/nginx-0-r1.ebuild b/acct-group/nginx/nginx-0-r1.ebuild
deleted file mode 100644
index b326e769a163..000000000000
--- a/acct-group/nginx/nginx-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/nginx"
-
-ACCT_GROUP_ID="82"
diff --git a/acct-group/nginx/nginx-0-r2.ebuild b/acct-group/nginx/nginx-0-r2.ebuild
new file mode 100644
index 000000000000..bca1e3ecda27
--- /dev/null
+++ b/acct-group/nginx/nginx-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/nginx"
+
+ACCT_GROUP_ID="82"
diff --git a/acct-group/ngircd/ngircd-0-r1.ebuild b/acct-group/ngircd/ngircd-0-r1.ebuild
deleted file mode 100644
index 54e757d68d33..000000000000
--- a/acct-group/ngircd/ngircd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for ngircd (IRC daemon)"
-ACCT_GROUP_ID=413
diff --git a/acct-group/ngircd/ngircd-0-r2.ebuild b/acct-group/ngircd/ngircd-0-r2.ebuild
new file mode 100644
index 000000000000..ea2849f0ea6d
--- /dev/null
+++ b/acct-group/ngircd/ngircd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for ngircd (IRC daemon)"
+ACCT_GROUP_ID=413
diff --git a/acct-group/ngrep/ngrep-0-r1.ebuild b/acct-group/ngrep/ngrep-0-r1.ebuild
deleted file mode 100644
index c01e5f34d05e..000000000000
--- a/acct-group/ngrep/ngrep-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-analyzer/ngrep"
-
-ACCT_GROUP_ID="185"
diff --git a/acct-group/ngrep/ngrep-0-r2.ebuild b/acct-group/ngrep/ngrep-0-r2.ebuild
new file mode 100644
index 000000000000..4953ba08691d
--- /dev/null
+++ b/acct-group/ngrep/ngrep-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/ngrep"
+
+ACCT_GROUP_ID="185"
diff --git a/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild b/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild
new file mode 100644
index 000000000000..90d1a5c1369f
--- /dev/null
+++ b/acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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-openconnect/nm-openconnect-0.ebuild b/acct-group/nm-openconnect/nm-openconnect-0.ebuild
deleted file mode 100644
index cf11b4322042..000000000000
--- a/acct-group/nm-openconnect/nm-openconnect-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/nm-openvpn-0-r1.ebuild b/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild
new file mode 100644
index 000000000000..c97d1aab90ef
--- /dev/null
+++ b/acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/nm-openvpn/nm-openvpn-0.ebuild b/acct-group/nm-openvpn/nm-openvpn-0.ebuild
deleted file mode 100644
index 2c34fcd00534..000000000000
--- a/acct-group/nm-openvpn/nm-openvpn-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/nobody/nobody-0-r1.ebuild b/acct-group/nobody/nobody-0-r1.ebuild
new file mode 100644
index 000000000000..4f32dd5f538e
--- /dev/null
+++ b/acct-group/nobody/nobody-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=65534
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/nobody/nobody-0.ebuild b/acct-group/nobody/nobody-0.ebuild
deleted file mode 100644
index 29b11e8db9d2..000000000000
--- a/acct-group/nobody/nobody-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=65534
-ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/node_exporter/node_exporter-0-r1.ebuild b/acct-group/node_exporter/node_exporter-0-r1.ebuild
deleted file mode 100644
index 7faae92e4669..000000000000
--- a/acct-group/node_exporter/node_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=459
diff --git a/acct-group/node_exporter/node_exporter-0-r2.ebuild b/acct-group/node_exporter/node_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..7c28a071b53d
--- /dev/null
+++ b/acct-group/node_exporter/node_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=459
diff --git a/acct-group/nofiles/nofiles-0-r1.ebuild b/acct-group/nofiles/nofiles-0-r1.ebuild
deleted file mode 100644
index 7f42c5050e80..000000000000
--- a/acct-group/nofiles/nofiles-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=200
diff --git a/acct-group/nofiles/nofiles-0-r2.ebuild b/acct-group/nofiles/nofiles-0-r2.ebuild
new file mode 100644
index 000000000000..1da9c58aaf7d
--- /dev/null
+++ b/acct-group/nofiles/nofiles-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=200
diff --git a/acct-group/notary/notary-0-r1.ebuild b/acct-group/notary/notary-0-r1.ebuild
new file mode 100644
index 000000000000..c40e97bec775
--- /dev/null
+++ b/acct-group/notary/notary-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-misc/notary"
+
+ACCT_GROUP_ID="280"
diff --git a/acct-group/notary/notary-0.ebuild b/acct-group/notary/notary-0.ebuild
deleted file mode 100644
index fb865b1555cc..000000000000
--- a/acct-group/notary/notary-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-misc/notary"
-
-ACCT_GROUP_ID="280"
diff --git a/acct-group/nova/nova-0-r1.ebuild b/acct-group/nova/nova-0-r1.ebuild
deleted file mode 100644
index 076e02d12e40..000000000000
--- a/acct-group/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=447
diff --git a/acct-group/nova/nova-0-r2.ebuild b/acct-group/nova/nova-0-r2.ebuild
new file mode 100644
index 000000000000..806349afc01d
--- /dev/null
+++ b/acct-group/nova/nova-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=447
diff --git a/acct-group/nsd/nsd-0-r1.ebuild b/acct-group/nsd/nsd-0-r1.ebuild
deleted file mode 100644
index 3fd399f2dcf7..000000000000
--- a/acct-group/nsd/nsd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=223
diff --git a/acct-group/nsd/nsd-0-r2.ebuild b/acct-group/nsd/nsd-0-r2.ebuild
new file mode 100644
index 000000000000..456480d76323
--- /dev/null
+++ b/acct-group/nsd/nsd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=223
diff --git a/acct-group/nslcd/nslcd-0-r1.ebuild b/acct-group/nslcd/nslcd-0-r1.ebuild
deleted file mode 100644
index 6e4738a45005..000000000000
--- a/acct-group/nslcd/nslcd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=357
diff --git a/acct-group/nslcd/nslcd-0-r2.ebuild b/acct-group/nslcd/nslcd-0-r2.ebuild
new file mode 100644
index 000000000000..138e0d6b99e8
--- /dev/null
+++ b/acct-group/nslcd/nslcd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=357
diff --git a/acct-group/ntopng/ntopng-0-r1.ebuild b/acct-group/ntopng/ntopng-0-r1.ebuild
new file mode 100644
index 000000000000..5f19248d57aa
--- /dev/null
+++ b/acct-group/ntopng/ntopng-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=296
diff --git a/acct-group/ntopng/ntopng-0.ebuild b/acct-group/ntopng/ntopng-0.ebuild
deleted file mode 100644
index e64f641de3d7..000000000000
--- a/acct-group/ntopng/ntopng-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=296
diff --git a/acct-group/ntp/ntp-0-r1.ebuild b/acct-group/ntp/ntp-0-r1.ebuild
deleted file mode 100644
index d8f17217cd8d..000000000000
--- a/acct-group/ntp/ntp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=123
diff --git a/acct-group/ntp/ntp-0-r2.ebuild b/acct-group/ntp/ntp-0-r2.ebuild
new file mode 100644
index 000000000000..45fffae0e48e
--- /dev/null
+++ b/acct-group/ntp/ntp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=123
diff --git a/acct-group/nullmail/nullmail-0-r1.ebuild b/acct-group/nullmail/nullmail-0-r1.ebuild
new file mode 100644
index 000000000000..c85a088847ba
--- /dev/null
+++ b/acct-group/nullmail/nullmail-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the nullmailer"
+
+ACCT_GROUP_ID="88"
diff --git a/acct-group/nullmail/nullmail-0.ebuild b/acct-group/nullmail/nullmail-0.ebuild
deleted file mode 100644
index 24f773d248c5..000000000000
--- a/acct-group/nullmail/nullmail-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 the nullmailer"
-
-ACCT_GROUP_ID="88"
diff --git a/acct-group/nut/nut-0-r1.ebuild b/acct-group/nut/nut-0-r1.ebuild
new file mode 100644
index 000000000000..f85662f46ff0
--- /dev/null
+++ b/acct-group/nut/nut-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Network-UPS Tools"
+
+ACCT_GROUP_ID="84"
diff --git a/acct-group/nut/nut-0.ebuild b/acct-group/nut/nut-0.ebuild
deleted file mode 100644
index e54ff2647200..000000000000
--- a/acct-group/nut/nut-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 the Network-UPS Tools"
-
-ACCT_GROUP_ID="84"
diff --git a/acct-group/nzbget/nzbget-0-r1.ebuild b/acct-group/nzbget/nzbget-0-r1.ebuild
new file mode 100644
index 000000000000..63dbcc4c6cdb
--- /dev/null
+++ b/acct-group/nzbget/nzbget-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-nntp/nzbget"
+ACCT_GROUP_ID=398
diff --git a/acct-group/nzbget/nzbget-0.ebuild b/acct-group/nzbget/nzbget-0.ebuild
deleted file mode 100644
index c0dae092d2b2..000000000000
--- a/acct-group/nzbget/nzbget-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-nntp/nzbget"
-ACCT_GROUP_ID=398
diff --git a/acct-group/oidentd/oidentd-0-r1.ebuild b/acct-group/oidentd/oidentd-0-r1.ebuild
deleted file mode 100644
index dadd950f9544..000000000000
--- a/acct-group/oidentd/oidentd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=493
diff --git a/acct-group/oidentd/oidentd-0-r2.ebuild b/acct-group/oidentd/oidentd-0-r2.ebuild
new file mode 100644
index 000000000000..703dc5367d39
--- /dev/null
+++ b/acct-group/oidentd/oidentd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=493
diff --git a/acct-group/openct/openct-0-r1.ebuild b/acct-group/openct/openct-0-r1.ebuild
deleted file mode 100644
index 256a6212aaef..000000000000
--- a/acct-group/openct/openct-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=46
diff --git a/acct-group/openct/openct-0-r2.ebuild b/acct-group/openct/openct-0-r2.ebuild
new file mode 100644
index 000000000000..e373f6d15260
--- /dev/null
+++ b/acct-group/openct/openct-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=46
diff --git a/acct-group/opendkim/opendkim-0-r1.ebuild b/acct-group/opendkim/opendkim-0-r1.ebuild
deleted file mode 100644
index 984414e1f114..000000000000
--- a/acct-group/opendkim/opendkim-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for OpenDKIM"
-ACCT_GROUP_ID=334
diff --git a/acct-group/opendkim/opendkim-0-r2.ebuild b/acct-group/opendkim/opendkim-0-r2.ebuild
new file mode 100644
index 000000000000..daae0306083c
--- /dev/null
+++ b/acct-group/opendkim/opendkim-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for OpenDKIM"
+ACCT_GROUP_ID=334
diff --git a/acct-group/opendmarc/opendmarc-1-r1.ebuild b/acct-group/opendmarc/opendmarc-1-r1.ebuild
new file mode 100644
index 000000000000..fd6d9faa1c13
--- /dev/null
+++ b/acct-group/opendmarc/opendmarc-1-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/opendmarc"
+ACCT_GROUP_ID=244
diff --git a/acct-group/opendmarc/opendmarc-1.ebuild b/acct-group/opendmarc/opendmarc-1.ebuild
deleted file mode 100644
index 87306502f6d3..000000000000
--- a/acct-group/opendmarc/opendmarc-1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/opendmarc"
-ACCT_GROUP_ID=244
diff --git a/acct-group/opendnssec/opendnssec-0-r1.ebuild b/acct-group/opendnssec/opendnssec-0-r1.ebuild
new file mode 100644
index 000000000000..291c3d63eba3
--- /dev/null
+++ b/acct-group/opendnssec/opendnssec-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-dns/opendnssec"
+
+ACCT_GROUP_ID="151"
diff --git a/acct-group/opendnssec/opendnssec-0.ebuild b/acct-group/opendnssec/opendnssec-0.ebuild
deleted file mode 100644
index b1ab40784094..000000000000
--- a/acct-group/opendnssec/opendnssec-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-dns/opendnssec"
-
-ACCT_GROUP_ID="151"
diff --git a/acct-group/openntpd/openntpd-0-r1.ebuild b/acct-group/openntpd/openntpd-0-r1.ebuild
deleted file mode 100644
index 26450b27e0f8..000000000000
--- a/acct-group/openntpd/openntpd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=321
diff --git a/acct-group/openntpd/openntpd-0-r2.ebuild b/acct-group/openntpd/openntpd-0-r2.ebuild
new file mode 100644
index 000000000000..3ee1906bc806
--- /dev/null
+++ b/acct-group/openntpd/openntpd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=321
diff --git a/acct-group/openrct2/openrct2-0-r1.ebuild b/acct-group/openrct2/openrct2-0-r1.ebuild
deleted file mode 100644
index 234d39ba1ebd..000000000000
--- a/acct-group/openrct2/openrct2-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the OpenRCT2 dedicated server"
-
-ACCT_GROUP_ID="479"
diff --git a/acct-group/openrct2/openrct2-0-r2.ebuild b/acct-group/openrct2/openrct2-0-r2.ebuild
new file mode 100644
index 000000000000..73667b9af642
--- /dev/null
+++ b/acct-group/openrct2/openrct2-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the OpenRCT2 dedicated server"
+
+ACCT_GROUP_ID="479"
diff --git a/acct-group/openttd/openttd-0-r1.ebuild b/acct-group/openttd/openttd-0-r1.ebuild
new file mode 100644
index 000000000000..0bcd30d046a1
--- /dev/null
+++ b/acct-group/openttd/openttd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for games-simulation/openttd"
+
+ACCT_GROUP_ID="513"
diff --git a/acct-group/openttd/openttd-0.ebuild b/acct-group/openttd/openttd-0.ebuild
deleted file mode 100644
index 1d9a13b5160b..000000000000
--- a/acct-group/openttd/openttd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for games-simulation/openttd"
-
-ACCT_GROUP_ID="513"
diff --git a/acct-group/openvpn/openvpn-0-r1.ebuild b/acct-group/openvpn/openvpn-0-r1.ebuild
deleted file mode 100644
index 0abedcd63903..000000000000
--- a/acct-group/openvpn/openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn/openvpn-0-r2.ebuild b/acct-group/openvpn/openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..8ab888445c6b
--- /dev/null
+++ b/acct-group/openvpn/openvpn-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=394
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild
deleted file mode 100644
index f950a40c2758..000000000000
--- a/acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=355
diff --git a/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild b/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..99350ce10aec
--- /dev/null
+++ b/acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=355
diff --git a/acct-group/opm/opm-0-r1.ebuild b/acct-group/opm/opm-0-r1.ebuild
new file mode 100644
index 000000000000..ef89d5cd2cc5
--- /dev/null
+++ b/acct-group/opm/opm-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for an open proxy monitor"
+ACCT_GROUP_ID=127
diff --git a/acct-group/opm/opm-0.ebuild b/acct-group/opm/opm-0.ebuild
deleted file mode 100644
index 155f6374c269..000000000000
--- a/acct-group/opm/opm-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for an open proxy monitor"
-ACCT_GROUP_ID=127
diff --git a/acct-group/oprofile/oprofile-0-r1.ebuild b/acct-group/oprofile/oprofile-0-r1.ebuild
deleted file mode 100644
index 2b203421271c..000000000000
--- a/acct-group/oprofile/oprofile-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for dev-util/oprofile JIT code processing"
-ACCT_GROUP_ID=492
diff --git a/acct-group/oprofile/oprofile-0-r2.ebuild b/acct-group/oprofile/oprofile-0-r2.ebuild
new file mode 100644
index 000000000000..05251855d7c8
--- /dev/null
+++ b/acct-group/oprofile/oprofile-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for dev-util/oprofile JIT code processing"
+ACCT_GROUP_ID=492
diff --git a/acct-group/oragono/oragono-0-r1.ebuild b/acct-group/oragono/oragono-0-r1.ebuild
new file mode 100644
index 000000000000..9595ed9beec8
--- /dev/null
+++ b/acct-group/oragono/oragono-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the Oragono IRC server"
+ACCT_GROUP_ID=324
diff --git a/acct-group/oragono/oragono-0.ebuild b/acct-group/oragono/oragono-0.ebuild
deleted file mode 100644
index 2566e7772276..000000000000
--- a/acct-group/oragono/oragono-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for the Oragono IRC server"
-ACCT_GROUP_ID=324
diff --git a/acct-group/ossec/ossec-0-r1.ebuild b/acct-group/ossec/ossec-0-r1.ebuild
deleted file mode 100644
index 591266c60294..000000000000
--- a/acct-group/ossec/ossec-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=330
-DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/ossec/ossec-0-r2.ebuild b/acct-group/ossec/ossec-0-r2.ebuild
new file mode 100644
index 000000000000..966abb634df9
--- /dev/null
+++ b/acct-group/ossec/ossec-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=330
+DESCRIPTION="Group for net-analyzer/ossec-hids"
diff --git a/acct-group/owntracks/owntracks-0-r1.ebuild b/acct-group/owntracks/owntracks-0-r1.ebuild
new file mode 100644
index 000000000000..fe5d67599e48
--- /dev/null
+++ b/acct-group/owntracks/owntracks-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-geosciences/owntracks-recorder"
+ACCT_GROUP_ID=524
diff --git a/acct-group/owntracks/owntracks-0.ebuild b/acct-group/owntracks/owntracks-0.ebuild
deleted file mode 100644
index 10c2ac74184e..000000000000
--- a/acct-group/owntracks/owntracks-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for sci-geosciences/owntracks-recorder"
-ACCT_GROUP_ID=524
diff --git a/acct-group/p2p/p2p-0-r1.ebuild b/acct-group/p2p/p2p-0-r1.ebuild
new file mode 100644
index 000000000000..52040d2ff7be
--- /dev/null
+++ b/acct-group/p2p/p2p-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mldonkey"
+ACCT_GROUP_ID=378
diff --git a/acct-group/p2p/p2p-0.ebuild b/acct-group/p2p/p2p-0.ebuild
deleted file mode 100644
index 682fd4cc07bc..000000000000
--- a/acct-group/p2p/p2p-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mldonkey"
-ACCT_GROUP_ID=378
diff --git a/acct-group/partimag/partimag-0-r1.ebuild b/acct-group/partimag/partimag-0-r1.ebuild
deleted file mode 100644
index d1c1482d6ab5..000000000000
--- a/acct-group/partimag/partimag-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for sys-block/partimage"
-
-ACCT_GROUP_ID="91"
diff --git a/acct-group/partimag/partimag-0-r2.ebuild b/acct-group/partimag/partimag-0-r2.ebuild
new file mode 100644
index 000000000000..1b3b59f53e25
--- /dev/null
+++ b/acct-group/partimag/partimag-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-block/partimage"
+
+ACCT_GROUP_ID="91"
diff --git a/acct-group/pcap/pcap-0-r1.ebuild b/acct-group/pcap/pcap-0-r1.ebuild
new file mode 100644
index 000000000000..7bb74847aafc
--- /dev/null
+++ b/acct-group/pcap/pcap-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for capturing network traffic"
+ACCT_GROUP_ID=377
diff --git a/acct-group/pcap/pcap-0.ebuild b/acct-group/pcap/pcap-0.ebuild
deleted file mode 100644
index 7c6ece39614e..000000000000
--- a/acct-group/pcap/pcap-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for capturing network traffic"
-ACCT_GROUP_ID=377
diff --git a/acct-group/pcscd/pcscd-0-r1.ebuild b/acct-group/pcscd/pcscd-0-r1.ebuild
deleted file mode 100644
index b2d98afd01e9..000000000000
--- a/acct-group/pcscd/pcscd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=47
diff --git a/acct-group/pcscd/pcscd-0-r2.ebuild b/acct-group/pcscd/pcscd-0-r2.ebuild
new file mode 100644
index 000000000000..29a733881a71
--- /dev/null
+++ b/acct-group/pcscd/pcscd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=47
diff --git a/acct-group/pdns/pdns-0-r1.ebuild b/acct-group/pdns/pdns-0-r1.ebuild
deleted file mode 100644
index 4f9392b371a0..000000000000
--- a/acct-group/pdns/pdns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=423
diff --git a/acct-group/pdns/pdns-0-r2.ebuild b/acct-group/pdns/pdns-0-r2.ebuild
new file mode 100644
index 000000000000..660d64dd4e1f
--- /dev/null
+++ b/acct-group/pdns/pdns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=423
diff --git a/acct-group/pdnsd/pdnsd-0-r1.ebuild b/acct-group/pdnsd/pdnsd-0-r1.ebuild
deleted file mode 100644
index 6c6a29d76f0d..000000000000
--- a/acct-group/pdnsd/pdnsd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=184
diff --git a/acct-group/pdnsd/pdnsd-0-r2.ebuild b/acct-group/pdnsd/pdnsd-0-r2.ebuild
new file mode 100644
index 000000000000..9a4d6fcc6db2
--- /dev/null
+++ b/acct-group/pdnsd/pdnsd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=184
diff --git a/acct-group/pgagent/pgagent-0-r1.ebuild b/acct-group/pgagent/pgagent-0-r1.ebuild
new file mode 100644
index 000000000000..5c1514304544
--- /dev/null
+++ b/acct-group/pgagent/pgagent-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/pgagent/pgagent-0.ebuild b/acct-group/pgagent/pgagent-0.ebuild
deleted file mode 100644
index a5716bd1cb4d..000000000000
--- a/acct-group/pgagent/pgagent-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/pipewire/pipewire-0-r1.ebuild b/acct-group/pipewire/pipewire-0-r1.ebuild
new file mode 100644
index 000000000000..5e1d25235785
--- /dev/null
+++ b/acct-group/pipewire/pipewire-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=509
diff --git a/acct-group/pipewire/pipewire-0.ebuild b/acct-group/pipewire/pipewire-0.ebuild
deleted file mode 100644
index c21081d66ed0..000000000000
--- a/acct-group/pipewire/pipewire-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=509
diff --git a/acct-group/pkcs11/pkcs11-0-r1.ebuild b/acct-group/pkcs11/pkcs11-0-r1.ebuild
new file mode 100644
index 000000000000..2c25489a23a4
--- /dev/null
+++ b/acct-group/pkcs11/pkcs11-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for dev-libs/opencryptoki"
+
+ACCT_GROUP_ID="331"
diff --git a/acct-group/pkcs11/pkcs11-0.ebuild b/acct-group/pkcs11/pkcs11-0.ebuild
deleted file mode 100644
index bd2c78e56eca..000000000000
--- a/acct-group/pkcs11/pkcs11-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for dev-libs/opencryptoki"
-
-ACCT_GROUP_ID="331"
diff --git a/acct-group/placement/placement-0-r1.ebuild b/acct-group/placement/placement-0-r1.ebuild
deleted file mode 100644
index 4fb6ed986132..000000000000
--- a/acct-group/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=448
diff --git a/acct-group/placement/placement-0-r2.ebuild b/acct-group/placement/placement-0-r2.ebuild
new file mode 100644
index 000000000000..2d561e1d290a
--- /dev/null
+++ b/acct-group/placement/placement-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=448
diff --git a/acct-group/plex/plex-0-r1.ebuild b/acct-group/plex/plex-0-r1.ebuild
deleted file mode 100644
index ec85c721a861..000000000000
--- a/acct-group/plex/plex-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Plex Media Server group"
-ACCT_GROUP_ID=103
diff --git a/acct-group/plex/plex-0-r2.ebuild b/acct-group/plex/plex-0-r2.ebuild
new file mode 100644
index 000000000000..9239d7ea7f62
--- /dev/null
+++ b/acct-group/plex/plex-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Plex Media Server group"
+ACCT_GROUP_ID=103
diff --git a/acct-group/plugdev/plugdev-0-r1.ebuild b/acct-group/plugdev/plugdev-0-r1.ebuild
deleted file mode 100644
index 66735a7fc0ff..000000000000
--- a/acct-group/plugdev/plugdev-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group controlling access to removable media"
-ACCT_GROUP_ID=272
diff --git a/acct-group/plugdev/plugdev-0-r2.ebuild b/acct-group/plugdev/plugdev-0-r2.ebuild
new file mode 100644
index 000000000000..e37da5772628
--- /dev/null
+++ b/acct-group/plugdev/plugdev-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group controlling access to removable media"
+ACCT_GROUP_ID=272
diff --git a/acct-group/polkitd/polkitd-0-r1.ebuild b/acct-group/polkitd/polkitd-0-r1.ebuild
deleted file mode 100644
index 7e7baeaeb481..000000000000
--- a/acct-group/polkitd/polkitd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=102
diff --git a/acct-group/polkitd/polkitd-0-r2.ebuild b/acct-group/polkitd/polkitd-0-r2.ebuild
new file mode 100644
index 000000000000..9398dcab7cc3
--- /dev/null
+++ b/acct-group/polkitd/polkitd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=102
diff --git a/acct-group/polw/polw-0-r1.ebuild b/acct-group/polw/polw-0-r1.ebuild
new file mode 100644
index 000000000000..24831f7820a0
--- /dev/null
+++ b/acct-group/polw/polw-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/policyd-weight"
+
+ACCT_GROUP_ID="263"
diff --git a/acct-group/polw/polw-0.ebuild b/acct-group/polw/polw-0.ebuild
deleted file mode 100644
index 66480cce7428..000000000000
--- a/acct-group/polw/polw-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-filter/policyd-weight"
-
-ACCT_GROUP_ID="263"
diff --git a/acct-group/popa3d/popa3d-0-r1.ebuild b/acct-group/popa3d/popa3d-0-r1.ebuild
new file mode 100644
index 000000000000..7857b0f08331
--- /dev/null
+++ b/acct-group/popa3d/popa3d-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/popa3d"
+ACCT_GROUP_ID=375
diff --git a/acct-group/popa3d/popa3d-0.ebuild b/acct-group/popa3d/popa3d-0.ebuild
deleted file mode 100644
index d3620c927b38..000000000000
--- a/acct-group/popa3d/popa3d-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-mail/popa3d"
-ACCT_GROUP_ID=375
diff --git a/acct-group/portage/portage-0-r1.ebuild b/acct-group/portage/portage-0-r1.ebuild
new file mode 100644
index 000000000000..84de44bd01ab
--- /dev/null
+++ b/acct-group/portage/portage-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=250
diff --git a/acct-group/portage/portage-0.ebuild b/acct-group/portage/portage-0.ebuild
deleted file mode 100644
index 802a74d18716..000000000000
--- a/acct-group/portage/portage-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=250
diff --git a/acct-group/postdrop/postdrop-0-r1.ebuild b/acct-group/postdrop/postdrop-0-r1.ebuild
deleted file mode 100644
index 2898ed6fb8ec..000000000000
--- a/acct-group/postdrop/postdrop-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=208
diff --git a/acct-group/postdrop/postdrop-0-r2.ebuild b/acct-group/postdrop/postdrop-0-r2.ebuild
new file mode 100644
index 000000000000..9931f3853516
--- /dev/null
+++ b/acct-group/postdrop/postdrop-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=208
diff --git a/acct-group/postfix/postfix-0-r1.ebuild b/acct-group/postfix/postfix-0-r1.ebuild
deleted file mode 100644
index 3ee20e0cc981..000000000000
--- a/acct-group/postfix/postfix-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=207
diff --git a/acct-group/postfix/postfix-0-r2.ebuild b/acct-group/postfix/postfix-0-r2.ebuild
new file mode 100644
index 000000000000..0df662082122
--- /dev/null
+++ b/acct-group/postfix/postfix-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=207
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild
deleted file mode 100644
index 4b924be02018..000000000000
--- a/acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=356
diff --git a/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild b/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..727bbf6ae770
--- /dev/null
+++ b/acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=356
diff --git a/acct-group/postfwd/postfwd-0-r1.ebuild b/acct-group/postfwd/postfwd-0-r1.ebuild
new file mode 100644
index 000000000000..cafa87134d52
--- /dev/null
+++ b/acct-group/postfwd/postfwd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/postfwd"
+
+ACCT_GROUP_ID="189"
diff --git a/acct-group/postfwd/postfwd-0.ebuild b/acct-group/postfwd/postfwd-0.ebuild
deleted file mode 100644
index a912e8aeb7fb..000000000000
--- a/acct-group/postfwd/postfwd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 mail-filter/postfwd"
-
-ACCT_GROUP_ID="189"
diff --git a/acct-group/postgres/postgres-0-r1.ebuild b/acct-group/postgres/postgres-0-r1.ebuild
deleted file mode 100644
index 979541863f53..000000000000
--- a/acct-group/postgres/postgres-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="PostgreSQL program group"
-ACCT_GROUP_ID=70
-SLOT="0"
diff --git a/acct-group/postgres/postgres-0-r2.ebuild b/acct-group/postgres/postgres-0-r2.ebuild
new file mode 100644
index 000000000000..1331ea3b1e55
--- /dev/null
+++ b/acct-group/postgres/postgres-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="PostgreSQL program group"
+ACCT_GROUP_ID=70
+SLOT="0"
diff --git a/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild b/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..977c3853bcc1
--- /dev/null
+++ b/acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=233
diff --git a/acct-group/postgres_exporter/postgres_exporter-0.ebuild b/acct-group/postgres_exporter/postgres_exporter-0.ebuild
deleted file mode 100644
index 06302af88d1e..000000000000
--- a/acct-group/postgres_exporter/postgres_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=233
diff --git a/acct-group/postgrey/postgrey-0-r1.ebuild b/acct-group/postgrey/postgrey-0-r1.ebuild
new file mode 100644
index 000000000000..9aace7c3955d
--- /dev/null
+++ b/acct-group/postgrey/postgrey-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for the postgrey mail daemon"
+ACCT_GROUP_ID=360
diff --git a/acct-group/postgrey/postgrey-0.ebuild b/acct-group/postgrey/postgrey-0.ebuild
deleted file mode 100644
index ff132477a3d6..000000000000
--- a/acct-group/postgrey/postgrey-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for the postgrey mail daemon"
-ACCT_GROUP_ID=360
diff --git a/acct-group/privoxy/privoxy-0-r1.ebuild b/acct-group/privoxy/privoxy-0-r1.ebuild
deleted file mode 100644
index c45bf8db39b2..000000000000
--- a/acct-group/privoxy/privoxy-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A privoxy: privacy oriented web proxy group"
-ACCT_GROUP_ID=392
diff --git a/acct-group/privoxy/privoxy-0-r2.ebuild b/acct-group/privoxy/privoxy-0-r2.ebuild
new file mode 100644
index 000000000000..152a13fb5e9e
--- /dev/null
+++ b/acct-group/privoxy/privoxy-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A privoxy: privacy oriented web proxy group"
+ACCT_GROUP_ID=392
diff --git a/acct-group/prometheus/prometheus-0-r1.ebuild b/acct-group/prometheus/prometheus-0-r1.ebuild
deleted file mode 100644
index 9a19925826cc..000000000000
--- a/acct-group/prometheus/prometheus-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=430
diff --git a/acct-group/prometheus/prometheus-0-r2.ebuild b/acct-group/prometheus/prometheus-0-r2.ebuild
new file mode 100644
index 000000000000..7b2cae83ab40
--- /dev/null
+++ b/acct-group/prometheus/prometheus-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=430
diff --git a/acct-group/prosody/prosody-0-r1.ebuild b/acct-group/prosody/prosody-0-r1.ebuild
new file mode 100644
index 000000000000..f90772575391
--- /dev/null
+++ b/acct-group/prosody/prosody-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/prosody"
+
+ACCT_GROUP_ID="115"
diff --git a/acct-group/prosody/prosody-0.ebuild b/acct-group/prosody/prosody-0.ebuild
deleted file mode 100644
index 9baa70ab7f70..000000000000
--- a/acct-group/prosody/prosody-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for net-im/prosody"
-
-ACCT_GROUP_ID="115"
diff --git a/acct-group/prowlarr/prowlarr-0-r1.ebuild b/acct-group/prowlarr/prowlarr-0-r1.ebuild
new file mode 100644
index 000000000000..fe67ad261fe3
--- /dev/null
+++ b/acct-group/prowlarr/prowlarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=517
diff --git a/acct-group/prowlarr/prowlarr-0.ebuild b/acct-group/prowlarr/prowlarr-0.ebuild
deleted file mode 100644
index 5ea7e36d2c6b..000000000000
--- a/acct-group/prowlarr/prowlarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=517
diff --git a/acct-group/psybnc/psybnc-0-r1.ebuild b/acct-group/psybnc/psybnc-0-r1.ebuild
new file mode 100644
index 000000000000..4df3a6c278ec
--- /dev/null
+++ b/acct-group/psybnc/psybnc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-irc/psybnc"
+
+ACCT_GROUP_ID="259"
diff --git a/acct-group/psybnc/psybnc-0.ebuild b/acct-group/psybnc/psybnc-0.ebuild
deleted file mode 100644
index bde356121739..000000000000
--- a/acct-group/psybnc/psybnc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-irc/psybnc"
-
-ACCT_GROUP_ID="259"
diff --git a/acct-group/pulse-access/pulse-access-0-r1.ebuild b/acct-group/pulse-access/pulse-access-0-r1.ebuild
new file mode 100644
index 000000000000..763cd4096edc
--- /dev/null
+++ b/acct-group/pulse-access/pulse-access-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=172
diff --git a/acct-group/pulse-access/pulse-access-0.ebuild b/acct-group/pulse-access/pulse-access-0.ebuild
deleted file mode 100644
index 700feb5f191b..000000000000
--- a/acct-group/pulse-access/pulse-access-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=172
diff --git a/acct-group/pulse/pulse-0-r1.ebuild b/acct-group/pulse/pulse-0-r1.ebuild
new file mode 100644
index 000000000000..dcbe29e5d3c1
--- /dev/null
+++ b/acct-group/pulse/pulse-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=171
diff --git a/acct-group/pulse/pulse-0.ebuild b/acct-group/pulse/pulse-0.ebuild
deleted file mode 100644
index 5b0084f6f4f1..000000000000
--- a/acct-group/pulse/pulse-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=171
diff --git a/acct-group/puppet/puppet-0-r1.ebuild b/acct-group/puppet/puppet-0-r1.ebuild
deleted file mode 100644
index cf9422869bf9..000000000000
--- a/acct-group/puppet/puppet-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=455
diff --git a/acct-group/puppet/puppet-0-r2.ebuild b/acct-group/puppet/puppet-0-r2.ebuild
new file mode 100644
index 000000000000..aaadca579eb4
--- /dev/null
+++ b/acct-group/puppet/puppet-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=455
diff --git a/acct-group/puppetdb/puppetdb-0-r1.ebuild b/acct-group/puppetdb/puppetdb-0-r1.ebuild
deleted file mode 100644
index 55e4b42af293..000000000000
--- a/acct-group/puppetdb/puppetdb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=456
diff --git a/acct-group/puppetdb/puppetdb-0-r2.ebuild b/acct-group/puppetdb/puppetdb-0-r2.ebuild
new file mode 100644
index 000000000000..623782c5052f
--- /dev/null
+++ b/acct-group/puppetdb/puppetdb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=456
diff --git a/acct-group/pushgateway/pushgateway-0-r1.ebuild b/acct-group/pushgateway/pushgateway-0-r1.ebuild
new file mode 100644
index 000000000000..013d7ec8b032
--- /dev/null
+++ b/acct-group/pushgateway/pushgateway-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/pushgateway/pushgateway-0.ebuild b/acct-group/pushgateway/pushgateway-0.ebuild
deleted file mode 100644
index c064f6390f10..000000000000
--- a/acct-group/pushgateway/pushgateway-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/pvpgn/pvpgn-0-r1.ebuild b/acct-group/pvpgn/pvpgn-0-r1.ebuild
new file mode 100644
index 000000000000..3c9571852687
--- /dev/null
+++ b/acct-group/pvpgn/pvpgn-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for pvpgn (gaming server for Battle.Net compatible clients)"
+ACCT_GROUP_ID=285
diff --git a/acct-group/pvpgn/pvpgn-0.ebuild b/acct-group/pvpgn/pvpgn-0.ebuild
deleted file mode 100644
index 0a8c0d6e5da8..000000000000
--- a/acct-group/pvpgn/pvpgn-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for pvpgn (gaming server for Battle.Net compatible clients)"
-ACCT_GROUP_ID=285
diff --git a/acct-group/qemu/qemu-0-r1.ebuild b/acct-group/qemu/qemu-0-r1.ebuild
deleted file mode 100644
index bfa7c828015d..000000000000
--- a/acct-group/qemu/qemu-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=77
diff --git a/acct-group/qemu/qemu-0-r2.ebuild b/acct-group/qemu/qemu-0-r2.ebuild
new file mode 100644
index 000000000000..207fc98e46dc
--- /dev/null
+++ b/acct-group/qemu/qemu-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=77
diff --git a/acct-group/qmail/qmail-0-r1.ebuild b/acct-group/qmail/qmail-0-r1.ebuild
deleted file mode 100644
index 86f1ae5e27f3..000000000000
--- a/acct-group/qmail/qmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=201
diff --git a/acct-group/qmail/qmail-0-r2.ebuild b/acct-group/qmail/qmail-0-r2.ebuild
new file mode 100644
index 000000000000..8dd6a346f564
--- /dev/null
+++ b/acct-group/qmail/qmail-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=201
diff --git a/acct-group/quagga/quagga-0-r1.ebuild b/acct-group/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index 104f8007e235..000000000000
--- a/acct-group/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=424
diff --git a/acct-group/quagga/quagga-0-r2.ebuild b/acct-group/quagga/quagga-0-r2.ebuild
new file mode 100644
index 000000000000..cf8345de1bb1
--- /dev/null
+++ b/acct-group/quagga/quagga-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=424
diff --git a/acct-group/quassel/quassel-0-r1.ebuild b/acct-group/quassel/quassel-0-r1.ebuild
deleted file mode 100644
index e700412c050b..000000000000
--- a/acct-group/quassel/quassel-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=472
diff --git a/acct-group/quassel/quassel-0-r2.ebuild b/acct-group/quassel/quassel-0-r2.ebuild
new file mode 100644
index 000000000000..ed73341e1622
--- /dev/null
+++ b/acct-group/quassel/quassel-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=472
diff --git a/acct-group/rabbitmq/rabbitmq-0-r1.ebuild b/acct-group/rabbitmq/rabbitmq-0-r1.ebuild
new file mode 100644
index 000000000000..68e9ffcebc90
--- /dev/null
+++ b/acct-group/rabbitmq/rabbitmq-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/rabbitmq-0.ebuild b/acct-group/rabbitmq/rabbitmq-0.ebuild
deleted file mode 100644
index 58c6c1ee1b21..000000000000
--- a/acct-group/rabbitmq/rabbitmq-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/rabbitmq_exporter-0-r1.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..6ebea851e441
--- /dev/null
+++ b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
deleted file mode 100644
index bd882d0b8866..000000000000
--- a/acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/radarr/radarr-0-r1.ebuild b/acct-group/radarr/radarr-0-r1.ebuild
new file mode 100644
index 000000000000..521778e8e827
--- /dev/null
+++ b/acct-group/radarr/radarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=516
diff --git a/acct-group/radarr/radarr-0.ebuild b/acct-group/radarr/radarr-0.ebuild
deleted file mode 100644
index 1437f0ef9d20..000000000000
--- a/acct-group/radarr/radarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=516
diff --git a/acct-group/radicale/radicale-0-r1.ebuild b/acct-group/radicale/radicale-0-r1.ebuild
deleted file mode 100644
index a2150f5982d2..000000000000
--- a/acct-group/radicale/radicale-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the www-apps/radicale"
-ACCT_GROUP_ID=327
diff --git a/acct-group/radicale/radicale-0-r2.ebuild b/acct-group/radicale/radicale-0-r2.ebuild
new file mode 100644
index 000000000000..3a15e9f97970
--- /dev/null
+++ b/acct-group/radicale/radicale-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the www-apps/radicale"
+ACCT_GROUP_ID=327
diff --git a/acct-group/radius/radius-0-r1.ebuild b/acct-group/radius/radius-0-r1.ebuild
deleted file mode 100644
index 78aaa17a382f..000000000000
--- a/acct-group/radius/radius-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="FreeRadius program group"
-ACCT_GROUP_ID=95
diff --git a/acct-group/radius/radius-0-r2.ebuild b/acct-group/radius/radius-0-r2.ebuild
new file mode 100644
index 000000000000..70012871610e
--- /dev/null
+++ b/acct-group/radius/radius-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="FreeRadius program group"
+ACCT_GROUP_ID=95
diff --git a/acct-group/radvd/radvd-0-r1.ebuild b/acct-group/radvd/radvd-0-r1.ebuild
new file mode 100644
index 000000000000..576d1cfd0166
--- /dev/null
+++ b/acct-group/radvd/radvd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Router Advertisement Daemon"
+
+ACCT_GROUP_ID="215"
diff --git a/acct-group/radvd/radvd-0.ebuild b/acct-group/radvd/radvd-0.ebuild
deleted file mode 100644
index 36fff292c554..000000000000
--- a/acct-group/radvd/radvd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 the Router Advertisement Daemon"
-
-ACCT_GROUP_ID="215"
diff --git a/acct-group/rbldns/rbldns-0-r1.ebuild b/acct-group/rbldns/rbldns-0-r1.ebuild
deleted file mode 100644
index 6a70e0c3be3d..000000000000
--- a/acct-group/rbldns/rbldns-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=153
diff --git a/acct-group/rbldns/rbldns-0-r2.ebuild b/acct-group/rbldns/rbldns-0-r2.ebuild
new file mode 100644
index 000000000000..1034e41ae529
--- /dev/null
+++ b/acct-group/rbldns/rbldns-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=153
diff --git a/acct-group/rbot/rbot-0-r1.ebuild b/acct-group/rbot/rbot-0-r1.ebuild
new file mode 100644
index 000000000000..aa03c16b5c3e
--- /dev/null
+++ b/acct-group/rbot/rbot-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/rbot/rbot-0.ebuild b/acct-group/rbot/rbot-0.ebuild
deleted file mode 100644
index 2e26e14ae37f..000000000000
--- a/acct-group/rbot/rbot-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/readarr/readarr-0-r1.ebuild b/acct-group/readarr/readarr-0-r1.ebuild
new file mode 100644
index 000000000000..7035a70d4581
--- /dev/null
+++ b/acct-group/readarr/readarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=521
diff --git a/acct-group/readarr/readarr-0.ebuild b/acct-group/readarr/readarr-0.ebuild
deleted file mode 100644
index 24ba49a36df4..000000000000
--- a/acct-group/readarr/readarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=521
diff --git a/acct-group/realtime/realtime-0-r1.ebuild b/acct-group/realtime/realtime-0-r1.ebuild
new file mode 100644
index 000000000000..a4734a21bd4f
--- /dev/null
+++ b/acct-group/realtime/realtime-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="realtime privileges group"
+
+ACCT_GROUP_ID=206
diff --git a/acct-group/realtime/realtime-0.ebuild b/acct-group/realtime/realtime-0.ebuild
deleted file mode 100644
index eb80c1e91091..000000000000
--- a/acct-group/realtime/realtime-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="realtime privileges group"
-
-ACCT_GROUP_ID=206
diff --git a/acct-group/redis/redis-0-r1.ebuild b/acct-group/redis/redis-0-r1.ebuild
deleted file mode 100644
index 83f725cd298c..000000000000
--- a/acct-group/redis/redis-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Redis program group"
-ACCT_GROUP_ID=75
diff --git a/acct-group/redis/redis-0-r2.ebuild b/acct-group/redis/redis-0-r2.ebuild
new file mode 100644
index 000000000000..0b0048c13fa7
--- /dev/null
+++ b/acct-group/redis/redis-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Redis program group"
+ACCT_GROUP_ID=75
diff --git a/acct-group/redis_exporter/redis_exporter-0-r1.ebuild b/acct-group/redis_exporter/redis_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..29ee8b117172
--- /dev/null
+++ b/acct-group/redis_exporter/redis_exporter-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=298
diff --git a/acct-group/redis_exporter/redis_exporter-0.ebuild b/acct-group/redis_exporter/redis_exporter-0.ebuild
deleted file mode 100644
index 89b3cb579f87..000000000000
--- a/acct-group/redis_exporter/redis_exporter-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=298
diff --git a/acct-group/redmine/redmine-0-r1.ebuild b/acct-group/redmine/redmine-0-r1.ebuild
deleted file mode 100644
index 73e968b837a7..000000000000
--- a/acct-group/redmine/redmine-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=451
diff --git a/acct-group/redmine/redmine-0-r2.ebuild b/acct-group/redmine/redmine-0-r2.ebuild
new file mode 100644
index 000000000000..f2fa23df394d
--- /dev/null
+++ b/acct-group/redmine/redmine-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=451
diff --git a/acct-group/redsocks/redsocks-0-r1.ebuild b/acct-group/redsocks/redsocks-0-r1.ebuild
deleted file mode 100644
index 376e5708d210..000000000000
--- a/acct-group/redsocks/redsocks-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-proxy/redsocks"
-
-ACCT_GROUP_ID="154"
diff --git a/acct-group/redsocks/redsocks-0-r2.ebuild b/acct-group/redsocks/redsocks-0-r2.ebuild
new file mode 100644
index 000000000000..af112f79b9d8
--- /dev/null
+++ b/acct-group/redsocks/redsocks-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/redsocks"
+
+ACCT_GROUP_ID="154"
diff --git a/acct-group/reg/reg-0-r1.ebuild b/acct-group/reg/reg-0-r1.ebuild
deleted file mode 100644
index 8bc51aa11edc..000000000000
--- a/acct-group/reg/reg-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-containers/reg"
-
-ACCT_GROUP_ID="503"
diff --git a/acct-group/reg/reg-0-r2.ebuild b/acct-group/reg/reg-0-r2.ebuild
new file mode 100644
index 000000000000..ecccab5fa8d8
--- /dev/null
+++ b/acct-group/reg/reg-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-containers/reg"
+
+ACCT_GROUP_ID="503"
diff --git a/acct-group/registry/registry-0-r1.ebuild b/acct-group/registry/registry-0-r1.ebuild
new file mode 100644
index 000000000000..2d3b7c31cc34
--- /dev/null
+++ b/acct-group/registry/registry-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-containers/docker-registry"
+
+ACCT_GROUP_ID="295"
diff --git a/acct-group/registry/registry-0.ebuild b/acct-group/registry/registry-0.ebuild
deleted file mode 100644
index 6da5197ae7ec..000000000000
--- a/acct-group/registry/registry-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-containers/docker-registry"
-
-ACCT_GROUP_ID="295"
diff --git a/acct-group/render/render-0-r1.ebuild b/acct-group/render/render-0-r1.ebuild
deleted file mode 100644
index 6e31b1326308..000000000000
--- a/acct-group/render/render-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=28
diff --git a/acct-group/render/render-0-r2.ebuild b/acct-group/render/render-0-r2.ebuild
new file mode 100644
index 000000000000..0a6ab8cd9485
--- /dev/null
+++ b/acct-group/render/render-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=28
diff --git a/acct-group/roccat/roccat-0-r1.ebuild b/acct-group/roccat/roccat-0-r1.ebuild
new file mode 100644
index 000000000000..34761f2dc218
--- /dev/null
+++ b/acct-group/roccat/roccat-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/roccat/roccat-0.ebuild b/acct-group/roccat/roccat-0.ebuild
deleted file mode 100644
index 8c8638f0a4e2..000000000000
--- a/acct-group/roccat/roccat-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/root/root-0-r1.ebuild b/acct-group/root/root-0-r1.ebuild
new file mode 100644
index 000000000000..731c421a20f9
--- /dev/null
+++ b/acct-group/root/root-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=0
+ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/root/root-0.ebuild b/acct-group/root/root-0.ebuild
deleted file mode 100644
index 4c5ed4b34698..000000000000
--- a/acct-group/root/root-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=0
-ACCT_GROUP_ENFORCE_ID=yes
diff --git a/acct-group/rplayd/rplayd-0-r1.ebuild b/acct-group/rplayd/rplayd-0-r1.ebuild
new file mode 100644
index 000000000000..39db60adba80
--- /dev/null
+++ b/acct-group/rplayd/rplayd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/rplay"
+
+ACCT_GROUP_ID="161"
diff --git a/acct-group/rplayd/rplayd-0.ebuild b/acct-group/rplayd/rplayd-0.ebuild
deleted file mode 100644
index 744523e8b26c..000000000000
--- a/acct-group/rplayd/rplayd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/rplay"
-
-ACCT_GROUP_ID="161"
diff --git a/acct-group/rrdcached/rrdcached-0-r1.ebuild b/acct-group/rrdcached/rrdcached-0-r1.ebuild
new file mode 100644
index 000000000000..bc2e20332168
--- /dev/null
+++ b/acct-group/rrdcached/rrdcached-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="511"
diff --git a/acct-group/rrdcached/rrdcached-0.ebuild b/acct-group/rrdcached/rrdcached-0.ebuild
deleted file mode 100644
index 1f28f6225226..000000000000
--- a/acct-group/rrdcached/rrdcached-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="511"
diff --git a/acct-group/rslsync/rslsync-0-r1.ebuild b/acct-group/rslsync/rslsync-0-r1.ebuild
new file mode 100644
index 000000000000..11fec48d0d8f
--- /dev/null
+++ b/acct-group/rslsync/rslsync-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/resilio-sync"
+
+ACCT_GROUP_ID="175"
diff --git a/acct-group/rslsync/rslsync-0.ebuild b/acct-group/rslsync/rslsync-0.ebuild
deleted file mode 100644
index c4e17e79078d..000000000000
--- a/acct-group/rslsync/rslsync-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/resilio-sync"
-
-ACCT_GROUP_ID="175"
diff --git a/acct-group/rspamd/rspamd-0-r1.ebuild b/acct-group/rspamd/rspamd-0-r1.ebuild
deleted file mode 100644
index 338cfd3414a7..000000000000
--- a/acct-group/rspamd/rspamd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for rspamd - Rapid spam filtering system"
-ACCT_GROUP_ID=237
diff --git a/acct-group/rspamd/rspamd-0-r2.ebuild b/acct-group/rspamd/rspamd-0-r2.ebuild
new file mode 100644
index 000000000000..2099e0d20e6a
--- /dev/null
+++ b/acct-group/rspamd/rspamd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for rspamd - Rapid spam filtering system"
+ACCT_GROUP_ID=237
diff --git a/acct-group/rstudio-server/rstudio-server-0-r1.ebuild b/acct-group/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index 1d702c365cb5..000000000000
--- a/acct-group/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for sci-mathematics/rstudio"
-ACCT_GROUP_ID=466
diff --git a/acct-group/rstudio-server/rstudio-server-0-r2.ebuild b/acct-group/rstudio-server/rstudio-server-0-r2.ebuild
new file mode 100644
index 000000000000..0fd60901e700
--- /dev/null
+++ b/acct-group/rstudio-server/rstudio-server-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for sci-mathematics/rstudio"
+ACCT_GROUP_ID=466
diff --git a/acct-group/rt/rt-0-r1.ebuild b/acct-group/rt/rt-0-r1.ebuild
deleted file mode 100644
index 5f188764ed44..000000000000
--- a/acct-group/rt/rt-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/rt"
-
-ACCT_GROUP_ID="126"
diff --git a/acct-group/rt/rt-0-r2.ebuild b/acct-group/rt/rt-0-r2.ebuild
new file mode 100644
index 000000000000..88c03248cb24
--- /dev/null
+++ b/acct-group/rt/rt-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-apps/rt"
+
+ACCT_GROUP_ID="126"
diff --git a/acct-group/rtkit/rtkit-0-r1.ebuild b/acct-group/rtkit/rtkit-0-r1.ebuild
deleted file mode 100644
index 5f92c0a646b5..000000000000
--- a/acct-group/rtkit/rtkit-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
-ACCT_GROUP_ID=133
diff --git a/acct-group/rtkit/rtkit-0-r2.ebuild b/acct-group/rtkit/rtkit-0-r2.ebuild
new file mode 100644
index 000000000000..df01f1e86d78
--- /dev/null
+++ b/acct-group/rtkit/rtkit-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon"
+ACCT_GROUP_ID=133
diff --git a/acct-group/rundeck/rundeck-0-r1.ebuild b/acct-group/rundeck/rundeck-0-r1.ebuild
new file mode 100644
index 000000000000..1ac045423f1a
--- /dev/null
+++ b/acct-group/rundeck/rundeck-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/rundeck/rundeck-0.ebuild b/acct-group/rundeck/rundeck-0.ebuild
deleted file mode 100644
index 9a51c176b28f..000000000000
--- a/acct-group/rundeck/rundeck-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/rwhoisd/rwhoisd-0-r1.ebuild b/acct-group/rwhoisd/rwhoisd-0-r1.ebuild
new file mode 100644
index 000000000000..90a1f5f83e76
--- /dev/null
+++ b/acct-group/rwhoisd/rwhoisd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/rwhoisd"
+
+ACCT_GROUP_ID="258"
diff --git a/acct-group/rwhoisd/rwhoisd-0.ebuild b/acct-group/rwhoisd/rwhoisd-0.ebuild
deleted file mode 100644
index efc2c2e69a79..000000000000
--- a/acct-group/rwhoisd/rwhoisd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/rwhoisd"
-
-ACCT_GROUP_ID="258"
diff --git a/acct-group/sabnzbd/sabnzbd-0-r1.ebuild b/acct-group/sabnzbd/sabnzbd-0-r1.ebuild
deleted file mode 100644
index 4f1a3726241b..000000000000
--- a/acct-group/sabnzbd/sabnzbd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="SABnzbd program group"
-
-ACCT_GROUP_ID=397
diff --git a/acct-group/sabnzbd/sabnzbd-0-r2.ebuild b/acct-group/sabnzbd/sabnzbd-0-r2.ebuild
new file mode 100644
index 000000000000..a86819cbc639
--- /dev/null
+++ b/acct-group/sabnzbd/sabnzbd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="SABnzbd program group"
+
+ACCT_GROUP_ID=397
diff --git a/acct-group/sagan/sagan-0-r1.ebuild b/acct-group/sagan/sagan-0-r1.ebuild
new file mode 100644
index 000000000000..01d058152a84
--- /dev/null
+++ b/acct-group/sagan/sagan-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the Sagan log monitoring system"
+ACCT_GROUP_ID=317
diff --git a/acct-group/sagan/sagan-0.ebuild b/acct-group/sagan/sagan-0.ebuild
deleted file mode 100644
index 18b52fedf006..000000000000
--- a/acct-group/sagan/sagan-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Sagan log monitoring system"
-ACCT_GROUP_ID=317
diff --git a/acct-group/samplicator/samplicator-0-r1.ebuild b/acct-group/samplicator/samplicator-0-r1.ebuild
new file mode 100644
index 000000000000..46a667f51ce1
--- /dev/null
+++ b/acct-group/samplicator/samplicator-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/samplicator"
+
+ACCT_GROUP_ID="179"
diff --git a/acct-group/samplicator/samplicator-0.ebuild b/acct-group/samplicator/samplicator-0.ebuild
deleted file mode 100644
index 7e5219d58e15..000000000000
--- a/acct-group/samplicator/samplicator-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/samplicator"
-
-ACCT_GROUP_ID="179"
diff --git a/acct-group/sancp/sancp-0-r1.ebuild b/acct-group/sancp/sancp-0-r1.ebuild
new file mode 100644
index 000000000000..4f74e4e83817
--- /dev/null
+++ b/acct-group/sancp/sancp-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-analyzer/sancp"
+
+ACCT_GROUP_ID=382
diff --git a/acct-group/sancp/sancp-0.ebuild b/acct-group/sancp/sancp-0.ebuild
deleted file mode 100644
index b273bc3c0ea2..000000000000
--- a/acct-group/sancp/sancp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-analyzer/sancp"
-
-ACCT_GROUP_ID=382
diff --git a/acct-group/sanlock/sanlock-0-r1.ebuild b/acct-group/sanlock/sanlock-0-r1.ebuild
deleted file mode 100644
index c0d196eb8395..000000000000
--- a/acct-group/sanlock/sanlock-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="shared storage lock manager"
-ACCT_GROUP_ID=340
diff --git a/acct-group/sanlock/sanlock-0-r2.ebuild b/acct-group/sanlock/sanlock-0-r2.ebuild
new file mode 100644
index 000000000000..71ceac8ce503
--- /dev/null
+++ b/acct-group/sanlock/sanlock-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="shared storage lock manager"
+ACCT_GROUP_ID=340
diff --git a/acct-group/sauerbraten/sauerbraten-0-r1.ebuild b/acct-group/sauerbraten/sauerbraten-0-r1.ebuild
deleted file mode 100644
index 2312bc0e37e2..000000000000
--- a/acct-group/sauerbraten/sauerbraten-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
-ACCT_GROUP_ID=286
diff --git a/acct-group/sauerbraten/sauerbraten-0-r2.ebuild b/acct-group/sauerbraten/sauerbraten-0-r2.ebuild
new file mode 100644
index 000000000000..4eb54a421250
--- /dev/null
+++ b/acct-group/sauerbraten/sauerbraten-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
+ACCT_GROUP_ID=286
diff --git a/acct-group/scanlogd/scanlogd-0-r1.ebuild b/acct-group/scanlogd/scanlogd-0-r1.ebuild
new file mode 100644
index 000000000000..2b6b4a16515c
--- /dev/null
+++ b/acct-group/scanlogd/scanlogd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/scanlogd"
+
+ACCT_GROUP_ID="166"
diff --git a/acct-group/scanlogd/scanlogd-0.ebuild b/acct-group/scanlogd/scanlogd-0.ebuild
deleted file mode 100644
index ba71638b34cd..000000000000
--- a/acct-group/scanlogd/scanlogd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-analyzer/scanlogd"
-
-ACCT_GROUP_ID="166"
diff --git a/acct-group/scanner/scanner-0-r1.ebuild b/acct-group/scanner/scanner-0-r1.ebuild
new file mode 100644
index 000000000000..7a2254915859
--- /dev/null
+++ b/acct-group/scanner/scanner-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for media-gfx/sane-backends"
+
+ACCT_GROUP_ID="332"
diff --git a/acct-group/scanner/scanner-0.ebuild b/acct-group/scanner/scanner-0.ebuild
deleted file mode 100644
index 41c58ed07571..000000000000
--- a/acct-group/scanner/scanner-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for media-gfx/sane-backends"
-
-ACCT_GROUP_ID="332"
diff --git a/acct-group/scponly/scponly-0-r1.ebuild b/acct-group/scponly/scponly-0-r1.ebuild
deleted file mode 100644
index c0418d2599cc..000000000000
--- a/acct-group/scponly/scponly-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for scponly"
-ACCT_GROUP_ID=239
diff --git a/acct-group/scponly/scponly-0-r2.ebuild b/acct-group/scponly/scponly-0-r2.ebuild
new file mode 100644
index 000000000000..d5a704be9aec
--- /dev/null
+++ b/acct-group/scponly/scponly-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for scponly"
+ACCT_GROUP_ID=239
diff --git a/acct-group/scsi/scsi-0-r1.ebuild b/acct-group/scsi/scsi-0-r1.ebuild
new file mode 100644
index 000000000000..f3ee233c3cdf
--- /dev/null
+++ b/acct-group/scsi/scsi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=415
diff --git a/acct-group/scsi/scsi-0.ebuild b/acct-group/scsi/scsi-0.ebuild
deleted file mode 100644
index e87f4b7b1c8d..000000000000
--- a/acct-group/scsi/scsi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=415
diff --git a/acct-group/sddm/sddm-0-r1.ebuild b/acct-group/sddm/sddm-0-r1.ebuild
new file mode 100644
index 000000000000..44ec1b3df484
--- /dev/null
+++ b/acct-group/sddm/sddm-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/sddm"
+
+ACCT_GROUP_ID="219"
diff --git a/acct-group/sddm/sddm-0.ebuild b/acct-group/sddm/sddm-0.ebuild
deleted file mode 100644
index 26a7d184213b..000000000000
--- a/acct-group/sddm/sddm-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for x11-misc/sddm"
-
-ACCT_GROUP_ID="219"
diff --git a/acct-group/seat/seat-0-r1.ebuild b/acct-group/seat/seat-0-r1.ebuild
new file mode 100644
index 000000000000..5feb719c5fdb
--- /dev/null
+++ b/acct-group/seat/seat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-auth/seatd"
+ACCT_GROUP_ID=202
diff --git a/acct-group/seat/seat-0.ebuild b/acct-group/seat/seat-0.ebuild
deleted file mode 100644
index b5c12d09822b..000000000000
--- a/acct-group/seat/seat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-auth/seatd"
-ACCT_GROUP_ID=202
diff --git a/acct-group/serf/serf-0-r1.ebuild b/acct-group/serf/serf-0-r1.ebuild
new file mode 100644
index 000000000000..6b8c298f2eeb
--- /dev/null
+++ b/acct-group/serf/serf-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-admin/serf"
+
+ACCT_GROUP_ID="314"
diff --git a/acct-group/serf/serf-0.ebuild b/acct-group/serf/serf-0.ebuild
deleted file mode 100644
index 00c3f9c40c85..000000000000
--- a/acct-group/serf/serf-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/serf"
-
-ACCT_GROUP_ID="314"
diff --git a/acct-group/sguil/sguil-0-r1.ebuild b/acct-group/sguil/sguil-0-r1.ebuild
new file mode 100644
index 000000000000..b1085c8168b7
--- /dev/null
+++ b/acct-group/sguil/sguil-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/sguil-sensor"
+
+ACCT_GROUP_ID="165"
diff --git a/acct-group/sguil/sguil-0.ebuild b/acct-group/sguil/sguil-0.ebuild
deleted file mode 100644
index 15fbe00afd0d..000000000000
--- a/acct-group/sguil/sguil-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-analyzer/sguil-sensor"
-
-ACCT_GROUP_ID="165"
diff --git a/acct-group/sgx/sgx-0-r1.ebuild b/acct-group/sgx/sgx-0-r1.ebuild
new file mode 100644
index 000000000000..dc4b0f1de0ba
--- /dev/null
+++ b/acct-group/sgx/sgx-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="System group: used for SGX enclaves"
+
+ACCT_GROUP_ID=405
diff --git a/acct-group/sgx/sgx-0.ebuild b/acct-group/sgx/sgx-0.ebuild
deleted file mode 100644
index 6a9d9ac0c9d8..000000000000
--- a/acct-group/sgx/sgx-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="System group: used for SGX enclaves"
-
-ACCT_GROUP_ID=405
diff --git a/acct-group/sigh/sigh-0-r1.ebuild b/acct-group/sigh/sigh-0-r1.ebuild
new file mode 100644
index 000000000000..e05e868d4d71
--- /dev/null
+++ b/acct-group/sigh/sigh-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=363
diff --git a/acct-group/sigh/sigh-0.ebuild b/acct-group/sigh/sigh-0.ebuild
deleted file mode 100644
index 82133b99b3ca..000000000000
--- a/acct-group/sigh/sigh-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=363
diff --git a/acct-group/simplevirt/simplevirt-0-r1.ebuild b/acct-group/simplevirt/simplevirt-0-r1.ebuild
deleted file mode 100644
index 6d4d4ffbc136..000000000000
--- a/acct-group/simplevirt/simplevirt-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=404
diff --git a/acct-group/simplevirt/simplevirt-0-r2.ebuild b/acct-group/simplevirt/simplevirt-0-r2.ebuild
new file mode 100644
index 000000000000..ea9e10ee72d3
--- /dev/null
+++ b/acct-group/simplevirt/simplevirt-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=404
diff --git a/acct-group/sispmctl/sispmctl-0-r1.ebuild b/acct-group/sispmctl/sispmctl-0-r1.ebuild
new file mode 100644
index 000000000000..7b4269a47c0c
--- /dev/null
+++ b/acct-group/sispmctl/sispmctl-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-power/sispmctl"
+
+ACCT_GROUP_ID="173"
diff --git a/acct-group/sispmctl/sispmctl-0.ebuild b/acct-group/sispmctl/sispmctl-0.ebuild
deleted file mode 100644
index 1dcdaedb2271..000000000000
--- a/acct-group/sispmctl/sispmctl-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-power/sispmctl"
-
-ACCT_GROUP_ID="173"
diff --git a/acct-group/sks/sks-0-r1.ebuild b/acct-group/sks/sks-0-r1.ebuild
new file mode 100644
index 000000000000..27cc84dd7259
--- /dev/null
+++ b/acct-group/sks/sks-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for SKS OpenPGP keyserver"
+ACCT_GROUP_ID=370
diff --git a/acct-group/sks/sks-0.ebuild b/acct-group/sks/sks-0.ebuild
deleted file mode 100644
index 0304197a7063..000000000000
--- a/acct-group/sks/sks-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for SKS OpenPGP keyserver"
-ACCT_GROUP_ID=370
diff --git a/acct-group/slurm/slurm-0-r1.ebuild b/acct-group/slurm/slurm-0-r1.ebuild
deleted file mode 100644
index a77214a6d765..000000000000
--- a/acct-group/slurm/slurm-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the slurm - Highly Scalable Resource Manager"
-ACCT_GROUP_ID=400
diff --git a/acct-group/slurm/slurm-0-r2.ebuild b/acct-group/slurm/slurm-0-r2.ebuild
new file mode 100644
index 000000000000..4d77700fd816
--- /dev/null
+++ b/acct-group/slurm/slurm-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the slurm - Highly Scalable Resource Manager"
+ACCT_GROUP_ID=400
diff --git a/acct-group/smmsp/smmsp-0-r1.ebuild b/acct-group/smmsp/smmsp-0-r1.ebuild
deleted file mode 100644
index 8e0821713295..000000000000
--- a/acct-group/smmsp/smmsp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=209
diff --git a/acct-group/smmsp/smmsp-0-r2.ebuild b/acct-group/smmsp/smmsp-0-r2.ebuild
new file mode 100644
index 000000000000..1b08887f6648
--- /dev/null
+++ b/acct-group/smmsp/smmsp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=209
diff --git a/acct-group/smokeping/smokeping-0-r1.ebuild b/acct-group/smokeping/smokeping-0-r1.ebuild
new file mode 100644
index 000000000000..8a12dbb3875a
--- /dev/null
+++ b/acct-group/smokeping/smokeping-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/smokeping"
+
+ACCT_GROUP_ID="164"
diff --git a/acct-group/smokeping/smokeping-0.ebuild b/acct-group/smokeping/smokeping-0.ebuild
deleted file mode 100644
index 0d00bb46fcb0..000000000000
--- a/acct-group/smokeping/smokeping-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-analyzer/smokeping"
-
-ACCT_GROUP_ID="164"
diff --git a/acct-group/sms/sms-0-r1.ebuild b/acct-group/sms/sms-0-r1.ebuild
new file mode 100644
index 000000000000..5de57373dacf
--- /dev/null
+++ b/acct-group/sms/sms-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=359
diff --git a/acct-group/sms/sms-0.ebuild b/acct-group/sms/sms-0.ebuild
deleted file mode 100644
index dea788cbae76..000000000000
--- a/acct-group/sms/sms-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=359
diff --git a/acct-group/smtpd/smtpd-0-r1.ebuild b/acct-group/smtpd/smtpd-0-r1.ebuild
deleted file mode 100644
index b09abd76d858..000000000000
--- a/acct-group/smtpd/smtpd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="daemon group for smtpd"
-ACCT_GROUP_ID=25
diff --git a/acct-group/smtpd/smtpd-0-r2.ebuild b/acct-group/smtpd/smtpd-0-r2.ebuild
new file mode 100644
index 000000000000..7c6daeb449a8
--- /dev/null
+++ b/acct-group/smtpd/smtpd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="daemon group for smtpd"
+ACCT_GROUP_ID=25
diff --git a/acct-group/smtpq/smtpq-0-r1.ebuild b/acct-group/smtpq/smtpq-0-r1.ebuild
deleted file mode 100644
index 8797fef847fb..000000000000
--- a/acct-group/smtpq/smtpq-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="queue group for smtpd"
-ACCT_GROUP_ID=252
diff --git a/acct-group/smtpq/smtpq-0-r2.ebuild b/acct-group/smtpq/smtpq-0-r2.ebuild
new file mode 100644
index 000000000000..1bc8ae7786bb
--- /dev/null
+++ b/acct-group/smtpq/smtpq-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="queue group for smtpd"
+ACCT_GROUP_ID=252
diff --git a/acct-group/snapserver/snapserver-0-r1.ebuild b/acct-group/snapserver/snapserver-0-r1.ebuild
new file mode 100644
index 000000000000..4742c6cf0de7
--- /dev/null
+++ b/acct-group/snapserver/snapserver-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Server group for media-sound/snapcast"
+ACCT_GROUP_ID=374
diff --git a/acct-group/snapserver/snapserver-0.ebuild b/acct-group/snapserver/snapserver-0.ebuild
deleted file mode 100644
index 7a224e941124..000000000000
--- a/acct-group/snapserver/snapserver-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Server group for media-sound/snapcast"
-ACCT_GROUP_ID=374
diff --git a/acct-group/sniproxy/sniproxy-0-r1.ebuild b/acct-group/sniproxy/sniproxy-0-r1.ebuild
new file mode 100644
index 000000000000..0858202737dc
--- /dev/null
+++ b/acct-group/sniproxy/sniproxy-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=366
diff --git a/acct-group/sniproxy/sniproxy-0.ebuild b/acct-group/sniproxy/sniproxy-0.ebuild
deleted file mode 100644
index 526eb45957e2..000000000000
--- a/acct-group/sniproxy/sniproxy-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=366
diff --git a/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild b/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..d5970e69065a
--- /dev/null
+++ b/acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/snmp_exporter/snmp_exporter-0.ebuild b/acct-group/snmp_exporter/snmp_exporter-0.ebuild
deleted file mode 100644
index 52cf4f2d532e..000000000000
--- a/acct-group/snmp_exporter/snmp_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/snort/snort-0-r1.ebuild b/acct-group/snort/snort-0-r1.ebuild
new file mode 100644
index 000000000000..0ad19e1d8cc9
--- /dev/null
+++ b/acct-group/snort/snort-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=328
diff --git a/acct-group/snort/snort-0.ebuild b/acct-group/snort/snort-0.ebuild
deleted file mode 100644
index 95dcdd566680..000000000000
--- a/acct-group/snort/snort-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=328
diff --git a/acct-group/sobby/sobby-0-r1.ebuild b/acct-group/sobby/sobby-0-r1.ebuild
new file mode 100644
index 000000000000..021a16065541
--- /dev/null
+++ b/acct-group/sobby/sobby-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=322
diff --git a/acct-group/sobby/sobby-0.ebuild b/acct-group/sobby/sobby-0.ebuild
deleted file mode 100644
index 0f95a3ce6461..000000000000
--- a/acct-group/sobby/sobby-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=322
diff --git a/acct-group/sobexsrv/sobexsrv-0-r1.ebuild b/acct-group/sobexsrv/sobexsrv-0-r1.ebuild
new file mode 100644
index 000000000000..7f01a21751cc
--- /dev/null
+++ b/acct-group/sobexsrv/sobexsrv-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sobexsrv: a secure OBEX server"
+ACCT_GROUP_ID=387
diff --git a/acct-group/sobexsrv/sobexsrv-0.ebuild b/acct-group/sobexsrv/sobexsrv-0.ebuild
deleted file mode 100644
index a91907f84e21..000000000000
--- a/acct-group/sobexsrv/sobexsrv-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for sobexsrv: a secure OBEX server"
-ACCT_GROUP_ID=387
diff --git a/acct-group/sockd/sockd-0-r1.ebuild b/acct-group/sockd/sockd-0-r1.ebuild
new file mode 100644
index 000000000000..d72ccb7e0e9e
--- /dev/null
+++ b/acct-group/sockd/sockd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-proxy/dante"
+
+ACCT_GROUP_ID="214"
diff --git a/acct-group/sockd/sockd-0.ebuild b/acct-group/sockd/sockd-0.ebuild
deleted file mode 100644
index deebd843ff19..000000000000
--- a/acct-group/sockd/sockd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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-proxy/dante"
-
-ACCT_GROUP_ID="214"
diff --git a/acct-group/sogo/sogo-0-r1.ebuild b/acct-group/sogo/sogo-0-r1.ebuild
deleted file mode 100644
index d23c3bef7ff9..000000000000
--- a/acct-group/sogo/sogo-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for gnustep-apps/sogo"
-ACCT_GROUP_ID=475
diff --git a/acct-group/sogo/sogo-0-r2.ebuild b/acct-group/sogo/sogo-0-r2.ebuild
new file mode 100644
index 000000000000..46692a2b3bdb
--- /dev/null
+++ b/acct-group/sogo/sogo-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for gnustep-apps/sogo"
+ACCT_GROUP_ID=475
diff --git a/acct-group/soju/soju-0-r1.ebuild b/acct-group/soju/soju-0-r1.ebuild
new file mode 100644
index 000000000000..66cd1ad30d26
--- /dev/null
+++ b/acct-group/soju/soju-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_GROUP_ID=526
diff --git a/acct-group/soju/soju-0.ebuild b/acct-group/soju/soju-0.ebuild
deleted file mode 100644
index e5be123ff93f..000000000000
--- a/acct-group/soju/soju-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="User for the net-irc/soju IRC bouncer"
-ACCT_GROUP_ID=526
diff --git a/acct-group/sonarr/sonarr-0-r1.ebuild b/acct-group/sonarr/sonarr-0-r1.ebuild
new file mode 100644
index 000000000000..bea9a228c69b
--- /dev/null
+++ b/acct-group/sonarr/sonarr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=515
diff --git a/acct-group/sonarr/sonarr-0.ebuild b/acct-group/sonarr/sonarr-0.ebuild
deleted file mode 100644
index c40efb6d7a67..000000000000
--- a/acct-group/sonarr/sonarr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=515
diff --git a/acct-group/spamd/spamd-0-r1.ebuild b/acct-group/spamd/spamd-0-r1.ebuild
deleted file mode 100644
index d995a905a5ce..000000000000
--- a/acct-group/spamd/spamd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the SpamAssassin daemon"
-ACCT_GROUP_ID=337
diff --git a/acct-group/spamd/spamd-0-r2.ebuild b/acct-group/spamd/spamd-0-r2.ebuild
new file mode 100644
index 000000000000..05d1b1f0d616
--- /dev/null
+++ b/acct-group/spamd/spamd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the SpamAssassin daemon"
+ACCT_GROUP_ID=337
diff --git a/acct-group/spectrum/spectrum-0-r1.ebuild b/acct-group/spectrum/spectrum-0-r1.ebuild
deleted file mode 100644
index be11afecfee1..000000000000
--- a/acct-group/spectrum/spectrum-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the Spectrum messaging transport"
-
-ACCT_GROUP_ID="486"
diff --git a/acct-group/spectrum/spectrum-0-r2.ebuild b/acct-group/spectrum/spectrum-0-r2.ebuild
new file mode 100644
index 000000000000..ca2ce6dd11b6
--- /dev/null
+++ b/acct-group/spectrum/spectrum-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Spectrum messaging transport"
+
+ACCT_GROUP_ID="486"
diff --git a/acct-group/spi/spi-0-r1.ebuild b/acct-group/spi/spi-0-r1.ebuild
new file mode 100644
index 000000000000..5e2962ae7212
--- /dev/null
+++ b/acct-group/spi/spi-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID="227"
diff --git a/acct-group/spi/spi-0.ebuild b/acct-group/spi/spi-0.ebuild
deleted file mode 100644
index 88be21fa31f0..000000000000
--- a/acct-group/spi/spi-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID="227"
diff --git a/acct-group/spire/spire-0-r1.ebuild b/acct-group/spire/spire-0-r1.ebuild
deleted file mode 100644
index 6bb96c368ca5..000000000000
--- a/acct-group/spire/spire-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=271
diff --git a/acct-group/spire/spire-0-r2.ebuild b/acct-group/spire/spire-0-r2.ebuild
new file mode 100644
index 000000000000..493d68009803
--- /dev/null
+++ b/acct-group/spire/spire-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=271
diff --git a/acct-group/spread/spread-0-r1.ebuild b/acct-group/spread/spread-0-r1.ebuild
new file mode 100644
index 000000000000..900b78116d63
--- /dev/null
+++ b/acct-group/spread/spread-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/spread"
+
+ACCT_GROUP_ID="159"
diff --git a/acct-group/spread/spread-0.ebuild b/acct-group/spread/spread-0.ebuild
deleted file mode 100644
index 7bbdd3539cd6..000000000000
--- a/acct-group/spread/spread-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/spread"
-
-ACCT_GROUP_ID="159"
diff --git a/acct-group/sqlgrey/sqlgrey-0-r1.ebuild b/acct-group/sqlgrey/sqlgrey-0-r1.ebuild
deleted file mode 100644
index 895ee6873352..000000000000
--- a/acct-group/sqlgrey/sqlgrey-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for SQLGrey"
-ACCT_GROUP_ID=336
diff --git a/acct-group/sqlgrey/sqlgrey-0-r2.ebuild b/acct-group/sqlgrey/sqlgrey-0-r2.ebuild
new file mode 100644
index 000000000000..fb26a5e012d1
--- /dev/null
+++ b/acct-group/sqlgrey/sqlgrey-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for SQLGrey"
+ACCT_GROUP_ID=336
diff --git a/acct-group/squid/squid-0-r1.ebuild b/acct-group/squid/squid-0-r1.ebuild
deleted file mode 100644
index 7295f3099cd9..000000000000
--- a/acct-group/squid/squid-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=301
diff --git a/acct-group/squid/squid-0-r2.ebuild b/acct-group/squid/squid-0-r2.ebuild
new file mode 100644
index 000000000000..4aaa19a79641
--- /dev/null
+++ b/acct-group/squid/squid-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=301
diff --git a/acct-group/sshd/sshd-0-r1.ebuild b/acct-group/sshd/sshd-0-r1.ebuild
deleted file mode 100644
index d54032fc8a6b..000000000000
--- a/acct-group/sshd/sshd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=22
diff --git a/acct-group/sshd/sshd-0-r2.ebuild b/acct-group/sshd/sshd-0-r2.ebuild
new file mode 100644
index 000000000000..fbe8efaf9c1b
--- /dev/null
+++ b/acct-group/sshd/sshd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=22
diff --git a/acct-group/ssmtp/ssmtp-0-r1.ebuild b/acct-group/ssmtp/ssmtp-0-r1.ebuild
new file mode 100644
index 000000000000..dd67498912e9
--- /dev/null
+++ b/acct-group/ssmtp/ssmtp-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-mta/ssmtp"
+
+ACCT_GROUP_ID="299"
diff --git a/acct-group/ssmtp/ssmtp-0.ebuild b/acct-group/ssmtp/ssmtp-0.ebuild
deleted file mode 100644
index 6ad46f6347f0..000000000000
--- a/acct-group/ssmtp/ssmtp-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for mail-mta/ssmtp"
-
-ACCT_GROUP_ID="299"
diff --git a/acct-group/sstpc/sstpc-0-r1.ebuild b/acct-group/sstpc/sstpc-0-r1.ebuild
new file mode 100644
index 000000000000..3a0e888cd978
--- /dev/null
+++ b/acct-group/sstpc/sstpc-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/sstp-client"
+
+ACCT_GROUP_ID="257"
diff --git a/acct-group/sstpc/sstpc-0.ebuild b/acct-group/sstpc/sstpc-0.ebuild
deleted file mode 100644
index 6d41098780cd..000000000000
--- a/acct-group/sstpc/sstpc-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/sstp-client"
-
-ACCT_GROUP_ID="257"
diff --git a/acct-group/stapdev/stapdev-0-r1.ebuild b/acct-group/stapdev/stapdev-0-r1.ebuild
new file mode 100644
index 000000000000..8e55b5a002f7
--- /dev/null
+++ b/acct-group/stapdev/stapdev-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=158
diff --git a/acct-group/stapdev/stapdev-0.ebuild b/acct-group/stapdev/stapdev-0.ebuild
deleted file mode 100644
index b964a19dcabe..000000000000
--- a/acct-group/stapdev/stapdev-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=158
diff --git a/acct-group/stapsys/stapsys-0-r1.ebuild b/acct-group/stapsys/stapsys-0-r1.ebuild
new file mode 100644
index 000000000000..60dd89044f9b
--- /dev/null
+++ b/acct-group/stapsys/stapsys-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=157
diff --git a/acct-group/stapsys/stapsys-0.ebuild b/acct-group/stapsys/stapsys-0.ebuild
deleted file mode 100644
index 82e1d15cc0b8..000000000000
--- a/acct-group/stapsys/stapsys-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=157
diff --git a/acct-group/stapusr/stapusr-0-r1.ebuild b/acct-group/stapusr/stapusr-0-r1.ebuild
new file mode 100644
index 000000000000..5e1a0850f61a
--- /dev/null
+++ b/acct-group/stapusr/stapusr-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=156
diff --git a/acct-group/stapusr/stapusr-0.ebuild b/acct-group/stapusr/stapusr-0.ebuild
deleted file mode 100644
index 386b74e9c57b..000000000000
--- a/acct-group/stapusr/stapusr-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=156
diff --git a/acct-group/steamcmd/steamcmd-0-r1.ebuild b/acct-group/steamcmd/steamcmd-0-r1.ebuild
deleted file mode 100644
index f2ddf2b44fb6..000000000000
--- a/acct-group/steamcmd/steamcmd-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the SteamCMD server"
-
-ACCT_GROUP_ID="489"
diff --git a/acct-group/steamcmd/steamcmd-0-r2.ebuild b/acct-group/steamcmd/steamcmd-0-r2.ebuild
new file mode 100644
index 000000000000..0857f379a59f
--- /dev/null
+++ b/acct-group/steamcmd/steamcmd-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the SteamCMD server"
+
+ACCT_GROUP_ID="489"
diff --git a/acct-group/stg/stg-0-r1.ebuild b/acct-group/stg/stg-0-r1.ebuild
new file mode 100644
index 000000000000..5364e086d229
--- /dev/null
+++ b/acct-group/stg/stg-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/stargazer"
+
+ACCT_GROUP_ID="176"
diff --git a/acct-group/stg/stg-0.ebuild b/acct-group/stg/stg-0.ebuild
deleted file mode 100644
index cd405cbaf857..000000000000
--- a/acct-group/stg/stg-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/stargazer"
-
-ACCT_GROUP_ID="176"
diff --git a/acct-group/stubby/stubby-0-r1.ebuild b/acct-group/stubby/stubby-0-r1.ebuild
deleted file mode 100644
index 13e45d99fbec..000000000000
--- a/acct-group/stubby/stubby-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Stubby program group (from net-dns/getdns)"
-ACCT_GROUP_ID=476
diff --git a/acct-group/stubby/stubby-0-r2.ebuild b/acct-group/stubby/stubby-0-r2.ebuild
new file mode 100644
index 000000000000..c87d37f3702a
--- /dev/null
+++ b/acct-group/stubby/stubby-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Stubby program group (from net-dns/getdns)"
+ACCT_GROUP_ID=476
diff --git a/acct-group/stunnel/stunnel-0-r1.ebuild b/acct-group/stunnel/stunnel-0-r1.ebuild
deleted file mode 100644
index 47360c73c9b6..000000000000
--- a/acct-group/stunnel/stunnel-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for stunnel"
-ACCT_GROUP_ID=341
diff --git a/acct-group/stunnel/stunnel-0-r2.ebuild b/acct-group/stunnel/stunnel-0-r2.ebuild
new file mode 100644
index 000000000000..39785b30995e
--- /dev/null
+++ b/acct-group/stunnel/stunnel-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for stunnel"
+ACCT_GROUP_ID=341
diff --git a/acct-group/subsonic/subsonic-0-r1.ebuild b/acct-group/subsonic/subsonic-0-r1.ebuild
new file mode 100644
index 000000000000..d4297cbcd2e8
--- /dev/null
+++ b/acct-group/subsonic/subsonic-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/subsonic/subsonic-0.ebuild b/acct-group/subsonic/subsonic-0.ebuild
deleted file mode 100644
index 95e9e9317296..000000000000
--- a/acct-group/subsonic/subsonic-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/supervisor/supervisor-0-r1.ebuild b/acct-group/supervisor/supervisor-0-r1.ebuild
deleted file mode 100644
index 4890748ecbfe..000000000000
--- a/acct-group/supervisor/supervisor-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group to grant access to app-admin/supervisor's management"
-ACCT_GROUP_ID=463
diff --git a/acct-group/supervisor/supervisor-0-r2.ebuild b/acct-group/supervisor/supervisor-0-r2.ebuild
new file mode 100644
index 000000000000..c617112584e2
--- /dev/null
+++ b/acct-group/supervisor/supervisor-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group to grant access to app-admin/supervisor's management"
+ACCT_GROUP_ID=463
diff --git a/acct-group/suricata/suricata-0-r1.ebuild b/acct-group/suricata/suricata-0-r1.ebuild
deleted file mode 100644
index c9ad4e167661..000000000000
--- a/acct-group/suricata/suricata-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Suricata IDS"
-ACCT_GROUP_ID=477
diff --git a/acct-group/suricata/suricata-0-r2.ebuild b/acct-group/suricata/suricata-0-r2.ebuild
new file mode 100644
index 000000000000..93bfdc32e360
--- /dev/null
+++ b/acct-group/suricata/suricata-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Suricata IDS"
+ACCT_GROUP_ID=477
diff --git a/acct-group/svnusers/svnusers-0-r1.ebuild b/acct-group/svnusers/svnusers-0-r1.ebuild
deleted file mode 100644
index 0a1c980c6503..000000000000
--- a/acct-group/svnusers/svnusers-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=399
diff --git a/acct-group/svnusers/svnusers-0-r2.ebuild b/acct-group/svnusers/svnusers-0-r2.ebuild
new file mode 100644
index 000000000000..5f1ff202b155
--- /dev/null
+++ b/acct-group/svnusers/svnusers-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=399
diff --git a/acct-group/svxlink/svxlink-0-r1.ebuild b/acct-group/svxlink/svxlink-0-r1.ebuild
new file mode 100644
index 000000000000..85c420295f38
--- /dev/null
+++ b/acct-group/svxlink/svxlink-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the svxlink server"
+ACCT_GROUP_ID=247
diff --git a/acct-group/svxlink/svxlink-0.ebuild b/acct-group/svxlink/svxlink-0.ebuild
deleted file mode 100644
index 73dbcd6e5c15..000000000000
--- a/acct-group/svxlink/svxlink-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the svxlink server"
-ACCT_GROUP_ID=247
diff --git a/acct-group/swift/swift-0-r1.ebuild b/acct-group/swift/swift-0-r1.ebuild
deleted file mode 100644
index 02bd773b31ab..000000000000
--- a/acct-group/swift/swift-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=449
diff --git a/acct-group/swift/swift-0-r2.ebuild b/acct-group/swift/swift-0-r2.ebuild
new file mode 100644
index 000000000000..bc62cfafcc2a
--- /dev/null
+++ b/acct-group/swift/swift-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=449
diff --git a/acct-group/synapse/synapse-0-r1.ebuild b/acct-group/synapse/synapse-0-r1.ebuild
new file mode 100644
index 000000000000..ce4c5e9bfbf0
--- /dev/null
+++ b/acct-group/synapse/synapse-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for net-im/synapse"
+ACCT_GROUP_ID=519
diff --git a/acct-group/synapse/synapse-0.ebuild b/acct-group/synapse/synapse-0.ebuild
deleted file mode 100644
index 0f7e576bb55a..000000000000
--- a/acct-group/synapse/synapse-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for net-im/synapse"
-ACCT_GROUP_ID=519
diff --git a/acct-group/syncthing/syncthing-0-r1.ebuild b/acct-group/syncthing/syncthing-0-r1.ebuild
deleted file mode 100644
index 2c7a7840c246..000000000000
--- a/acct-group/syncthing/syncthing-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the system-wide net-p2p/syncthing server"
-ACCT_GROUP_ID=499
diff --git a/acct-group/syncthing/syncthing-0-r2.ebuild b/acct-group/syncthing/syncthing-0-r2.ebuild
new file mode 100644
index 000000000000..d97c9cd968c7
--- /dev/null
+++ b/acct-group/syncthing/syncthing-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide net-p2p/syncthing server"
+ACCT_GROUP_ID=499
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild
deleted file mode 100644
index 118999609538..000000000000
--- a/acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild b/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild
new file mode 100644
index 000000000000..1d7bb6544080
--- /dev/null
+++ b/acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=194
diff --git a/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild b/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild
deleted file mode 100644
index 24f44986f516..000000000000
--- a/acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=505
diff --git a/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild b/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild
new file mode 100644
index 000000000000..d6954f22835e
--- /dev/null
+++ b/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=505
diff --git a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
deleted file mode 100644
index 8ddee6ec320f..000000000000
--- a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
new file mode 100644
index 000000000000..85c381bd53ea
--- /dev/null
+++ b/acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=191
diff --git a/acct-group/systemd-journal/systemd-journal-0-r1.ebuild b/acct-group/systemd-journal/systemd-journal-0-r1.ebuild
deleted file mode 100644
index c439156e2f63..000000000000
--- a/acct-group/systemd-journal/systemd-journal-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-journal/systemd-journal-0-r2.ebuild b/acct-group/systemd-journal/systemd-journal-0-r2.ebuild
new file mode 100644
index 000000000000..fa6af68a04c4
--- /dev/null
+++ b/acct-group/systemd-journal/systemd-journal-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=190
diff --git a/acct-group/systemd-network/systemd-network-0-r1.ebuild b/acct-group/systemd-network/systemd-network-0-r1.ebuild
deleted file mode 100644
index 6f88d3ca9895..000000000000
--- a/acct-group/systemd-network/systemd-network-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-network/systemd-network-0-r2.ebuild b/acct-group/systemd-network/systemd-network-0-r2.ebuild
new file mode 100644
index 000000000000..bb6b7af62bb3
--- /dev/null
+++ b/acct-group/systemd-network/systemd-network-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=192
diff --git a/acct-group/systemd-oom/systemd-oom-0-r1.ebuild b/acct-group/systemd-oom/systemd-oom-0-r1.ebuild
new file mode 100644
index 000000000000..9d1b0e6de967
--- /dev/null
+++ b/acct-group/systemd-oom/systemd-oom-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-oom/systemd-oom-0.ebuild b/acct-group/systemd-oom/systemd-oom-0.ebuild
deleted file mode 100644
index 175d26d66eb5..000000000000
--- a/acct-group/systemd-oom/systemd-oom-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=198
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild
deleted file mode 100644
index 903603df6230..000000000000
--- a/acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild b/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild
new file mode 100644
index 000000000000..d5a49e0df40a
--- /dev/null
+++ b/acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=193
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild
deleted file mode 100644
index 50abd9371502..000000000000
--- a/acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=195
diff --git a/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild b/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild
new file mode 100644
index 000000000000..b3acdb6f39cd
--- /dev/null
+++ b/acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=195
diff --git a/acct-group/tape/tape-0-r1.ebuild b/acct-group/tape/tape-0-r1.ebuild
deleted file mode 100644
index e7aa561286dd..000000000000
--- a/acct-group/tape/tape-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=26
diff --git a/acct-group/tape/tape-0-r2.ebuild b/acct-group/tape/tape-0-r2.ebuild
new file mode 100644
index 000000000000..87743a734062
--- /dev/null
+++ b/acct-group/tape/tape-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=26
diff --git a/acct-group/taskd/taskd-0-r1.ebuild b/acct-group/taskd/taskd-0-r1.ebuild
new file mode 100644
index 000000000000..65a47cc845e3
--- /dev/null
+++ b/acct-group/taskd/taskd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/taskd"
+
+ACCT_GROUP_ID="152"
diff --git a/acct-group/taskd/taskd-0.ebuild b/acct-group/taskd/taskd-0.ebuild
deleted file mode 100644
index 16ca38a8ade9..000000000000
--- a/acct-group/taskd/taskd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/taskd"
-
-ACCT_GROUP_ID="152"
diff --git a/acct-group/teamspeak/teamspeak-0-r1.ebuild b/acct-group/teamspeak/teamspeak-0-r1.ebuild
deleted file mode 100644
index 05f5b6fd1ea8..000000000000
--- a/acct-group/teamspeak/teamspeak-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the TeamSpeak server"
-
-ACCT_GROUP_ID="488"
diff --git a/acct-group/teamspeak/teamspeak-0-r2.ebuild b/acct-group/teamspeak/teamspeak-0-r2.ebuild
new file mode 100644
index 000000000000..3387dde0dba0
--- /dev/null
+++ b/acct-group/teamspeak/teamspeak-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the TeamSpeak server"
+
+ACCT_GROUP_ID="488"
diff --git a/acct-group/telegraf/telegraf-0-r1.ebuild b/acct-group/telegraf/telegraf-0-r1.ebuild
deleted file mode 100644
index c7a063da8332..000000000000
--- a/acct-group/telegraf/telegraf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=428
diff --git a/acct-group/telegraf/telegraf-0-r2.ebuild b/acct-group/telegraf/telegraf-0-r2.ebuild
new file mode 100644
index 000000000000..593c2d977184
--- /dev/null
+++ b/acct-group/telegraf/telegraf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=428
diff --git a/acct-group/tenshi/tenshi-0-r1.ebuild b/acct-group/tenshi/tenshi-0-r1.ebuild
new file mode 100644
index 000000000000..577b6e34ee6b
--- /dev/null
+++ b/acct-group/tenshi/tenshi-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for app-admin/tenshi"
+
+ACCT_GROUP_ID="283"
diff --git a/acct-group/tenshi/tenshi-0.ebuild b/acct-group/tenshi/tenshi-0.ebuild
deleted file mode 100644
index 4ca858e2c78d..000000000000
--- a/acct-group/tenshi/tenshi-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for app-admin/tenshi"
-
-ACCT_GROUP_ID="283"
diff --git a/acct-group/thttpd/thttpd-0-r1.ebuild b/acct-group/thttpd/thttpd-0-r1.ebuild
new file mode 100644
index 000000000000..ecd4915fa384
--- /dev/null
+++ b/acct-group/thttpd/thttpd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/thttpd/thttpd-0.ebuild b/acct-group/thttpd/thttpd-0.ebuild
deleted file mode 100644
index f30403a01946..000000000000
--- a/acct-group/thttpd/thttpd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/tinyproxy/tinyproxy-0-r1.ebuild b/acct-group/tinyproxy/tinyproxy-0-r1.ebuild
new file mode 100644
index 000000000000..6f7689c3c3df
--- /dev/null
+++ b/acct-group/tinyproxy/tinyproxy-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-proxy/tinyproxy"
+
+ACCT_GROUP_ID=186
diff --git a/acct-group/tinyproxy/tinyproxy-0.ebuild b/acct-group/tinyproxy/tinyproxy-0.ebuild
deleted file mode 100644
index 24a884b47c59..000000000000
--- a/acct-group/tinyproxy/tinyproxy-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="gid for net-proxy/tinyproxy"
-
-ACCT_GROUP_ID=186
diff --git a/acct-group/tomcat/tomcat-0-r1.ebuild b/acct-group/tomcat/tomcat-0-r1.ebuild
new file mode 100644
index 000000000000..d9b3c7ed3296
--- /dev/null
+++ b/acct-group/tomcat/tomcat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Apache Tomcat"
+ACCT_GROUP_ID=265
diff --git a/acct-group/tomcat/tomcat-0.ebuild b/acct-group/tomcat/tomcat-0.ebuild
deleted file mode 100644
index ddef1fa45694..000000000000
--- a/acct-group/tomcat/tomcat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Apache Tomcat"
-ACCT_GROUP_ID=265
diff --git a/acct-group/tor/tor-0-r1.ebuild b/acct-group/tor/tor-0-r1.ebuild
deleted file mode 100644
index 0fe44e122b31..000000000000
--- a/acct-group/tor/tor-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for tor daemon"
-ACCT_GROUP_ID=43
diff --git a/acct-group/tor/tor-0-r2.ebuild b/acct-group/tor/tor-0-r2.ebuild
new file mode 100644
index 000000000000..cb5343bcbdc3
--- /dev/null
+++ b/acct-group/tor/tor-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for tor daemon"
+ACCT_GROUP_ID=43
diff --git a/acct-group/tox/tox-0-r1.ebuild b/acct-group/tox/tox-0-r1.ebuild
deleted file mode 100644
index e50b936945ed..000000000000
--- a/acct-group/tox/tox-0-r1.ebuild
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-group
-DESCRIPTION="Group management for package net-libs/tox"
-ACCT_GROUP_ID=236 #day-month of first commit of tox (23-6-13).
diff --git a/acct-group/tox/tox-0-r2.ebuild b/acct-group/tox/tox-0-r2.ebuild
new file mode 100644
index 000000000000..e0df3c1427c9
--- /dev/null
+++ b/acct-group/tox/tox-0-r2.ebuild
@@ -0,0 +1,7 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-group
+DESCRIPTION="Group management for package net-libs/tox"
+ACCT_GROUP_ID=236 #day-month of first commit of tox (23-6-13).
diff --git a/acct-group/tpm/tpm-0-r1.ebuild b/acct-group/tpm/tpm-0-r1.ebuild
new file mode 100644
index 000000000000..42ec8b85c14e
--- /dev/null
+++ b/acct-group/tpm/tpm-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=347
diff --git a/acct-group/tpm/tpm-0.ebuild b/acct-group/tpm/tpm-0.ebuild
deleted file mode 100644
index 78bf604298a0..000000000000
--- a/acct-group/tpm/tpm-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=347
diff --git a/acct-group/transmission/transmission-0-r1.ebuild b/acct-group/transmission/transmission-0-r1.ebuild
deleted file mode 100644
index 682145cd09be..000000000000
--- a/acct-group/transmission/transmission-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=169
diff --git a/acct-group/transmission/transmission-0-r2.ebuild b/acct-group/transmission/transmission-0-r2.ebuild
new file mode 100644
index 000000000000..ea7be7a6a2bd
--- /dev/null
+++ b/acct-group/transmission/transmission-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=169
diff --git a/acct-group/trickster/trickster-0-r1.ebuild b/acct-group/trickster/trickster-0-r1.ebuild
new file mode 100644
index 000000000000..f52d9309fbfc
--- /dev/null
+++ b/acct-group/trickster/trickster-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/trickster/trickster-0.ebuild b/acct-group/trickster/trickster-0.ebuild
deleted file mode 100644
index fa5e88995312..000000000000
--- a/acct-group/trickster/trickster-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/trojan/trojan-0-r1.ebuild b/acct-group/trojan/trojan-0-r1.ebuild
new file mode 100644
index 000000000000..8c754f0d94e6
--- /dev/null
+++ b/acct-group/trojan/trojan-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=326
diff --git a/acct-group/trojan/trojan-0.ebuild b/acct-group/trojan/trojan-0.ebuild
deleted file mode 100644
index e3af9f513f48..000000000000
--- a/acct-group/trojan/trojan-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=326
diff --git a/acct-group/tsm/tsm-0-r1.ebuild b/acct-group/tsm/tsm-0-r1.ebuild
deleted file mode 100644
index 117a3a3bde45..000000000000
--- a/acct-group/tsm/tsm-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=465
diff --git a/acct-group/tsm/tsm-0-r2.ebuild b/acct-group/tsm/tsm-0-r2.ebuild
new file mode 100644
index 000000000000..e992130a445e
--- /dev/null
+++ b/acct-group/tsm/tsm-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=465
diff --git a/acct-group/tss/tss-0-r1.ebuild b/acct-group/tss/tss-0-r1.ebuild
deleted file mode 100644
index 3ecc4e54949c..000000000000
--- a/acct-group/tss/tss-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Trusted Software Stack for TPMs group"
-ACCT_GROUP_ID=59
diff --git a/acct-group/tss/tss-0-r2.ebuild b/acct-group/tss/tss-0-r2.ebuild
new file mode 100644
index 000000000000..24626e201848
--- /dev/null
+++ b/acct-group/tss/tss-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Trusted Software Stack for TPMs group"
+ACCT_GROUP_ID=59
diff --git a/acct-group/ttrssd/ttrssd-0-r1.ebuild b/acct-group/ttrssd/ttrssd-0-r1.ebuild
new file mode 100644
index 000000000000..a42e44e4631c
--- /dev/null
+++ b/acct-group/ttrssd/ttrssd-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for www-apps/tt-rss"
+ACCT_GROUP_ID=386
diff --git a/acct-group/ttrssd/ttrssd-0.ebuild b/acct-group/ttrssd/ttrssd-0.ebuild
deleted file mode 100644
index 1d5fcc70b9ab..000000000000
--- a/acct-group/ttrssd/ttrssd-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for www-apps/tt-rss"
-ACCT_GROUP_ID=386
diff --git a/acct-group/tty/tty-0-r1.ebuild b/acct-group/tty/tty-0-r1.ebuild
deleted file mode 100644
index 2133d92cfa3b..000000000000
--- a/acct-group/tty/tty-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=5
diff --git a/acct-group/tty/tty-0-r2.ebuild b/acct-group/tty/tty-0-r2.ebuild
new file mode 100644
index 000000000000..b6a00ae485fb
--- /dev/null
+++ b/acct-group/tty/tty-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=5
diff --git a/acct-group/turnserver/turnserver-0-r1.ebuild b/acct-group/turnserver/turnserver-0-r1.ebuild
deleted file mode 100644
index 37a44ee01058..000000000000
--- a/acct-group/turnserver/turnserver-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for a turn server like coturn"
-
-ACCT_GROUP_ID="235"
diff --git a/acct-group/turnserver/turnserver-0-r2.ebuild b/acct-group/turnserver/turnserver-0-r2.ebuild
new file mode 100644
index 000000000000..557eba9e0b1b
--- /dev/null
+++ b/acct-group/turnserver/turnserver-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for a turn server like coturn"
+
+ACCT_GROUP_ID="235"
diff --git a/acct-group/ubridge/ubridge-0-r1.ebuild b/acct-group/ubridge/ubridge-0-r1.ebuild
deleted file mode 100644
index 6d79fba1f383..000000000000
--- a/acct-group/ubridge/ubridge-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/ubridge"
-ACCT_GROUP_ID=461
diff --git a/acct-group/ubridge/ubridge-0-r2.ebuild b/acct-group/ubridge/ubridge-0-r2.ebuild
new file mode 100644
index 000000000000..20ab07a4c9e4
--- /dev/null
+++ b/acct-group/ubridge/ubridge-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/ubridge"
+ACCT_GROUP_ID=461
diff --git a/acct-group/ulogd/ulogd-0-r1.ebuild b/acct-group/ulogd/ulogd-0-r1.ebuild
new file mode 100644
index 000000000000..15b7a3bf99fc
--- /dev/null
+++ b/acct-group/ulogd/ulogd-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ulogd"
+ACCT_GROUP_ID=311
diff --git a/acct-group/ulogd/ulogd-0.ebuild b/acct-group/ulogd/ulogd-0.ebuild
deleted file mode 100644
index d9c49c9aff0e..000000000000
--- a/acct-group/ulogd/ulogd-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ulogd"
-ACCT_GROUP_ID=311
diff --git a/acct-group/ultimaker/ultimaker-0-r1.ebuild b/acct-group/ultimaker/ultimaker-0-r1.ebuild
deleted file mode 100644
index af415ea3785f..000000000000
--- a/acct-group/ultimaker/ultimaker-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ultimaker"
-ACCT_GROUP_ID=369
diff --git a/acct-group/ultimaker/ultimaker-0-r2.ebuild b/acct-group/ultimaker/ultimaker-0-r2.ebuild
new file mode 100644
index 000000000000..a69acd173bf8
--- /dev/null
+++ b/acct-group/ultimaker/ultimaker-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ultimaker"
+ACCT_GROUP_ID=369
diff --git a/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild
new file mode 100644
index 000000000000..59e9459f0fdb
--- /dev/null
+++ b/acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=279
diff --git a/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild b/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild
deleted file mode 100644
index 7cf4cee045e4..000000000000
--- a/acct-group/unbound-telemetry/unbound-telemetry-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=279
diff --git a/acct-group/unbound/unbound-0-r1.ebuild b/acct-group/unbound/unbound-0-r1.ebuild
deleted file mode 100644
index 4a2eab027793..000000000000
--- a/acct-group/unbound/unbound-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="unbound program group"
-
-ACCT_GROUP_ID=391
diff --git a/acct-group/unbound/unbound-0-r2.ebuild b/acct-group/unbound/unbound-0-r2.ebuild
new file mode 100644
index 000000000000..a9047bfb0b5f
--- /dev/null
+++ b/acct-group/unbound/unbound-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="unbound program group"
+
+ACCT_GROUP_ID=391
diff --git a/acct-group/unifi-video/unifi-video-0-r1.ebuild b/acct-group/unifi-video/unifi-video-0-r1.ebuild
new file mode 100644
index 000000000000..21165892f5b5
--- /dev/null
+++ b/acct-group/unifi-video/unifi-video-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Unifi Video"
+ACCT_GROUP_ID=348
diff --git a/acct-group/unifi-video/unifi-video-0.ebuild b/acct-group/unifi-video/unifi-video-0.ebuild
deleted file mode 100644
index 39344e103ea3..000000000000
--- a/acct-group/unifi-video/unifi-video-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Unifi Video"
-ACCT_GROUP_ID=348
diff --git a/acct-group/unifi/unifi-0-r1.ebuild b/acct-group/unifi/unifi-0-r1.ebuild
deleted file mode 100644
index f4db39318eb5..000000000000
--- a/acct-group/unifi/unifi-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="A group for the UniFi controller"
-
-ACCT_GROUP_ID="113"
diff --git a/acct-group/unifi/unifi-0-r2.ebuild b/acct-group/unifi/unifi-0-r2.ebuild
new file mode 100644
index 000000000000..8cc4b89e2b27
--- /dev/null
+++ b/acct-group/unifi/unifi-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the UniFi controller"
+
+ACCT_GROUP_ID="113"
diff --git a/acct-group/unrealircd/unrealircd-0-r1.ebuild b/acct-group/unrealircd/unrealircd-0-r1.ebuild
deleted file mode 100644
index 70f925a3cf58..000000000000
--- a/acct-group/unrealircd/unrealircd-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=494
diff --git a/acct-group/unrealircd/unrealircd-0-r2.ebuild b/acct-group/unrealircd/unrealircd-0-r2.ebuild
new file mode 100644
index 000000000000..6e9905dda3ca
--- /dev/null
+++ b/acct-group/unrealircd/unrealircd-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=494
diff --git a/acct-group/upmpdcli/upmpdcli-0-r1.ebuild b/acct-group/upmpdcli/upmpdcli-0-r1.ebuild
new file mode 100644
index 000000000000..ad99f3ce7935
--- /dev/null
+++ b/acct-group/upmpdcli/upmpdcli-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for upmpdcli"
+ACCT_GROUP_ID=372
diff --git a/acct-group/upmpdcli/upmpdcli-0.ebuild b/acct-group/upmpdcli/upmpdcli-0.ebuild
deleted file mode 100644
index 1b73dccb8d2f..000000000000
--- a/acct-group/upmpdcli/upmpdcli-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for upmpdcli"
-ACCT_GROUP_ID=372
diff --git a/acct-group/uptimed/uptimed-0-r2.ebuild b/acct-group/uptimed/uptimed-0-r2.ebuild
deleted file mode 100644
index 1934484e34a1..000000000000
--- a/acct-group/uptimed/uptimed-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID="220"
diff --git a/acct-group/uptimed/uptimed-0-r3.ebuild b/acct-group/uptimed/uptimed-0-r3.ebuild
new file mode 100644
index 000000000000..9e862e5c5de5
--- /dev/null
+++ b/acct-group/uptimed/uptimed-0-r3.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID="220"
diff --git a/acct-group/usb/usb-0-r1.ebuild b/acct-group/usb/usb-0-r1.ebuild
deleted file mode 100644
index 4655512049db..000000000000
--- a/acct-group/usb/usb-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=85
diff --git a/acct-group/usb/usb-0-r2.ebuild b/acct-group/usb/usb-0-r2.ebuild
new file mode 100644
index 000000000000..8f739063b3e6
--- /dev/null
+++ b/acct-group/usb/usb-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=85
diff --git a/acct-group/users/users-0-r1.ebuild b/acct-group/users/users-0-r1.ebuild
new file mode 100644
index 000000000000..c0c91d1e11a8
--- /dev/null
+++ b/acct-group/users/users-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=100
diff --git a/acct-group/users/users-0.ebuild b/acct-group/users/users-0.ebuild
deleted file mode 100644
index 50b573c2629d..000000000000
--- a/acct-group/users/users-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=100
diff --git a/acct-group/ushare/ushare-0-r1.ebuild b/acct-group/ushare/ushare-0-r1.ebuild
new file mode 100644
index 000000000000..3cfb444c312f
--- /dev/null
+++ b/acct-group/ushare/ushare-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for uShare"
+ACCT_GROUP_ID=349
diff --git a/acct-group/ushare/ushare-0.ebuild b/acct-group/ushare/ushare-0.ebuild
deleted file mode 100644
index 43678d459806..000000000000
--- a/acct-group/ushare/ushare-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for uShare"
-ACCT_GROUP_ID=349
diff --git a/acct-group/utmp/utmp-0-r1.ebuild b/acct-group/utmp/utmp-0-r1.ebuild
deleted file mode 100644
index 24664616643a..000000000000
--- a/acct-group/utmp/utmp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=406
diff --git a/acct-group/utmp/utmp-0-r2.ebuild b/acct-group/utmp/utmp-0-r2.ebuild
new file mode 100644
index 000000000000..023d71c363c8
--- /dev/null
+++ b/acct-group/utmp/utmp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=406
diff --git a/acct-group/uucp/uucp-0-r1.ebuild b/acct-group/uucp/uucp-0-r1.ebuild
deleted file mode 100644
index e2e32b62e410..000000000000
--- a/acct-group/uucp/uucp-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=14
diff --git a/acct-group/uucp/uucp-0-r2.ebuild b/acct-group/uucp/uucp-0-r2.ebuild
new file mode 100644
index 000000000000..4a2dba7d1e89
--- /dev/null
+++ b/acct-group/uucp/uucp-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=14
diff --git a/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..2d2d1d5b3ec5
--- /dev/null
+++ b/acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
deleted file mode 100644
index 4c7c20d457ec..000000000000
--- a/acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/vacation-0-r1.ebuild b/acct-group/vacation/vacation-0-r1.ebuild
new file mode 100644
index 000000000000..6214a9b58c91
--- /dev/null
+++ b/acct-group/vacation/vacation-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 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/vacation/vacation-0.ebuild b/acct-group/vacation/vacation-0.ebuild
deleted file mode 100644
index 94ef2caa53ed..000000000000
--- a/acct-group/vacation/vacation-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/varnish/varnish-0-r1.ebuild b/acct-group/varnish/varnish-0-r1.ebuild
deleted file mode 100644
index 9fbcc6472b4e..000000000000
--- a/acct-group/varnish/varnish-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for varnish"
-ACCT_GROUP_ID=474
diff --git a/acct-group/varnish/varnish-0-r2.ebuild b/acct-group/varnish/varnish-0-r2.ebuild
new file mode 100644
index 000000000000..78dafd64efae
--- /dev/null
+++ b/acct-group/varnish/varnish-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for varnish"
+ACCT_GROUP_ID=474
diff --git a/acct-group/vault/vault-0-r1.ebuild b/acct-group/vault/vault-0-r1.ebuild
deleted file mode 100644
index 518aa5cb3111..000000000000
--- a/acct-group/vault/vault-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=410
diff --git a/acct-group/vault/vault-0-r2.ebuild b/acct-group/vault/vault-0-r2.ebuild
new file mode 100644
index 000000000000..bd459568b12e
--- /dev/null
+++ b/acct-group/vault/vault-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=410
diff --git a/acct-group/vault_exporter/vault_exporter-0-r1.ebuild b/acct-group/vault_exporter/vault_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..75c5cf1352b1
--- /dev/null
+++ b/acct-group/vault_exporter/vault_exporter-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-metrics/vault_exporter"
+
+ACCT_GROUP_ID="323"
diff --git a/acct-group/vault_exporter/vault_exporter-0.ebuild b/acct-group/vault_exporter/vault_exporter-0.ebuild
deleted file mode 100644
index e808ce81aad1..000000000000
--- a/acct-group/vault_exporter/vault_exporter-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/vault_exporter"
-
-ACCT_GROUP_ID="323"
diff --git a/acct-group/vboxguest/vboxguest-0-r1.ebuild b/acct-group/vboxguest/vboxguest-0-r1.ebuild
deleted file mode 100644
index 8f7c117f5882..000000000000
--- a/acct-group/vboxguest/vboxguest-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=305
diff --git a/acct-group/vboxguest/vboxguest-0-r2.ebuild b/acct-group/vboxguest/vboxguest-0-r2.ebuild
new file mode 100644
index 000000000000..41282da59a0f
--- /dev/null
+++ b/acct-group/vboxguest/vboxguest-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=305
diff --git a/acct-group/vboxsf/vboxsf-0-r1.ebuild b/acct-group/vboxsf/vboxsf-0-r1.ebuild
deleted file mode 100644
index 6b6336afa19f..000000000000
--- a/acct-group/vboxsf/vboxsf-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=306
diff --git a/acct-group/vboxsf/vboxsf-0-r2.ebuild b/acct-group/vboxsf/vboxsf-0-r2.ebuild
new file mode 100644
index 000000000000..2b8cd4dfef06
--- /dev/null
+++ b/acct-group/vboxsf/vboxsf-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=306
diff --git a/acct-group/vboxusers/vboxusers-0-r1.ebuild b/acct-group/vboxusers/vboxusers-0-r1.ebuild
deleted file mode 100644
index ce349b0fcdf7..000000000000
--- a/acct-group/vboxusers/vboxusers-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=304
diff --git a/acct-group/vboxusers/vboxusers-0-r2.ebuild b/acct-group/vboxusers/vboxusers-0-r2.ebuild
new file mode 100644
index 000000000000..81e73edb6bba
--- /dev/null
+++ b/acct-group/vboxusers/vboxusers-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=304
diff --git a/acct-group/vdr/vdr-0-r1.ebuild b/acct-group/vdr/vdr-0-r1.ebuild
deleted file mode 100644
index b150a48a3abe..000000000000
--- a/acct-group/vdr/vdr-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 the VDR (VideoDiskRecorder)"
-
-ACCT_GROUP_ID="452"
diff --git a/acct-group/vdr/vdr-0-r2.ebuild b/acct-group/vdr/vdr-0-r2.ebuild
new file mode 100644
index 000000000000..edc442a09c5e
--- /dev/null
+++ b/acct-group/vdr/vdr-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the VDR (VideoDiskRecorder)"
+
+ACCT_GROUP_ID="452"
diff --git a/acct-group/vdradmin/vdradmin-0-r1.ebuild b/acct-group/vdradmin/vdradmin-0-r1.ebuild
deleted file mode 100644
index 458e6b888862..000000000000
--- a/acct-group/vdradmin/vdradmin-0-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for www-misc/vdradmin-am"
-
-ACCT_GROUP_ID=453
diff --git a/acct-group/vdradmin/vdradmin-0-r2.ebuild b/acct-group/vdradmin/vdradmin-0-r2.ebuild
new file mode 100644
index 000000000000..88460ab332c4
--- /dev/null
+++ b/acct-group/vdradmin/vdradmin-0-r2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for www-misc/vdradmin-am"
+
+ACCT_GROUP_ID=453
diff --git a/acct-group/video/video-0-r1.ebuild b/acct-group/video/video-0-r1.ebuild
deleted file mode 100644
index 3b06b5be9d79..000000000000
--- a/acct-group/video/video-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=27
diff --git a/acct-group/video/video-0-r2.ebuild b/acct-group/video/video-0-r2.ebuild
new file mode 100644
index 000000000000..cbcaf294640b
--- /dev/null
+++ b/acct-group/video/video-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=27
diff --git a/acct-group/vlock/vlock-0-r1.ebuild b/acct-group/vlock/vlock-0-r1.ebuild
new file mode 100644
index 000000000000..086049300d62
--- /dev/null
+++ b/acct-group/vlock/vlock-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for app-misc/vlock"
+
+ACCT_GROUP_ID="178"
diff --git a/acct-group/vlock/vlock-0.ebuild b/acct-group/vlock/vlock-0.ebuild
deleted file mode 100644
index 5f73550404af..000000000000
--- a/acct-group/vlock/vlock-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019-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/vlock"
-
-ACCT_GROUP_ID="178"
diff --git a/acct-group/vnstat/vnstat-0-r1.ebuild b/acct-group/vnstat/vnstat-0-r1.ebuild
new file mode 100644
index 000000000000..d33a0de72d50
--- /dev/null
+++ b/acct-group/vnstat/vnstat-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for vnstat network monitoring"
+ACCT_GROUP_ID=229
diff --git a/acct-group/vnstat/vnstat-0.ebuild b/acct-group/vnstat/vnstat-0.ebuild
deleted file mode 100644
index 9eba86cbc629..000000000000
--- a/acct-group/vnstat/vnstat-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for vnstat network monitoring"
-ACCT_GROUP_ID=229
diff --git a/acct-group/vpopmail/vpopmail-0-r1.ebuild b/acct-group/vpopmail/vpopmail-0-r1.ebuild
deleted file mode 100644
index 05fca0f655ee..000000000000
--- a/acct-group/vpopmail/vpopmail-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=89
diff --git a/acct-group/vpopmail/vpopmail-0-r2.ebuild b/acct-group/vpopmail/vpopmail-0-r2.ebuild
new file mode 100644
index 000000000000..970296853684
--- /dev/null
+++ b/acct-group/vpopmail/vpopmail-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=89
diff --git a/acct-group/wesnoth/wesnoth-0-r1.ebuild b/acct-group/wesnoth/wesnoth-0-r1.ebuild
deleted file mode 100644
index 434362fd312c..000000000000
--- a/acct-group/wesnoth/wesnoth-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=419
diff --git a/acct-group/wesnoth/wesnoth-0-r2.ebuild b/acct-group/wesnoth/wesnoth-0-r2.ebuild
new file mode 100644
index 000000000000..b5b457394987
--- /dev/null
+++ b/acct-group/wesnoth/wesnoth-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=419
diff --git a/acct-group/wheel/wheel-0-r1.ebuild b/acct-group/wheel/wheel-0-r1.ebuild
deleted file mode 100644
index 8f5f3e4f88b7..000000000000
--- a/acct-group/wheel/wheel-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=10
diff --git a/acct-group/wheel/wheel-0-r2.ebuild b/acct-group/wheel/wheel-0-r2.ebuild
new file mode 100644
index 000000000000..b1925f5da53b
--- /dev/null
+++ b/acct-group/wheel/wheel-0-r2.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=10
diff --git a/acct-group/wwwoffle/wwwoffle-0-r1.ebuild b/acct-group/wwwoffle/wwwoffle-0-r1.ebuild
new file mode 100644
index 000000000000..56285ff1380c
--- /dev/null
+++ b/acct-group/wwwoffle/wwwoffle-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-proxy/wwwoffle"
+
+ACCT_GROUP_ID="251"
diff --git a/acct-group/wwwoffle/wwwoffle-0.ebuild b/acct-group/wwwoffle/wwwoffle-0.ebuild
deleted file mode 100644
index 05d1c23d5ebb..000000000000
--- a/acct-group/wwwoffle/wwwoffle-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-proxy/wwwoffle"
-
-ACCT_GROUP_ID="251"
diff --git a/acct-group/x2goprint/x2goprint-0-r1.ebuild b/acct-group/x2goprint/x2goprint-0-r1.ebuild
deleted file mode 100644
index c81c3e3ac695..000000000000
--- a/acct-group/x2goprint/x2goprint-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/x2goserver"
-ACCT_GROUP_ID=292
diff --git a/acct-group/x2goprint/x2goprint-0-r2.ebuild b/acct-group/x2goprint/x2goprint-0-r2.ebuild
new file mode 100644
index 000000000000..16275e07002d
--- /dev/null
+++ b/acct-group/x2goprint/x2goprint-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=292
diff --git a/acct-group/x2gouser/x2gouser-0-r1.ebuild b/acct-group/x2gouser/x2gouser-0-r1.ebuild
deleted file mode 100644
index 7e838501eee0..000000000000
--- a/acct-group/x2gouser/x2gouser-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-misc/x2goserver"
-ACCT_GROUP_ID=291
diff --git a/acct-group/x2gouser/x2gouser-0-r2.ebuild b/acct-group/x2gouser/x2gouser-0-r2.ebuild
new file mode 100644
index 000000000000..800125020e8b
--- /dev/null
+++ b/acct-group/x2gouser/x2gouser-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=291
diff --git a/acct-group/xpra/xpra-0-r1.ebuild b/acct-group/xpra/xpra-0-r1.ebuild
new file mode 100644
index 000000000000..0f163b260c1f
--- /dev/null
+++ b/acct-group/xpra/xpra-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for x11-wm/xpra"
+ACCT_GROUP_ID=462
diff --git a/acct-group/xpra/xpra-0.ebuild b/acct-group/xpra/xpra-0.ebuild
deleted file mode 100644
index 282cee0f5757..000000000000
--- a/acct-group/xpra/xpra-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="group for x11-wm/xpra"
-ACCT_GROUP_ID=462
diff --git a/acct-group/xrootd/xrootd-0-r1.ebuild b/acct-group/xrootd/xrootd-0-r1.ebuild
deleted file mode 100644
index 15cdbba956eb..000000000000
--- a/acct-group/xrootd/xrootd-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the XRootD server"
-ACCT_GROUP_ID=469
diff --git a/acct-group/xrootd/xrootd-0-r2.ebuild b/acct-group/xrootd/xrootd-0-r2.ebuild
new file mode 100644
index 000000000000..37258ac9342c
--- /dev/null
+++ b/acct-group/xrootd/xrootd-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the XRootD server"
+ACCT_GROUP_ID=469
diff --git a/acct-group/xwax/xwax-0-r1.ebuild b/acct-group/xwax/xwax-0-r1.ebuild
new file mode 100644
index 000000000000..9f208e62f068
--- /dev/null
+++ b/acct-group/xwax/xwax-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for media-sound/xwax"
+
+ACCT_GROUP_ID="205"
diff --git a/acct-group/xwax/xwax-0.ebuild b/acct-group/xwax/xwax-0.ebuild
deleted file mode 100644
index fa5f01bc8577..000000000000
--- a/acct-group/xwax/xwax-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/xwax"
-
-ACCT_GROUP_ID="205"
diff --git a/acct-group/yubihsm-connector/yubihsm-connector-0.ebuild b/acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
similarity index 100%
rename from acct-group/yubihsm-connector/yubihsm-connector-0.ebuild
rename to acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
diff --git a/acct-group/zabbix/zabbix-0-r1.ebuild b/acct-group/zabbix/zabbix-0-r1.ebuild
new file mode 100644
index 000000000000..0d2ced4b507b
--- /dev/null
+++ b/acct-group/zabbix/zabbix-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Zabbix"
+ACCT_GROUP_ID=329
diff --git a/acct-group/zabbix/zabbix-0.ebuild b/acct-group/zabbix/zabbix-0.ebuild
deleted file mode 100644
index 73561e628222..000000000000
--- a/acct-group/zabbix/zabbix-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for Zabbix"
-ACCT_GROUP_ID=329
diff --git a/acct-group/zeppelin/zeppelin-0-r1.ebuild b/acct-group/zeppelin/zeppelin-0-r1.ebuild
deleted file mode 100644
index d65d1aed6485..000000000000
--- a/acct-group/zeppelin/zeppelin-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for system-wide www-apps/zeppelin-bin"
-ACCT_GROUP_ID=224
diff --git a/acct-group/zeppelin/zeppelin-0-r2.ebuild b/acct-group/zeppelin/zeppelin-0-r2.ebuild
new file mode 100644
index 000000000000..96d38d3b6e2b
--- /dev/null
+++ b/acct-group/zeppelin/zeppelin-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for system-wide www-apps/zeppelin-bin"
+ACCT_GROUP_ID=224
diff --git a/acct-group/zetcd/zetcd-0-r1.ebuild b/acct-group/zetcd/zetcd-0-r1.ebuild
new file mode 100644
index 000000000000..7b5d55eac3bd
--- /dev/null
+++ b/acct-group/zetcd/zetcd-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-cluster/zetcd"
+
+ACCT_GROUP_ID="253"
diff --git a/acct-group/zetcd/zetcd-0.ebuild b/acct-group/zetcd/zetcd-0.ebuild
deleted file mode 100644
index 1c35fc9add9a..000000000000
--- a/acct-group/zetcd/zetcd-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for sys-cluster/zetcd"
-
-ACCT_GROUP_ID="253"
diff --git a/acct-group/ziproxy/ziproxy-0-r1.ebuild b/acct-group/ziproxy/ziproxy-0-r1.ebuild
new file mode 100644
index 000000000000..c9060c781154
--- /dev/null
+++ b/acct-group/ziproxy/ziproxy-0-r1.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=367
diff --git a/acct-group/ziproxy/ziproxy-0.ebuild b/acct-group/ziproxy/ziproxy-0.ebuild
deleted file mode 100644
index 2a615442577d..000000000000
--- a/acct-group/ziproxy/ziproxy-0.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=367
diff --git a/acct-group/znc/znc-0-r1.ebuild b/acct-group/znc/znc-0-r1.ebuild
deleted file mode 100644
index 513803e86f5c..000000000000
--- a/acct-group/znc/znc-0-r1.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for net-irc/znc"
-ACCT_GROUP_ID=421
diff --git a/acct-group/znc/znc-0-r2.ebuild b/acct-group/znc/znc-0-r2.ebuild
new file mode 100644
index 000000000000..7475710c30af
--- /dev/null
+++ b/acct-group/znc/znc-0-r2.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-irc/znc"
+ACCT_GROUP_ID=421
diff --git a/acct-group/zookeeper/zookeeper-0-r1.ebuild b/acct-group/zookeeper/zookeeper-0-r1.ebuild
new file mode 100644
index 000000000000..23e22ef66749
--- /dev/null
+++ b/acct-group/zookeeper/zookeeper-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-cluster/zookeeper-bin"
+
+ACCT_GROUP_ID="211"
diff --git a/acct-group/zookeeper/zookeeper-0.ebuild b/acct-group/zookeeper/zookeeper-0.ebuild
deleted file mode 100644
index c45af2d2d110..000000000000
--- a/acct-group/zookeeper/zookeeper-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/zookeeper-bin"
-
-ACCT_GROUP_ID="211"
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 1b609b21b508..2236c563c744 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/_cron-failure/_cron-failure-0-r1.ebuild b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
new file mode 100644
index 000000000000..d521c8d59f17
--- /dev/null
+++ b/acct-user/_cron-failure/_cron-failure-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/systemd-cron failure emails"
+ACCT_USER_ID="520"
+ACCT_USER_GROUPS=( _cron-failure )
+
+acct-user_add_deps
diff --git a/acct-user/_cron-failure/_cron-failure-0.ebuild b/acct-user/_cron-failure/_cron-failure-0.ebuild
deleted file mode 100644
index bf25d6b1fc4d..000000000000
--- a/acct-user/_cron-failure/_cron-failure-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/systemd-cron failure emails"
-ACCT_USER_ID="520"
-ACCT_USER_GROUPS=( _cron-failure )
-
-acct-user_add_deps
diff --git a/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild b/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild
new file mode 100644
index 000000000000..dd0e1d7b8aa0
--- /dev/null
+++ b/acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/aerospike-amc-community"
+
+ACCT_USER_GROUPS=( "aerospike-amc" )
+ACCT_USER_ID="210"
+
+acct-user_add_deps
diff --git a/acct-user/aerospike-amc/aerospike-amc-0.ebuild b/acct-user/aerospike-amc/aerospike-amc-0.ebuild
deleted file mode 100644
index c73b7ab51d09..000000000000
--- a/acct-user/aerospike-amc/aerospike-amc-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/aerospike-amc-community"
-
-ACCT_USER_GROUPS=( "aerospike-amc" )
-ACCT_USER_ID="210"
-
-acct-user_add_deps
diff --git a/acct-user/airdcppd/airdcppd-0-r1.ebuild b/acct-user/airdcppd/airdcppd-0-r1.ebuild
deleted file mode 100644
index 75df52a65b7d..000000000000
--- a/acct-user/airdcppd/airdcppd-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/airdcpp-webclient"
-ACCT_USER_ID=464
-ACCT_USER_GROUPS=( ${PN} )
-# Settings are stored in $HOME
-ACCT_USER_HOME=/var/lib/airdcppd
-# Grant write access to group members
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/airdcppd/airdcppd-0-r2.ebuild b/acct-user/airdcppd/airdcppd-0-r2.ebuild
new file mode 100644
index 000000000000..11aec89a5d06
--- /dev/null
+++ b/acct-user/airdcppd/airdcppd-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/airdcpp-webclient"
+ACCT_USER_ID=464
+ACCT_USER_GROUPS=( ${PN} )
+# Settings are stored in $HOME
+ACCT_USER_HOME=/var/lib/airdcppd
+# Grant write access to group members
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/alertmanager/alertmanager-0-r1.ebuild b/acct-user/alertmanager/alertmanager-0-r1.ebuild
new file mode 100644
index 000000000000..867ecaa994db
--- /dev/null
+++ b/acct-user/alertmanager/alertmanager-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for alertmanager"
+ACCT_USER_ID=294
+ACCT_USER_GROUPS=( alertmanager )
+
+acct-user_add_deps
diff --git a/acct-user/alertmanager/alertmanager-0.ebuild b/acct-user/alertmanager/alertmanager-0.ebuild
deleted file mode 100644
index 78028f69692f..000000000000
--- a/acct-user/alertmanager/alertmanager-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for alertmanager"
-ACCT_USER_ID=294
-ACCT_USER_GROUPS=( alertmanager )
-
-acct-user_add_deps
diff --git a/acct-user/alias/alias-0-r1.ebuild b/acct-user/alias/alias-0-r1.ebuild
deleted file mode 100644
index 9910f7b0ae6b..000000000000
--- a/acct-user/alias/alias-0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="alias user for qmail mail delivery"
-ACCT_USER_ID=200
-ACCT_USER_HOME=/var/qmail/alias
-ACCT_USER_HOME_OWNER=alias:qmail
-ACCT_USER_HOME_PERMS=02755
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/qmail "
-RDEPEND+=" acct-group/qmail "
diff --git a/acct-user/alias/alias-0-r2.ebuild b/acct-user/alias/alias-0-r2.ebuild
new file mode 100644
index 000000000000..e02890f71c60
--- /dev/null
+++ b/acct-user/alias/alias-0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="alias user for qmail mail delivery"
+ACCT_USER_ID=200
+ACCT_USER_HOME=/var/qmail/alias
+ACCT_USER_HOME_OWNER=alias:qmail
+ACCT_USER_HOME_PERMS=02755
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/qmail "
+RDEPEND+=" acct-group/qmail "
diff --git a/acct-user/amanda/amanda-0-r1.ebuild b/acct-user/amanda/amanda-0-r1.ebuild
new file mode 100644
index 000000000000..0bfd30545fc1
--- /dev/null
+++ b/acct-user/amanda/amanda-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=362
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/var/spool/amanda
+
+acct-user_add_deps
diff --git a/acct-user/amanda/amanda-0.ebuild b/acct-user/amanda/amanda-0.ebuild
deleted file mode 100644
index 18c4485c8eba..000000000000
--- a/acct-user/amanda/amanda-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=362
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/var/spool/amanda
-
-acct-user_add_deps
diff --git a/acct-user/amavis/amavis-0-r1.ebuild b/acct-user/amavis/amavis-0-r1.ebuild
deleted file mode 100644
index 7fb7c66fadeb..000000000000
--- a/acct-user/amavis/amavis-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=333
-ACCT_USER_GROUPS=( amavis )
-ACCT_USER_HOME=/var/lib/amavishome
-DESCRIPTION="User for mail-filter/amavisd-new"
-
-acct-user_add_deps
diff --git a/acct-user/amavis/amavis-0-r2.ebuild b/acct-user/amavis/amavis-0-r2.ebuild
new file mode 100644
index 000000000000..cea1b1964c03
--- /dev/null
+++ b/acct-user/amavis/amavis-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=333
+ACCT_USER_GROUPS=( amavis )
+ACCT_USER_HOME=/var/lib/amavishome
+DESCRIPTION="User for mail-filter/amavisd-new"
+
+acct-user_add_deps
diff --git a/acct-user/amule/amule-0-r2.ebuild b/acct-user/amule/amule-0-r2.ebuild
deleted file mode 100644
index 545f68eb371a..000000000000
--- a/acct-user/amule/amule-0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/amule"
-
-ACCT_USER_GROUPS=( "amule" )
-ACCT_USER_HOME="/var/lib/amule"
-ACCT_USER_ID="468"
-
-acct-user_add_deps
diff --git a/acct-user/amule/amule-0-r3.ebuild b/acct-user/amule/amule-0-r3.ebuild
new file mode 100644
index 000000000000..68f824126c23
--- /dev/null
+++ b/acct-user/amule/amule-0-r3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/amule"
+
+ACCT_USER_GROUPS=( "amule" )
+ACCT_USER_HOME="/var/lib/amule"
+ACCT_USER_ID="468"
+
+acct-user_add_deps
diff --git a/acct-user/anope/anope-0-r1.ebuild b/acct-user/anope/anope-0-r1.ebuild
deleted file mode 100644
index e2080507f913..000000000000
--- a/acct-user/anope/anope-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for Anope IRC services"
-ACCT_USER_ID=417
-ACCT_USER_GROUPS=( anope )
-
-acct-user_add_deps
diff --git a/acct-user/anope/anope-0-r2.ebuild b/acct-user/anope/anope-0-r2.ebuild
new file mode 100644
index 000000000000..1af9d55b98f6
--- /dev/null
+++ b/acct-user/anope/anope-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for Anope IRC services"
+ACCT_USER_ID=417
+ACCT_USER_GROUPS=( anope )
+
+acct-user_add_deps
diff --git a/acct-user/apache/apache-0-r2.ebuild b/acct-user/apache/apache-0-r2.ebuild
deleted file mode 100644
index 47626ba98bd7..000000000000
--- a/acct-user/apache/apache-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID="81"
-ACCT_USER_GROUPS=( "apache" )
-ACCT_USER_HOME="/var/www"
-
-acct-user_add_deps
diff --git a/acct-user/apache/apache-0-r3.ebuild b/acct-user/apache/apache-0-r3.ebuild
new file mode 100644
index 000000000000..1d0b8a4e54b9
--- /dev/null
+++ b/acct-user/apache/apache-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="81"
+ACCT_USER_GROUPS=( "apache" )
+ACCT_USER_HOME="/var/www"
+
+acct-user_add_deps
diff --git a/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
new file mode 100644
index 000000000000..5ff5cdddbc60
--- /dev/null
+++ b/acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for apt-cacher-ng"
+ACCT_USER_ID=319
+ACCT_USER_GROUPS=( apt-cacher-ng )
+
+acct-user_add_deps
diff --git a/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild b/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild
deleted file mode 100644
index b51ca6c88ad3..000000000000
--- a/acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for apt-cacher-ng"
-ACCT_USER_ID=319
-ACCT_USER_GROUPS=( apt-cacher-ng )
-
-acct-user_add_deps
diff --git a/acct-user/argus/argus-0-r1.ebuild b/acct-user/argus/argus-0-r1.ebuild
new file mode 100644
index 000000000000..52b0c4b0a391
--- /dev/null
+++ b/acct-user/argus/argus-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/argus"
+ACCT_USER_ID=383
+ACCT_USER_HOME=/var/lib/argus
+ACCT_USER_GROUPS=( argus )
+
+acct-user_add_deps
diff --git a/acct-user/argus/argus-0.ebuild b/acct-user/argus/argus-0.ebuild
deleted file mode 100644
index dc0f6e2dffb1..000000000000
--- a/acct-user/argus/argus-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/argus"
-ACCT_USER_ID=383
-ACCT_USER_HOME=/var/lib/argus
-ACCT_USER_GROUPS=( argus )
-
-acct-user_add_deps
diff --git a/acct-user/arpwatch/arpwatch-0-r1.ebuild b/acct-user/arpwatch/arpwatch-0-r1.ebuild
new file mode 100644
index 000000000000..e85389c061ea
--- /dev/null
+++ b/acct-user/arpwatch/arpwatch-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/arpwatch"
+
+ACCT_USER_GROUPS=( "arpwatch" )
+ACCT_USER_ID="170"
+
+acct-user_add_deps
diff --git a/acct-user/arpwatch/arpwatch-0.ebuild b/acct-user/arpwatch/arpwatch-0.ebuild
deleted file mode 100644
index 24f4e8b490e2..000000000000
--- a/acct-user/arpwatch/arpwatch-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/arpwatch"
-
-ACCT_USER_GROUPS=( "arpwatch" )
-ACCT_USER_ID="170"
-
-acct-user_add_deps
diff --git a/acct-user/artifactory/artifactory-0-r1.ebuild b/acct-user/artifactory/artifactory-0-r1.ebuild
new file mode 100644
index 000000000000..22ebc4531a7a
--- /dev/null
+++ b/acct-user/artifactory/artifactory-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for dev-util/artifactory-bin"
+
+ACCT_USER_GROUPS=( "artifactory" )
+ACCT_USER_ID="264"
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
diff --git a/acct-user/artifactory/artifactory-0.ebuild b/acct-user/artifactory/artifactory-0.ebuild
deleted file mode 100644
index f1132d14b63c..000000000000
--- a/acct-user/artifactory/artifactory-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for dev-util/artifactory-bin"
-
-ACCT_USER_GROUPS=( "artifactory" )
-ACCT_USER_ID="264"
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
diff --git a/acct-user/aspnet/aspnet-0-r1.ebuild b/acct-user/aspnet/aspnet-0-r1.ebuild
new file mode 100644
index 000000000000..051c267d59f8
--- /dev/null
+++ b/acct-user/aspnet/aspnet-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the www-servers/xsp dotnet server"
+
+ACCT_USER_ID=216
+ACCT_USER_GROUPS=( aspnet )
+
+acct-user_add_deps
diff --git a/acct-user/aspnet/aspnet-0.ebuild b/acct-user/aspnet/aspnet-0.ebuild
deleted file mode 100644
index 8dec86be7001..000000000000
--- a/acct-user/aspnet/aspnet-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the www-servers/xsp dotnet server"
-
-ACCT_USER_ID=216
-ACCT_USER_GROUPS=( aspnet )
-
-acct-user_add_deps
diff --git a/acct-user/asterisk/asterisk-0-r1.ebuild b/acct-user/asterisk/asterisk-0-r1.ebuild
deleted file mode 100644
index 30e23737ef8f..000000000000
--- a/acct-user/asterisk/asterisk-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for asterisk"
-ACCT_USER_ID=242
-ACCT_USER_GROUPS=( asterisk dialout )
-
-acct-user_add_deps
diff --git a/acct-user/asterisk/asterisk-0-r2.ebuild b/acct-user/asterisk/asterisk-0-r2.ebuild
new file mode 100644
index 000000000000..03d2d8b69fe0
--- /dev/null
+++ b/acct-user/asterisk/asterisk-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for asterisk"
+ACCT_USER_ID=242
+ACCT_USER_GROUPS=( asterisk dialout )
+
+acct-user_add_deps
diff --git a/acct-user/at/at-0-r1.ebuild b/acct-user/at/at-0-r1.ebuild
new file mode 100644
index 000000000000..4ab9f746daa6
--- /dev/null
+++ b/acct-user/at/at-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for at daemon"
+ACCT_USER_ID=246
+ACCT_USER_GROUPS=( at )
+
+acct-user_add_deps
diff --git a/acct-user/at/at-0.ebuild b/acct-user/at/at-0.ebuild
deleted file mode 100644
index 74ef92246e38..000000000000
--- a/acct-user/at/at-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for at daemon"
-ACCT_USER_ID=246
-ACCT_USER_GROUPS=( at )
-
-acct-user_add_deps
diff --git a/acct-user/atheme-services/atheme-services-0-r1.ebuild b/acct-user/atheme-services/atheme-services-0-r1.ebuild
deleted file mode 100644
index ada83054fdae..000000000000
--- a/acct-user/atheme-services/atheme-services-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Atheme IRC services"
-ACCT_USER_ID=412
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/atheme-services/atheme-services-0-r2.ebuild b/acct-user/atheme-services/atheme-services-0-r2.ebuild
new file mode 100644
index 000000000000..ced19e695ddd
--- /dev/null
+++ b/acct-user/atheme-services/atheme-services-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Atheme IRC services"
+ACCT_USER_ID=412
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/automatic/automatic-0.ebuild b/acct-user/automatic/automatic-0-r1.ebuild
similarity index 100%
rename from acct-user/automatic/automatic-0.ebuild
rename to acct-user/automatic/automatic-0-r1.ebuild
diff --git a/acct-user/automx2/automx2-0-r1.ebuild b/acct-user/automx2/automx2-0-r1.ebuild
deleted file mode 100644
index c4effe2e71e2..000000000000
--- a/acct-user/automx2/automx2-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/automx2"
-
-ACCT_USER_ID=437
-ACCT_USER_GROUPS=( automx2 )
-ACCT_USER_HOME="/var/lib/automx2"
-
-acct-user_add_deps
diff --git a/acct-user/automx2/automx2-0-r2.ebuild b/acct-user/automx2/automx2-0-r2.ebuild
new file mode 100644
index 000000000000..c35accc7997d
--- /dev/null
+++ b/acct-user/automx2/automx2-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/automx2"
+
+ACCT_USER_ID=437
+ACCT_USER_GROUPS=( automx2 )
+ACCT_USER_HOME="/var/lib/automx2"
+
+acct-user_add_deps
diff --git a/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild
deleted file mode 100644
index e932d8b44c26..000000000000
--- a/acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for avahi-autoipd"
-ACCT_USER_ID=62
-ACCT_USER_GROUPS=( avahi-autoipd )
-
-acct-user_add_deps
diff --git a/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild
new file mode 100644
index 000000000000..871a5fe4d3c5
--- /dev/null
+++ b/acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for avahi-autoipd"
+ACCT_USER_ID=62
+ACCT_USER_GROUPS=( avahi-autoipd )
+
+acct-user_add_deps
diff --git a/acct-user/avahi/avahi-0-r1.ebuild b/acct-user/avahi/avahi-0-r1.ebuild
deleted file mode 100644
index 60dcf3053d7c..000000000000
--- a/acct-user/avahi/avahi-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for avahi"
-ACCT_USER_ID=61
-ACCT_USER_GROUPS=( avahi )
-
-acct-user_add_deps
diff --git a/acct-user/avahi/avahi-0-r2.ebuild b/acct-user/avahi/avahi-0-r2.ebuild
new file mode 100644
index 000000000000..0db7ea604121
--- /dev/null
+++ b/acct-user/avahi/avahi-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for avahi"
+ACCT_USER_ID=61
+ACCT_USER_GROUPS=( avahi )
+
+acct-user_add_deps
diff --git a/acct-user/axtls/axtls-0-r1.ebuild b/acct-user/axtls/axtls-0-r1.ebuild
new file mode 100644
index 000000000000..9dc12cc02cf7
--- /dev/null
+++ b/acct-user/axtls/axtls-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-libs/axtls"
+
+ACCT_USER_GROUPS=( "axtls" )
+ACCT_USER_ID="147"
+
+acct-user_add_deps
diff --git a/acct-user/axtls/axtls-0.ebuild b/acct-user/axtls/axtls-0.ebuild
deleted file mode 100644
index b85720579f78..000000000000
--- a/acct-user/axtls/axtls-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-libs/axtls"
-
-ACCT_USER_GROUPS=( "axtls" )
-ACCT_USER_ID="147"
-
-acct-user_add_deps
diff --git a/acct-user/backuppc/backuppc-0-r1.ebuild b/acct-user/backuppc/backuppc-0-r1.ebuild
new file mode 100644
index 000000000000..f5b1713025df
--- /dev/null
+++ b/acct-user/backuppc/backuppc-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-backup/backuppc"
+
+ACCT_USER_GROUPS=( "backuppc" )
+ACCT_USER_HOME="/var/lib/backuppc"
+ACCT_USER_ID="282"
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/backuppc/backuppc-0.ebuild b/acct-user/backuppc/backuppc-0.ebuild
deleted file mode 100644
index 3b5a50c9c7a9..000000000000
--- a/acct-user/backuppc/backuppc-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-backup/backuppc"
-
-ACCT_USER_GROUPS=( "backuppc" )
-ACCT_USER_HOME="/var/lib/backuppc"
-ACCT_USER_ID="282"
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/bacula/bacula-0-r1.ebuild b/acct-user/bacula/bacula-0-r1.ebuild
deleted file mode 100644
index 4c2114bfcaf0..000000000000
--- a/acct-user/bacula/bacula-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A group for the bacula backup system"
-ACCT_USER_ID=273
-ACCT_USER_HOME=/var/lib/bacula
-ACCT_USER_GROUPS=( bacula disk tape cdrom )
-
-acct-user_add_deps
diff --git a/acct-user/bacula/bacula-0-r2.ebuild b/acct-user/bacula/bacula-0-r2.ebuild
new file mode 100644
index 000000000000..4158074868d5
--- /dev/null
+++ b/acct-user/bacula/bacula-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A group for the bacula backup system"
+ACCT_USER_ID=273
+ACCT_USER_HOME=/var/lib/bacula
+ACCT_USER_GROUPS=( bacula disk tape cdrom )
+
+acct-user_add_deps
diff --git a/acct-user/bareos/bareos-0-r1.ebuild b/acct-user/bareos/bareos-0-r1.ebuild
deleted file mode 100644
index a382943a3403..000000000000
--- a/acct-user/bareos/bareos-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the bareos network backup suite"
-ACCT_USER_ID=403
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_GROUPS=( ${PN} disk tape cdrom )
-
-acct-user_add_deps
diff --git a/acct-user/bareos/bareos-0-r2.ebuild b/acct-user/bareos/bareos-0-r2.ebuild
new file mode 100644
index 000000000000..d466e8c22273
--- /dev/null
+++ b/acct-user/bareos/bareos-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the bareos network backup suite"
+ACCT_USER_ID=403
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_GROUPS=( ${PN} disk tape cdrom )
+
+acct-user_add_deps
diff --git a/acct-user/beanstalk/beanstalk-0-r1.ebuild b/acct-user/beanstalk/beanstalk-0-r1.ebuild
new file mode 100644
index 000000000000..9aa2f7e50a26
--- /dev/null
+++ b/acct-user/beanstalk/beanstalk-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/beanstalkd"
+
+ACCT_USER_GROUPS=( "beanstalk" )
+ACCT_USER_HOME="/var/lib/beanstalkd"
+ACCT_USER_ID="137"
+
+acct-user_add_deps
diff --git a/acct-user/beanstalk/beanstalk-0.ebuild b/acct-user/beanstalk/beanstalk-0.ebuild
deleted file mode 100644
index a17083ef609d..000000000000
--- a/acct-user/beanstalk/beanstalk-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/beanstalkd"
-
-ACCT_USER_GROUPS=( "beanstalk" )
-ACCT_USER_HOME="/var/lib/beanstalkd"
-ACCT_USER_ID="137"
-
-acct-user_add_deps
diff --git a/acct-user/bedrock/bedrock-0-r1.ebuild b/acct-user/bedrock/bedrock-0-r1.ebuild
deleted file mode 100644
index 454126f27b07..000000000000
--- a/acct-user/bedrock/bedrock-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minecraft Bedrock server"
-
-ACCT_USER_GROUPS=( "bedrock" )
-ACCT_USER_ID="485"
-
-acct-user_add_deps
diff --git a/acct-user/bedrock/bedrock-0-r2.ebuild b/acct-user/bedrock/bedrock-0-r2.ebuild
new file mode 100644
index 000000000000..a96d60d2e1d0
--- /dev/null
+++ b/acct-user/bedrock/bedrock-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minecraft Bedrock server"
+
+ACCT_USER_GROUPS=( "bedrock" )
+ACCT_USER_ID="485"
+
+acct-user_add_deps
diff --git a/acct-user/biboumi/biboumi-0-r1.ebuild b/acct-user/biboumi/biboumi-0-r1.ebuild
new file mode 100644
index 000000000000..3d9df0b62339
--- /dev/null
+++ b/acct-user/biboumi/biboumi-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/biboumi"
+ACCT_USER_ID=508
+ACCT_USER_GROUPS=( biboumi )
+
+acct-user_add_deps
diff --git a/acct-user/biboumi/biboumi-0.ebuild b/acct-user/biboumi/biboumi-0.ebuild
deleted file mode 100644
index 8cd114a9a893..000000000000
--- a/acct-user/biboumi/biboumi-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/biboumi"
-ACCT_USER_ID=508
-ACCT_USER_GROUPS=( biboumi )
-
-acct-user_add_deps
diff --git a/acct-user/bind_exporter/bind_exporter-0-r1.ebuild b/acct-user/bind_exporter/bind_exporter-0-r1.ebuild
deleted file mode 100644
index c1e86aa002ff..000000000000
--- a/acct-user/bind_exporter/bind_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for bind_exporter"
-ACCT_USER_ID=276
-ACCT_USER_GROUPS=( bind_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/bind_exporter/bind_exporter-0-r2.ebuild b/acct-user/bind_exporter/bind_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..bfb761c4b06a
--- /dev/null
+++ b/acct-user/bind_exporter/bind_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for bind_exporter"
+ACCT_USER_ID=276
+ACCT_USER_GROUPS=( bind_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/bird/bird-0-r1.ebuild b/acct-user/bird/bird-0-r1.ebuild
new file mode 100644
index 000000000000..fd0539f6f221
--- /dev/null
+++ b/acct-user/bird/bird-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for BIRD"
+# TCP port 179, but 179 is already used by acct-group/_bgpd
+ACCT_USER_ID=180
+ACCT_USER_GROUPS=( bird )
+
+acct-user_add_deps
diff --git a/acct-user/bird/bird-0.ebuild b/acct-user/bird/bird-0.ebuild
deleted file mode 100644
index 177b8ca80b68..000000000000
--- a/acct-user/bird/bird-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for BIRD"
-# TCP port 179, but 179 is already used by acct-group/_bgpd
-ACCT_USER_ID=180
-ACCT_USER_GROUPS=( bird )
-
-acct-user_add_deps
diff --git a/acct-user/bitcoin/bitcoin-0-r1.ebuild b/acct-user/bitcoin/bitcoin-0-r1.ebuild
deleted file mode 100644
index 1a0d89f8c698..000000000000
--- a/acct-user/bitcoin/bitcoin-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="System-wide Bitcoin services user"
-ACCT_USER_ID=483
-ACCT_USER_GROUPS=( bitcoin )
-
-acct-user_add_deps
diff --git a/acct-user/bitcoin/bitcoin-0-r2.ebuild b/acct-user/bitcoin/bitcoin-0-r2.ebuild
new file mode 100644
index 000000000000..b19975c4a120
--- /dev/null
+++ b/acct-user/bitcoin/bitcoin-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="System-wide Bitcoin services user"
+ACCT_USER_ID=483
+ACCT_USER_GROUPS=( bitcoin )
+
+acct-user_add_deps
diff --git a/acct-user/bitflu/bitflu-0-r1.ebuild b/acct-user/bitflu/bitflu-0-r1.ebuild
new file mode 100644
index 000000000000..239af8cbb540
--- /dev/null
+++ b/acct-user/bitflu/bitflu-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-p2p/bitflu"
+
+ACCT_USER_GROUPS=( "bitflu" )
+ACCT_USER_HOME="/var/lib/bitflu"
+ACCT_USER_ID="148"
+
+acct-user_add_deps
diff --git a/acct-user/bitflu/bitflu-0.ebuild b/acct-user/bitflu/bitflu-0.ebuild
deleted file mode 100644
index 11ea87038ad9..000000000000
--- a/acct-user/bitflu/bitflu-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-p2p/bitflu"
-
-ACCT_USER_GROUPS=( "bitflu" )
-ACCT_USER_HOME="/var/lib/bitflu"
-ACCT_USER_ID="148"
-
-acct-user_add_deps
diff --git a/acct-user/bitlbee/bitlbee-0-r1.ebuild b/acct-user/bitlbee/bitlbee-0-r1.ebuild
deleted file mode 100644
index 31daee37ce52..000000000000
--- a/acct-user/bitlbee/bitlbee-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for biltbee"
-ACCT_USER_ID=407
-ACCT_USER_GROUPS=( bitlbee )
-
-acct-user_add_deps
diff --git a/acct-user/bitlbee/bitlbee-0-r2.ebuild b/acct-user/bitlbee/bitlbee-0-r2.ebuild
new file mode 100644
index 000000000000..7a1497cec9eb
--- /dev/null
+++ b/acct-user/bitlbee/bitlbee-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for biltbee"
+ACCT_USER_ID=407
+ACCT_USER_GROUPS=( bitlbee )
+
+acct-user_add_deps
diff --git a/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..c4ac2c198c67
--- /dev/null
+++ b/acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for blackbox_exporter"
+ACCT_USER_ID=293
+ACCT_USER_GROUPS=( blackbox_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild b/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild
deleted file mode 100644
index ca262a5dade3..000000000000
--- a/acct-user/blackbox_exporter/blackbox_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for blackbox_exporter"
-ACCT_USER_ID=293
-ACCT_USER_GROUPS=( blackbox_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/boinc/boinc-0-r1.ebuild b/acct-user/boinc/boinc-0-r1.ebuild
new file mode 100644
index 000000000000..5ed25f7d5ffd
--- /dev/null
+++ b/acct-user/boinc/boinc-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for sci-misc/boinc"
+ACCT_USER_ID=352
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( boinc video )
+
+acct-user_add_deps
diff --git a/acct-user/boinc/boinc-0.ebuild b/acct-user/boinc/boinc-0.ebuild
deleted file mode 100644
index c96379bc4fbf..000000000000
--- a/acct-user/boinc/boinc-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for sci-misc/boinc"
-ACCT_USER_ID=352
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( boinc video )
-
-acct-user_add_deps
diff --git a/acct-user/brltty/brltty-0-r1.ebuild b/acct-user/brltty/brltty-0-r1.ebuild
new file mode 100644
index 000000000000..5ec59c18540d
--- /dev/null
+++ b/acct-user/brltty/brltty-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for brltty"
+ACCT_USER_ID=506
+ACCT_USER_HOME=/var/lib/brltty
+ACCT_USER_GROUPS=( brltty audio brlapi dialout input pulse-access root tty )
+
+acct-user_add_deps
diff --git a/acct-user/brltty/brltty-0.ebuild b/acct-user/brltty/brltty-0.ebuild
deleted file mode 100644
index 69bff2c3c0ee..000000000000
--- a/acct-user/brltty/brltty-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for brltty"
-ACCT_USER_ID=506
-ACCT_USER_HOME=/var/lib/brltty
-ACCT_USER_GROUPS=( brltty audio brlapi dialout input pulse-access root tty )
-
-acct-user_add_deps
diff --git a/acct-user/buildbot/buildbot-0-r1.ebuild b/acct-user/buildbot/buildbot-0-r1.ebuild
deleted file mode 100644
index f0570fc26f0b..000000000000
--- a/acct-user/buildbot/buildbot-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Buildbot program user"
-ACCT_USER_ID=393
-ACCT_USER_GROUPS=( buildbot )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/buildbot/buildbot-0-r2.ebuild b/acct-user/buildbot/buildbot-0-r2.ebuild
new file mode 100644
index 000000000000..3ecc7b0a3f19
--- /dev/null
+++ b/acct-user/buildbot/buildbot-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Buildbot program user"
+ACCT_USER_ID=393
+ACCT_USER_GROUPS=( buildbot )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/burp/burp-0-r1.ebuild b/acct-user/burp/burp-0-r1.ebuild
deleted file mode 100644
index 646ad79a442c..000000000000
--- a/acct-user/burp/burp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the app-backup/burp server"
-ACCT_USER_ID=498
-ACCT_USER_GROUPS=( burp )
-
-acct-user_add_deps
diff --git a/acct-user/burp/burp-0-r2.ebuild b/acct-user/burp/burp-0-r2.ebuild
new file mode 100644
index 000000000000..e39e2f77d21a
--- /dev/null
+++ b/acct-user/burp/burp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the app-backup/burp server"
+ACCT_USER_ID=498
+ACCT_USER_GROUPS=( burp )
+
+acct-user_add_deps
diff --git a/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild
deleted file mode 100644
index 2985c39db4ca..000000000000
--- a/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/burrow_exporter"
-
-ACCT_USER_ID=502
-ACCT_USER_GROUPS=( burrow_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ef0c97a228f5
--- /dev/null
+++ b/acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/burrow_exporter"
+
+ACCT_USER_ID=502
+ACCT_USER_GROUPS=( burrow_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/cadvisor/cadvisor-0-r1.ebuild b/acct-user/cadvisor/cadvisor-0-r1.ebuild
deleted file mode 100644
index a464a6029a1c..000000000000
--- a/acct-user/cadvisor/cadvisor-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for cadvisor"
-ACCT_USER_ID=427
-ACCT_USER_GROUPS=( cadvisor )
-
-acct-user_add_deps
diff --git a/acct-user/cadvisor/cadvisor-0-r2.ebuild b/acct-user/cadvisor/cadvisor-0-r2.ebuild
new file mode 100644
index 000000000000..e4fbf56e0e6c
--- /dev/null
+++ b/acct-user/cadvisor/cadvisor-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for cadvisor"
+ACCT_USER_ID=427
+ACCT_USER_GROUPS=( cadvisor )
+
+acct-user_add_deps
diff --git a/acct-user/cancd/cancd-0-r1.ebuild b/acct-user/cancd/cancd-0-r1.ebuild
deleted file mode 100644
index 41284202bbcb..000000000000
--- a/acct-user/cancd/cancd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the CA NetConsole Daemon"
-
-ACCT_USER_GROUPS=( "cancd" )
-ACCT_USER_ID="213"
-
-acct-user_add_deps
diff --git a/acct-user/cancd/cancd-0-r2.ebuild b/acct-user/cancd/cancd-0-r2.ebuild
new file mode 100644
index 000000000000..d5f370bd4a36
--- /dev/null
+++ b/acct-user/cancd/cancd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the CA NetConsole Daemon"
+
+ACCT_USER_GROUPS=( "cancd" )
+ACCT_USER_ID="213"
+
+acct-user_add_deps
diff --git a/acct-user/carbon/carbon-0-r1.ebuild b/acct-user/carbon/carbon-0-r1.ebuild
deleted file mode 100644
index ba8999d6020d..000000000000
--- a/acct-user/carbon/carbon-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for graphite/carbon suite"
-ACCT_USER_ID=230
-ACCT_USER_GROUPS=( carbon )
-
-acct-user_add_deps
diff --git a/acct-user/carbon/carbon-0-r2.ebuild b/acct-user/carbon/carbon-0-r2.ebuild
new file mode 100644
index 000000000000..c7145d21b9ab
--- /dev/null
+++ b/acct-user/carbon/carbon-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for graphite/carbon suite"
+ACCT_USER_ID=230
+ACCT_USER_GROUPS=( carbon )
+
+acct-user_add_deps
diff --git a/acct-user/ceph/ceph-0-r1.ebuild b/acct-user/ceph/ceph-0-r2.ebuild
similarity index 100%
rename from acct-user/ceph/ceph-0-r1.ebuild
rename to acct-user/ceph/ceph-0-r2.ebuild
diff --git a/acct-user/cgit/cgit-0-r1.ebuild b/acct-user/cgit/cgit-0-r1.ebuild
new file mode 100644
index 000000000000..24d621614f49
--- /dev/null
+++ b/acct-user/cgit/cgit-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="a fast web-interface for git repositories"
+
+ACCT_USER_ID=197
+ACCT_USER_GROUPS=( cgit )
+
+acct-user_add_deps
diff --git a/acct-user/cgit/cgit-0.ebuild b/acct-user/cgit/cgit-0.ebuild
deleted file mode 100644
index 5f8c9f85490a..000000000000
--- a/acct-user/cgit/cgit-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="a fast web-interface for git repositories"
-
-ACCT_USER_ID=197
-ACCT_USER_GROUPS=( cgit )
-
-acct-user_add_deps
diff --git a/acct-user/chronograf/chronograf-0-r1.ebuild b/acct-user/chronograf/chronograf-0-r1.ebuild
deleted file mode 100644
index b441506a5d5a..000000000000
--- a/acct-user/chronograf/chronograf-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for chronograf"
-ACCT_USER_ID=344
-ACCT_USER_GROUPS=( chronograf )
-ACCT_USER_HOME=/var/lib/chronograf
-
-acct-user_add_deps
diff --git a/acct-user/chronograf/chronograf-0-r2.ebuild b/acct-user/chronograf/chronograf-0-r2.ebuild
new file mode 100644
index 000000000000..825dece24629
--- /dev/null
+++ b/acct-user/chronograf/chronograf-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for chronograf"
+ACCT_USER_ID=344
+ACCT_USER_GROUPS=( chronograf )
+ACCT_USER_HOME=/var/lib/chronograf
+
+acct-user_add_deps
diff --git a/acct-user/cinder/cinder-0-r1.ebuild b/acct-user/cinder/cinder-0-r1.ebuild
deleted file mode 100644
index 3576a06cec02..000000000000
--- a/acct-user/cinder/cinder-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack cinder service"
-ACCT_USER_ID=442
-ACCT_USER_HOME=/var/lib/cinder
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( cinder )
-
-acct-user_add_deps
diff --git a/acct-user/cinder/cinder-0-r2.ebuild b/acct-user/cinder/cinder-0-r2.ebuild
new file mode 100644
index 000000000000..ef4ee18dbf85
--- /dev/null
+++ b/acct-user/cinder/cinder-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack cinder service"
+ACCT_USER_ID=442
+ACCT_USER_HOME=/var/lib/cinder
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( cinder )
+
+acct-user_add_deps
diff --git a/acct-user/clair/clair-0-r1.ebuild b/acct-user/clair/clair-0-r1.ebuild
deleted file mode 100644
index c8af2edf912f..000000000000
--- a/acct-user/clair/clair-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for clair"
-ACCT_USER_ID=307
-ACCT_USER_GROUPS=( clair )
-
-acct-user_add_deps
diff --git a/acct-user/clair/clair-0-r2.ebuild b/acct-user/clair/clair-0-r2.ebuild
new file mode 100644
index 000000000000..20127fc6d174
--- /dev/null
+++ b/acct-user/clair/clair-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for clair"
+ACCT_USER_ID=307
+ACCT_USER_GROUPS=( clair )
+
+acct-user_add_deps
diff --git a/acct-user/clamav/clamav-0-r1.ebuild b/acct-user/clamav/clamav-0-r1.ebuild
deleted file mode 100644
index 98649dc699aa..000000000000
--- a/acct-user/clamav/clamav-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=435
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/clamav/clamav-0-r2.ebuild b/acct-user/clamav/clamav-0-r2.ebuild
new file mode 100644
index 000000000000..957eecb6b483
--- /dev/null
+++ b/acct-user/clamav/clamav-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=435
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/cntlm/cntlm-0-r1.ebuild b/acct-user/cntlm/cntlm-0-r1.ebuild
new file mode 100644
index 000000000000..938462f1b567
--- /dev/null
+++ b/acct-user/cntlm/cntlm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/cntlm"
+
+ACCT_USER_GROUPS=( "cntlm" )
+ACCT_USER_ID="255"
+
+acct-user_add_deps
diff --git a/acct-user/cntlm/cntlm-0.ebuild b/acct-user/cntlm/cntlm-0.ebuild
deleted file mode 100644
index 03ab9195b999..000000000000
--- a/acct-user/cntlm/cntlm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/cntlm"
-
-ACCT_USER_GROUPS=( "cntlm" )
-ACCT_USER_ID="255"
-
-acct-user_add_deps
diff --git a/acct-user/cockroach/cockroach-0-r1.ebuild b/acct-user/cockroach/cockroach-0-r1.ebuild
new file mode 100644
index 000000000000..5be8db3263c9
--- /dev/null
+++ b/acct-user/cockroach/cockroach-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/cockroach"
+
+ACCT_USER_ID=110
+ACCT_USER_GROUPS=( cockroach )
+ACCT_USER_HOME=/var/lib/cockroach
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/cockroach/cockroach-0.ebuild b/acct-user/cockroach/cockroach-0.ebuild
deleted file mode 100644
index 404244332221..000000000000
--- a/acct-user/cockroach/cockroach-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/cockroach"
-
-ACCT_USER_ID=110
-ACCT_USER_GROUPS=( cockroach )
-ACCT_USER_HOME=/var/lib/cockroach
-ACCT_USER_SHELL=/bin/sh
-
-acct-user_add_deps
diff --git a/acct-user/collectd/collectd-0-r1.ebuild b/acct-user/collectd/collectd-0-r1.ebuild
new file mode 100644
index 000000000000..8ca7b28f5fa9
--- /dev/null
+++ b/acct-user/collectd/collectd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="collectd program user"
+
+ACCT_USER_ID=440
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/collectd/collectd-0.ebuild b/acct-user/collectd/collectd-0.ebuild
deleted file mode 100644
index f1af4a6b69b1..000000000000
--- a/acct-user/collectd/collectd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="collectd program user"
-
-ACCT_USER_ID=440
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/colord/colord-0-r1.ebuild b/acct-user/colord/colord-0-r1.ebuild
new file mode 100644
index 000000000000..7ad884c93ae1
--- /dev/null
+++ b/acct-user/colord/colord-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the colord service"
+ACCT_USER_ID=350
+ACCT_USER_GROUPS=( colord )
+ACCT_USER_HOME=/var/lib/colord
+
+acct-user_add_deps
diff --git a/acct-user/colord/colord-0.ebuild b/acct-user/colord/colord-0.ebuild
deleted file mode 100644
index e5387b5b0f7a..000000000000
--- a/acct-user/colord/colord-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the colord service"
-ACCT_USER_ID=350
-ACCT_USER_GROUPS=( colord )
-ACCT_USER_HOME=/var/lib/colord
-
-acct-user_add_deps
diff --git a/acct-user/consul-template/consul-template-0-r1.ebuild b/acct-user/consul-template/consul-template-0-r1.ebuild
deleted file mode 100644
index 9976bf6fafda..000000000000
--- a/acct-user/consul-template/consul-template-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for consul-template"
-ACCT_USER_ID=408
-ACCT_USER_GROUPS=( consul-template )
-
-acct-user_add_deps
diff --git a/acct-user/consul-template/consul-template-0-r2.ebuild b/acct-user/consul-template/consul-template-0-r2.ebuild
new file mode 100644
index 000000000000..52a1fcfde90a
--- /dev/null
+++ b/acct-user/consul-template/consul-template-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for consul-template"
+ACCT_USER_ID=408
+ACCT_USER_GROUPS=( consul-template )
+
+acct-user_add_deps
diff --git a/acct-user/consul/consul-0-r1.ebuild b/acct-user/consul/consul-0-r1.ebuild
deleted file mode 100644
index 49c0d5a31b06..000000000000
--- a/acct-user/consul/consul-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for consul"
-ACCT_USER_HOME=/var/lib/consul
-ACCT_USER_ID=411
-ACCT_USER_GROUPS=( consul )
-
-acct-user_add_deps
diff --git a/acct-user/consul/consul-0-r2.ebuild b/acct-user/consul/consul-0-r2.ebuild
new file mode 100644
index 000000000000..8cf68af0bd7c
--- /dev/null
+++ b/acct-user/consul/consul-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for consul"
+ACCT_USER_HOME=/var/lib/consul
+ACCT_USER_ID=411
+ACCT_USER_GROUPS=( consul )
+
+acct-user_add_deps
diff --git a/acct-user/consul_exporter/consul_exporter-0-r1.ebuild b/acct-user/consul_exporter/consul_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..90b769bcce2f
--- /dev/null
+++ b/acct-user/consul_exporter/consul_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for consul_exporter"
+ACCT_USER_ID=278
+ACCT_USER_GROUPS=( consul_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/consul_exporter/consul_exporter-0.ebuild b/acct-user/consul_exporter/consul_exporter-0.ebuild
deleted file mode 100644
index 2ea0df3bb057..000000000000
--- a/acct-user/consul_exporter/consul_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for consul_exporter"
-ACCT_USER_ID=278
-ACCT_USER_GROUPS=( consul_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/coredns/coredns-0-r1.ebuild b/acct-user/coredns/coredns-0-r1.ebuild
new file mode 100644
index 000000000000..49377d1566d4
--- /dev/null
+++ b/acct-user/coredns/coredns-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/coredns"
+
+ACCT_USER_HOME=/var/lib/coredns
+ACCT_USER_GROUPS=( "coredns" )
+ACCT_USER_ID="312"
+
+acct-user_add_deps
diff --git a/acct-user/coredns/coredns-0.ebuild b/acct-user/coredns/coredns-0.ebuild
deleted file mode 100644
index 2811839307e2..000000000000
--- a/acct-user/coredns/coredns-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/coredns"
-
-ACCT_USER_HOME=/var/lib/coredns
-ACCT_USER_GROUPS=( "coredns" )
-ACCT_USER_ID="312"
-
-acct-user_add_deps
diff --git a/acct-user/croc/croc-0-r1.ebuild b/acct-user/croc/croc-0-r1.ebuild
new file mode 100644
index 000000000000..ec221b097a29
--- /dev/null
+++ b/acct-user/croc/croc-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/croc"
+ACCT_USER_ID=310
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/croc/croc-0.ebuild b/acct-user/croc/croc-0.ebuild
deleted file mode 100644
index 84f75f78aac4..000000000000
--- a/acct-user/croc/croc-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/croc"
-ACCT_USER_ID=310
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/cron/cron-0-r1.ebuild b/acct-user/cron/cron-0-r1.ebuild
new file mode 100644
index 000000000000..cae4953127b9
--- /dev/null
+++ b/acct-user/cron/cron-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/cronbase"
+
+ACCT_USER_GROUPS=( "cron" )
+ACCT_USER_HOME="/var/spool/cron"
+ACCT_USER_ID="16"
+
+acct-user_add_deps
diff --git a/acct-user/cron/cron-0.ebuild b/acct-user/cron/cron-0.ebuild
deleted file mode 100644
index 7ec64484762e..000000000000
--- a/acct-user/cron/cron-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/cronbase"
-
-ACCT_USER_GROUPS=( "cron" )
-ACCT_USER_HOME="/var/spool/cron"
-ACCT_USER_ID="16"
-
-acct-user_add_deps
diff --git a/acct-user/cvmfs/cvmfs-0-r1.ebuild b/acct-user/cvmfs/cvmfs-0-r1.ebuild
deleted file mode 100644
index 9296d50fb9c1..000000000000
--- a/acct-user/cvmfs/cvmfs-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the CernVM-FS network file system"
-ACCT_USER_ID=268
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/cvmfs/cvmfs-0-r2.ebuild b/acct-user/cvmfs/cvmfs-0-r2.ebuild
new file mode 100644
index 000000000000..aa027b43a791
--- /dev/null
+++ b/acct-user/cvmfs/cvmfs-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the CernVM-FS network file system"
+ACCT_USER_ID=268
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/cyrus/cyrus-0-r2.ebuild b/acct-user/cyrus/cyrus-0-r2.ebuild
deleted file mode 100644
index 7c200b7856e4..000000000000
--- a/acct-user/cyrus/cyrus-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for cyrus-imapd daemon"
-ACCT_USER_ID=415
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/cyrus/cyrus-0-r3.ebuild b/acct-user/cyrus/cyrus-0-r3.ebuild
new file mode 100644
index 000000000000..44c206ccbbc0
--- /dev/null
+++ b/acct-user/cyrus/cyrus-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for cyrus-imapd daemon"
+ACCT_USER_ID=415
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/darkstat/darkstat-0-r1.ebuild b/acct-user/darkstat/darkstat-0-r1.ebuild
new file mode 100644
index 000000000000..27c0e44a253f
--- /dev/null
+++ b/acct-user/darkstat/darkstat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/darkstat"
+ACCT_USER_ID=380
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/darkstat/darkstat-0.ebuild b/acct-user/darkstat/darkstat-0.ebuild
deleted file mode 100644
index f4dfa5bc3f6e..000000000000
--- a/acct-user/darkstat/darkstat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/darkstat"
-ACCT_USER_ID=380
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/davfs2/davfs2-0-r1.ebuild b/acct-user/davfs2/davfs2-0-r1.ebuild
deleted file mode 100644
index fcc2e117501e..000000000000
--- a/acct-user/davfs2/davfs2-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=420
-ACCT_USER_GROUPS=( davfs2 )
-
-acct-user_add_deps
diff --git a/acct-user/davfs2/davfs2-0-r2.ebuild b/acct-user/davfs2/davfs2-0-r2.ebuild
new file mode 100644
index 000000000000..eb92b96293fa
--- /dev/null
+++ b/acct-user/davfs2/davfs2-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=420
+ACCT_USER_GROUPS=( davfs2 )
+
+acct-user_add_deps
diff --git a/acct-user/dbmail/dbmail-0-r1.ebuild b/acct-user/dbmail/dbmail-0-r1.ebuild
new file mode 100644
index 000000000000..ac0c219fdba1
--- /dev/null
+++ b/acct-user/dbmail/dbmail-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=365
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/dbmail/dbmail-0.ebuild b/acct-user/dbmail/dbmail-0.ebuild
deleted file mode 100644
index 273ecbb4ddce..000000000000
--- a/acct-user/dbmail/dbmail-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=365
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/dbskkd/dbskkd-0-r1.ebuild b/acct-user/dbskkd/dbskkd-0-r1.ebuild
new file mode 100644
index 000000000000..fe53f18a5880
--- /dev/null
+++ b/acct-user/dbskkd/dbskkd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-i18n/dbskkd-cdb"
+
+ACCT_USER_GROUPS=( "dbskkd" )
+ACCT_USER_ID="146"
+
+acct-user_add_deps
diff --git a/acct-user/dbskkd/dbskkd-0.ebuild b/acct-user/dbskkd/dbskkd-0.ebuild
deleted file mode 100644
index 07abb14a7d7e..000000000000
--- a/acct-user/dbskkd/dbskkd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-i18n/dbskkd-cdb"
-
-ACCT_USER_GROUPS=( "dbskkd" )
-ACCT_USER_ID="146"
-
-acct-user_add_deps
diff --git a/acct-user/ddclient/ddclient-0-r1.ebuild b/acct-user/ddclient/ddclient-0-r1.ebuild
deleted file mode 100644
index 60bac047e757..000000000000
--- a/acct-user/ddclient/ddclient-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the dynamic DNS client"
-
-ACCT_USER_GROUPS=( "ddclient" )
-ACCT_USER_ID="487"
-
-acct-user_add_deps
diff --git a/acct-user/ddclient/ddclient-0-r2.ebuild b/acct-user/ddclient/ddclient-0-r2.ebuild
new file mode 100644
index 000000000000..0ae2a8ad0574
--- /dev/null
+++ b/acct-user/ddclient/ddclient-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the dynamic DNS client"
+
+ACCT_USER_GROUPS=( "ddclient" )
+ACCT_USER_ID="487"
+
+acct-user_add_deps
diff --git a/acct-user/defang/defang-0-r1.ebuild b/acct-user/defang/defang-0-r1.ebuild
new file mode 100644
index 000000000000..168d014590de
--- /dev/null
+++ b/acct-user/defang/defang-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for mail-filter/mimedefang"
+
+ACCT_USER_GROUPS=( "defang" )
+ACCT_USER_ID="181"
+
+acct-user_add_deps
diff --git a/acct-user/defang/defang-0.ebuild b/acct-user/defang/defang-0.ebuild
deleted file mode 100644
index 295e77995907..000000000000
--- a/acct-user/defang/defang-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for mail-filter/mimedefang"
-
-ACCT_USER_GROUPS=( "defang" )
-ACCT_USER_ID="181"
-
-acct-user_add_deps
diff --git a/acct-user/dehydrated/dehydrated-0-r1.ebuild b/acct-user/dehydrated/dehydrated-0-r1.ebuild
new file mode 100644
index 000000000000..fa49bb0e2d49
--- /dev/null
+++ b/acct-user/dehydrated/dehydrated-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="dehydrated program user"
+
+ACCT_USER_ID=361
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/${PN}
+
+acct-user_add_deps
diff --git a/acct-user/dehydrated/dehydrated-0.ebuild b/acct-user/dehydrated/dehydrated-0.ebuild
deleted file mode 100644
index a6ec59958704..000000000000
--- a/acct-user/dehydrated/dehydrated-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="dehydrated program user"
-
-ACCT_USER_ID=361
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/lib/${PN}
-
-acct-user_add_deps
diff --git a/acct-user/deluge/deluge-0-r1.ebuild b/acct-user/deluge/deluge-0-r2.ebuild
similarity index 100%
rename from acct-user/deluge/deluge-0-r1.ebuild
rename to acct-user/deluge/deluge-0-r2.ebuild
diff --git a/acct-user/dhcp/dhcp-0-r1.ebuild b/acct-user/dhcp/dhcp-0-r1.ebuild
deleted file mode 100644
index d27eca296a9d..000000000000
--- a/acct-user/dhcp/dhcp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dhcp daemon"
-ACCT_USER_ID=300
-ACCT_USER_GROUPS=( dhcp )
-
-acct-user_add_deps
diff --git a/acct-user/dhcp/dhcp-0-r2.ebuild b/acct-user/dhcp/dhcp-0-r2.ebuild
new file mode 100644
index 000000000000..c526b058b798
--- /dev/null
+++ b/acct-user/dhcp/dhcp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dhcp daemon"
+ACCT_USER_ID=300
+ACCT_USER_GROUPS=( dhcp )
+
+acct-user_add_deps
diff --git a/acct-user/dhcpcd/dhcpcd-0-r1.ebuild b/acct-user/dhcpcd/dhcpcd-0-r1.ebuild
deleted file mode 100644
index 6673dab0fffe..000000000000
--- a/acct-user/dhcpcd/dhcpcd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dhcpcd client"
-ACCT_USER_ID=303
-ACCT_USER_GROUPS=( dhcpcd )
-ACCT_USER_HOME="/var/chroot/dhcpcd"
-
-acct-user_add_deps
diff --git a/acct-user/dhcpcd/dhcpcd-0-r2.ebuild b/acct-user/dhcpcd/dhcpcd-0-r2.ebuild
new file mode 100644
index 000000000000..b9d9b0944546
--- /dev/null
+++ b/acct-user/dhcpcd/dhcpcd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dhcpcd client"
+ACCT_USER_ID=303
+ACCT_USER_GROUPS=( dhcpcd )
+ACCT_USER_HOME="/var/chroot/dhcpcd"
+
+acct-user_add_deps
diff --git a/acct-user/dictd/dictd-0-r1.ebuild b/acct-user/dictd/dictd-0-r1.ebuild
new file mode 100644
index 000000000000..8b54a5ae197f
--- /dev/null
+++ b/acct-user/dictd/dictd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for app-text/dictd"
+ACCT_USER_ID=381
+ACCT_USER_GROUPS=( dictd )
+
+acct-user_add_deps
diff --git a/acct-user/dictd/dictd-0.ebuild b/acct-user/dictd/dictd-0.ebuild
deleted file mode 100644
index 1e32eaaad282..000000000000
--- a/acct-user/dictd/dictd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for app-text/dictd"
-ACCT_USER_ID=381
-ACCT_USER_GROUPS=( dictd )
-
-acct-user_add_deps
diff --git a/acct-user/dirsrv/dirsrv-0-r1.ebuild b/acct-user/dirsrv/dirsrv-0-r1.ebuild
new file mode 100644
index 000000000000..047daaddeedd
--- /dev/null
+++ b/acct-user/dirsrv/dirsrv-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-nds/389-ds-base"
+ACCT_USER_ID=346
+ACCT_USER_GROUPS=( dirsrv )
+
+acct-user_add_deps
diff --git a/acct-user/dirsrv/dirsrv-0.ebuild b/acct-user/dirsrv/dirsrv-0.ebuild
deleted file mode 100644
index 993383e06415..000000000000
--- a/acct-user/dirsrv/dirsrv-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-nds/389-ds-base"
-ACCT_USER_ID=346
-ACCT_USER_GROUPS=( dirsrv )
-
-acct-user_add_deps
diff --git a/acct-user/distcc/distcc-1-r1.ebuild b/acct-user/distcc/distcc-1-r1.ebuild
new file mode 100644
index 000000000000..47daaacfdefa
--- /dev/null
+++ b/acct-user/distcc/distcc-1-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User used to run distcc daemon"
+ACCT_USER_ID=240
+ACCT_USER_GROUPS=( distcc )
+
+acct-user_add_deps
diff --git a/acct-user/distcc/distcc-1.ebuild b/acct-user/distcc/distcc-1.ebuild
deleted file mode 100644
index e04e0ea8603b..000000000000
--- a/acct-user/distcc/distcc-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User used to run distcc daemon"
-ACCT_USER_ID=240
-ACCT_USER_GROUPS=( distcc )
-
-acct-user_add_deps
diff --git a/acct-user/dnrd/dnrd-0-r1.ebuild b/acct-user/dnrd/dnrd-0-r1.ebuild
new file mode 100644
index 000000000000..3ec8bafd53e9
--- /dev/null
+++ b/acct-user/dnrd/dnrd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnrd"
+
+ACCT_USER_GROUPS=( "dnrd" )
+ACCT_USER_ID="262"
+
+acct-user_add_deps
diff --git a/acct-user/dnrd/dnrd-0.ebuild b/acct-user/dnrd/dnrd-0.ebuild
deleted file mode 100644
index ef1ebf9041e3..000000000000
--- a/acct-user/dnrd/dnrd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnrd"
-
-ACCT_USER_GROUPS=( "dnrd" )
-ACCT_USER_ID="262"
-
-acct-user_add_deps
diff --git a/acct-user/dnscache/dnscache-0-r1.ebuild b/acct-user/dnscache/dnscache-0-r1.ebuild
new file mode 100644
index 000000000000..c0b54fd7cad7
--- /dev/null
+++ b/acct-user/dnscache/dnscache-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=225
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/dnscache/dnscache-0.ebuild b/acct-user/dnscache/dnscache-0.ebuild
deleted file mode 100644
index e4716c571e77..000000000000
--- a/acct-user/dnscache/dnscache-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=225
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
deleted file mode 100644
index ef741ba82993..000000000000
--- a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnscrypt-proxy"
-ACCT_USER_ID=353
-ACCT_USER_GROUPS=( dnscrypt-proxy )
-
-acct-user_add_deps
diff --git a/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
new file mode 100644
index 000000000000..3075854092bd
--- /dev/null
+++ b/acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnscrypt-proxy"
+ACCT_USER_ID=353
+ACCT_USER_GROUPS=( dnscrypt-proxy )
+
+acct-user_add_deps
diff --git a/acct-user/dnsdist/dnsdist-0-r1.ebuild b/acct-user/dnsdist/dnsdist-0-r1.ebuild
deleted file mode 100644
index 64f3d8922ace..000000000000
--- a/acct-user/dnsdist/dnsdist-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/dnsdist"
-
-ACCT_USER_GROUPS=( "dnsdist" )
-ACCT_USER_ID="414"
-
-acct-user_add_deps
diff --git a/acct-user/dnsdist/dnsdist-0-r2.ebuild b/acct-user/dnsdist/dnsdist-0-r2.ebuild
new file mode 100644
index 000000000000..8b89e209e152
--- /dev/null
+++ b/acct-user/dnsdist/dnsdist-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/dnsdist"
+
+ACCT_USER_GROUPS=( "dnsdist" )
+ACCT_USER_ID="414"
+
+acct-user_add_deps
diff --git a/acct-user/dnslog/dnslog-0-r1.ebuild b/acct-user/dnslog/dnslog-0-r1.ebuild
new file mode 100644
index 000000000000..0c794b383e53
--- /dev/null
+++ b/acct-user/dnslog/dnslog-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=226
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/dnslog/dnslog-0.ebuild b/acct-user/dnslog/dnslog-0.ebuild
deleted file mode 100644
index b961aa923436..000000000000
--- a/acct-user/dnslog/dnslog-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=226
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq/dnsmasq-0-r1.ebuild b/acct-user/dnsmasq/dnsmasq-0-r1.ebuild
deleted file mode 100644
index bf98c0fc929b..000000000000
--- a/acct-user/dnsmasq/dnsmasq-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/dnsmasq"
-
-ACCT_USER_ID=275
-ACCT_USER_GROUPS=( dnsmasq )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq/dnsmasq-0-r2.ebuild b/acct-user/dnsmasq/dnsmasq-0-r2.ebuild
new file mode 100644
index 000000000000..548af2c0d5a4
--- /dev/null
+++ b/acct-user/dnsmasq/dnsmasq-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/dnsmasq"
+
+ACCT_USER_ID=275
+ACCT_USER_GROUPS=( dnsmasq )
+
+acct-user_add_deps
diff --git a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
deleted file mode 100644
index 3bad6b64097a..000000000000
--- a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dnsmasq_exporter"
-ACCT_USER_ID=274
-ACCT_USER_GROUPS=( dnsmasq_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..aafd1d549d4b
--- /dev/null
+++ b/acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dnsmasq_exporter"
+ACCT_USER_ID=274
+ACCT_USER_GROUPS=( dnsmasq_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/docker_auth/docker_auth-0-r1.ebuild b/acct-user/docker_auth/docker_auth-0-r1.ebuild
deleted file mode 100644
index c6af83062e39..000000000000
--- a/acct-user/docker_auth/docker_auth-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for docker_auth"
-ACCT_USER_ID=345
-ACCT_USER_GROUPS=( docker_auth )
-
-acct-user_add_deps
diff --git a/acct-user/docker_auth/docker_auth-0-r2.ebuild b/acct-user/docker_auth/docker_auth-0-r2.ebuild
new file mode 100644
index 000000000000..4b43ec91c96f
--- /dev/null
+++ b/acct-user/docker_auth/docker_auth-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for docker_auth"
+ACCT_USER_ID=345
+ACCT_USER_GROUPS=( docker_auth )
+
+acct-user_add_deps
diff --git a/acct-user/dovecot/dovecot-0-r1.ebuild b/acct-user/dovecot/dovecot-0-r1.ebuild
deleted file mode 100644
index 661e3706f564..000000000000
--- a/acct-user/dovecot/dovecot-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dovecot daemon"
-ACCT_USER_ID=76
-ACCT_USER_GROUPS=( dovecot )
-
-acct-user_add_deps
diff --git a/acct-user/dovecot/dovecot-0-r2.ebuild b/acct-user/dovecot/dovecot-0-r2.ebuild
new file mode 100644
index 000000000000..107dc2b7bf7d
--- /dev/null
+++ b/acct-user/dovecot/dovecot-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dovecot daemon"
+ACCT_USER_ID=76
+ACCT_USER_GROUPS=( dovecot )
+
+acct-user_add_deps
diff --git a/acct-user/dovenull/dovenull-0-r1.ebuild b/acct-user/dovenull/dovenull-0-r1.ebuild
deleted file mode 100644
index 40d476bdc4eb..000000000000
--- a/acct-user/dovenull/dovenull-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for dovecot daemon"
-ACCT_USER_ID=74
-ACCT_USER_GROUPS=( dovenull )
-
-acct-user_add_deps
diff --git a/acct-user/dovenull/dovenull-0-r2.ebuild b/acct-user/dovenull/dovenull-0-r2.ebuild
new file mode 100644
index 000000000000..b1fd15df1755
--- /dev/null
+++ b/acct-user/dovenull/dovenull-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dovecot daemon"
+ACCT_USER_ID=74
+ACCT_USER_GROUPS=( dovenull )
+
+acct-user_add_deps
diff --git a/acct-user/drone/drone-0-r1.ebuild b/acct-user/drone/drone-0-r1.ebuild
new file mode 100644
index 000000000000..9cd5b314e13e
--- /dev/null
+++ b/acct-user/drone/drone-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-util/drone"
+
+ACCT_USER_ID=112
+ACCT_USER_GROUPS=( drone )
+ACCT_USER_HOME=/var/lib/drone
+
+acct-user_add_deps
diff --git a/acct-user/drone/drone-0.ebuild b/acct-user/drone/drone-0.ebuild
deleted file mode 100644
index 3f0bfb9afded..000000000000
--- a/acct-user/drone/drone-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-util/drone"
-
-ACCT_USER_ID=112
-ACCT_USER_GROUPS=( drone )
-ACCT_USER_HOME=/var/lib/drone
-
-acct-user_add_deps
diff --git a/acct-user/duende/duende-0-r1.ebuild b/acct-user/duende/duende-0-r1.ebuild
deleted file mode 100644
index b7ad1e5a6dbf..000000000000
--- a/acct-user/duende/duende-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=66
-ACCT_USER_GROUPS=( "maradns" )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/maradns "
-RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/duende/duende-0-r2.ebuild b/acct-user/duende/duende-0-r2.ebuild
new file mode 100644
index 000000000000..9606fcf3d80c
--- /dev/null
+++ b/acct-user/duende/duende-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=66
+ACCT_USER_GROUPS=( "maradns" )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/maradns "
+RDEPEND+=" acct-group/maradns "
diff --git a/acct-user/ejabberd/ejabberd-2-r1.ebuild b/acct-user/ejabberd/ejabberd-2-r1.ebuild
new file mode 100644
index 000000000000..08408483d2ce
--- /dev/null
+++ b/acct-user/ejabberd/ejabberd-2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/ejabberd"
+
+ACCT_USER_ID=114
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/${PN}
+
+IUSE="pam"
+
+RDEPEND="pam? ( acct-group/epam )"
+
+acct-user_add_deps
+
+pkg_setup() {
+	use pam && ACCT_USER_GROUPS+=( epam )
+}
diff --git a/acct-user/ejabberd/ejabberd-2.ebuild b/acct-user/ejabberd/ejabberd-2.ebuild
deleted file mode 100644
index 70c1280b36b2..000000000000
--- a/acct-user/ejabberd/ejabberd-2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/ejabberd"
-
-ACCT_USER_ID=114
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/lib/${PN}
-
-IUSE="pam"
-
-RDEPEND="pam? ( acct-group/epam )"
-
-acct-user_add_deps
-
-pkg_setup() {
-	use pam && ACCT_USER_GROUPS+=( epam )
-}
diff --git a/acct-user/elasticsearch/elasticsearch-0-r1.ebuild b/acct-user/elasticsearch/elasticsearch-0-r1.ebuild
deleted file mode 100644
index 397e25fe4fde..000000000000
--- a/acct-user/elasticsearch/elasticsearch-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Elasticsearch program user"
-ACCT_USER_ID=183
-ACCT_USER_HOME=/usr/share/elasticsearch
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( elasticsearch )
-acct-user_add_deps
diff --git a/acct-user/elasticsearch/elasticsearch-0-r2.ebuild b/acct-user/elasticsearch/elasticsearch-0-r2.ebuild
new file mode 100644
index 000000000000..e1b91dea15cb
--- /dev/null
+++ b/acct-user/elasticsearch/elasticsearch-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Elasticsearch program user"
+ACCT_USER_ID=183
+ACCT_USER_HOME=/usr/share/elasticsearch
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( elasticsearch )
+acct-user_add_deps
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
deleted file mode 100644
index 0641a19753f0..000000000000
--- a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/elasticsearch_exporter"
-
-ACCT_USER_ID=501
-ACCT_USER_GROUPS=( elasticsearch_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..4d8aef4a88c1
--- /dev/null
+++ b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/elasticsearch_exporter"
+
+ACCT_USER_ID=501
+ACCT_USER_GROUPS=( elasticsearch_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/energi3/energi3-0-r1.ebuild b/acct-user/energi3/energi3-0-r1.ebuild
new file mode 100644
index 000000000000..c4c06a942c1a
--- /dev/null
+++ b/acct-user/energi3/energi3-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/energi3"
+ACCT_USER_ID=218
+ACCT_USER_GROUPS=( energi3 )
+
+acct-user_add_deps
diff --git a/acct-user/energi3/energi3-0.ebuild b/acct-user/energi3/energi3-0.ebuild
deleted file mode 100644
index 3672377d2cc4..000000000000
--- a/acct-user/energi3/energi3-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/energi3"
-ACCT_USER_ID=218
-ACCT_USER_GROUPS=( energi3 )
-
-acct-user_add_deps
diff --git a/acct-user/epmd/epmd-0-r1.ebuild b/acct-user/epmd/epmd-0-r1.ebuild
deleted file mode 100644
index 5648cf82fb26..000000000000
--- a/acct-user/epmd/epmd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Erlang Portmapper Daemon"
-ACCT_USER_ID=335
-ACCT_USER_GROUPS=( epmd )
-
-acct-user_add_deps
diff --git a/acct-user/epmd/epmd-0-r2.ebuild b/acct-user/epmd/epmd-0-r2.ebuild
new file mode 100644
index 000000000000..093ecbc957b1
--- /dev/null
+++ b/acct-user/epmd/epmd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Erlang Portmapper Daemon"
+ACCT_USER_ID=335
+ACCT_USER_GROUPS=( epmd )
+
+acct-user_add_deps
diff --git a/acct-user/err/err-0-r1.ebuild b/acct-user/err/err-0-r1.ebuild
new file mode 100644
index 000000000000..0def72aa8a34
--- /dev/null
+++ b/acct-user/err/err-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=325
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/err/err-0.ebuild b/acct-user/err/err-0.ebuild
deleted file mode 100644
index 1663b0acc907..000000000000
--- a/acct-user/err/err-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=325
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/etcd/etcd-0-r1.ebuild b/acct-user/etcd/etcd-0-r1.ebuild
deleted file mode 100644
index d682dc9b6422..000000000000
--- a/acct-user/etcd/etcd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for etcd"
-ACCT_USER_HOME=/var/lib/etcd
-ACCT_USER_HOME_PERMS=700
-ACCT_USER_ID=426
-ACCT_USER_GROUPS=( etcd )
-
-acct-user_add_deps
diff --git a/acct-user/etcd/etcd-0-r2.ebuild b/acct-user/etcd/etcd-0-r2.ebuild
new file mode 100644
index 000000000000..0af97deddaa8
--- /dev/null
+++ b/acct-user/etcd/etcd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for etcd"
+ACCT_USER_HOME=/var/lib/etcd
+ACCT_USER_HOME_PERMS=700
+ACCT_USER_ID=426
+ACCT_USER_GROUPS=( etcd )
+
+acct-user_add_deps
diff --git a/acct-user/exabgp/exabgp-0-r1.ebuild b/acct-user/exabgp/exabgp-0-r1.ebuild
deleted file mode 100644
index a78e30a7b12a..000000000000
--- a/acct-user/exabgp/exabgp-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/exabgp"
-
-ACCT_USER_ID=316
-ACCT_USER_GROUPS=( exabgp )
-
-acct-user_add_deps
diff --git a/acct-user/exabgp/exabgp-0-r2.ebuild b/acct-user/exabgp/exabgp-0-r2.ebuild
new file mode 100644
index 000000000000..06853b063cb3
--- /dev/null
+++ b/acct-user/exabgp/exabgp-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/exabgp"
+
+ACCT_USER_ID=316
+ACCT_USER_GROUPS=( exabgp )
+
+acct-user_add_deps
diff --git a/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild b/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild
new file mode 100644
index 000000000000..92be78693837
--- /dev/null
+++ b/acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/ez-ipupdate"
+
+ACCT_USER_GROUPS=( "ez-ipupd" )
+ACCT_USER_HOME="/var/cache/ez-ipupdate"
+ACCT_USER_ID="261"
+
+acct-user_add_deps
diff --git a/acct-user/ez-ipupd/ez-ipupd-0.ebuild b/acct-user/ez-ipupd/ez-ipupd-0.ebuild
deleted file mode 100644
index 79656896dc6e..000000000000
--- a/acct-user/ez-ipupd/ez-ipupd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dns/ez-ipupdate"
-
-ACCT_USER_GROUPS=( "ez-ipupd" )
-ACCT_USER_HOME="/var/cache/ez-ipupdate"
-ACCT_USER_ID="261"
-
-acct-user_add_deps
diff --git a/acct-user/fax/fax-0-r1.ebuild b/acct-user/fax/fax-0-r1.ebuild
new file mode 100644
index 000000000000..3ced3405070d
--- /dev/null
+++ b/acct-user/fax/fax-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dialup/mgetty"
+
+ACCT_USER_GROUPS=( "fax" )
+ACCT_USER_ID="320"
+
+acct-user_add_deps
diff --git a/acct-user/fax/fax-0.ebuild b/acct-user/fax/fax-0.ebuild
deleted file mode 100644
index cbc57fbfd4b1..000000000000
--- a/acct-user/fax/fax-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dialup/mgetty"
-
-ACCT_USER_GROUPS=( "fax" )
-ACCT_USER_ID="320"
-
-acct-user_add_deps
diff --git a/acct-user/fcron/fcron-0-r1.ebuild b/acct-user/fcron/fcron-0-r1.ebuild
new file mode 100644
index 000000000000..ca25b3a170af
--- /dev/null
+++ b/acct-user/fcron/fcron-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/fcron"
+
+ACCT_USER_GROUPS=( "fcron" )
+ACCT_USER_ID="120"
+
+acct-user_add_deps
diff --git a/acct-user/fcron/fcron-0.ebuild b/acct-user/fcron/fcron-0.ebuild
deleted file mode 100644
index 2cf35de584c6..000000000000
--- a/acct-user/fcron/fcron-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-process/fcron"
-
-ACCT_USER_GROUPS=( "fcron" )
-ACCT_USER_ID="120"
-
-acct-user_add_deps
diff --git a/acct-user/fdm/fdm-0-r1.ebuild b/acct-user/fdm/fdm-0-r1.ebuild
new file mode 100644
index 000000000000..646dc4cf50fd
--- /dev/null
+++ b/acct-user/fdm/fdm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/fdm"
+
+ACCT_USER_GROUPS=( "fdm" )
+ACCT_USER_ID="248"
+
+acct-user_add_deps
diff --git a/acct-user/fdm/fdm-0.ebuild b/acct-user/fdm/fdm-0.ebuild
deleted file mode 100644
index 8f0d4e8d7814..000000000000
--- a/acct-user/fdm/fdm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/fdm"
-
-ACCT_USER_GROUPS=( "fdm" )
-ACCT_USER_ID="248"
-
-acct-user_add_deps
diff --git a/acct-user/fetchmail/fetchmail-0-r1.ebuild b/acct-user/fetchmail/fetchmail-0-r1.ebuild
deleted file mode 100644
index 306170f9841a..000000000000
--- a/acct-user/fetchmail/fetchmail-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/fetchmail"
-ACCT_USER_ID=124
-ACCT_USER_GROUPS=( fetchmail )
-ACCT_USER_HOME="/var/lib/fetchmail"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/fetchmail/fetchmail-0-r2.ebuild b/acct-user/fetchmail/fetchmail-0-r2.ebuild
new file mode 100644
index 000000000000..4101dcfa26b4
--- /dev/null
+++ b/acct-user/fetchmail/fetchmail-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/fetchmail"
+ACCT_USER_ID=124
+ACCT_USER_GROUPS=( fetchmail )
+ACCT_USER_HOME="/var/lib/fetchmail"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/fhem/fhem-0-r1.ebuild b/acct-user/fhem/fhem-0-r1.ebuild
deleted file mode 100644
index 00ea760c48fe..000000000000
--- a/acct-user/fhem/fhem-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the FHEM perl server for house automation"
-
-ACCT_USER_GROUPS=( "fhem" )
-ACCT_USER_HOME="/opt/fhem"
-ACCT_USER_ID="491"
-
-acct-user_add_deps
diff --git a/acct-user/fhem/fhem-0-r2.ebuild b/acct-user/fhem/fhem-0-r2.ebuild
new file mode 100644
index 000000000000..51c17069a9a7
--- /dev/null
+++ b/acct-user/fhem/fhem-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the FHEM perl server for house automation"
+
+ACCT_USER_GROUPS=( "fhem" )
+ACCT_USER_HOME="/opt/fhem"
+ACCT_USER_ID="491"
+
+acct-user_add_deps
diff --git a/acct-user/firebird/firebird-0-r2.ebuild b/acct-user/firebird/firebird-0-r2.ebuild
deleted file mode 100644
index e34d2c1a8ac7..000000000000
--- a/acct-user/firebird/firebird-0-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/firebird"
-
-ACCT_USER_GROUPS=( "firebird" )
-ACCT_USER_ID="450"
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
-
-pkg_setup() {
-	ACCT_USER_HOME="/usr/$(get_libdir)/firebird"
-}
diff --git a/acct-user/firebird/firebird-0-r3.ebuild b/acct-user/firebird/firebird-0-r3.ebuild
new file mode 100644
index 000000000000..9e881781fdf6
--- /dev/null
+++ b/acct-user/firebird/firebird-0-r3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/firebird"
+
+ACCT_USER_GROUPS=( "firebird" )
+ACCT_USER_ID="450"
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
+
+pkg_setup() {
+	ACCT_USER_HOME="/usr/$(get_libdir)/firebird"
+}
diff --git a/acct-user/flatpak/flatpak-0-r1.ebuild b/acct-user/flatpak/flatpak-0-r1.ebuild
new file mode 100644
index 000000000000..aaead0d36975
--- /dev/null
+++ b/acct-user/flatpak/flatpak-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=313
+ACCT_USER_GROUPS=( flatpak )
+acct-user_add_deps
diff --git a/acct-user/flatpak/flatpak-0.ebuild b/acct-user/flatpak/flatpak-0.ebuild
deleted file mode 100644
index fb1fa5a77512..000000000000
--- a/acct-user/flatpak/flatpak-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=313
-ACCT_USER_GROUPS=( flatpak )
-acct-user_add_deps
diff --git a/acct-user/flows/flows-0-r1.ebuild b/acct-user/flows/flows-0-r1.ebuild
new file mode 100644
index 000000000000..2d265636ba43
--- /dev/null
+++ b/acct-user/flows/flows-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/flow-tools"
+ACCT_USER_ID=384
+ACCT_USER_HOME=/var/lib/flows
+ACCT_USER_GROUPS=( flows )
+
+acct-user_add_deps
diff --git a/acct-user/flows/flows-0.ebuild b/acct-user/flows/flows-0.ebuild
deleted file mode 100644
index dbfdd9f98492..000000000000
--- a/acct-user/flows/flows-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/flow-tools"
-ACCT_USER_ID=384
-ACCT_USER_HOME=/var/lib/flows
-ACCT_USER_GROUPS=( flows )
-
-acct-user_add_deps
diff --git a/acct-user/fluentd/fluentd-0-r1.ebuild b/acct-user/fluentd/fluentd-0-r1.ebuild
deleted file mode 100644
index b25d51d0046a..000000000000
--- a/acct-user/fluentd/fluentd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/fluentd"
-
-ACCT_USER_ID=504
-ACCT_USER_GROUPS=( fluentd )
-
-acct-user_add_deps
diff --git a/acct-user/fluentd/fluentd-0-r2.ebuild b/acct-user/fluentd/fluentd-0-r2.ebuild
new file mode 100644
index 000000000000..15b390b4f36b
--- /dev/null
+++ b/acct-user/fluentd/fluentd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/fluentd"
+
+ACCT_USER_ID=504
+ACCT_USER_GROUPS=( fluentd )
+
+acct-user_add_deps
diff --git a/acct-user/fnord/fnord-0-r1.ebuild b/acct-user/fnord/fnord-0-r1.ebuild
new file mode 100644
index 000000000000..2a104f9cbaeb
--- /dev/null
+++ b/acct-user/fnord/fnord-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-servers/fnord"
+
+ACCT_USER_GROUPS=( "nofiles" )
+ACCT_USER_HOME="/etc/fnord"
+ACCT_USER_ID="402"
+
+acct-user_add_deps
diff --git a/acct-user/fnord/fnord-0.ebuild b/acct-user/fnord/fnord-0.ebuild
deleted file mode 100644
index fe97d10637a2..000000000000
--- a/acct-user/fnord/fnord-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-servers/fnord"
-
-ACCT_USER_GROUPS=( "nofiles" )
-ACCT_USER_HOME="/etc/fnord"
-ACCT_USER_ID="402"
-
-acct-user_add_deps
diff --git a/acct-user/fnordlog/fnordlog-0-r1.ebuild b/acct-user/fnordlog/fnordlog-0-r1.ebuild
new file mode 100644
index 000000000000..9fb95c7fbad1
--- /dev/null
+++ b/acct-user/fnordlog/fnordlog-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-servers/fnord"
+
+ACCT_USER_GROUPS=( "nofiles" )
+ACCT_USER_HOME="/etc/fnord"
+ACCT_USER_ID="385"
+
+acct-user_add_deps
diff --git a/acct-user/fnordlog/fnordlog-0.ebuild b/acct-user/fnordlog/fnordlog-0.ebuild
deleted file mode 100644
index 25b7383a8575..000000000000
--- a/acct-user/fnordlog/fnordlog-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-servers/fnord"
-
-ACCT_USER_GROUPS=( "nofiles" )
-ACCT_USER_HOME="/etc/fnord"
-ACCT_USER_ID="385"
-
-acct-user_add_deps
diff --git a/acct-user/foldingathome/foldingathome-0-r1.ebuild b/acct-user/foldingathome/foldingathome-0-r1.ebuild
new file mode 100644
index 000000000000..4f01d42def53
--- /dev/null
+++ b/acct-user/foldingathome/foldingathome-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sci-biology/foldingathome"
+
+ACCT_USER_GROUPS=( "foldingathome" "video" )
+ACCT_USER_HOME="/opt/foldingathome"
+ACCT_USER_ID="128"
+
+acct-user_add_deps
diff --git a/acct-user/foldingathome/foldingathome-0.ebuild b/acct-user/foldingathome/foldingathome-0.ebuild
deleted file mode 100644
index a09b52cd1831..000000000000
--- a/acct-user/foldingathome/foldingathome-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sci-biology/foldingathome"
-
-ACCT_USER_GROUPS=( "foldingathome" "video" )
-ACCT_USER_HOME="/opt/foldingathome"
-ACCT_USER_ID="128"
-
-acct-user_add_deps
diff --git a/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild b/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild
new file mode 100644
index 000000000000..0397363b2c62
--- /dev/null
+++ b/acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/fp-multiuser"
+
+ACCT_USER_HOME=/var/lib/fp-multiuser
+ACCT_USER_GROUPS=( "fp-multiuser" )
+ACCT_USER_ID="318"
+
+acct-user_add_deps
diff --git a/acct-user/fp-multiuser/fp-multiuser-0.ebuild b/acct-user/fp-multiuser/fp-multiuser-0.ebuild
deleted file mode 100644
index bbaef0f6ce78..000000000000
--- a/acct-user/fp-multiuser/fp-multiuser-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/fp-multiuser"
-
-ACCT_USER_HOME=/var/lib/fp-multiuser
-ACCT_USER_GROUPS=( "fp-multiuser" )
-ACCT_USER_ID="318"
-
-acct-user_add_deps
diff --git a/acct-user/freenet/freenet-0-r1.ebuild b/acct-user/freenet/freenet-0-r1.ebuild
new file mode 100644
index 000000000000..c03cfb616ecc
--- /dev/null
+++ b/acct-user/freenet/freenet-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/freenet"
+ACCT_USER_ID=105
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/freenet
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/freenet/freenet-0.ebuild b/acct-user/freenet/freenet-0.ebuild
deleted file mode 100644
index 3f624fa01977..000000000000
--- a/acct-user/freenet/freenet-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/freenet"
-ACCT_USER_ID=105
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME=/var/freenet
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..8cc42b2fe072
--- /dev/null
+++ b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="FRITZ!Box Smart Home Exporter User"
+
+ACCT_USER_ID=228
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild b/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
deleted file mode 100644
index 7b7ec26bde35..000000000000
--- a/acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="FRITZ!Box Smart Home Exporter User"
-
-ACCT_USER_ID=228
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/frr/frr-0-r1.ebuild b/acct-user/frr/frr-0-r1.ebuild
new file mode 100644
index 000000000000..8a2f7caed68f
--- /dev/null
+++ b/acct-user/frr/frr-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=371
+ACCT_USER_GROUPS=( frr )
+
+acct-user_add_deps
diff --git a/acct-user/frr/frr-0.ebuild b/acct-user/frr/frr-0.ebuild
deleted file mode 100644
index ec7cc1f8d314..000000000000
--- a/acct-user/frr/frr-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=371
-ACCT_USER_GROUPS=( frr )
-
-acct-user_add_deps
diff --git a/acct-user/ftp/ftp-0-r3.ebuild b/acct-user/ftp/ftp-0-r3.ebuild
deleted file mode 100644
index d82683fffe97..000000000000
--- a/acct-user/ftp/ftp-0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="File Transfer Protocol (FTP) server user"
-
-ACCT_USER_GROUPS=( "ftp" )
-ACCT_USER_HOME="/var/lib/ftp"
-ACCT_USER_HOME_OWNER="root:ftp"
-ACCT_USER_ID="21"
-
-acct-user_add_deps
diff --git a/acct-user/ftp/ftp-0-r4.ebuild b/acct-user/ftp/ftp-0-r4.ebuild
new file mode 100644
index 000000000000..9d7d85fa77b3
--- /dev/null
+++ b/acct-user/ftp/ftp-0-r4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="File Transfer Protocol (FTP) server user"
+
+ACCT_USER_GROUPS=( "ftp" )
+ACCT_USER_HOME="/var/lib/ftp"
+ACCT_USER_HOME_OWNER="root:ftp"
+ACCT_USER_ID="21"
+
+acct-user_add_deps
diff --git a/acct-user/ftpproxy/ftpproxy-0-r1.ebuild b/acct-user/ftpproxy/ftpproxy-0-r1.ebuild
new file mode 100644
index 000000000000..4a50399145da
--- /dev/null
+++ b/acct-user/ftpproxy/ftpproxy-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-ftp/frox"
+
+ACCT_USER_GROUPS=( "ftpproxy" )
+ACCT_USER_HOME="/var/spool/frox"
+ACCT_USER_HOME_PERMS="700"
+ACCT_USER_ID="182"
+
+acct-user_add_deps
diff --git a/acct-user/ftpproxy/ftpproxy-0.ebuild b/acct-user/ftpproxy/ftpproxy-0.ebuild
deleted file mode 100644
index 0a05768729d5..000000000000
--- a/acct-user/ftpproxy/ftpproxy-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-ftp/frox"
-
-ACCT_USER_GROUPS=( "ftpproxy" )
-ACCT_USER_HOME="/var/spool/frox"
-ACCT_USER_HOME_PERMS="700"
-ACCT_USER_ID="182"
-
-acct-user_add_deps
diff --git a/acct-user/gatling/gatling-0-r1.ebuild b/acct-user/gatling/gatling-0-r1.ebuild
deleted file mode 100644
index ea4d268d2c40..000000000000
--- a/acct-user/gatling/gatling-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_GROUPS=( gatling )
-ACCT_USER_HOME=/var/www/localhost
-ACCT_USER_ID=364  # matches acct-group/gatling
-
-acct-user_add_deps
diff --git a/acct-user/gatling/gatling-0-r2.ebuild b/acct-user/gatling/gatling-0-r2.ebuild
new file mode 100644
index 000000000000..9c2708333635
--- /dev/null
+++ b/acct-user/gatling/gatling-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_GROUPS=( gatling )
+ACCT_USER_HOME=/var/www/localhost
+ACCT_USER_ID=364  # matches acct-group/gatling
+
+acct-user_add_deps
diff --git a/acct-user/gauth/gauth-0-r1.ebuild b/acct-user/gauth/gauth-0-r1.ebuild
new file mode 100644
index 000000000000..4ba3f3f025b3
--- /dev/null
+++ b/acct-user/gauth/gauth-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-auth/google-authenticator-wrappers"
+
+ACCT_USER_GROUPS=( "gauth" )
+ACCT_USER_ID="138"
+
+acct-user_add_deps
diff --git a/acct-user/gauth/gauth-0.ebuild b/acct-user/gauth/gauth-0.ebuild
deleted file mode 100644
index 97ad122a12bb..000000000000
--- a/acct-user/gauth/gauth-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-auth/google-authenticator-wrappers"
-
-ACCT_USER_GROUPS=( "gauth" )
-ACCT_USER_ID="138"
-
-acct-user_add_deps
diff --git a/acct-user/gdm/gdm-0-r1.ebuild b/acct-user/gdm/gdm-0-r1.ebuild
new file mode 100644
index 000000000000..9d57eb6782f5
--- /dev/null
+++ b/acct-user/gdm/gdm-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running GDM"
+ACCT_USER_ID=32
+ACCT_USER_GROUPS=( gdm video )
+ACCT_USER_HOME=/var/lib/gdm
+
+acct-user_add_deps
diff --git a/acct-user/gdm/gdm-0.ebuild b/acct-user/gdm/gdm-0.ebuild
deleted file mode 100644
index dcbdc40a98e1..000000000000
--- a/acct-user/gdm/gdm-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running GDM"
-ACCT_USER_ID=32
-ACCT_USER_GROUPS=( gdm video )
-ACCT_USER_HOME=/var/lib/gdm
-
-acct-user_add_deps
diff --git a/acct-user/geneweb/geneweb-0-r1.ebuild b/acct-user/geneweb/geneweb-0-r1.ebuild
deleted file mode 100644
index ddb7933984a2..000000000000
--- a/acct-user/geneweb/geneweb-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user id for geneweb daemon"
-
-ACCT_USER_ID=467
-ACCT_USER_HOME=/var/lib/geneweb
-ACCT_USER_GROUPS=( geneweb )
-
-acct-user_add_deps
diff --git a/acct-user/geneweb/geneweb-0-r2.ebuild b/acct-user/geneweb/geneweb-0-r2.ebuild
new file mode 100644
index 000000000000..c63d14d893c0
--- /dev/null
+++ b/acct-user/geneweb/geneweb-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user id for geneweb daemon"
+
+ACCT_USER_ID=467
+ACCT_USER_HOME=/var/lib/geneweb
+ACCT_USER_GROUPS=( geneweb )
+
+acct-user_add_deps
diff --git a/acct-user/geoclue/geoclue-0-r1.ebuild b/acct-user/geoclue/geoclue-0-r1.ebuild
new file mode 100644
index 000000000000..e679be2efdf6
--- /dev/null
+++ b/acct-user/geoclue/geoclue-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the GeoClue D-Bus geolocation service"
+ACCT_USER_ID=351
+ACCT_USER_GROUPS=( geoclue )
+ACCT_USER_HOME=/var/lib/geoclue
+
+acct-user_add_deps
diff --git a/acct-user/geoclue/geoclue-0.ebuild b/acct-user/geoclue/geoclue-0.ebuild
deleted file mode 100644
index 0a6888d43ee4..000000000000
--- a/acct-user/geoclue/geoclue-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the GeoClue D-Bus geolocation service"
-ACCT_USER_ID=351
-ACCT_USER_GROUPS=( geoclue )
-ACCT_USER_HOME=/var/lib/geoclue
-
-acct-user_add_deps
diff --git a/acct-user/gerbera/gerbera-0-r1.ebuild b/acct-user/gerbera/gerbera-0-r1.ebuild
deleted file mode 100644
index ded9049718c7..000000000000
--- a/acct-user/gerbera/gerbera-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Gerbera UPnP Media Server user"
-ACCT_USER_ID=429
-ACCT_USER_HOME=/var/lib/gerbera
-ACCT_USER_GROUPS=( gerbera video )
-
-acct-user_add_deps
diff --git a/acct-user/gerbera/gerbera-0-r2.ebuild b/acct-user/gerbera/gerbera-0-r2.ebuild
new file mode 100644
index 000000000000..6d7dd80afe5c
--- /dev/null
+++ b/acct-user/gerbera/gerbera-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Gerbera UPnP Media Server user"
+ACCT_USER_ID=429
+ACCT_USER_HOME=/var/lib/gerbera
+ACCT_USER_GROUPS=( gerbera video )
+
+acct-user_add_deps
diff --git a/acct-user/git/git-0-r2.ebuild b/acct-user/git/git-0-r3.ebuild
similarity index 100%
rename from acct-user/git/git-0-r2.ebuild
rename to acct-user/git/git-0-r3.ebuild
diff --git a/acct-user/github-exporter/github-exporter-0-r1.ebuild b/acct-user/github-exporter/github-exporter-0-r1.ebuild
new file mode 100644
index 000000000000..26444dd97aef
--- /dev/null
+++ b/acct-user/github-exporter/github-exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for github-exporter"
+ACCT_USER_ID=238
+ACCT_USER_GROUPS=( github-exporter )
+
+acct-user_add_deps
diff --git a/acct-user/github-exporter/github-exporter-0.ebuild b/acct-user/github-exporter/github-exporter-0.ebuild
deleted file mode 100644
index 5fc6470f9cdc..000000000000
--- a/acct-user/github-exporter/github-exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for github-exporter"
-ACCT_USER_ID=238
-ACCT_USER_GROUPS=( github-exporter )
-
-acct-user_add_deps
diff --git a/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild b/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild
new file mode 100644
index 000000000000..0dcd40188c58
--- /dev/null
+++ b/acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Dedicated user for gitlab-runner"
+
+ACCT_USER_ID=510
+ACCT_USER_GROUPS=( gitlab-runner )
+
+ACCT_USER_HOME=/var/lib/gitlab-runner
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/gitlab-runner/gitlab-runner-1.ebuild b/acct-user/gitlab-runner/gitlab-runner-1.ebuild
deleted file mode 100644
index 927761e522c4..000000000000
--- a/acct-user/gitlab-runner/gitlab-runner-1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Dedicated user for gitlab-runner"
-
-ACCT_USER_ID=510
-ACCT_USER_GROUPS=( gitlab-runner )
-
-ACCT_USER_HOME=/var/lib/gitlab-runner
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/gkrellmd/gkrellmd-0-r1.ebuild b/acct-user/gkrellmd/gkrellmd-0-r1.ebuild
deleted file mode 100644
index 419393f02f51..000000000000
--- a/acct-user/gkrellmd/gkrellmd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for gkrellm daemon"
-ACCT_USER_ID=221
-ACCT_USER_GROUPS=( gkrellmd )
-
-acct-user_add_deps
diff --git a/acct-user/gkrellmd/gkrellmd-0-r2.ebuild b/acct-user/gkrellmd/gkrellmd-0-r2.ebuild
new file mode 100644
index 000000000000..a174866f976a
--- /dev/null
+++ b/acct-user/gkrellmd/gkrellmd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for gkrellm daemon"
+ACCT_USER_ID=221
+ACCT_USER_GROUPS=( gkrellmd )
+
+acct-user_add_deps
diff --git a/acct-user/glance/glance-0-r1.ebuild b/acct-user/glance/glance-0-r1.ebuild
deleted file mode 100644
index bf1992f35860..000000000000
--- a/acct-user/glance/glance-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the glance openstack service"
-ACCT_USER_ID=443
-ACCT_USER_HOME=/var/lib/glance
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( glance )
-
-acct-user_add_deps
diff --git a/acct-user/glance/glance-0-r2.ebuild b/acct-user/glance/glance-0-r2.ebuild
new file mode 100644
index 000000000000..da592367b662
--- /dev/null
+++ b/acct-user/glance/glance-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the glance openstack service"
+ACCT_USER_ID=443
+ACCT_USER_HOME=/var/lib/glance
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( glance )
+
+acct-user_add_deps
diff --git a/acct-user/gluster/gluster-0-r1.ebuild b/acct-user/gluster/gluster-0-r1.ebuild
deleted file mode 100644
index 7b4597c69810..000000000000
--- a/acct-user/gluster/gluster-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-# Needed for statedumps
-# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
-
-ACCT_USER_ID=416
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/gluster/gluster-0-r2.ebuild b/acct-user/gluster/gluster-0-r2.ebuild
new file mode 100644
index 000000000000..f76614e4e886
--- /dev/null
+++ b/acct-user/gluster/gluster-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+# Needed for statedumps
+# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
+
+ACCT_USER_ID=416
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/gns3/gns3-0-r1.ebuild b/acct-user/gns3/gns3-0-r1.ebuild
new file mode 100644
index 000000000000..3f5fd4abf6f3
--- /dev/null
+++ b/acct-user/gns3/gns3-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=522
+ACCT_USER_HOME=/var/lib/gns3
+ACCT_USER_GROUPS=( gns3 ubridge )
+
+acct-user_add_deps
diff --git a/acct-user/gns3/gns3-0.ebuild b/acct-user/gns3/gns3-0.ebuild
deleted file mode 100644
index c3e289d69213..000000000000
--- a/acct-user/gns3/gns3-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=522
-ACCT_USER_HOME=/var/lib/gns3
-ACCT_USER_GROUPS=( gns3 ubridge )
-
-acct-user_add_deps
diff --git a/acct-user/gnump3d/gnump3d-0-r1.ebuild b/acct-user/gnump3d/gnump3d-0-r1.ebuild
new file mode 100644
index 000000000000..19f4d5e4fb9b
--- /dev/null
+++ b/acct-user/gnump3d/gnump3d-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/gnump3d"
+
+ACCT_USER_GROUPS=( "gnump3d" )
+ACCT_USER_ID="160"
+
+acct-user_add_deps
diff --git a/acct-user/gnump3d/gnump3d-0.ebuild b/acct-user/gnump3d/gnump3d-0.ebuild
deleted file mode 100644
index 131534a55167..000000000000
--- a/acct-user/gnump3d/gnump3d-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/gnump3d"
-
-ACCT_USER_GROUPS=( "gnump3d" )
-ACCT_USER_ID="160"
-
-acct-user_add_deps
diff --git a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
new file mode 100644
index 000000000000..dfbbe919c7ce
--- /dev/null
+++ b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-crypt/gnupg-pkcs11-scd"
+
+ACCT_USER_GROUPS=( "gnupg-pkcs11-scd-proxy" "gnupg-pkcs11" )
+ACCT_USER_ID="281"
+
+acct-user_add_deps
diff --git a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild b/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
deleted file mode 100644
index a0fafbbe430f..000000000000
--- a/acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-crypt/gnupg-pkcs11-scd"
-
-ACCT_USER_GROUPS=( "gnupg-pkcs11-scd-proxy" "gnupg-pkcs11" )
-ACCT_USER_ID="281"
-
-acct-user_add_deps
diff --git a/acct-user/goaccess/goaccess-0.ebuild b/acct-user/goaccess/goaccess-0-r1.ebuild
similarity index 100%
rename from acct-user/goaccess/goaccess-0.ebuild
rename to acct-user/goaccess/goaccess-0-r1.ebuild
diff --git a/acct-user/gopher/gopher-0-r1.ebuild b/acct-user/gopher/gopher-0-r1.ebuild
new file mode 100644
index 000000000000..4edc807d798c
--- /dev/null
+++ b/acct-user/gopher/gopher-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for gofish"
+ACCT_USER_ID=287
+ACCT_USER_GROUPS=( gopher )
+
+acct-user_add_deps
diff --git a/acct-user/gopher/gopher-0.ebuild b/acct-user/gopher/gopher-0.ebuild
deleted file mode 100644
index 6bfe8e00e98f..000000000000
--- a/acct-user/gopher/gopher-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for gofish"
-ACCT_USER_ID=287
-ACCT_USER_GROUPS=( gopher )
-
-acct-user_add_deps
diff --git a/acct-user/gopherd/gopherd-0-r1.ebuild b/acct-user/gopherd/gopherd-0-r1.ebuild
new file mode 100644
index 000000000000..8b8b389b9eef
--- /dev/null
+++ b/acct-user/gopherd/gopherd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/geomyidae"
+
+ACCT_USER_GROUPS=( "gopherd" )
+ACCT_USER_HOME="/var/gopher"
+ACCT_USER_ID="132"
+
+acct-user_add_deps
diff --git a/acct-user/gopherd/gopherd-0.ebuild b/acct-user/gopherd/gopherd-0.ebuild
deleted file mode 100644
index fe62a2eccb04..000000000000
--- a/acct-user/gopherd/gopherd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/geomyidae"
-
-ACCT_USER_GROUPS=( "gopherd" )
-ACCT_USER_HOME="/var/gopher"
-ACCT_USER_ID="132"
-
-acct-user_add_deps
diff --git a/acct-user/gpsd/gpsd-0-r2.ebuild b/acct-user/gpsd/gpsd-0-r2.ebuild
deleted file mode 100644
index 50e1fb06a35d..000000000000
--- a/acct-user/gpsd/gpsd-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for gpsd"
-ACCT_USER_ID=299
-# bug #744982
-ACCT_USER_GROUPS=( dialout uucp )
-
-acct-user_add_deps
diff --git a/acct-user/gpsd/gpsd-0-r3.ebuild b/acct-user/gpsd/gpsd-0-r3.ebuild
new file mode 100644
index 000000000000..02e5bd60b85a
--- /dev/null
+++ b/acct-user/gpsd/gpsd-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for gpsd"
+ACCT_USER_ID=299
+# bug #744982
+ACCT_USER_GROUPS=( dialout uucp )
+
+acct-user_add_deps
diff --git a/acct-user/grafana/grafana-0-r1.ebuild b/acct-user/grafana/grafana-0-r1.ebuild
deleted file mode 100644
index 3ba21e568192..000000000000
--- a/acct-user/grafana/grafana-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="grafana program user"
-
-ACCT_USER_ID=389
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/grafana/grafana-0-r2.ebuild b/acct-user/grafana/grafana-0-r2.ebuild
new file mode 100644
index 000000000000..b990bfa8bda8
--- /dev/null
+++ b/acct-user/grafana/grafana-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="grafana program user"
+
+ACCT_USER_ID=389
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/graylog/graylog-0-r1.ebuild b/acct-user/graylog/graylog-0-r1.ebuild
deleted file mode 100644
index e9da0964abcc..000000000000
--- a/acct-user/graylog/graylog-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Graylog program user"
-ACCT_USER_ID=478
-ACCT_USER_GROUPS=( graylog )
-acct-user_add_deps
diff --git a/acct-user/graylog/graylog-0-r2.ebuild b/acct-user/graylog/graylog-0-r2.ebuild
new file mode 100644
index 000000000000..eb3ad26ddeb4
--- /dev/null
+++ b/acct-user/graylog/graylog-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Graylog program user"
+ACCT_USER_ID=478
+ACCT_USER_GROUPS=( graylog )
+acct-user_add_deps
diff --git a/acct-user/greetd/greetd-0-r1.ebuild b/acct-user/greetd/greetd-0-r1.ebuild
deleted file mode 100644
index 9578715d3bbe..000000000000
--- a/acct-user/greetd/greetd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=396
-ACCT_USER_GROUPS=( greetd video )
-DESCRIPTION="User for gui-libs/greetd"
-
-acct-user_add_deps
diff --git a/acct-user/greetd/greetd-0-r2.ebuild b/acct-user/greetd/greetd-0-r2.ebuild
new file mode 100644
index 000000000000..48f4b6d94f38
--- /dev/null
+++ b/acct-user/greetd/greetd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=396
+ACCT_USER_GROUPS=( greetd video )
+DESCRIPTION="User for gui-libs/greetd"
+
+acct-user_add_deps
diff --git a/acct-user/grok_exporter/grok_exporter-0-r1.ebuild b/acct-user/grok_exporter/grok_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..87a17187d7ed
--- /dev/null
+++ b/acct-user/grok_exporter/grok_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/grok_exporter"
+
+ACCT_USER_ID=104
+ACCT_USER_GROUPS=( grok_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/grok_exporter/grok_exporter-0.ebuild b/acct-user/grok_exporter/grok_exporter-0.ebuild
deleted file mode 100644
index c58147fb8bc5..000000000000
--- a/acct-user/grok_exporter/grok_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/grok_exporter"
-
-ACCT_USER_ID=104
-ACCT_USER_GROUPS=( grok_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/groonga/groonga-0-r1.ebuild b/acct-user/groonga/groonga-0-r1.ebuild
new file mode 100644
index 000000000000..6647b44bb496
--- /dev/null
+++ b/acct-user/groonga/groonga-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-text/groonga"
+
+ACCT_USER_GROUPS=( "groonga" )
+ACCT_USER_ID="266"
+
+acct-user_add_deps
diff --git a/acct-user/groonga/groonga-0.ebuild b/acct-user/groonga/groonga-0.ebuild
deleted file mode 100644
index 7df7ee2917a9..000000000000
--- a/acct-user/groonga/groonga-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-text/groonga"
-
-ACCT_USER_GROUPS=( "groonga" )
-ACCT_USER_ID="266"
-
-acct-user_add_deps
diff --git a/acct-user/gvm/gvm-0-r1.ebuild b/acct-user/gvm/gvm-0-r1.ebuild
deleted file mode 100644
index a6d2af7e6b4f..000000000000
--- a/acct-user/gvm/gvm-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Greenbone vulnerability management program user"
-ACCT_USER_ID=495
-ACCT_USER_HOME=/var/lib/gvm
-ACCT_USER_GROUPS=( gvm )
-
-acct-user_add_deps
diff --git a/acct-user/gvm/gvm-0-r2.ebuild b/acct-user/gvm/gvm-0-r2.ebuild
new file mode 100644
index 000000000000..bafded17a742
--- /dev/null
+++ b/acct-user/gvm/gvm-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Greenbone vulnerability management program user"
+ACCT_USER_ID=495
+ACCT_USER_HOME=/var/lib/gvm
+ACCT_USER_GROUPS=( gvm )
+
+acct-user_add_deps
diff --git a/acct-user/h2o/h2o-0-r1.ebuild b/acct-user/h2o/h2o-0-r1.ebuild
new file mode 100644
index 000000000000..d01ee4c8ca23
--- /dev/null
+++ b/acct-user/h2o/h2o-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/h2o"
+
+ACCT_USER_GROUPS=( "h2o" )
+ACCT_USER_ID="141"
+
+acct-user_add_deps
diff --git a/acct-user/h2o/h2o-0.ebuild b/acct-user/h2o/h2o-0.ebuild
deleted file mode 100644
index 356f1e56ec29..000000000000
--- a/acct-user/h2o/h2o-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/h2o"
-
-ACCT_USER_GROUPS=( "h2o" )
-ACCT_USER_ID="141"
-
-acct-user_add_deps
diff --git a/acct-user/hacluster/hacluster-0-r1.ebuild b/acct-user/hacluster/hacluster-0-r1.ebuild
new file mode 100644
index 000000000000..becc65512d90
--- /dev/null
+++ b/acct-user/hacluster/hacluster-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-cluster/cluster-glue"
+
+ACCT_USER_GROUPS=( "haclient" )
+ACCT_USER_HOME="/var/lib/heartbeat"
+ACCT_USER_ID="304"
+
+acct-user_add_deps
diff --git a/acct-user/hacluster/hacluster-0.ebuild b/acct-user/hacluster/hacluster-0.ebuild
deleted file mode 100644
index 7558b70e8c0d..000000000000
--- a/acct-user/hacluster/hacluster-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-cluster/cluster-glue"
-
-ACCT_USER_GROUPS=( "haclient" )
-ACCT_USER_HOME="/var/lib/heartbeat"
-ACCT_USER_ID="304"
-
-acct-user_add_deps
diff --git a/acct-user/haproxy/haproxy-0-r1.ebuild b/acct-user/haproxy/haproxy-0-r1.ebuild
deleted file mode 100644
index 7306045a6a3e..000000000000
--- a/acct-user/haproxy/haproxy-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=188
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/haproxy/haproxy-0-r2.ebuild b/acct-user/haproxy/haproxy-0-r2.ebuild
new file mode 100644
index 000000000000..03c81ce79b9b
--- /dev/null
+++ b/acct-user/haproxy/haproxy-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=188
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/havp/havp-0-r1.ebuild b/acct-user/havp/havp-0-r2.ebuild
similarity index 100%
rename from acct-user/havp/havp-0-r1.ebuild
rename to acct-user/havp/havp-0-r2.ebuild
diff --git a/acct-user/headscale/headscale-0.ebuild b/acct-user/headscale/headscale-0-r1.ebuild
similarity index 100%
rename from acct-user/headscale/headscale-0.ebuild
rename to acct-user/headscale/headscale-0-r1.ebuild
diff --git a/acct-user/heat/heat-0-r1.ebuild b/acct-user/heat/heat-0-r1.ebuild
deleted file mode 100644
index d721c2e9d042..000000000000
--- a/acct-user/heat/heat-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the heat openstack service"
-ACCT_USER_ID=444
-ACCT_USER_HOME=/var/lib/heat
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( heat )
-
-acct-user_add_deps
diff --git a/acct-user/heat/heat-0-r2.ebuild b/acct-user/heat/heat-0-r2.ebuild
new file mode 100644
index 000000000000..eb03e5de5de4
--- /dev/null
+++ b/acct-user/heat/heat-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the heat openstack service"
+ACCT_USER_ID=444
+ACCT_USER_HOME=/var/lib/heat
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( heat )
+
+acct-user_add_deps
diff --git a/acct-user/hsqldb/hsqldb-0-r1.ebuild b/acct-user/hsqldb/hsqldb-0-r1.ebuild
new file mode 100644
index 000000000000..18eddffbea04
--- /dev/null
+++ b/acct-user/hsqldb/hsqldb-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for hsqldb"
+ACCT_USER_ID=217
+ACCT_USER_GROUPS=( hsqldb )
+
+acct-user_add_deps
diff --git a/acct-user/hsqldb/hsqldb-0.ebuild b/acct-user/hsqldb/hsqldb-0.ebuild
deleted file mode 100644
index 887cecb0627e..000000000000
--- a/acct-user/hsqldb/hsqldb-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for hsqldb"
-ACCT_USER_ID=217
-ACCT_USER_GROUPS=( hsqldb )
-
-acct-user_add_deps
diff --git a/acct-user/http/http-0-r1.ebuild b/acct-user/http/http-0-r1.ebuild
new file mode 100644
index 000000000000..01da8bc68a00
--- /dev/null
+++ b/acct-user/http/http-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/caddy"
+
+ACCT_USER_HOME=/var/lib/http
+ACCT_USER_GROUPS=( "http" )
+ACCT_USER_ID="297"
+
+acct-user_add_deps
diff --git a/acct-user/http/http-0.ebuild b/acct-user/http/http-0.ebuild
deleted file mode 100644
index b33130fdf84e..000000000000
--- a/acct-user/http/http-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/caddy"
-
-ACCT_USER_HOME=/var/lib/http
-ACCT_USER_GROUPS=( "http" )
-ACCT_USER_ID="297"
-
-acct-user_add_deps
diff --git a/acct-user/i2p/i2p-0-r1.ebuild b/acct-user/i2p/i2p-0-r1.ebuild
deleted file mode 100644
index 3acdb2cf83f0..000000000000
--- a/acct-user/i2p/i2p-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for system-wide net-vpn/i2p"
-ACCT_USER_ID=471
-ACCT_USER_GROUPS=( i2p )
-ACCT_USER_HOME=/var/lib/i2p
-
-acct-user_add_deps
diff --git a/acct-user/i2p/i2p-0-r2.ebuild b/acct-user/i2p/i2p-0-r2.ebuild
new file mode 100644
index 000000000000..03e1a11909f6
--- /dev/null
+++ b/acct-user/i2p/i2p-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for system-wide net-vpn/i2p"
+ACCT_USER_ID=471
+ACCT_USER_GROUPS=( i2p )
+ACCT_USER_HOME=/var/lib/i2p
+
+acct-user_add_deps
diff --git a/acct-user/i2pd/i2pd-0-r1.ebuild b/acct-user/i2pd/i2pd-0-r1.ebuild
deleted file mode 100644
index b46cb5b6fb3a..000000000000
--- a/acct-user/i2pd/i2pd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-vpn/i2pd server"
-ACCT_USER_ID=470
-ACCT_USER_GROUPS=( i2pd )
-ACCT_USER_HOME=/var/lib/i2pd
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/i2pd/i2pd-0-r2.ebuild b/acct-user/i2pd/i2pd-0-r2.ebuild
new file mode 100644
index 000000000000..5260bcec21a1
--- /dev/null
+++ b/acct-user/i2pd/i2pd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-vpn/i2pd server"
+ACCT_USER_ID=470
+ACCT_USER_GROUPS=( i2pd )
+ACCT_USER_HOME=/var/lib/i2pd
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/icecast/icecast-0-r1.ebuild b/acct-user/icecast/icecast-0-r1.ebuild
new file mode 100644
index 000000000000..b303a86666d0
--- /dev/null
+++ b/acct-user/icecast/icecast-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/icecast"
+
+ACCT_USER_GROUPS=( "icecast" )
+ACCT_USER_ID="131"
+
+acct-user_add_deps
diff --git a/acct-user/icecast/icecast-0.ebuild b/acct-user/icecast/icecast-0.ebuild
deleted file mode 100644
index 50f822213b0b..000000000000
--- a/acct-user/icecast/icecast-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/icecast"
-
-ACCT_USER_GROUPS=( "icecast" )
-ACCT_USER_ID="131"
-
-acct-user_add_deps
diff --git a/acct-user/icecream/icecream-0-r1.ebuild b/acct-user/icecream/icecream-0-r1.ebuild
new file mode 100644
index 000000000000..955f96208772
--- /dev/null
+++ b/acct-user/icecream/icecream-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-devel/icecream"
+
+ACCT_USER_GROUPS=( "icecream" )
+ACCT_USER_HOME="/var/cache/icecream"
+ACCT_USER_ID="145"
+
+acct-user_add_deps
diff --git a/acct-user/icecream/icecream-0.ebuild b/acct-user/icecream/icecream-0.ebuild
deleted file mode 100644
index 267a068e5776..000000000000
--- a/acct-user/icecream/icecream-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-devel/icecream"
-
-ACCT_USER_GROUPS=( "icecream" )
-ACCT_USER_HOME="/var/cache/icecream"
-ACCT_USER_ID="145"
-
-acct-user_add_deps
diff --git a/acct-user/ices/ices-0-r1.ebuild b/acct-user/ices/ices-0-r1.ebuild
new file mode 100644
index 000000000000..0cc042ce665d
--- /dev/null
+++ b/acct-user/ices/ices-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/ices"
+
+ACCT_USER_GROUPS=( "ices" )
+ACCT_USER_ID="162"
+
+acct-user_add_deps
diff --git a/acct-user/ices/ices-0.ebuild b/acct-user/ices/ices-0.ebuild
deleted file mode 100644
index f5e3508280b0..000000000000
--- a/acct-user/ices/ices-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/ices"
-
-ACCT_USER_GROUPS=( "ices" )
-ACCT_USER_ID="162"
-
-acct-user_add_deps
diff --git a/acct-user/icinga/icinga-0-r1.ebuild b/acct-user/icinga/icinga-0-r1.ebuild
deleted file mode 100644
index 015dc5c32ff5..000000000000
--- a/acct-user/icinga/icinga-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Icinga User"
-ACCT_USER_ID=457
-ACCT_USER_HOME=/var/lib/icinga2
-ACCT_USER_GROUPS=( icinga icingacmd nagios )
-
-acct-user_add_deps
diff --git a/acct-user/icinga/icinga-0-r2.ebuild b/acct-user/icinga/icinga-0-r2.ebuild
new file mode 100644
index 000000000000..8d2976baab64
--- /dev/null
+++ b/acct-user/icinga/icinga-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Icinga User"
+ACCT_USER_ID=457
+ACCT_USER_HOME=/var/lib/icinga2
+ACCT_USER_GROUPS=( icinga icingacmd nagios )
+
+acct-user_add_deps
diff --git a/acct-user/icingadirector/icingadirector-0-r1.ebuild b/acct-user/icingadirector/icingadirector-0-r1.ebuild
new file mode 100644
index 000000000000..e2684ec08fc9
--- /dev/null
+++ b/acct-user/icingadirector/icingadirector-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Icinga Director User"
+ACCT_USER_ID=231
+ACCT_USER_HOME=/var/lib/icingadirector
+ACCT_USER_GROUPS=( icingaweb2 )
+
+acct-user_add_deps
diff --git a/acct-user/icingadirector/icingadirector-0.ebuild b/acct-user/icingadirector/icingadirector-0.ebuild
deleted file mode 100644
index f82b14af5783..000000000000
--- a/acct-user/icingadirector/icingadirector-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="Icinga Director User"
-ACCT_USER_ID=231
-ACCT_USER_HOME=/var/lib/icingadirector
-ACCT_USER_GROUPS=( icingaweb2 )
-
-acct-user_add_deps
diff --git a/acct-user/inadyn/inadyn-0.ebuild b/acct-user/inadyn/inadyn-0-r1.ebuild
similarity index 100%
rename from acct-user/inadyn/inadyn-0.ebuild
rename to acct-user/inadyn/inadyn-0-r1.ebuild
diff --git a/acct-user/influxdb/influxdb-0-r1.ebuild b/acct-user/influxdb/influxdb-0-r1.ebuild
deleted file mode 100644
index 9f92875d2fdf..000000000000
--- a/acct-user/influxdb/influxdb-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for influxdb"
-ACCT_USER_ID=342
-ACCT_USER_GROUPS=( influxdb )
-ACCT_USER_HOME=/var/lib/influxdb
-
-acct-user_add_deps
diff --git a/acct-user/influxdb/influxdb-0-r2.ebuild b/acct-user/influxdb/influxdb-0-r2.ebuild
new file mode 100644
index 000000000000..21d7eb55e107
--- /dev/null
+++ b/acct-user/influxdb/influxdb-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for influxdb"
+ACCT_USER_ID=342
+ACCT_USER_GROUPS=( influxdb )
+ACCT_USER_HOME=/var/lib/influxdb
+
+acct-user_add_deps
diff --git a/acct-user/inspircd/inspircd-0-r1.ebuild b/acct-user/inspircd/inspircd-0-r1.ebuild
deleted file mode 100644
index 7719ce203cbd..000000000000
--- a/acct-user/inspircd/inspircd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for InspIRCd server daemon"
-ACCT_USER_ID=167
-ACCT_USER_GROUPS=( inspircd )
-
-acct-user_add_deps
diff --git a/acct-user/inspircd/inspircd-0-r2.ebuild b/acct-user/inspircd/inspircd-0-r2.ebuild
new file mode 100644
index 000000000000..387ce15f89bd
--- /dev/null
+++ b/acct-user/inspircd/inspircd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for InspIRCd server daemon"
+ACCT_USER_ID=167
+ACCT_USER_GROUPS=( inspircd )
+
+acct-user_add_deps
diff --git a/acct-user/ipfs/ipfs-0-r1.ebuild b/acct-user/ipfs/ipfs-0-r1.ebuild
deleted file mode 100644
index 54ddc40e854c..000000000000
--- a/acct-user/ipfs/ipfs-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-p2p/go-ipfs-bin server"
-ACCT_USER_ID=484
-ACCT_USER_HOME=/var/lib/ipfs
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( ipfs )
-
-acct-user_add_deps
diff --git a/acct-user/ipfs/ipfs-0-r2.ebuild b/acct-user/ipfs/ipfs-0-r2.ebuild
new file mode 100644
index 000000000000..b9df15adae9e
--- /dev/null
+++ b/acct-user/ipfs/ipfs-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-p2p/go-ipfs-bin server"
+ACCT_USER_ID=484
+ACCT_USER_HOME=/var/lib/ipfs
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( ipfs )
+
+acct-user_add_deps
diff --git a/acct-user/ippl/ippl-0-r1.ebuild b/acct-user/ippl/ippl-0-r1.ebuild
deleted file mode 100644
index 24bf022a7c8c..000000000000
--- a/acct-user/ippl/ippl-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for net-analyzer/ippl"
-ACCT_USER_ID=465
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/ippl/ippl-0-r2.ebuild b/acct-user/ippl/ippl-0-r2.ebuild
new file mode 100644
index 000000000000..151c567ab853
--- /dev/null
+++ b/acct-user/ippl/ippl-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for net-analyzer/ippl"
+ACCT_USER_ID=465
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/ipsec/ipsec-0-r1.ebuild b/acct-user/ipsec/ipsec-0-r1.ebuild
new file mode 100644
index 000000000000..a5697b99a67a
--- /dev/null
+++ b/acct-user/ipsec/ipsec-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="ipsec (strongswan) program user"
+
+ACCT_USER_ID=199
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/ipsec/ipsec-0.ebuild b/acct-user/ipsec/ipsec-0.ebuild
deleted file mode 100644
index 738b68f43199..000000000000
--- a/acct-user/ipsec/ipsec-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="ipsec (strongswan) program user"
-
-ACCT_USER_ID=199
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/ipsentinel/ipsentinel-0-r1.ebuild b/acct-user/ipsentinel/ipsentinel-0-r1.ebuild
new file mode 100644
index 000000000000..8c7be37bbd69
--- /dev/null
+++ b/acct-user/ipsentinel/ipsentinel-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/ip-sentinel"
+
+ACCT_USER_GROUPS=( "ipsentinel" )
+ACCT_USER_ID="163"
+
+acct-user_add_deps
diff --git a/acct-user/ipsentinel/ipsentinel-0.ebuild b/acct-user/ipsentinel/ipsentinel-0.ebuild
deleted file mode 100644
index 1dceb5b8104a..000000000000
--- a/acct-user/ipsentinel/ipsentinel-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/ip-sentinel"
-
-ACCT_USER_GROUPS=( "ipsentinel" )
-ACCT_USER_ID="163"
-
-acct-user_add_deps
diff --git a/acct-user/iroffer/iroffer-0-r1.ebuild b/acct-user/iroffer/iroffer-0-r1.ebuild
new file mode 100644
index 000000000000..a44bed6da0d0
--- /dev/null
+++ b/acct-user/iroffer/iroffer-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=187
+ACCT_USER_GROUPS=( iroffer )
+
+acct-user_add_deps
diff --git a/acct-user/iroffer/iroffer-0.ebuild b/acct-user/iroffer/iroffer-0.ebuild
deleted file mode 100644
index 452a50f2f547..000000000000
--- a/acct-user/iroffer/iroffer-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=187
-ACCT_USER_GROUPS=( iroffer )
-
-acct-user_add_deps
diff --git a/acct-user/jellyfin/jellyfin-0-r1.ebuild b/acct-user/jellyfin/jellyfin-0-r1.ebuild
deleted file mode 100644
index 80de5e231296..000000000000
--- a/acct-user/jellyfin/jellyfin-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_HOME=/var/lib/jellyfin
-ACCT_USER_ID=518
-ACCT_USER_GROUPS=( jellyfin render video )
-
-acct-user_add_deps
diff --git a/acct-user/jellyfin/jellyfin-0-r2.ebuild b/acct-user/jellyfin/jellyfin-0-r2.ebuild
new file mode 100644
index 000000000000..c19f4a25d127
--- /dev/null
+++ b/acct-user/jellyfin/jellyfin-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_HOME=/var/lib/jellyfin
+ACCT_USER_ID=518
+ACCT_USER_GROUPS=( jellyfin render video )
+
+acct-user_add_deps
diff --git a/acct-user/jenkins/jenkins-0-r1.ebuild b/acct-user/jenkins/jenkins-0-r1.ebuild
new file mode 100644
index 000000000000..fe4befe0583b
--- /dev/null
+++ b/acct-user/jenkins/jenkins-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Jenkins program user"
+
+ACCT_USER_ID=473
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/jenkins/jenkins-0.ebuild b/acct-user/jenkins/jenkins-0.ebuild
deleted file mode 100644
index e568647b1f02..000000000000
--- a/acct-user/jenkins/jenkins-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Jenkins program user"
-
-ACCT_USER_ID=473
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/kafka/kafka-0-r1.ebuild b/acct-user/kafka/kafka-0-r1.ebuild
deleted file mode 100644
index f69be4e3ece8..000000000000
--- a/acct-user/kafka/kafka-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for kafka"
-
-ACCT_USER_ID=425
-ACCT_USER_HOME=/var/lib/kafka
-ACCT_USER_SHELL=/bin/sh
-ACCT_USER_GROUPS=( kafka )
-
-acct-user_add_deps
diff --git a/acct-user/kafka/kafka-0-r2.ebuild b/acct-user/kafka/kafka-0-r2.ebuild
new file mode 100644
index 000000000000..2b3793a80e93
--- /dev/null
+++ b/acct-user/kafka/kafka-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for kafka"
+
+ACCT_USER_ID=425
+ACCT_USER_HOME=/var/lib/kafka
+ACCT_USER_SHELL=/bin/sh
+ACCT_USER_GROUPS=( kafka )
+
+acct-user_add_deps
diff --git a/acct-user/kapacitor/kapacitor-0-r1.ebuild b/acct-user/kapacitor/kapacitor-0-r1.ebuild
deleted file mode 100644
index abc1cc404a05..000000000000
--- a/acct-user/kapacitor/kapacitor-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for kapacitor"
-ACCT_USER_ID=343
-ACCT_USER_GROUPS=( kapacitor )
-ACCT_USER_HOME=/var/lib/kapacitor
-
-acct-user_add_deps
diff --git a/acct-user/kapacitor/kapacitor-0-r2.ebuild b/acct-user/kapacitor/kapacitor-0-r2.ebuild
new file mode 100644
index 000000000000..b61f9fbd2c9a
--- /dev/null
+++ b/acct-user/kapacitor/kapacitor-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for kapacitor"
+ACCT_USER_ID=343
+ACCT_USER_GROUPS=( kapacitor )
+ACCT_USER_HOME=/var/lib/kapacitor
+
+acct-user_add_deps
diff --git a/acct-user/karma/karma-0-r1.ebuild b/acct-user/karma/karma-0-r1.ebuild
new file mode 100644
index 000000000000..420c7da0121f
--- /dev/null
+++ b/acct-user/karma/karma-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/karma-bin"
+
+ACCT_USER_ID=118
+ACCT_USER_GROUPS=( karma )
+
+acct-user_add_deps
diff --git a/acct-user/karma/karma-0.ebuild b/acct-user/karma/karma-0.ebuild
deleted file mode 100644
index e125361d1e72..000000000000
--- a/acct-user/karma/karma-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/karma-bin"
-
-ACCT_USER_ID=118
-ACCT_USER_GROUPS=( karma )
-
-acct-user_add_deps
diff --git a/acct-user/keystone/keystone-0-r1.ebuild b/acct-user/keystone/keystone-0-r1.ebuild
deleted file mode 100644
index 1519aa941e90..000000000000
--- a/acct-user/keystone/keystone-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the keystone openstack service"
-ACCT_USER_ID=445
-ACCT_USER_HOME=/var/lib/keystone
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( keystone )
-
-acct-user_add_deps
diff --git a/acct-user/keystone/keystone-0-r2.ebuild b/acct-user/keystone/keystone-0-r2.ebuild
new file mode 100644
index 000000000000..873aea351054
--- /dev/null
+++ b/acct-user/keystone/keystone-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the keystone openstack service"
+ACCT_USER_ID=445
+ACCT_USER_HOME=/var/lib/keystone
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( keystone )
+
+acct-user_add_deps
diff --git a/acct-user/kibana/kibana-0-r1.ebuild b/acct-user/kibana/kibana-0-r1.ebuild
deleted file mode 100644
index b04ba4aacc1d..000000000000
--- a/acct-user/kibana/kibana-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Kibana program user"
-ACCT_USER_ID=269
-ACCT_USER_HOME=/var/lib/kibana
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( kibana )
-acct-user_add_deps
diff --git a/acct-user/kibana/kibana-0-r2.ebuild b/acct-user/kibana/kibana-0-r2.ebuild
new file mode 100644
index 000000000000..4a188fc20953
--- /dev/null
+++ b/acct-user/kibana/kibana-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Kibana program user"
+ACCT_USER_ID=269
+ACCT_USER_HOME=/var/lib/kibana
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( kibana )
+acct-user_add_deps
diff --git a/acct-user/kismet/kismet-0-r1.ebuild b/acct-user/kismet/kismet-0-r1.ebuild
deleted file mode 100644
index 76f56775cac5..000000000000
--- a/acct-user/kismet/kismet-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="net-wireless/kismet"
-ACCT_USER_ID="388"
-ACCT_USER_GROUPS=( kismet )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/kismet "
-RDEPEND+=" acct-group/kismet "
diff --git a/acct-user/kismet/kismet-0-r2.ebuild b/acct-user/kismet/kismet-0-r2.ebuild
new file mode 100644
index 000000000000..7d3a4b49839d
--- /dev/null
+++ b/acct-user/kismet/kismet-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="net-wireless/kismet"
+ACCT_USER_ID="388"
+ACCT_USER_GROUPS=( kismet )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/kismet "
+RDEPEND+=" acct-group/kismet "
diff --git a/acct-user/knot-resolver/knot-resolver-0-r1.ebuild b/acct-user/knot-resolver/knot-resolver-0-r1.ebuild
new file mode 100644
index 000000000000..726a5d2c673f
--- /dev/null
+++ b/acct-user/knot-resolver/knot-resolver-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=525
+ACCT_USER_HOME=/var/lib/knot-resolver
+ACCT_USER_GROUPS=( knot-resolver )
+
+acct-user_add_deps
diff --git a/acct-user/knot-resolver/knot-resolver-0.ebuild b/acct-user/knot-resolver/knot-resolver-0.ebuild
deleted file mode 100644
index acac705b4619..000000000000
--- a/acct-user/knot-resolver/knot-resolver-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=525
-ACCT_USER_HOME=/var/lib/knot-resolver
-ACCT_USER_GROUPS=( knot-resolver )
-
-acct-user_add_deps
diff --git a/acct-user/knot/knot-0-r1.ebuild b/acct-user/knot/knot-0-r1.ebuild
deleted file mode 100644
index 5be8df72f20f..000000000000
--- a/acct-user/knot/knot-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for knot DNS server"
-ACCT_USER_ID=53
-ACCT_USER_HOME=/var/lib/knot
-ACCT_USER_GROUPS=( knot )
-
-acct-user_add_deps
diff --git a/acct-user/knot/knot-0-r2.ebuild b/acct-user/knot/knot-0-r2.ebuild
new file mode 100644
index 000000000000..e1589d0acc7f
--- /dev/null
+++ b/acct-user/knot/knot-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for knot DNS server"
+ACCT_USER_ID=53
+ACCT_USER_HOME=/var/lib/knot
+ACCT_USER_GROUPS=( knot )
+
+acct-user_add_deps
diff --git a/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild
deleted file mode 100644
index 7ec98102fdae..000000000000
--- a/acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-apiserver"
-ACCT_USER_ID=432
-ACCT_USER_GROUPS=( kube-apiserver )
-
-acct-user_add_deps
diff --git a/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild b/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild
new file mode 100644
index 000000000000..0ca7505f290c
--- /dev/null
+++ b/acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-apiserver"
+ACCT_USER_ID=432
+ACCT_USER_GROUPS=( kube-apiserver )
+
+acct-user_add_deps
diff --git a/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild b/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild
deleted file mode 100644
index 6ba2b48ee468..000000000000
--- a/acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-controller-manager"
-ACCT_USER_ID=433
-ACCT_USER_GROUPS=( kube-controller-manager )
-
-acct-user_add_deps
diff --git a/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild b/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild
new file mode 100644
index 000000000000..472ccc1d16f7
--- /dev/null
+++ b/acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-controller-manager"
+ACCT_USER_ID=433
+ACCT_USER_GROUPS=( kube-controller-manager )
+
+acct-user_add_deps
diff --git a/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild
deleted file mode 100644
index 913fcb70494d..000000000000
--- a/acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for kube-scheduler"
-ACCT_USER_ID=434
-ACCT_USER_GROUPS=( kube-scheduler )
-
-acct-user_add_deps
diff --git a/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild b/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild
new file mode 100644
index 000000000000..a6fcaaa54979
--- /dev/null
+++ b/acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for kube-scheduler"
+ACCT_USER_ID=434
+ACCT_USER_GROUPS=( kube-scheduler )
+
+acct-user_add_deps
diff --git a/acct-user/ldap/ldap-0-r1.ebuild b/acct-user/ldap/ldap-0-r1.ebuild
new file mode 100644
index 000000000000..46d4c83ae93e
--- /dev/null
+++ b/acct-user/ldap/ldap-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for ldap"
+ACCT_USER_ID=439
+ACCT_USER_GROUPS=( ldap )
+
+acct-user_add_deps
+
+pkg_setup() {
+	ACCT_USER_HOME=/usr/$(get_libdir)/openldap
+}
diff --git a/acct-user/ldap/ldap-0.ebuild b/acct-user/ldap/ldap-0.ebuild
deleted file mode 100644
index dbb6a9e79d87..000000000000
--- a/acct-user/ldap/ldap-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for ldap"
-ACCT_USER_ID=439
-ACCT_USER_GROUPS=( ldap )
-
-acct-user_add_deps
-
-pkg_setup() {
-	ACCT_USER_HOME=/usr/$(get_libdir)/openldap
-}
diff --git a/acct-user/libreoffice/libreoffice-0-r1.ebuild b/acct-user/libreoffice/libreoffice-0-r1.ebuild
new file mode 100644
index 000000000000..aa08fcfb70de
--- /dev/null
+++ b/acct-user/libreoffice/libreoffice-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for the headless LibreOffice server"
+
+ACCT_USER_GROUPS=( "libreoffice" )
+ACCT_USER_HOME="/var/lib/libreoffice"
+ACCT_USER_ID="512"
+
+acct-user_add_deps
diff --git a/acct-user/libreoffice/libreoffice-0.ebuild b/acct-user/libreoffice/libreoffice-0.ebuild
deleted file mode 100644
index 59f859ea5a19..000000000000
--- a/acct-user/libreoffice/libreoffice-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for the headless LibreOffice server"
-
-ACCT_USER_GROUPS=( "libreoffice" )
-ACCT_USER_HOME="/var/lib/libreoffice"
-ACCT_USER_ID="512"
-
-acct-user_add_deps
diff --git a/acct-user/lightdm/lightdm-0-r1.ebuild b/acct-user/lightdm/lightdm-0-r1.ebuild
new file mode 100644
index 000000000000..25af3b9c7f54
--- /dev/null
+++ b/acct-user/lightdm/lightdm-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for x11-misc/lightdm"
+
+ACCT_USER_GROUPS=( "lightdm" "video" )
+ACCT_USER_HOME="/var/lib/lightdm"
+ACCT_USER_ID="134"
+
+acct-user_add_deps
diff --git a/acct-user/lightdm/lightdm-0.ebuild b/acct-user/lightdm/lightdm-0.ebuild
deleted file mode 100644
index 43ea49e4ee73..000000000000
--- a/acct-user/lightdm/lightdm-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for x11-misc/lightdm"
-
-ACCT_USER_GROUPS=( "lightdm" "video" )
-ACCT_USER_HOME="/var/lib/lightdm"
-ACCT_USER_ID="134"
-
-acct-user_add_deps
diff --git a/acct-user/lighttpd/lighttpd-0-r1.ebuild b/acct-user/lighttpd/lighttpd-0-r1.ebuild
deleted file mode 100644
index 5534663d206b..000000000000
--- a/acct-user/lighttpd/lighttpd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for lighttpd"
-ACCT_USER_ID=302
-ACCT_USER_GROUPS=( lighttpd )
-
-acct-user_add_deps
diff --git a/acct-user/lighttpd/lighttpd-0-r2.ebuild b/acct-user/lighttpd/lighttpd-0-r2.ebuild
new file mode 100644
index 000000000000..155cf8661c81
--- /dev/null
+++ b/acct-user/lighttpd/lighttpd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for lighttpd"
+ACCT_USER_ID=302
+ACCT_USER_GROUPS=( lighttpd )
+
+acct-user_add_deps
diff --git a/acct-user/litecoin/litecoin-0-r1.ebuild b/acct-user/litecoin/litecoin-0-r1.ebuild
new file mode 100644
index 000000000000..4f83d6e97e50
--- /dev/null
+++ b/acct-user/litecoin/litecoin-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-p2p/litecoind"
+
+ACCT_USER_GROUPS=( "litecoin" )
+ACCT_USER_HOME="/var/lib/litecoin"
+ACCT_USER_ID="256"
+
+acct-user_add_deps
diff --git a/acct-user/litecoin/litecoin-0.ebuild b/acct-user/litecoin/litecoin-0.ebuild
deleted file mode 100644
index 2a9cad12ecb1..000000000000
--- a/acct-user/litecoin/litecoin-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/litecoind"
-
-ACCT_USER_GROUPS=( "litecoin" )
-ACCT_USER_HOME="/var/lib/litecoin"
-ACCT_USER_ID="256"
-
-acct-user_add_deps
diff --git a/acct-user/lldpd/lldpd-0-r1.ebuild b/acct-user/lldpd/lldpd-0-r1.ebuild
deleted file mode 100644
index 1b1593fc3a76..000000000000
--- a/acct-user/lldpd/lldpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/lldpd"
-
-ACCT_USER_ID=315
-ACCT_USER_GROUPS=( lldpd )
-
-acct-user_add_deps
diff --git a/acct-user/lldpd/lldpd-0-r2.ebuild b/acct-user/lldpd/lldpd-0-r2.ebuild
new file mode 100644
index 000000000000..e8ac77195bf3
--- /dev/null
+++ b/acct-user/lldpd/lldpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/lldpd"
+
+ACCT_USER_ID=315
+ACCT_USER_GROUPS=( lldpd )
+
+acct-user_add_deps
diff --git a/acct-user/logcheck/logcheck-0-r1.ebuild b/acct-user/logcheck/logcheck-0-r1.ebuild
new file mode 100644
index 000000000000..f2635a5ebd27
--- /dev/null
+++ b/acct-user/logcheck/logcheck-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/logcheck"
+
+ACCT_USER_GROUPS=( "logcheck" )
+ACCT_USER_ID="284"
+
+acct-user_add_deps
diff --git a/acct-user/logcheck/logcheck-0.ebuild b/acct-user/logcheck/logcheck-0.ebuild
deleted file mode 100644
index 4dfb987a1636..000000000000
--- a/acct-user/logcheck/logcheck-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/logcheck"
-
-ACCT_USER_GROUPS=( "logcheck" )
-ACCT_USER_ID="284"
-
-acct-user_add_deps
diff --git a/acct-user/logstash/logstash-0-r1.ebuild b/acct-user/logstash/logstash-0-r1.ebuild
deleted file mode 100644
index 748b9f907d0d..000000000000
--- a/acct-user/logstash/logstash-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Logstash program user"
-ACCT_USER_ID=270
-ACCT_USER_HOME=/var/lib/logstash
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( logstash )
-acct-user_add_deps
diff --git a/acct-user/logstash/logstash-0-r2.ebuild b/acct-user/logstash/logstash-0-r2.ebuild
new file mode 100644
index 000000000000..44658d2d4261
--- /dev/null
+++ b/acct-user/logstash/logstash-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Logstash program user"
+ACCT_USER_ID=270
+ACCT_USER_HOME=/var/lib/logstash
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( logstash )
+acct-user_add_deps
diff --git a/acct-user/logsurfer/logsurfer-0-r1.ebuild b/acct-user/logsurfer/logsurfer-0-r1.ebuild
new file mode 100644
index 000000000000..f55cf8a7802d
--- /dev/null
+++ b/acct-user/logsurfer/logsurfer-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/logsurfer"
+
+ACCT_USER_GROUPS=( "logsurfer" )
+ACCT_USER_ID="249"
+
+acct-user_add_deps
diff --git a/acct-user/logsurfer/logsurfer-0.ebuild b/acct-user/logsurfer/logsurfer-0.ebuild
deleted file mode 100644
index be3a125870b5..000000000000
--- a/acct-user/logsurfer/logsurfer-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/logsurfer"
-
-ACCT_USER_GROUPS=( "logsurfer" )
-ACCT_USER_ID="249"
-
-acct-user_add_deps
diff --git a/acct-user/lxc/lxc-0-r1.ebuild b/acct-user/lxc/lxc-0-r1.ebuild
new file mode 100644
index 000000000000..503091786bb5
--- /dev/null
+++ b/acct-user/lxc/lxc-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-containers/lxc"
+ACCT_USER_ID=358
+ACCT_USER_GROUPS=( lxc )
+
+acct-user_add_deps
diff --git a/acct-user/lxc/lxc-0.ebuild b/acct-user/lxc/lxc-0.ebuild
deleted file mode 100644
index 1ea4ec8d2826..000000000000
--- a/acct-user/lxc/lxc-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-containers/lxc"
-ACCT_USER_ID=358
-ACCT_USER_GROUPS=( lxc )
-
-acct-user_add_deps
diff --git a/acct-user/mail/mail-0-r1.ebuild b/acct-user/mail/mail-0-r1.ebuild
deleted file mode 100644
index da2aeb27f123..000000000000
--- a/acct-user/mail/mail-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Mail program user"
-ACCT_USER_ID=8
-ACCT_USER_HOME=/var/spool/mail
-ACCT_USER_HOME_OWNER=root:mail
-ACCT_USER_HOME_PERMS=03775
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/mail/mail-0-r2.ebuild b/acct-user/mail/mail-0-r2.ebuild
new file mode 100644
index 000000000000..7e265e0f4c6f
--- /dev/null
+++ b/acct-user/mail/mail-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Mail program user"
+ACCT_USER_ID=8
+ACCT_USER_HOME=/var/spool/mail
+ACCT_USER_HOME_OWNER=root:mail
+ACCT_USER_HOME_PERMS=03775
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/man/man-1-r1.ebuild b/acct-user/man/man-1-r1.ebuild
deleted file mode 100644
index 7fc43e801d0b..000000000000
--- a/acct-user/man/man-1-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=13
-ACCT_USER_GROUPS=( man )
-
-acct-user_add_deps
diff --git a/acct-user/man/man-1-r2.ebuild b/acct-user/man/man-1-r2.ebuild
new file mode 100644
index 000000000000..95551cbfed4e
--- /dev/null
+++ b/acct-user/man/man-1-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=13
+ACCT_USER_GROUPS=( man )
+
+acct-user_add_deps
diff --git a/acct-user/maradns/maradns-0-r1.ebuild b/acct-user/maradns/maradns-0-r1.ebuild
deleted file mode 100644
index c2a756d077b5..000000000000
--- a/acct-user/maradns/maradns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=99
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/maradns/maradns-0-r2.ebuild b/acct-user/maradns/maradns-0-r2.ebuild
new file mode 100644
index 000000000000..7448e405ec94
--- /dev/null
+++ b/acct-user/maradns/maradns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=99
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/memcached/memcached-0-r1.ebuild b/acct-user/memcached/memcached-0-r1.ebuild
deleted file mode 100644
index 65ff4babf81f..000000000000
--- a/acct-user/memcached/memcached-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the memcached service"
-ACCT_USER_ID=441
-ACCT_USER_GROUPS=( memcached )
-
-acct-user_add_deps
diff --git a/acct-user/memcached/memcached-0-r2.ebuild b/acct-user/memcached/memcached-0-r2.ebuild
new file mode 100644
index 000000000000..17e00df26495
--- /dev/null
+++ b/acct-user/memcached/memcached-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the memcached service"
+ACCT_USER_ID=441
+ACCT_USER_GROUPS=( memcached )
+
+acct-user_add_deps
diff --git a/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild b/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..78a563f0de1e
--- /dev/null
+++ b/acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for memcached_exporter"
+ACCT_USER_ID=234
+ACCT_USER_GROUPS=( memcached_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/memcached_exporter/memcached_exporter-0.ebuild b/acct-user/memcached_exporter/memcached_exporter-0.ebuild
deleted file mode 100644
index 289d72e5eb68..000000000000
--- a/acct-user/memcached_exporter/memcached_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for memcached_exporter"
-ACCT_USER_ID=234
-ACCT_USER_GROUPS=( memcached_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/messagebus/messagebus-0-r1.ebuild b/acct-user/messagebus/messagebus-0-r1.ebuild
deleted file mode 100644
index 4dbd5fc10439..000000000000
--- a/acct-user/messagebus/messagebus-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=101
-ACCT_USER_GROUPS=( messagebus )
-
-acct-user_add_deps
diff --git a/acct-user/messagebus/messagebus-0-r2.ebuild b/acct-user/messagebus/messagebus-0-r2.ebuild
new file mode 100644
index 000000000000..c75cc7874852
--- /dev/null
+++ b/acct-user/messagebus/messagebus-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=101
+ACCT_USER_GROUPS=( messagebus )
+
+acct-user_add_deps
diff --git a/acct-user/mgraph/mgraph-0-r1.ebuild b/acct-user/mgraph/mgraph-0-r1.ebuild
new file mode 100644
index 000000000000..fd1fee37a63d
--- /dev/null
+++ b/acct-user/mgraph/mgraph-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/mailgraph"
+ACCT_USER_ID=376
+ACCT_USER_GROUPS=( mgraph adm )
+ACCT_USER_HOME="/var/lib/mailgraph"
+ACCT_USER_HOME_PERMS=750
+
+acct-user_add_deps
diff --git a/acct-user/mgraph/mgraph-0.ebuild b/acct-user/mgraph/mgraph-0.ebuild
deleted file mode 100644
index 4dc665546fd0..000000000000
--- a/acct-user/mgraph/mgraph-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/mailgraph"
-ACCT_USER_ID=376
-ACCT_USER_GROUPS=( mgraph adm )
-ACCT_USER_HOME="/var/lib/mailgraph"
-ACCT_USER_HOME_PERMS=750
-
-acct-user_add_deps
diff --git a/acct-user/milter-regex/milter-regex-0-r1.ebuild b/acct-user/milter-regex/milter-regex-0-r1.ebuild
deleted file mode 100644
index 973ab9bf9783..000000000000
--- a/acct-user/milter-regex/milter-regex-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/milter-regex"
-
-ACCT_USER_ID=438
-ACCT_USER_GROUPS=( milter-regex )
-
-acct-user_add_deps
diff --git a/acct-user/milter-regex/milter-regex-0-r2.ebuild b/acct-user/milter-regex/milter-regex-0-r2.ebuild
new file mode 100644
index 000000000000..666063185127
--- /dev/null
+++ b/acct-user/milter-regex/milter-regex-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/milter-regex"
+
+ACCT_USER_ID=438
+ACCT_USER_GROUPS=( milter-regex )
+
+acct-user_add_deps
diff --git a/acct-user/minbif/minbif-0-r1.ebuild b/acct-user/minbif/minbif-0-r1.ebuild
new file mode 100644
index 000000000000..8b2a8d2ffe3a
--- /dev/null
+++ b/acct-user/minbif/minbif-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/minbif"
+
+ACCT_USER_GROUPS=( "minbif" )
+ACCT_USER_HOME="/var/lib/minbif"
+ACCT_USER_ID="260"
+
+acct-user_add_deps
diff --git a/acct-user/minbif/minbif-0.ebuild b/acct-user/minbif/minbif-0.ebuild
deleted file mode 100644
index e93ddf7c984a..000000000000
--- a/acct-user/minbif/minbif-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-im/minbif"
-
-ACCT_USER_GROUPS=( "minbif" )
-ACCT_USER_HOME="/var/lib/minbif"
-ACCT_USER_ID="260"
-
-acct-user_add_deps
diff --git a/acct-user/minecraft/minecraft-0-r1.ebuild b/acct-user/minecraft/minecraft-0-r1.ebuild
deleted file mode 100644
index c4290868b526..000000000000
--- a/acct-user/minecraft/minecraft-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minecraft server"
-
-ACCT_USER_GROUPS=( "minecraft" )
-ACCT_USER_HOME="/var/lib/minecraft-server"
-ACCT_USER_ID="490"
-
-acct-user_add_deps
diff --git a/acct-user/minecraft/minecraft-0-r2.ebuild b/acct-user/minecraft/minecraft-0-r2.ebuild
new file mode 100644
index 000000000000..b591f5313e6b
--- /dev/null
+++ b/acct-user/minecraft/minecraft-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minecraft server"
+
+ACCT_USER_GROUPS=( "minecraft" )
+ACCT_USER_HOME="/var/lib/minecraft-server"
+ACCT_USER_ID="490"
+
+acct-user_add_deps
diff --git a/acct-user/minetest/minetest-1-r1.ebuild b/acct-user/minetest/minetest-1-r1.ebuild
deleted file mode 100644
index 728978354ba5..000000000000
--- a/acct-user/minetest/minetest-1-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Minetest server"
-
-ACCT_USER_GROUPS=( "minetest" )
-ACCT_USER_ID="480"
-ACCT_USER_HOME="/var/lib/minetest"
-
-acct-user_add_deps
diff --git a/acct-user/minetest/minetest-1-r2.ebuild b/acct-user/minetest/minetest-1-r2.ebuild
new file mode 100644
index 000000000000..4af1d2ed9392
--- /dev/null
+++ b/acct-user/minetest/minetest-1-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minetest server"
+
+ACCT_USER_GROUPS=( "minetest" )
+ACCT_USER_ID="480"
+ACCT_USER_HOME="/var/lib/minetest"
+
+acct-user_add_deps
diff --git a/acct-user/minidlna/minidlna-0-r1.ebuild b/acct-user/minidlna/minidlna-0-r1.ebuild
new file mode 100644
index 000000000000..cbf710b89ee5
--- /dev/null
+++ b/acct-user/minidlna/minidlna-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=339
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/minidlna/minidlna-0.ebuild b/acct-user/minidlna/minidlna-0.ebuild
deleted file mode 100644
index df5a7d15b91f..000000000000
--- a/acct-user/minidlna/minidlna-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=339
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/miniflux/miniflux-0-r1.ebuild b/acct-user/miniflux/miniflux-0-r1.ebuild
new file mode 100644
index 000000000000..b2317ab7f2e7
--- /dev/null
+++ b/acct-user/miniflux/miniflux-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/miniflux"
+ACCT_USER_ID=404
+ACCT_USER_GROUPS=( nobody )
+
+acct-user_add_deps
diff --git a/acct-user/miniflux/miniflux-0.ebuild b/acct-user/miniflux/miniflux-0.ebuild
deleted file mode 100644
index 941a566e7309..000000000000
--- a/acct-user/miniflux/miniflux-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/miniflux"
-ACCT_USER_ID=404
-ACCT_USER_GROUPS=( nobody )
-
-acct-user_add_deps
diff --git a/acct-user/minio/minio-0-r1.ebuild b/acct-user/minio/minio-0-r1.ebuild
new file mode 100644
index 000000000000..4efb67950a9c
--- /dev/null
+++ b/acct-user/minio/minio-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for minio"
+ACCT_USER_ID=309
+ACCT_USER_HOME=/var/lib/minio
+ACCT_USER_GROUPS=( minio )
+
+acct-user_add_deps
diff --git a/acct-user/minio/minio-0.ebuild b/acct-user/minio/minio-0.ebuild
deleted file mode 100644
index 1c8765edb840..000000000000
--- a/acct-user/minio/minio-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for minio"
-ACCT_USER_ID=309
-ACCT_USER_HOME=/var/lib/minio
-ACCT_USER_GROUPS=( minio )
-
-acct-user_add_deps
diff --git a/acct-user/mogile/mogile-0-r1.ebuild b/acct-user/mogile/mogile-0-r1.ebuild
new file mode 100644
index 000000000000..407e8ab74359
--- /dev/null
+++ b/acct-user/mogile/mogile-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MogileFS user"
+ACCT_USER_ID=460
+ACCT_USER_ENFORCE_ID=1
+ACCT_USER_GROUPS=( mogile )
+
+acct-user_add_deps
diff --git a/acct-user/mogile/mogile-0.ebuild b/acct-user/mogile/mogile-0.ebuild
deleted file mode 100644
index 2441a86d5f14..000000000000
--- a/acct-user/mogile/mogile-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MogileFS user"
-ACCT_USER_ID=460
-ACCT_USER_ENFORCE_ID=1
-ACCT_USER_GROUPS=( mogile )
-
-acct-user_add_deps
diff --git a/acct-user/mongodb/mongodb-0-r1.ebuild b/acct-user/mongodb/mongodb-0-r1.ebuild
deleted file mode 100644
index b52e1ce055b5..000000000000
--- a/acct-user/mongodb/mongodb-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MongoDB program user"
-ACCT_USER_ID=481
-ACCT_USER_HOME=/var/lib/mongodb
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( mongodb )
-acct-user_add_deps
diff --git a/acct-user/mongodb/mongodb-0-r2.ebuild b/acct-user/mongodb/mongodb-0-r2.ebuild
new file mode 100644
index 000000000000..e1b6eeb17d80
--- /dev/null
+++ b/acct-user/mongodb/mongodb-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MongoDB program user"
+ACCT_USER_ID=481
+ACCT_USER_HOME=/var/lib/mongodb
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( mongodb )
+acct-user_add_deps
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..6b855f4acfef
--- /dev/null
+++ b/acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for mongodb_exporter"
+ACCT_USER_ID=277
+ACCT_USER_GROUPS=( mongodb_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild
deleted file mode 100644
index aadf83004efd..000000000000
--- a/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for mongodb_exporter"
-ACCT_USER_ID=277
-ACCT_USER_GROUPS=( mongodb_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/monitorix/monitorix-0-r1.ebuild b/acct-user/monitorix/monitorix-0-r1.ebuild
deleted file mode 100644
index 4109068cc47f..000000000000
--- a/acct-user/monitorix/monitorix-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Monitorix system tool user"
-ACCT_USER_ID=401
-ACCT_USER_GROUPS=( monitorix )
-
-acct-user_add_deps
diff --git a/acct-user/monitorix/monitorix-0-r2.ebuild b/acct-user/monitorix/monitorix-0-r2.ebuild
new file mode 100644
index 000000000000..e9c54be3e683
--- /dev/null
+++ b/acct-user/monitorix/monitorix-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Monitorix system tool user"
+ACCT_USER_ID=401
+ACCT_USER_GROUPS=( monitorix )
+
+acct-user_add_deps
diff --git a/acct-user/monkeyd/monkeyd-0-r1.ebuild b/acct-user/monkeyd/monkeyd-0-r1.ebuild
new file mode 100644
index 000000000000..228bd178732e
--- /dev/null
+++ b/acct-user/monkeyd/monkeyd-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/monkeyd"
+
+ACCT_USER_GROUPS=( "monkeyd" )
+ACCT_USER_HOME="/var/tmp/monkeyd"
+ACCT_USER_HOME_PERMS="0770"
+ACCT_USER_ID="149"
+
+acct-user_add_deps
diff --git a/acct-user/monkeyd/monkeyd-0.ebuild b/acct-user/monkeyd/monkeyd-0.ebuild
deleted file mode 100644
index 55cb3b5ff5d2..000000000000
--- a/acct-user/monkeyd/monkeyd-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/monkeyd"
-
-ACCT_USER_GROUPS=( "monkeyd" )
-ACCT_USER_HOME="/var/tmp/monkeyd"
-ACCT_USER_HOME_PERMS="0770"
-ACCT_USER_ID="149"
-
-acct-user_add_deps
diff --git a/acct-user/monkeysphere/monkeysphere-0-r1.ebuild b/acct-user/monkeysphere/monkeysphere-0-r1.ebuild
deleted file mode 100644
index a4288b053b5a..000000000000
--- a/acct-user/monkeysphere/monkeysphere-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="monkeysphere program user"
-
-ACCT_USER_ID=390
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_HOME_OWNER="root:${PN}"
-ACCT_USER_HOME_PERMS=0751
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/monkeysphere/monkeysphere-0-r2.ebuild b/acct-user/monkeysphere/monkeysphere-0-r2.ebuild
new file mode 100644
index 000000000000..5bf080cb25de
--- /dev/null
+++ b/acct-user/monkeysphere/monkeysphere-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="monkeysphere program user"
+
+ACCT_USER_ID=390
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_HOME_OWNER="root:${PN}"
+ACCT_USER_HOME_PERMS=0751
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/mosquitto/mosquitto-0-r1.ebuild b/acct-user/mosquitto/mosquitto-0-r1.ebuild
deleted file mode 100644
index b894117073bd..000000000000
--- a/acct-user/mosquitto/mosquitto-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the mosquitto MQTT broker"
-ACCT_USER_ID=482
-ACCT_USER_GROUPS=( mosquitto )
-
-acct-user_add_deps
diff --git a/acct-user/mosquitto/mosquitto-0-r2.ebuild b/acct-user/mosquitto/mosquitto-0-r2.ebuild
new file mode 100644
index 000000000000..450a523203e3
--- /dev/null
+++ b/acct-user/mosquitto/mosquitto-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the mosquitto MQTT broker"
+ACCT_USER_ID=482
+ACCT_USER_GROUPS=( mosquitto )
+
+acct-user_add_deps
diff --git a/acct-user/motion/motion-0-r1.ebuild b/acct-user/motion/motion-0-r1.ebuild
deleted file mode 100644
index bb4695efc896..000000000000
--- a/acct-user/motion/motion-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="added by portage for motion, a software motion detector"
-ACCT_USER_ID=395
-ACCT_USER_GROUPS=( motion video )
-
-acct-user_add_deps
diff --git a/acct-user/motion/motion-0-r2.ebuild b/acct-user/motion/motion-0-r2.ebuild
new file mode 100644
index 000000000000..2580f7f8db61
--- /dev/null
+++ b/acct-user/motion/motion-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="added by portage for motion, a software motion detector"
+ACCT_USER_ID=395
+ACCT_USER_GROUPS=( motion video )
+
+acct-user_add_deps
diff --git a/acct-user/mpd/mpd-0-r1.ebuild b/acct-user/mpd/mpd-0-r1.ebuild
deleted file mode 100644
index a941e48d0f2e..000000000000
--- a/acct-user/mpd/mpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for music player daemon (mpd)"
-ACCT_USER_ID=45
-ACCT_USER_HOME=/var/lib/mpd
-ACCT_USER_GROUPS=( audio )
-
-acct-user_add_deps
diff --git a/acct-user/mpd/mpd-0-r2.ebuild b/acct-user/mpd/mpd-0-r2.ebuild
new file mode 100644
index 000000000000..7bf030d369de
--- /dev/null
+++ b/acct-user/mpd/mpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for music player daemon (mpd)"
+ACCT_USER_ID=45
+ACCT_USER_HOME=/var/lib/mpd
+ACCT_USER_GROUPS=( audio )
+
+acct-user_add_deps
diff --git a/acct-user/msmtpd/msmtpd-0-r1.ebuild b/acct-user/msmtpd/msmtpd-0-r1.ebuild
deleted file mode 100644
index 897476f00345..000000000000
--- a/acct-user/msmtpd/msmtpd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for msmtp daemon"
-ACCT_USER_ID=222
-ACCT_USER_GROUPS=( msmtpd )
-
-acct-user_add_deps
diff --git a/acct-user/msmtpd/msmtpd-0-r2.ebuild b/acct-user/msmtpd/msmtpd-0-r2.ebuild
new file mode 100644
index 000000000000..f635313b24c0
--- /dev/null
+++ b/acct-user/msmtpd/msmtpd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for msmtp daemon"
+ACCT_USER_ID=222
+ACCT_USER_GROUPS=( msmtpd )
+
+acct-user_add_deps
diff --git a/acct-user/munge/munge-0-r1.ebuild b/acct-user/munge/munge-0-r1.ebuild
new file mode 100644
index 000000000000..51037b9634ff
--- /dev/null
+++ b/acct-user/munge/munge-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-auth/munge"
+
+ACCT_USER_GROUPS=( "munge" )
+ACCT_USER_HOME="/var/lib/munge"
+ACCT_USER_ID="144"
+
+acct-user_add_deps
diff --git a/acct-user/munge/munge-0.ebuild b/acct-user/munge/munge-0.ebuild
deleted file mode 100644
index fa2e7d4fe227..000000000000
--- a/acct-user/munge/munge-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-auth/munge"
-
-ACCT_USER_GROUPS=( "munge" )
-ACCT_USER_HOME="/var/lib/munge"
-ACCT_USER_ID="144"
-
-acct-user_add_deps
diff --git a/acct-user/munin-async/munin-async-0-r1.ebuild b/acct-user/munin-async/munin-async-0-r2.ebuild
similarity index 100%
rename from acct-user/munin-async/munin-async-0-r1.ebuild
rename to acct-user/munin-async/munin-async-0-r2.ebuild
diff --git a/acct-user/munin/munin-0-r1.ebuild b/acct-user/munin/munin-0-r2.ebuild
similarity index 100%
rename from acct-user/munin/munin-0-r1.ebuild
rename to acct-user/munin/munin-0-r2.ebuild
diff --git a/acct-user/murmur/murmur-0-r1.ebuild b/acct-user/murmur/murmur-0-r1.ebuild
deleted file mode 100644
index 10429cb587b3..000000000000
--- a/acct-user/murmur/murmur-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for murmur daemon"
-ACCT_USER_ID=122
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_OWNER=${PN}:root
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( murmur )
-
-acct-user_add_deps
diff --git a/acct-user/murmur/murmur-0-r2.ebuild b/acct-user/murmur/murmur-0-r2.ebuild
new file mode 100644
index 000000000000..b6d3fcb6fa7c
--- /dev/null
+++ b/acct-user/murmur/murmur-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for murmur daemon"
+ACCT_USER_ID=122
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_OWNER=${PN}:root
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( murmur )
+
+acct-user_add_deps
diff --git a/acct-user/mysql/mysql-0-r1.ebuild b/acct-user/mysql/mysql-0-r1.ebuild
deleted file mode 100644
index 85cead7ce2e0..000000000000
--- a/acct-user/mysql/mysql-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="MySQL program user"
-ACCT_USER_ID=60
-ACCT_USER_GROUPS=( mysql )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/mysql/mysql-0-r2.ebuild b/acct-user/mysql/mysql-0-r2.ebuild
new file mode 100644
index 000000000000..e198373af282
--- /dev/null
+++ b/acct-user/mysql/mysql-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MySQL program user"
+ACCT_USER_ID=60
+ACCT_USER_GROUPS=( mysql )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild
deleted file mode 100644
index 2dda2325009a..000000000000
--- a/acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="mysqld_exporter User"
-ACCT_USER_ID=308
-ACCT_USER_HOME=/var/lib/mysqld_exporter
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( mysqld_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild b/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..7e5666e46909
--- /dev/null
+++ b/acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="mysqld_exporter User"
+ACCT_USER_ID=308
+ACCT_USER_HOME=/var/lib/mysqld_exporter
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( mysqld_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/mythtv/mythtv-0-r1.ebuild b/acct-user/mythtv/mythtv-0-r1.ebuild
deleted file mode 100644
index 79984187e86a..000000000000
--- a/acct-user/mythtv/mythtv-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Mythtv mythbackend server/daemon user"
-ACCT_USER_ID=117
-ACCT_USER_GROUPS=( mythtv video audio cdrom tty )
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_HOME=/var/lib/mythtv
-
-acct-user_add_deps
diff --git a/acct-user/mythtv/mythtv-0-r2.ebuild b/acct-user/mythtv/mythtv-0-r2.ebuild
new file mode 100644
index 000000000000..43fc7503be63
--- /dev/null
+++ b/acct-user/mythtv/mythtv-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Mythtv mythbackend server/daemon user"
+ACCT_USER_ID=117
+ACCT_USER_GROUPS=( mythtv video audio cdrom tty )
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_HOME=/var/lib/mythtv
+
+acct-user_add_deps
diff --git a/acct-user/nagios/nagios-0-r1.ebuild b/acct-user/nagios/nagios-0-r1.ebuild
deleted file mode 100644
index c092b1d3ae8b..000000000000
--- a/acct-user/nagios/nagios-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=436
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/nagios/nagios-0-r2.ebuild b/acct-user/nagios/nagios-0-r2.ebuild
new file mode 100644
index 000000000000..b20dbf0f431b
--- /dev/null
+++ b/acct-user/nagios/nagios-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=436
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/named/named-0-r1.ebuild b/acct-user/named/named-0-r2.ebuild
similarity index 100%
rename from acct-user/named/named-0-r1.ebuild
rename to acct-user/named/named-0-r2.ebuild
diff --git a/acct-user/netbox/netbox-0-r1.ebuild b/acct-user/netbox/netbox-0-r1.ebuild
deleted file mode 100644
index 1d47bf20c233..000000000000
--- a/acct-user/netbox/netbox-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for netbox"
-ACCT_USER_ID=431
-ACCT_USER_GROUPS=( netbox )
-ACCT_USER_HOME=/var/lib/netbox
-
-acct-user_add_deps
diff --git a/acct-user/netbox/netbox-0-r2.ebuild b/acct-user/netbox/netbox-0-r2.ebuild
new file mode 100644
index 000000000000..ee94820335d9
--- /dev/null
+++ b/acct-user/netbox/netbox-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for netbox"
+ACCT_USER_ID=431
+ACCT_USER_GROUPS=( netbox )
+ACCT_USER_HOME=/var/lib/netbox
+
+acct-user_add_deps
diff --git a/acct-user/netdata/netdata-1-r1.ebuild b/acct-user/netdata/netdata-1-r1.ebuild
new file mode 100644
index 000000000000..6b571b269430
--- /dev/null
+++ b/acct-user/netdata/netdata-1-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for netdata"
+ACCT_USER_ID=290
+ACCT_USER_GROUPS=( netdata )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/netdata/netdata-1.ebuild b/acct-user/netdata/netdata-1.ebuild
deleted file mode 100644
index 0d66b49653cd..000000000000
--- a/acct-user/netdata/netdata-1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for netdata"
-ACCT_USER_ID=290
-ACCT_USER_GROUPS=( netdata )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/netperf/netperf-0-r1.ebuild b/acct-user/netperf/netperf-0-r1.ebuild
new file mode 100644
index 000000000000..b255ae4a2f28
--- /dev/null
+++ b/acct-user/netperf/netperf-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/netperf"
+
+ACCT_USER_GROUPS=( "netperf" )
+ACCT_USER_ID="168"
+
+acct-user_add_deps
diff --git a/acct-user/netperf/netperf-0.ebuild b/acct-user/netperf/netperf-0.ebuild
deleted file mode 100644
index 479d3788dbaa..000000000000
--- a/acct-user/netperf/netperf-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/netperf"
-
-ACCT_USER_GROUPS=( "netperf" )
-ACCT_USER_ID="168"
-
-acct-user_add_deps
diff --git a/acct-user/neutron/neutron-0-r1.ebuild b/acct-user/neutron/neutron-0-r1.ebuild
deleted file mode 100644
index 8f58ff4800e9..000000000000
--- a/acct-user/neutron/neutron-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack neutron service"
-ACCT_USER_ID=446
-ACCT_USER_HOME=/var/lib/neutron
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( neutron )
-
-acct-user_add_deps
diff --git a/acct-user/neutron/neutron-0-r2.ebuild b/acct-user/neutron/neutron-0-r2.ebuild
new file mode 100644
index 000000000000..46060ff7e46b
--- /dev/null
+++ b/acct-user/neutron/neutron-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack neutron service"
+ACCT_USER_ID=446
+ACCT_USER_HOME=/var/lib/neutron
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( neutron )
+
+acct-user_add_deps
diff --git a/acct-user/nginx-unit/nginx-unit-0.ebuild b/acct-user/nginx-unit/nginx-unit-0-r1.ebuild
similarity index 100%
rename from acct-user/nginx-unit/nginx-unit-0.ebuild
rename to acct-user/nginx-unit/nginx-unit-0-r1.ebuild
diff --git a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
deleted file mode 100644
index a066f8e465cf..000000000000
--- a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for nginx-vts-exporter"
-ACCT_USER_ID=354
-ACCT_USER_GROUPS=( nginx-vts-exporter )
-
-acct-user_add_deps
diff --git a/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
new file mode 100644
index 000000000000..ede97d226773
--- /dev/null
+++ b/acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for nginx-vts-exporter"
+ACCT_USER_ID=354
+ACCT_USER_GROUPS=( nginx-vts-exporter )
+
+acct-user_add_deps
diff --git a/acct-user/nginx/nginx-0-r1.ebuild b/acct-user/nginx/nginx-0-r1.ebuild
new file mode 100644
index 000000000000..f6b6ea4ea30f
--- /dev/null
+++ b/acct-user/nginx/nginx-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="82"
+ACCT_USER_GROUPS=( "nginx" )
+ACCT_USER_HOME="/var/lib/nginx"
+
+acct-user_add_deps
diff --git a/acct-user/nginx/nginx-0.ebuild b/acct-user/nginx/nginx-0.ebuild
deleted file mode 100644
index 959c00fdf8c4..000000000000
--- a/acct-user/nginx/nginx-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID="82"
-ACCT_USER_GROUPS=( "nginx" )
-ACCT_USER_HOME="/var/lib/nginx"
-
-acct-user_add_deps
diff --git a/acct-user/ngircd/ngircd-0-r1.ebuild b/acct-user/ngircd/ngircd-0-r1.ebuild
deleted file mode 100644
index 19028a9bee20..000000000000
--- a/acct-user/ngircd/ngircd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for ngircd (IRC daemon)"
-ACCT_USER_ID=413
-ACCT_USER_GROUPS=( ngircd )
-
-acct-user_add_deps
diff --git a/acct-user/ngircd/ngircd-0-r2.ebuild b/acct-user/ngircd/ngircd-0-r2.ebuild
new file mode 100644
index 000000000000..79639b6b8e4c
--- /dev/null
+++ b/acct-user/ngircd/ngircd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for ngircd (IRC daemon)"
+ACCT_USER_ID=413
+ACCT_USER_GROUPS=( ngircd )
+
+acct-user_add_deps
diff --git a/acct-user/ngrep/ngrep-0-r1.ebuild b/acct-user/ngrep/ngrep-0-r1.ebuild
deleted file mode 100644
index 4851b7fcb10f..000000000000
--- a/acct-user/ngrep/ngrep-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/ngrep"
-
-ACCT_USER_GROUPS=( "ngrep" )
-ACCT_USER_ID="185"
-
-acct-user_add_deps
diff --git a/acct-user/ngrep/ngrep-0-r2.ebuild b/acct-user/ngrep/ngrep-0-r2.ebuild
new file mode 100644
index 000000000000..810bddcee9f5
--- /dev/null
+++ b/acct-user/ngrep/ngrep-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/ngrep"
+
+ACCT_USER_GROUPS=( "ngrep" )
+ACCT_USER_ID="185"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild b/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild
new file mode 100644
index 000000000000..5f0a81f394f3
--- /dev/null
+++ b/acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/networkmanager-openconnect"
+
+ACCT_USER_GROUPS=( "nm-openconnect" )
+ACCT_USER_ID="142"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openconnect/nm-openconnect-0.ebuild b/acct-user/nm-openconnect/nm-openconnect-0.ebuild
deleted file mode 100644
index aee4002155c4..000000000000
--- a/acct-user/nm-openconnect/nm-openconnect-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/networkmanager-openconnect"
-
-ACCT_USER_GROUPS=( "nm-openconnect" )
-ACCT_USER_ID="142"
-
-acct-user_add_deps
diff --git a/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild b/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild
new file mode 100644
index 000000000000..24e46f7d19a1
--- /dev/null
+++ b/acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/networkmanager-openvpn"
+
+ACCT_USER_GROUPS=( "nm-openvpn" )
+ACCT_USER_ID="143"
+
+acct-user_add_deps
diff --git a/acct-user/nm-openvpn/nm-openvpn-0.ebuild b/acct-user/nm-openvpn/nm-openvpn-0.ebuild
deleted file mode 100644
index 6a7cef1e2ce4..000000000000
--- a/acct-user/nm-openvpn/nm-openvpn-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-vpn/networkmanager-openvpn"
-
-ACCT_USER_GROUPS=( "nm-openvpn" )
-ACCT_USER_ID="143"
-
-acct-user_add_deps
diff --git a/acct-user/nobody/nobody-0-r1.ebuild b/acct-user/nobody/nobody-0-r1.ebuild
new file mode 100644
index 000000000000..8ee787fc00b2
--- /dev/null
+++ b/acct-user/nobody/nobody-0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=65534
+ACCT_USER_ENFORCE_ID=yes
+ACCT_USER_HOME="/var/empty"
+ACCT_USER_HOME_OWNER="root:root"
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( nobody )
+
+acct-user_add_deps
+
+RDEPEND+=" acct-user/root"
diff --git a/acct-user/nobody/nobody-0.ebuild b/acct-user/nobody/nobody-0.ebuild
deleted file mode 100644
index 444addd883b0..000000000000
--- a/acct-user/nobody/nobody-0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=65534
-ACCT_USER_ENFORCE_ID=yes
-ACCT_USER_HOME="/var/empty"
-ACCT_USER_HOME_OWNER="root:root"
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( nobody )
-
-acct-user_add_deps
-
-RDEPEND+=" acct-user/root"
diff --git a/acct-user/node_exporter/node_exporter-0-r1.ebuild b/acct-user/node_exporter/node_exporter-0-r1.ebuild
deleted file mode 100644
index 9bd941f4b72f..000000000000
--- a/acct-user/node_exporter/node_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="node_exporter User"
-ACCT_USER_ID=459
-ACCT_USER_GROUPS=( node_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/node_exporter/node_exporter-0-r2.ebuild b/acct-user/node_exporter/node_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..2ca85112dfde
--- /dev/null
+++ b/acct-user/node_exporter/node_exporter-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="node_exporter User"
+ACCT_USER_ID=459
+ACCT_USER_GROUPS=( node_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/notary/notary-0-r1.ebuild b/acct-user/notary/notary-0-r1.ebuild
new file mode 100644
index 000000000000..754a4408efe1
--- /dev/null
+++ b/acct-user/notary/notary-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-misc/notary"
+
+ACCT_USER_GROUPS=( "notary" )
+ACCT_USER_ID="280"
+
+acct-user_add_deps
diff --git a/acct-user/notary/notary-0.ebuild b/acct-user/notary/notary-0.ebuild
deleted file mode 100644
index 4b852c14c7f0..000000000000
--- a/acct-user/notary/notary-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-misc/notary"
-
-ACCT_USER_GROUPS=( "notary" )
-ACCT_USER_ID="280"
-
-acct-user_add_deps
diff --git a/acct-user/nova/nova-0-r1.ebuild b/acct-user/nova/nova-0-r1.ebuild
deleted file mode 100644
index 660f668cf623..000000000000
--- a/acct-user/nova/nova-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for the openstack nova service"
-ACCT_USER_ID=447
-ACCT_USER_HOME=/var/lib/nova
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( nova )
-
-acct-user_add_deps
diff --git a/acct-user/nova/nova-0-r2.ebuild b/acct-user/nova/nova-0-r2.ebuild
new file mode 100644
index 000000000000..03c2a8b97662
--- /dev/null
+++ b/acct-user/nova/nova-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for the openstack nova service"
+ACCT_USER_ID=447
+ACCT_USER_HOME=/var/lib/nova
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( nova )
+
+acct-user_add_deps
diff --git a/acct-user/nsd/nsd-0-r1.ebuild b/acct-user/nsd/nsd-0-r1.ebuild
deleted file mode 100644
index 127c286f9a84..000000000000
--- a/acct-user/nsd/nsd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for nsd daemon"
-ACCT_USER_ID=223
-ACCT_USER_GROUPS=( nsd )
-
-acct-user_add_deps
diff --git a/acct-user/nsd/nsd-0-r2.ebuild b/acct-user/nsd/nsd-0-r2.ebuild
new file mode 100644
index 000000000000..be5ee197a884
--- /dev/null
+++ b/acct-user/nsd/nsd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for nsd daemon"
+ACCT_USER_ID=223
+ACCT_USER_GROUPS=( nsd )
+
+acct-user_add_deps
diff --git a/acct-user/nslcd/nslcd-0-r1.ebuild b/acct-user/nslcd/nslcd-0-r1.ebuild
deleted file mode 100644
index c783848cf4bb..000000000000
--- a/acct-user/nslcd/nslcd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for nss-pam-ldapd"
-
-ACCT_USER_ID=357
-ACCT_USER_GROUPS=( nslcd )
-
-acct-user_add_deps
diff --git a/acct-user/nslcd/nslcd-0-r2.ebuild b/acct-user/nslcd/nslcd-0-r2.ebuild
new file mode 100644
index 000000000000..2b6742845a63
--- /dev/null
+++ b/acct-user/nslcd/nslcd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for nss-pam-ldapd"
+
+ACCT_USER_ID=357
+ACCT_USER_GROUPS=( nslcd )
+
+acct-user_add_deps
diff --git a/acct-user/ntopng/ntopng-0-r1.ebuild b/acct-user/ntopng/ntopng-0-r1.ebuild
new file mode 100644
index 000000000000..4697c8d589a8
--- /dev/null
+++ b/acct-user/ntopng/ntopng-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ntopng"
+ACCT_USER_ID=296
+ACCT_USER_GROUPS=( ntopng )
+
+acct-user_add_deps
diff --git a/acct-user/ntopng/ntopng-0.ebuild b/acct-user/ntopng/ntopng-0.ebuild
deleted file mode 100644
index f6a1885ae868..000000000000
--- a/acct-user/ntopng/ntopng-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ntopng"
-ACCT_USER_ID=296
-ACCT_USER_GROUPS=( ntopng )
-
-acct-user_add_deps
diff --git a/acct-user/ntp/ntp-0-r1.ebuild b/acct-user/ntp/ntp-0-r1.ebuild
deleted file mode 100644
index cd5fe5a72db6..000000000000
--- a/acct-user/ntp/ntp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for ntp daemon"
-ACCT_USER_ID=123
-ACCT_USER_GROUPS=( ntp )
-
-acct-user_add_deps
diff --git a/acct-user/ntp/ntp-0-r2.ebuild b/acct-user/ntp/ntp-0-r2.ebuild
new file mode 100644
index 000000000000..0e38e0cb70d3
--- /dev/null
+++ b/acct-user/ntp/ntp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for ntp daemon"
+ACCT_USER_ID=123
+ACCT_USER_GROUPS=( ntp )
+
+acct-user_add_deps
diff --git a/acct-user/nullmail/nullmail-0-r1.ebuild b/acct-user/nullmail/nullmail-0-r1.ebuild
new file mode 100644
index 000000000000..ed75e88c8a6f
--- /dev/null
+++ b/acct-user/nullmail/nullmail-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the nullmailer"
+
+ACCT_USER_GROUPS=( "nullmail" )
+ACCT_USER_HOME="/var/spool/nullmailer"
+ACCT_USER_ID="88"
+
+acct-user_add_deps
diff --git a/acct-user/nullmail/nullmail-0.ebuild b/acct-user/nullmail/nullmail-0.ebuild
deleted file mode 100644
index 01b773208aeb..000000000000
--- a/acct-user/nullmail/nullmail-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the nullmailer"
-
-ACCT_USER_GROUPS=( "nullmail" )
-ACCT_USER_HOME="/var/spool/nullmailer"
-ACCT_USER_ID="88"
-
-acct-user_add_deps
diff --git a/acct-user/nut/nut-0-r1.ebuild b/acct-user/nut/nut-0-r1.ebuild
deleted file mode 100644
index e0c09e02a34b..000000000000
--- a/acct-user/nut/nut-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Network-UPS Tools"
-
-ACCT_USER_GROUPS=( "nut" "uucp" )
-ACCT_USER_HOME="/var/lib/nut"
-ACCT_USER_ID="84"
-
-acct-user_add_deps
diff --git a/acct-user/nut/nut-0-r2.ebuild b/acct-user/nut/nut-0-r2.ebuild
new file mode 100644
index 000000000000..d9c746f626db
--- /dev/null
+++ b/acct-user/nut/nut-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Network-UPS Tools"
+
+ACCT_USER_GROUPS=( "nut" "uucp" )
+ACCT_USER_HOME="/var/lib/nut"
+ACCT_USER_ID="84"
+
+acct-user_add_deps
diff --git a/acct-user/nvpd/nvpd-0-r1.ebuild b/acct-user/nvpd/nvpd-0-r1.ebuild
new file mode 100644
index 000000000000..072adc5d8abc
--- /dev/null
+++ b/acct-user/nvpd/nvpd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for nvidia-persistenced"
+ACCT_USER_ID=458
+ACCT_USER_GROUPS=( video )
+
+acct-user_add_deps
diff --git a/acct-user/nvpd/nvpd-0.ebuild b/acct-user/nvpd/nvpd-0.ebuild
deleted file mode 100644
index fa3633c7862e..000000000000
--- a/acct-user/nvpd/nvpd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for nvidia-persistenced"
-ACCT_USER_ID=458
-ACCT_USER_GROUPS=( video )
-
-acct-user_add_deps
diff --git a/acct-user/nzbget/nzbget-0-r1.ebuild b/acct-user/nzbget/nzbget-0-r1.ebuild
new file mode 100644
index 000000000000..7bf7f87f0097
--- /dev/null
+++ b/acct-user/nzbget/nzbget-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-nntp/nzbget"
+ACCT_USER_ID=398
+ACCT_USER_GROUPS=( ${PN} )
+# Downloads are stored there
+ACCT_USER_HOME=/var/lib/nzbget
+# Grant write access to group members
+ACCT_USER_HOME_PERMS=0770
+
+acct-user_add_deps
diff --git a/acct-user/nzbget/nzbget-0.ebuild b/acct-user/nzbget/nzbget-0.ebuild
deleted file mode 100644
index d7b1ff8b1a14..000000000000
--- a/acct-user/nzbget/nzbget-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-nntp/nzbget"
-ACCT_USER_ID=398
-ACCT_USER_GROUPS=( ${PN} )
-# Downloads are stored there
-ACCT_USER_HOME=/var/lib/nzbget
-# Grant write access to group members
-ACCT_USER_HOME_PERMS=0770
-
-acct-user_add_deps
diff --git a/acct-user/oidentd/oidentd-0-r1.ebuild b/acct-user/oidentd/oidentd-0-r1.ebuild
deleted file mode 100644
index c4c59907e3bc..000000000000
--- a/acct-user/oidentd/oidentd-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=493
-ACCT_USER_GROUPS=( oidentd )
-
-acct-user_add_deps
diff --git a/acct-user/oidentd/oidentd-0-r2.ebuild b/acct-user/oidentd/oidentd-0-r2.ebuild
new file mode 100644
index 000000000000..e750efb495d8
--- /dev/null
+++ b/acct-user/oidentd/oidentd-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=493
+ACCT_USER_GROUPS=( oidentd )
+
+acct-user_add_deps
diff --git a/acct-user/openctd/openctd-0-r1.ebuild b/acct-user/openctd/openctd-0-r1.ebuild
new file mode 100644
index 000000000000..e5943719af29
--- /dev/null
+++ b/acct-user/openctd/openctd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for dev-libs/openct"
+
+ACCT_USER_GROUPS=( "openct" )
+ACCT_USER_ID="46"
+
+acct-user_add_deps
diff --git a/acct-user/openctd/openctd-0.ebuild b/acct-user/openctd/openctd-0.ebuild
deleted file mode 100644
index 71d19f1fd648..000000000000
--- a/acct-user/openctd/openctd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for dev-libs/openct"
-
-ACCT_USER_GROUPS=( "openct" )
-ACCT_USER_ID="46"
-
-acct-user_add_deps
diff --git a/acct-user/opendkim/opendkim-0-r1.ebuild b/acct-user/opendkim/opendkim-0-r1.ebuild
deleted file mode 100644
index 6e82e3c1bc82..000000000000
--- a/acct-user/opendkim/opendkim-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for OpenDKIM"
-
-ACCT_USER_ID=334
-ACCT_USER_GROUPS=( opendkim )
-
-acct-user_add_deps
diff --git a/acct-user/opendkim/opendkim-0-r2.ebuild b/acct-user/opendkim/opendkim-0-r2.ebuild
new file mode 100644
index 000000000000..45820b9fe19e
--- /dev/null
+++ b/acct-user/opendkim/opendkim-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for OpenDKIM"
+
+ACCT_USER_ID=334
+ACCT_USER_GROUPS=( opendkim )
+
+acct-user_add_deps
diff --git a/acct-user/opendmarc/opendmarc-0-r1.ebuild b/acct-user/opendmarc/opendmarc-0-r1.ebuild
new file mode 100644
index 000000000000..f7defc95688f
--- /dev/null
+++ b/acct-user/opendmarc/opendmarc-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/opendmarc"
+
+ACCT_USER_ID=244
+ACCT_USER_GROUPS=( opendmarc )
+
+ACCT_USER_HOME="/var/lib/opendmarc"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/opendmarc/opendmarc-0.ebuild b/acct-user/opendmarc/opendmarc-0.ebuild
deleted file mode 100644
index bd9a6b89f925..000000000000
--- a/acct-user/opendmarc/opendmarc-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/opendmarc"
-
-ACCT_USER_ID=244
-ACCT_USER_GROUPS=( opendmarc )
-
-ACCT_USER_HOME="/var/lib/opendmarc"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/opendnssec/opendnssec-0-r1.ebuild b/acct-user/opendnssec/opendnssec-0-r1.ebuild
new file mode 100644
index 000000000000..3684c42cbf0e
--- /dev/null
+++ b/acct-user/opendnssec/opendnssec-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-dns/opendnssec"
+
+ACCT_USER_GROUPS=( "opendnssec" )
+ACCT_USER_ID="151"
+
+acct-user_add_deps
diff --git a/acct-user/opendnssec/opendnssec-0.ebuild b/acct-user/opendnssec/opendnssec-0.ebuild
deleted file mode 100644
index 620602fb74b7..000000000000
--- a/acct-user/opendnssec/opendnssec-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-dns/opendnssec"
-
-ACCT_USER_GROUPS=( "opendnssec" )
-ACCT_USER_ID="151"
-
-acct-user_add_deps
diff --git a/acct-user/openntpd/openntpd-0-r1.ebuild b/acct-user/openntpd/openntpd-0-r1.ebuild
deleted file mode 100644
index 9210523ff425..000000000000
--- a/acct-user/openntpd/openntpd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for openntpd daemon"
-ACCT_USER_ID=321
-ACCT_USER_GROUPS=( openntpd )
-ACCT_USER_HOME=/var/lib/openntpd/chroot
-ACCT_USER_HOME_OWNER=root:root
-
-acct-user_add_deps
diff --git a/acct-user/openntpd/openntpd-0-r2.ebuild b/acct-user/openntpd/openntpd-0-r2.ebuild
new file mode 100644
index 000000000000..64e9497fe4be
--- /dev/null
+++ b/acct-user/openntpd/openntpd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for openntpd daemon"
+ACCT_USER_ID=321
+ACCT_USER_GROUPS=( openntpd )
+ACCT_USER_HOME=/var/lib/openntpd/chroot
+ACCT_USER_HOME_OWNER=root:root
+
+acct-user_add_deps
diff --git a/acct-user/openrct2/openrct2-0-r1.ebuild b/acct-user/openrct2/openrct2-0-r1.ebuild
deleted file mode 100644
index fb6e4992b578..000000000000
--- a/acct-user/openrct2/openrct2-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the OpenRCT2 dedicated server"
-
-ACCT_USER_GROUPS=( "openrct2" )
-ACCT_USER_ID="479"
-
-acct-user_add_deps
diff --git a/acct-user/openrct2/openrct2-0-r2.ebuild b/acct-user/openrct2/openrct2-0-r2.ebuild
new file mode 100644
index 000000000000..bd994570f3e6
--- /dev/null
+++ b/acct-user/openrct2/openrct2-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the OpenRCT2 dedicated server"
+
+ACCT_USER_GROUPS=( "openrct2" )
+ACCT_USER_ID="479"
+
+acct-user_add_deps
diff --git a/acct-user/openttd/openttd-0-r1.ebuild b/acct-user/openttd/openttd-0-r1.ebuild
new file mode 100644
index 000000000000..3d6994af0a58
--- /dev/null
+++ b/acct-user/openttd/openttd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for games-simulation/openttd"
+
+ACCT_USER_HOME="/var/lib/openttd"
+ACCT_USER_GROUPS=( "openttd" )
+ACCT_USER_ID="513"
+
+acct-user_add_deps
diff --git a/acct-user/openttd/openttd-0.ebuild b/acct-user/openttd/openttd-0.ebuild
deleted file mode 100644
index 98fea61231ee..000000000000
--- a/acct-user/openttd/openttd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for games-simulation/openttd"
-
-ACCT_USER_HOME="/var/lib/openttd"
-ACCT_USER_GROUPS=( "openttd" )
-ACCT_USER_ID="513"
-
-acct-user_add_deps
diff --git a/acct-user/openvpn/openvpn-0-r1.ebuild b/acct-user/openvpn/openvpn-0-r1.ebuild
deleted file mode 100644
index 006f42138df5..000000000000
--- a/acct-user/openvpn/openvpn-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-vpn/openvpn"
-
-ACCT_USER_ID=394
-ACCT_USER_GROUPS=( openvpn )
-
-acct-user_add_deps
diff --git a/acct-user/openvpn/openvpn-0-r2.ebuild b/acct-user/openvpn/openvpn-0-r2.ebuild
new file mode 100644
index 000000000000..910756a921ad
--- /dev/null
+++ b/acct-user/openvpn/openvpn-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-vpn/openvpn"
+
+ACCT_USER_ID=394
+ACCT_USER_GROUPS=( openvpn )
+
+acct-user_add_deps
diff --git a/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild
deleted file mode 100644
index 29f970ce62a2..000000000000
--- a/acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for openvpn_exporter"
-ACCT_USER_ID=355
-ACCT_USER_GROUPS=( openvpn_exporter )
-ACCT_USER_HOME=/var/lib/openvpn_exporter
-
-acct-user_add_deps
diff --git a/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild b/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..286c269ef79b
--- /dev/null
+++ b/acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for openvpn_exporter"
+ACCT_USER_ID=355
+ACCT_USER_GROUPS=( openvpn_exporter )
+ACCT_USER_HOME=/var/lib/openvpn_exporter
+
+acct-user_add_deps
diff --git a/acct-user/opm/opm-0-r1.ebuild b/acct-user/opm/opm-0-r1.ebuild
deleted file mode 100644
index ed82e1d8a36c..000000000000
--- a/acct-user/opm/opm-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for an open proxy monitor"
-ACCT_USER_ID=127
-ACCT_USER_GROUPS=( opm )
-
-acct-user_add_deps
diff --git a/acct-user/opm/opm-0-r2.ebuild b/acct-user/opm/opm-0-r2.ebuild
new file mode 100644
index 000000000000..41599e175ed2
--- /dev/null
+++ b/acct-user/opm/opm-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for an open proxy monitor"
+ACCT_USER_ID=127
+ACCT_USER_GROUPS=( opm )
+
+acct-user_add_deps
diff --git a/acct-user/oprofile/oprofile-0-r1.ebuild b/acct-user/oprofile/oprofile-0-r1.ebuild
deleted file mode 100644
index 2a7a5bafe18d..000000000000
--- a/acct-user/oprofile/oprofile-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-util/oprofile JIT code processing"
-ACCT_USER_ID=492
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/oprofile/oprofile-0-r2.ebuild b/acct-user/oprofile/oprofile-0-r2.ebuild
new file mode 100644
index 000000000000..193a1f38d923
--- /dev/null
+++ b/acct-user/oprofile/oprofile-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-util/oprofile JIT code processing"
+ACCT_USER_ID=492
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/oragono/oragono-0-r1.ebuild b/acct-user/oragono/oragono-0-r1.ebuild
new file mode 100644
index 000000000000..94eddf9061c1
--- /dev/null
+++ b/acct-user/oragono/oragono-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Oragono IRC server"
+ACCT_USER_ID=324
+ACCT_USER_GROUPS=( oragono )
+
+acct-user_add_deps
diff --git a/acct-user/oragono/oragono-0.ebuild b/acct-user/oragono/oragono-0.ebuild
deleted file mode 100644
index 0c0040c559ca..000000000000
--- a/acct-user/oragono/oragono-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Oragono IRC server"
-ACCT_USER_ID=324
-ACCT_USER_GROUPS=( oragono )
-
-acct-user_add_deps
diff --git a/acct-user/ossec/ossec-0-r1.ebuild b/acct-user/ossec/ossec-0-r1.ebuild
deleted file mode 100644
index 875c3884f1f2..000000000000
--- a/acct-user/ossec/ossec-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=330
-ACCT_USER_GROUPS=( ossec )
-ACCT_USER_HOME=/var/ossec
-DESCRIPTION="net-analyzer/ossec-hids (agentlessd, analysisd, monitord)"
-
-acct-user_add_deps
diff --git a/acct-user/ossec/ossec-0-r2.ebuild b/acct-user/ossec/ossec-0-r2.ebuild
new file mode 100644
index 000000000000..a559074b51e8
--- /dev/null
+++ b/acct-user/ossec/ossec-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=330
+ACCT_USER_GROUPS=( ossec )
+ACCT_USER_HOME=/var/ossec
+DESCRIPTION="net-analyzer/ossec-hids (agentlessd, analysisd, monitord)"
+
+acct-user_add_deps
diff --git a/acct-user/ossecm/ossecm-0-r1.ebuild b/acct-user/ossecm/ossecm-0-r1.ebuild
deleted file mode 100644
index f180b5c65102..000000000000
--- a/acct-user/ossecm/ossecm-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=331
-ACCT_USER_GROUPS=( ossec )
-DESCRIPTION="net-analyzer/ossec-hids (csyslogd, maild)"
-
-acct-user_add_deps
diff --git a/acct-user/ossecm/ossecm-0-r2.ebuild b/acct-user/ossecm/ossecm-0-r2.ebuild
new file mode 100644
index 000000000000..6f0937bc3343
--- /dev/null
+++ b/acct-user/ossecm/ossecm-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=331
+ACCT_USER_GROUPS=( ossec )
+DESCRIPTION="net-analyzer/ossec-hids (csyslogd, maild)"
+
+acct-user_add_deps
diff --git a/acct-user/ossecr/ossecr-0-r1.ebuild b/acct-user/ossecr/ossecr-0-r1.ebuild
deleted file mode 100644
index 09a1309ef995..000000000000
--- a/acct-user/ossecr/ossecr-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=332
-ACCT_USER_GROUPS=( ossec )
-DESCRIPTION="net-analyzer/ossec-hids (remoted)"
-
-acct-user_add_deps
diff --git a/acct-user/ossecr/ossecr-0-r2.ebuild b/acct-user/ossecr/ossecr-0-r2.ebuild
new file mode 100644
index 000000000000..4ad2a76704e8
--- /dev/null
+++ b/acct-user/ossecr/ossecr-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=332
+ACCT_USER_GROUPS=( ossec )
+DESCRIPTION="net-analyzer/ossec-hids (remoted)"
+
+acct-user_add_deps
diff --git a/acct-user/owntracks/owntracks-0-r1.ebuild b/acct-user/owntracks/owntracks-0-r1.ebuild
new file mode 100644
index 000000000000..41f51bcfe485
--- /dev/null
+++ b/acct-user/owntracks/owntracks-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for sci-geosciences/owntracks-recorder"
+ACCT_USER_ID=524
+ACCT_USER_GROUPS=( owntracks )
+
+acct-user_add_deps
diff --git a/acct-user/owntracks/owntracks-0.ebuild b/acct-user/owntracks/owntracks-0.ebuild
deleted file mode 100644
index 6a429d1e7c3e..000000000000
--- a/acct-user/owntracks/owntracks-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for sci-geosciences/owntracks-recorder"
-ACCT_USER_ID=524
-ACCT_USER_GROUPS=( owntracks )
-
-acct-user_add_deps
diff --git a/acct-user/p2p/p2p-0-r1.ebuild b/acct-user/p2p/p2p-0-r1.ebuild
new file mode 100644
index 000000000000..c01f9700cdee
--- /dev/null
+++ b/acct-user/p2p/p2p-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mldonkey"
+ACCT_USER_ID=378
+ACCT_USER_GROUPS=( p2p )
+
+acct-user_add_deps
diff --git a/acct-user/p2p/p2p-0.ebuild b/acct-user/p2p/p2p-0.ebuild
deleted file mode 100644
index ec404415aeb4..000000000000
--- a/acct-user/p2p/p2p-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mldonkey"
-ACCT_USER_ID=378
-ACCT_USER_GROUPS=( p2p )
-
-acct-user_add_deps
diff --git a/acct-user/partimag/partimag-0-r1.ebuild b/acct-user/partimag/partimag-0-r1.ebuild
new file mode 100644
index 000000000000..ca2de473588c
--- /dev/null
+++ b/acct-user/partimag/partimag-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-block/partimag"
+
+ACCT_USER_HOME="/var/lib/partimage"
+ACCT_USER_ID="91"
+ACCT_USER_GROUPS=( "partimag" )
+
+acct-user_add_deps
diff --git a/acct-user/partimag/partimag-0.ebuild b/acct-user/partimag/partimag-0.ebuild
deleted file mode 100644
index 27434b6a4472..000000000000
--- a/acct-user/partimag/partimag-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-block/partimag"
-
-ACCT_USER_HOME="/var/lib/partimage"
-ACCT_USER_ID="91"
-ACCT_USER_GROUPS=( "partimag" )
-
-acct-user_add_deps
diff --git a/acct-user/pcap/pcap-0-r1.ebuild b/acct-user/pcap/pcap-0-r1.ebuild
new file mode 100644
index 000000000000..fcff027697a4
--- /dev/null
+++ b/acct-user/pcap/pcap-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for capturing network traffic"
+ACCT_USER_ID=377
+ACCT_USER_GROUPS=( pcap )
+
+acct-user_add_deps
diff --git a/acct-user/pcap/pcap-0.ebuild b/acct-user/pcap/pcap-0.ebuild
deleted file mode 100644
index 781fd3191925..000000000000
--- a/acct-user/pcap/pcap-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for capturing network traffic"
-ACCT_USER_ID=377
-ACCT_USER_GROUPS=( pcap )
-
-acct-user_add_deps
diff --git a/acct-user/pcscd/pcscd-0-r1.ebuild b/acct-user/pcscd/pcscd-0-r1.ebuild
deleted file mode 100644
index 8341bf973cab..000000000000
--- a/acct-user/pcscd/pcscd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for pcsc-lite"
-ACCT_USER_ID=47
-ACCT_USER_GROUPS=( pcscd openct usb )
-
-acct-user_add_deps
diff --git a/acct-user/pcscd/pcscd-0-r2.ebuild b/acct-user/pcscd/pcscd-0-r2.ebuild
new file mode 100644
index 000000000000..7da6a318dccb
--- /dev/null
+++ b/acct-user/pcscd/pcscd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for pcsc-lite"
+ACCT_USER_ID=47
+ACCT_USER_GROUPS=( pcscd openct usb )
+
+acct-user_add_deps
diff --git a/acct-user/pdns/pdns-0-r1.ebuild b/acct-user/pdns/pdns-0-r1.ebuild
deleted file mode 100644
index 7e7272f48a8c..000000000000
--- a/acct-user/pdns/pdns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=423
-ACCT_USER_GROUPS=( pdns )
-
-acct-user_add_deps
diff --git a/acct-user/pdns/pdns-0-r2.ebuild b/acct-user/pdns/pdns-0-r2.ebuild
new file mode 100644
index 000000000000..08cc83f39d72
--- /dev/null
+++ b/acct-user/pdns/pdns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=423
+ACCT_USER_GROUPS=( pdns )
+
+acct-user_add_deps
diff --git a/acct-user/pdnsd/pdnsd-0-r1.ebuild b/acct-user/pdnsd/pdnsd-0-r1.ebuild
deleted file mode 100644
index 1d7bf049ad29..000000000000
--- a/acct-user/pdnsd/pdnsd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for pdns daemon"
-ACCT_USER_ID=184
-ACCT_USER_HOME=/var/lib/pdnsd
-ACCT_USER_HOME_OWNER=pdnsd:root
-ACCT_USER_GROUPS=( pdnsd )
-
-acct-user_add_deps
diff --git a/acct-user/pdnsd/pdnsd-0-r2.ebuild b/acct-user/pdnsd/pdnsd-0-r2.ebuild
new file mode 100644
index 000000000000..3b3ff7fe51f7
--- /dev/null
+++ b/acct-user/pdnsd/pdnsd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for pdns daemon"
+ACCT_USER_ID=184
+ACCT_USER_HOME=/var/lib/pdnsd
+ACCT_USER_HOME_OWNER=pdnsd:root
+ACCT_USER_GROUPS=( pdnsd )
+
+acct-user_add_deps
diff --git a/acct-user/pgagent/pgagent-0-r1.ebuild b/acct-user/pgagent/pgagent-0-r1.ebuild
new file mode 100644
index 000000000000..9bda2e510d21
--- /dev/null
+++ b/acct-user/pgagent/pgagent-0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="pgagent program user"
+ACCT_USER_ID=135
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_HOME=/var/lib/pgagent
+ACCT_USER_GROUPS=( pgagent )
+acct-user_add_deps
+SLOT="0"
+
+pkg_postinst() {
+	ewarn "The home directory has changed for pgagent."
+	ewarn "You should move files, especially .pgpass, from:"
+	ewarn "    /home/pgagent"
+	ewarn "To:"
+	ewarn "    ${ACCT_USER_HOME}"
+}
diff --git a/acct-user/pgagent/pgagent-0.ebuild b/acct-user/pgagent/pgagent-0.ebuild
deleted file mode 100644
index da03477a46a1..000000000000
--- a/acct-user/pgagent/pgagent-0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="pgagent program user"
-ACCT_USER_ID=135
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_HOME=/var/lib/pgagent
-ACCT_USER_GROUPS=( pgagent )
-acct-user_add_deps
-SLOT="0"
-
-pkg_postinst() {
-	ewarn "The home directory has changed for pgagent."
-	ewarn "You should move files, especially .pgpass, from:"
-	ewarn "    /home/pgagent"
-	ewarn "To:"
-	ewarn "    ${ACCT_USER_HOME}"
-}
diff --git a/acct-user/pgbouncer/pgbouncer-0-r1.ebuild b/acct-user/pgbouncer/pgbouncer-0-r1.ebuild
new file mode 100644
index 000000000000..5903c2bb5c40
--- /dev/null
+++ b/acct-user/pgbouncer/pgbouncer-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="PgBouncer program user"
+ACCT_USER_ID=463
+ACCT_USER_GROUPS=( postgres )
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/pgbouncer/pgbouncer-0.ebuild b/acct-user/pgbouncer/pgbouncer-0.ebuild
deleted file mode 100644
index 91bdbd6630ff..000000000000
--- a/acct-user/pgbouncer/pgbouncer-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="PgBouncer program user"
-ACCT_USER_ID=463
-ACCT_USER_GROUPS=( postgres )
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/pgpool/pgpool-0-r1.ebuild b/acct-user/pgpool/pgpool-0-r1.ebuild
new file mode 100644
index 000000000000..9d5ee1d3cda7
--- /dev/null
+++ b/acct-user/pgpool/pgpool-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/pgpool2"
+
+ACCT_USER_GROUPS=( "postgres" )
+ACCT_USER_ID="106"
+
+acct-user_add_deps
diff --git a/acct-user/pgpool/pgpool-0.ebuild b/acct-user/pgpool/pgpool-0.ebuild
deleted file mode 100644
index 209a4ee7605e..000000000000
--- a/acct-user/pgpool/pgpool-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for dev-db/pgpool2"
-
-ACCT_USER_GROUPS=( "postgres" )
-ACCT_USER_ID="106"
-
-acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-0-r1.ebuild b/acct-user/pipewire/pipewire-0-r1.ebuild
new file mode 100644
index 000000000000..75bfc8650b44
--- /dev/null
+++ b/acct-user/pipewire/pipewire-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running PipeWire as a system-wide instance"
+ACCT_USER_ID=509
+ACCT_USER_GROUPS=( pipewire audio )
+ACCT_USER_HOME=/var/run/pipewire
+
+acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-0.ebuild b/acct-user/pipewire/pipewire-0.ebuild
deleted file mode 100644
index 7d3ea52b7d16..000000000000
--- a/acct-user/pipewire/pipewire-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running PipeWire as a system-wide instance"
-ACCT_USER_ID=509
-ACCT_USER_GROUPS=( pipewire audio )
-ACCT_USER_HOME=/var/run/pipewire
-
-acct-user_add_deps
diff --git a/acct-user/pipewire/pipewire-1.ebuild b/acct-user/pipewire/pipewire-1-r1.ebuild
similarity index 100%
rename from acct-user/pipewire/pipewire-1.ebuild
rename to acct-user/pipewire/pipewire-1-r1.ebuild
diff --git a/acct-user/placement/placement-0-r1.ebuild b/acct-user/placement/placement-0-r1.ebuild
deleted file mode 100644
index 33bddfb4a00e..000000000000
--- a/acct-user/placement/placement-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the placement openstack service"
-ACCT_USER_ID=448
-ACCT_USER_HOME=/var/lib/placement
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( placement )
-
-acct-user_add_deps
diff --git a/acct-user/placement/placement-0-r2.ebuild b/acct-user/placement/placement-0-r2.ebuild
new file mode 100644
index 000000000000..9a2247f71e46
--- /dev/null
+++ b/acct-user/placement/placement-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the placement openstack service"
+ACCT_USER_ID=448
+ACCT_USER_HOME=/var/lib/placement
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( placement )
+
+acct-user_add_deps
diff --git a/acct-user/plex/plex-0-r1.ebuild b/acct-user/plex/plex-0-r1.ebuild
deleted file mode 100644
index d5e798054bd7..000000000000
--- a/acct-user/plex/plex-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Plex Media Server user"
-ACCT_USER_ID=103
-ACCT_USER_HOME=/var/lib/plexmediaserver
-ACCT_USER_GROUPS=( plex video )
-
-acct-user_add_deps
diff --git a/acct-user/plex/plex-0-r2.ebuild b/acct-user/plex/plex-0-r2.ebuild
new file mode 100644
index 000000000000..10782ef24f9b
--- /dev/null
+++ b/acct-user/plex/plex-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Plex Media Server user"
+ACCT_USER_ID=103
+ACCT_USER_HOME=/var/lib/plexmediaserver
+ACCT_USER_GROUPS=( plex video )
+
+acct-user_add_deps
diff --git a/acct-user/polkitd/polkitd-0-r1.ebuild b/acct-user/polkitd/polkitd-0-r1.ebuild
deleted file mode 100644
index 2d441cd42616..000000000000
--- a/acct-user/polkitd/polkitd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=102
-ACCT_USER_GROUPS=( polkitd )
-ACCT_USER_HOME=/var/lib/polkit-1
-
-acct-user_add_deps
diff --git a/acct-user/polkitd/polkitd-0-r2.ebuild b/acct-user/polkitd/polkitd-0-r2.ebuild
new file mode 100644
index 000000000000..2546ca918d7b
--- /dev/null
+++ b/acct-user/polkitd/polkitd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=102
+ACCT_USER_GROUPS=( polkitd )
+ACCT_USER_HOME=/var/lib/polkit-1
+
+acct-user_add_deps
diff --git a/acct-user/polw/polw-0-r1.ebuild b/acct-user/polw/polw-0-r1.ebuild
new file mode 100644
index 000000000000..7d25130c691c
--- /dev/null
+++ b/acct-user/polw/polw-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/policyd-weight"
+
+ACCT_USER_GROUPS=( "polw" )
+ACCT_USER_ID="263"
+
+acct-user_add_deps
diff --git a/acct-user/polw/polw-0.ebuild b/acct-user/polw/polw-0.ebuild
deleted file mode 100644
index 9a86e4848d40..000000000000
--- a/acct-user/polw/polw-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for mail-filter/policyd-weight"
-
-ACCT_USER_GROUPS=( "polw" )
-ACCT_USER_ID="263"
-
-acct-user_add_deps
diff --git a/acct-user/popa3d/popa3d-0-r1.ebuild b/acct-user/popa3d/popa3d-0-r1.ebuild
new file mode 100644
index 000000000000..dc83868e0236
--- /dev/null
+++ b/acct-user/popa3d/popa3d-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/popa3d"
+ACCT_USER_ID=375
+ACCT_USER_GROUPS=( popa3d )
+
+acct-user_add_deps
diff --git a/acct-user/popa3d/popa3d-0.ebuild b/acct-user/popa3d/popa3d-0.ebuild
deleted file mode 100644
index 7d9064ca0001..000000000000
--- a/acct-user/popa3d/popa3d-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-mail/popa3d"
-ACCT_USER_ID=375
-ACCT_USER_GROUPS=( popa3d )
-
-acct-user_add_deps
diff --git a/acct-user/portage/portage-0-r1.ebuild b/acct-user/portage/portage-0-r2.ebuild
similarity index 100%
rename from acct-user/portage/portage-0-r1.ebuild
rename to acct-user/portage/portage-0-r2.ebuild
diff --git a/acct-user/postfix/postfix-0-r1.ebuild b/acct-user/postfix/postfix-0-r1.ebuild
deleted file mode 100644
index 227740ec875a..000000000000
--- a/acct-user/postfix/postfix-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postfix daemon"
-ACCT_USER_ID=207
-ACCT_USER_GROUPS=( postfix mail )
-
-acct-user_add_deps
diff --git a/acct-user/postfix/postfix-0-r2.ebuild b/acct-user/postfix/postfix-0-r2.ebuild
new file mode 100644
index 000000000000..7543f3afb66e
--- /dev/null
+++ b/acct-user/postfix/postfix-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postfix daemon"
+ACCT_USER_ID=207
+ACCT_USER_GROUPS=( postfix mail )
+
+acct-user_add_deps
diff --git a/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild
deleted file mode 100644
index b5b31e9b49d2..000000000000
--- a/acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postfix_exporter"
-ACCT_USER_ID=356
-ACCT_USER_GROUPS=( postfix_exporter )
-ACCT_USER_HOME=/var/lib/postfix_exporter
-
-acct-user_add_deps
diff --git a/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild b/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild
new file mode 100644
index 000000000000..eec25c5cbfa1
--- /dev/null
+++ b/acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postfix_exporter"
+ACCT_USER_ID=356
+ACCT_USER_GROUPS=( postfix_exporter )
+ACCT_USER_HOME=/var/lib/postfix_exporter
+
+acct-user_add_deps
diff --git a/acct-user/postfwd/postfwd-0-r1.ebuild b/acct-user/postfwd/postfwd-0-r1.ebuild
new file mode 100644
index 000000000000..a9f9bb00ff8d
--- /dev/null
+++ b/acct-user/postfwd/postfwd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for mail-filter/postfwd"
+
+ACCT_USER_GROUPS=( "postfwd" )
+ACCT_USER_ID="189"
+
+acct-user_add_deps
diff --git a/acct-user/postfwd/postfwd-0.ebuild b/acct-user/postfwd/postfwd-0.ebuild
deleted file mode 100644
index ba5ad6136dfa..000000000000
--- a/acct-user/postfwd/postfwd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for mail-filter/postfwd"
-
-ACCT_USER_GROUPS=( "postfwd" )
-ACCT_USER_ID="189"
-
-acct-user_add_deps
diff --git a/acct-user/postgres/postgres-0-r1.ebuild b/acct-user/postgres/postgres-0-r1.ebuild
deleted file mode 100644
index e420798667c5..000000000000
--- a/acct-user/postgres/postgres-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="PostgreSQL program user"
-ACCT_USER_ID=70
-ACCT_USER_GROUPS=( postgres )
-ACCT_USER_HOME=/var/lib/postgresql
-ACCT_USER_HOME_PERMS=0700
-ACCT_USER_SHELL=/bin/sh
-acct-user_add_deps
-SLOT="0"
diff --git a/acct-user/postgres/postgres-0-r2.ebuild b/acct-user/postgres/postgres-0-r2.ebuild
new file mode 100644
index 000000000000..4bc70595c4de
--- /dev/null
+++ b/acct-user/postgres/postgres-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="PostgreSQL program user"
+ACCT_USER_ID=70
+ACCT_USER_GROUPS=( postgres )
+ACCT_USER_HOME=/var/lib/postgresql
+ACCT_USER_HOME_PERMS=0700
+ACCT_USER_SHELL=/bin/sh
+acct-user_add_deps
+SLOT="0"
diff --git a/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild b/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..f451c6f3ed15
--- /dev/null
+++ b/acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postgres_exporter"
+ACCT_USER_ID=233
+ACCT_USER_GROUPS=( postgres_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/postgres_exporter/postgres_exporter-0.ebuild b/acct-user/postgres_exporter/postgres_exporter-0.ebuild
deleted file mode 100644
index 4e6d3dd388ba..000000000000
--- a/acct-user/postgres_exporter/postgres_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for postgres_exporter"
-ACCT_USER_ID=233
-ACCT_USER_GROUPS=( postgres_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/postgrey/postgrey-0-r1.ebuild b/acct-user/postgrey/postgrey-0-r1.ebuild
new file mode 100644
index 000000000000..11f06cdca018
--- /dev/null
+++ b/acct-user/postgrey/postgrey-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the postgrey mail daemon"
+ACCT_USER_ID=360
+ACCT_USER_GROUPS=( postgrey )
+
+acct-user_add_deps
diff --git a/acct-user/postgrey/postgrey-0.ebuild b/acct-user/postgrey/postgrey-0.ebuild
deleted file mode 100644
index 71d344b37917..000000000000
--- a/acct-user/postgrey/postgrey-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the postgrey mail daemon"
-ACCT_USER_ID=360
-ACCT_USER_GROUPS=( postgrey )
-
-acct-user_add_deps
diff --git a/acct-user/postmaster/postmaster-0-r1.ebuild b/acct-user/postmaster/postmaster-0-r1.ebuild
deleted file mode 100644
index cbf6a9f00c19..000000000000
--- a/acct-user/postmaster/postmaster-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Postmaster user"
-ACCT_USER_ID=14
-ACCT_USER_HOME=/var/spool/mail
-ACCT_USER_HOME_OWNER=root:mail
-ACCT_USER_HOME_PERMS=03775
-ACCT_USER_GROUPS=( mail )
-
-acct-user_add_deps
diff --git a/acct-user/postmaster/postmaster-0-r2.ebuild b/acct-user/postmaster/postmaster-0-r2.ebuild
new file mode 100644
index 000000000000..f2ec25973733
--- /dev/null
+++ b/acct-user/postmaster/postmaster-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Postmaster user"
+ACCT_USER_ID=14
+ACCT_USER_HOME=/var/spool/mail
+ACCT_USER_HOME_OWNER=root:mail
+ACCT_USER_HOME_PERMS=03775
+ACCT_USER_GROUPS=( mail )
+
+acct-user_add_deps
diff --git a/acct-user/privoxy/privoxy-0-r1.ebuild b/acct-user/privoxy/privoxy-0-r1.ebuild
deleted file mode 100644
index 9a3113c42296..000000000000
--- a/acct-user/privoxy/privoxy-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A privoxy: privacy oriented web proxy user"
-ACCT_USER_ID=392
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/privoxy/privoxy-0-r2.ebuild b/acct-user/privoxy/privoxy-0-r2.ebuild
new file mode 100644
index 000000000000..2afb11613a43
--- /dev/null
+++ b/acct-user/privoxy/privoxy-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A privoxy: privacy oriented web proxy user"
+ACCT_USER_ID=392
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/prometheus/prometheus-0-r1.ebuild b/acct-user/prometheus/prometheus-0-r1.ebuild
deleted file mode 100644
index df0a3191d93d..000000000000
--- a/acct-user/prometheus/prometheus-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for prometheus"
-ACCT_USER_ID=430
-ACCT_USER_GROUPS=( prometheus )
-ACCT_USER_HOME=/var/lib/prometheus
-
-acct-user_add_deps
diff --git a/acct-user/prometheus/prometheus-0-r2.ebuild b/acct-user/prometheus/prometheus-0-r2.ebuild
new file mode 100644
index 000000000000..048869dfe9b9
--- /dev/null
+++ b/acct-user/prometheus/prometheus-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for prometheus"
+ACCT_USER_ID=430
+ACCT_USER_GROUPS=( prometheus )
+ACCT_USER_HOME=/var/lib/prometheus
+
+acct-user_add_deps
diff --git a/acct-user/prosody/prosody-0-r1.ebuild b/acct-user/prosody/prosody-0-r1.ebuild
new file mode 100644
index 000000000000..9d228c8218a7
--- /dev/null
+++ b/acct-user/prosody/prosody-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-im/prosody"
+
+ACCT_USER_GROUPS=( "prosody" )
+ACCT_USER_ID="115"
+
+acct-user_add_deps
diff --git a/acct-user/prosody/prosody-0.ebuild b/acct-user/prosody/prosody-0.ebuild
deleted file mode 100644
index 223aa45c40f1..000000000000
--- a/acct-user/prosody/prosody-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-im/prosody"
-
-ACCT_USER_GROUPS=( "prosody" )
-ACCT_USER_ID="115"
-
-acct-user_add_deps
diff --git a/acct-user/prowlarr/prowlarr-0-r1.ebuild b/acct-user/prowlarr/prowlarr-0-r1.ebuild
new file mode 100644
index 000000000000..8780c5f0fed3
--- /dev/null
+++ b/acct-user/prowlarr/prowlarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for prowlarr"
+ACCT_USER_HOME=/var/lib/prowlarr
+ACCT_USER_ID=517
+ACCT_USER_GROUPS=( prowlarr )
+
+acct-user_add_deps
diff --git a/acct-user/prowlarr/prowlarr-0.ebuild b/acct-user/prowlarr/prowlarr-0.ebuild
deleted file mode 100644
index be6de1d3e940..000000000000
--- a/acct-user/prowlarr/prowlarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for prowlarr"
-ACCT_USER_HOME=/var/lib/prowlarr
-ACCT_USER_ID=517
-ACCT_USER_GROUPS=( prowlarr )
-
-acct-user_add_deps
diff --git a/acct-user/psybnc/psybnc-0-r1.ebuild b/acct-user/psybnc/psybnc-0-r1.ebuild
new file mode 100644
index 000000000000..5d2635b896c5
--- /dev/null
+++ b/acct-user/psybnc/psybnc-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-irc/psybnc"
+
+ACCT_USER_GROUPS=( "psybnc" )
+ACCT_USER_HOME="/var/lib/psybnc"
+ACCT_USER_ID="259"
+
+acct-user_add_deps
diff --git a/acct-user/psybnc/psybnc-0.ebuild b/acct-user/psybnc/psybnc-0.ebuild
deleted file mode 100644
index 854b5bf822a9..000000000000
--- a/acct-user/psybnc/psybnc-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-irc/psybnc"
-
-ACCT_USER_GROUPS=( "psybnc" )
-ACCT_USER_HOME="/var/lib/psybnc"
-ACCT_USER_ID="259"
-
-acct-user_add_deps
diff --git a/acct-user/pulse/pulse-0-r1.ebuild b/acct-user/pulse/pulse-0-r1.ebuild
new file mode 100644
index 000000000000..88465175512a
--- /dev/null
+++ b/acct-user/pulse/pulse-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the PulseAudio daemon as a system-wide instance"
+ACCT_USER_ID=171
+ACCT_USER_GROUPS=( pulse audio )
+ACCT_USER_HOME=/var/run/pulse
+
+acct-user_add_deps
diff --git a/acct-user/pulse/pulse-0.ebuild b/acct-user/pulse/pulse-0.ebuild
deleted file mode 100644
index 4e885b688f7b..000000000000
--- a/acct-user/pulse/pulse-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running the PulseAudio daemon as a system-wide instance"
-ACCT_USER_ID=171
-ACCT_USER_GROUPS=( pulse audio )
-ACCT_USER_HOME=/var/run/pulse
-
-acct-user_add_deps
diff --git a/acct-user/puppet/puppet-0-r1.ebuild b/acct-user/puppet/puppet-0-r1.ebuild
deleted file mode 100644
index 61230a8a6a60..000000000000
--- a/acct-user/puppet/puppet-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for puppet services"
-ACCT_USER_ID=455
-ACCT_USER_HOME=/var/lib/puppet
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( puppet )
-
-acct-user_add_deps
diff --git a/acct-user/puppet/puppet-0-r2.ebuild b/acct-user/puppet/puppet-0-r2.ebuild
new file mode 100644
index 000000000000..4e634ff27bf3
--- /dev/null
+++ b/acct-user/puppet/puppet-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for puppet services"
+ACCT_USER_ID=455
+ACCT_USER_HOME=/var/lib/puppet
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( puppet )
+
+acct-user_add_deps
diff --git a/acct-user/puppetdb/puppetdb-0-r1.ebuild b/acct-user/puppetdb/puppetdb-0-r1.ebuild
deleted file mode 100644
index 7f70113f6559..000000000000
--- a/acct-user/puppetdb/puppetdb-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the puppetdb service"
-ACCT_USER_ID=456
-ACCT_USER_HOME=/opt/puppetlabs/server/data/puppetserver
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( puppetdb )
-
-acct-user_add_deps
diff --git a/acct-user/puppetdb/puppetdb-0-r2.ebuild b/acct-user/puppetdb/puppetdb-0-r2.ebuild
new file mode 100644
index 000000000000..c509fa9a158c
--- /dev/null
+++ b/acct-user/puppetdb/puppetdb-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the puppetdb service"
+ACCT_USER_ID=456
+ACCT_USER_HOME=/opt/puppetlabs/server/data/puppetserver
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( puppetdb )
+
+acct-user_add_deps
diff --git a/acct-user/pushgateway/pushgateway-0-r1.ebuild b/acct-user/pushgateway/pushgateway-0-r1.ebuild
new file mode 100644
index 000000000000..a7a92c4456f9
--- /dev/null
+++ b/acct-user/pushgateway/pushgateway-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/pushgateway"
+
+ACCT_USER_GROUPS=( "pushgateway" )
+ACCT_USER_ID="288"
+
+acct-user_add_deps
diff --git a/acct-user/pushgateway/pushgateway-0.ebuild b/acct-user/pushgateway/pushgateway-0.ebuild
deleted file mode 100644
index dfd5dad5e837..000000000000
--- a/acct-user/pushgateway/pushgateway-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/pushgateway"
-
-ACCT_USER_GROUPS=( "pushgateway" )
-ACCT_USER_ID="288"
-
-acct-user_add_deps
diff --git a/acct-user/pvpgn/pvpgn-0-r1.ebuild b/acct-user/pvpgn/pvpgn-0-r1.ebuild
new file mode 100644
index 000000000000..ddabd61a188e
--- /dev/null
+++ b/acct-user/pvpgn/pvpgn-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for pvpgn (gaming server for Battle.Net compatible clients)"
+ACCT_USER_ID=285
+ACCT_USER_GROUPS=( pvpgn )
+
+acct-user_add_deps
diff --git a/acct-user/pvpgn/pvpgn-0.ebuild b/acct-user/pvpgn/pvpgn-0.ebuild
deleted file mode 100644
index 42d6b6c54788..000000000000
--- a/acct-user/pvpgn/pvpgn-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for pvpgn (gaming server for Battle.Net compatible clients)"
-ACCT_USER_ID=285
-ACCT_USER_GROUPS=( pvpgn )
-
-acct-user_add_deps
diff --git a/acct-user/qemu/qemu-0-r1.ebuild b/acct-user/qemu/qemu-0-r1.ebuild
deleted file mode 100644
index b2c94705fe97..000000000000
--- a/acct-user/qemu/qemu-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=77
-ACCT_USER_GROUPS=( qemu kvm )
-
-acct-user_add_deps
diff --git a/acct-user/qemu/qemu-0-r2.ebuild b/acct-user/qemu/qemu-0-r2.ebuild
new file mode 100644
index 000000000000..ca7ef414b25c
--- /dev/null
+++ b/acct-user/qemu/qemu-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=77
+ACCT_USER_GROUPS=( qemu kvm )
+
+acct-user_add_deps
diff --git a/acct-user/qmaild/qmaild-0-r1.ebuild b/acct-user/qmaild/qmaild-0-r1.ebuild
deleted file mode 100644
index 01104fd99156..000000000000
--- a/acct-user/qmaild/qmaild-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-smtpd"
-ACCT_USER_ID=201
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmaild/qmaild-0-r2.ebuild b/acct-user/qmaild/qmaild-0-r2.ebuild
new file mode 100644
index 000000000000..c5d19a59cf46
--- /dev/null
+++ b/acct-user/qmaild/qmaild-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-smtpd"
+ACCT_USER_ID=201
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmaill/qmaill-0-r1.ebuild b/acct-user/qmaill/qmaill-0-r1.ebuild
deleted file mode 100644
index 52d00df5c450..000000000000
--- a/acct-user/qmaill/qmaill-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail logging"
-ACCT_USER_ID=202
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmaill/qmaill-0-r2.ebuild b/acct-user/qmaill/qmaill-0-r2.ebuild
new file mode 100644
index 000000000000..58863dc7fa00
--- /dev/null
+++ b/acct-user/qmaill/qmaill-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail logging"
+ACCT_USER_ID=202
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmailp/qmailp-0-r1.ebuild b/acct-user/qmailp/qmailp-0-r1.ebuild
deleted file mode 100644
index cce7a11a4dee..000000000000
--- a/acct-user/qmailp/qmailp-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-getpw"
-ACCT_USER_ID=203
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/qmailp/qmailp-0-r2.ebuild b/acct-user/qmailp/qmailp-0-r2.ebuild
new file mode 100644
index 000000000000..cd06f3ce8ccd
--- /dev/null
+++ b/acct-user/qmailp/qmailp-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-getpw"
+ACCT_USER_ID=203
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/qmailq/qmailq-0-r1.ebuild b/acct-user/qmailq/qmailq-0-r1.ebuild
deleted file mode 100644
index f01b4dbb6a5f..000000000000
--- a/acct-user/qmailq/qmailq-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail queue"
-ACCT_USER_ID=204
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmailq/qmailq-0-r2.ebuild b/acct-user/qmailq/qmailq-0-r2.ebuild
new file mode 100644
index 000000000000..3f48c735c70c
--- /dev/null
+++ b/acct-user/qmailq/qmailq-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail queue"
+ACCT_USER_ID=204
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/qmailr/qmailr-0-r1.ebuild b/acct-user/qmailr/qmailr-0-r1.ebuild
deleted file mode 100644
index acc355174d63..000000000000
--- a/acct-user/qmailr/qmailr-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-rspawn and qmail-remote"
-ACCT_USER_ID=205
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmailr/qmailr-0-r2.ebuild b/acct-user/qmailr/qmailr-0-r2.ebuild
new file mode 100644
index 000000000000..dabc73bfed6c
--- /dev/null
+++ b/acct-user/qmailr/qmailr-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-rspawn and qmail-remote"
+ACCT_USER_ID=205
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/qmails/qmails-0-r1.ebuild b/acct-user/qmails/qmails-0-r1.ebuild
deleted file mode 100644
index 67ada5606b16..000000000000
--- a/acct-user/qmails/qmails-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for qmail-smtpd"
-ACCT_USER_ID=206
-ACCT_USER_GROUPS=( qmail )
-
-acct-user_add_deps
diff --git a/acct-user/qmails/qmails-0-r2.ebuild b/acct-user/qmails/qmails-0-r2.ebuild
new file mode 100644
index 000000000000..7f26ec2f89b3
--- /dev/null
+++ b/acct-user/qmails/qmails-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for qmail-smtpd"
+ACCT_USER_ID=206
+ACCT_USER_GROUPS=( qmail )
+
+acct-user_add_deps
diff --git a/acct-user/quagga/quagga-0-r1.ebuild b/acct-user/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index d40e6dace3fe..000000000000
--- a/acct-user/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=424
-ACCT_USER_GROUPS=( quagga )
-
-acct-user_add_deps
diff --git a/acct-user/quagga/quagga-0-r2.ebuild b/acct-user/quagga/quagga-0-r2.ebuild
new file mode 100644
index 000000000000..bf4a158964ed
--- /dev/null
+++ b/acct-user/quagga/quagga-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=424
+ACCT_USER_GROUPS=( quagga )
+
+acct-user_add_deps
diff --git a/acct-user/quassel/quassel-0-r1.ebuild b/acct-user/quassel/quassel-0-r1.ebuild
deleted file mode 100644
index 402d7a01cfca..000000000000
--- a/acct-user/quassel/quassel-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=472
-ACCT_USER_HOME=/var/lib/quassel
-ACCT_USER_GROUPS=( quassel )
-
-acct-user_add_deps
diff --git a/acct-user/quassel/quassel-0-r2.ebuild b/acct-user/quassel/quassel-0-r2.ebuild
new file mode 100644
index 000000000000..4f783f9a351f
--- /dev/null
+++ b/acct-user/quassel/quassel-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=472
+ACCT_USER_HOME=/var/lib/quassel
+ACCT_USER_GROUPS=( quassel )
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq/rabbitmq-0-r1.ebuild b/acct-user/rabbitmq/rabbitmq-0-r1.ebuild
new file mode 100644
index 000000000000..ec27b7545b5b
--- /dev/null
+++ b/acct-user/rabbitmq/rabbitmq-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/rabbitmq-server"
+
+ACCT_USER_GROUPS=( "rabbitmq" )
+ACCT_USER_HOME="/var/lib/rabbitmq"
+ACCT_USER_HOME_PERMS="0750"
+ACCT_USER_ID="121"
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq/rabbitmq-0.ebuild b/acct-user/rabbitmq/rabbitmq-0.ebuild
deleted file mode 100644
index 23f7f618a8fc..000000000000
--- a/acct-user/rabbitmq/rabbitmq-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/rabbitmq-server"
-
-ACCT_USER_GROUPS=( "rabbitmq" )
-ACCT_USER_HOME="/var/lib/rabbitmq"
-ACCT_USER_HOME_PERMS="0750"
-ACCT_USER_ID="121"
-
-acct-user_add_deps
diff --git a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..78248a6b75ff
--- /dev/null
+++ b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/rabbitmq_exporter"
+
+ACCT_USER_ID=107
+ACCT_USER_GROUPS=( rabbitmq_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild b/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
deleted file mode 100644
index 89db38665fb8..000000000000
--- a/acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/rabbitmq_exporter"
-
-ACCT_USER_ID=107
-ACCT_USER_GROUPS=( rabbitmq_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/radarr/radarr-0-r1.ebuild b/acct-user/radarr/radarr-0-r1.ebuild
new file mode 100644
index 000000000000..419aa4591317
--- /dev/null
+++ b/acct-user/radarr/radarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for radarr"
+ACCT_USER_HOME=/var/lib/radarr
+ACCT_USER_ID=516
+ACCT_USER_GROUPS=( radarr )
+
+acct-user_add_deps
diff --git a/acct-user/radarr/radarr-0.ebuild b/acct-user/radarr/radarr-0.ebuild
deleted file mode 100644
index c910ab4636ce..000000000000
--- a/acct-user/radarr/radarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for radarr"
-ACCT_USER_HOME=/var/lib/radarr
-ACCT_USER_ID=516
-ACCT_USER_GROUPS=( radarr )
-
-acct-user_add_deps
diff --git a/acct-user/radicale/radicale-0-r2.ebuild b/acct-user/radicale/radicale-0-r2.ebuild
deleted file mode 100644
index 221d3fb16490..000000000000
--- a/acct-user/radicale/radicale-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/radicale"
-ACCT_USER_ID=327
-ACCT_USER_GROUPS=( radicale )
-ACCT_USER_HOME=/var/lib/radicale
-
-acct-user_add_deps
diff --git a/acct-user/radicale/radicale-0-r3.ebuild b/acct-user/radicale/radicale-0-r3.ebuild
new file mode 100644
index 000000000000..75d00441a126
--- /dev/null
+++ b/acct-user/radicale/radicale-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/radicale"
+ACCT_USER_ID=327
+ACCT_USER_GROUPS=( radicale )
+ACCT_USER_HOME=/var/lib/radicale
+
+acct-user_add_deps
diff --git a/acct-user/radius/radius-0-r1.ebuild b/acct-user/radius/radius-0-r1.ebuild
deleted file mode 100644
index 811870d8e2d6..000000000000
--- a/acct-user/radius/radius-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="FreeRadius program user"
-ACCT_USER_ID=95
-ACCT_USER_GROUPS=( radius )
-acct-user_add_deps
diff --git a/acct-user/radius/radius-0-r2.ebuild b/acct-user/radius/radius-0-r2.ebuild
new file mode 100644
index 000000000000..2611f8b3352a
--- /dev/null
+++ b/acct-user/radius/radius-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="FreeRadius program user"
+ACCT_USER_ID=95
+ACCT_USER_GROUPS=( radius )
+acct-user_add_deps
diff --git a/acct-user/radvd/radvd-0-r1.ebuild b/acct-user/radvd/radvd-0-r1.ebuild
new file mode 100644
index 000000000000..d74fe7916643
--- /dev/null
+++ b/acct-user/radvd/radvd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Router Advertisement Daemon"
+
+ACCT_USER_GROUPS=( "radvd" )
+ACCT_USER_ID="215"
+
+acct-user_add_deps
diff --git a/acct-user/radvd/radvd-0.ebuild b/acct-user/radvd/radvd-0.ebuild
deleted file mode 100644
index 3b51448d28b9..000000000000
--- a/acct-user/radvd/radvd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Router Advertisement Daemon"
-
-ACCT_USER_GROUPS=( "radvd" )
-ACCT_USER_ID="215"
-
-acct-user_add_deps
diff --git a/acct-user/rbldns/rbldns-0-r1.ebuild b/acct-user/rbldns/rbldns-0-r1.ebuild
deleted file mode 100644
index f9ec0841095b..000000000000
--- a/acct-user/rbldns/rbldns-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=153
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/rbldns/rbldns-0-r2.ebuild b/acct-user/rbldns/rbldns-0-r2.ebuild
new file mode 100644
index 000000000000..43929c1fad55
--- /dev/null
+++ b/acct-user/rbldns/rbldns-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=153
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/rbot/rbot-0-r1.ebuild b/acct-user/rbot/rbot-0-r1.ebuild
new file mode 100644
index 000000000000..bf0c7c145e88
--- /dev/null
+++ b/acct-user/rbot/rbot-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-irc/rbot"
+
+ACCT_USER_GROUPS=( "rbot" )
+ACCT_USER_HOME="/var/lib/rbot"
+ACCT_USER_ID="129"
+
+acct-user_add_deps
diff --git a/acct-user/rbot/rbot-0.ebuild b/acct-user/rbot/rbot-0.ebuild
deleted file mode 100644
index c4e767ac30a0..000000000000
--- a/acct-user/rbot/rbot-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-irc/rbot"
-
-ACCT_USER_GROUPS=( "rbot" )
-ACCT_USER_HOME="/var/lib/rbot"
-ACCT_USER_ID="129"
-
-acct-user_add_deps
diff --git a/acct-user/readarr/readarr-0-r1.ebuild b/acct-user/readarr/readarr-0-r1.ebuild
new file mode 100644
index 000000000000..d782879aa061
--- /dev/null
+++ b/acct-user/readarr/readarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for readarr"
+ACCT_USER_HOME=/var/lib/readarr
+ACCT_USER_ID=521
+ACCT_USER_GROUPS=( readarr )
+
+acct-user_add_deps
diff --git a/acct-user/readarr/readarr-0.ebuild b/acct-user/readarr/readarr-0.ebuild
deleted file mode 100644
index 9998e137f4ad..000000000000
--- a/acct-user/readarr/readarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for readarr"
-ACCT_USER_HOME=/var/lib/readarr
-ACCT_USER_ID=521
-ACCT_USER_GROUPS=( readarr )
-
-acct-user_add_deps
diff --git a/acct-user/redis/redis-0-r1.ebuild b/acct-user/redis/redis-0-r1.ebuild
deleted file mode 100644
index b685af71488c..000000000000
--- a/acct-user/redis/redis-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="Redis program user"
-ACCT_USER_ID=75
-ACCT_USER_GROUPS=( redis )
-acct-user_add_deps
diff --git a/acct-user/redis/redis-0-r2.ebuild b/acct-user/redis/redis-0-r2.ebuild
new file mode 100644
index 000000000000..a9cebb2a7108
--- /dev/null
+++ b/acct-user/redis/redis-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="Redis program user"
+ACCT_USER_ID=75
+ACCT_USER_GROUPS=( redis )
+acct-user_add_deps
diff --git a/acct-user/redis_exporter/redis_exporter-0-r1.ebuild b/acct-user/redis_exporter/redis_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..9dc7b65510f4
--- /dev/null
+++ b/acct-user/redis_exporter/redis_exporter-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/redis_exporter"
+
+ACCT_USER_HOME=/var/lib/redis_exporter
+ACCT_USER_GROUPS=( "redis_exporter" )
+ACCT_USER_ID="298"
+
+acct-user_add_deps
diff --git a/acct-user/redis_exporter/redis_exporter-0.ebuild b/acct-user/redis_exporter/redis_exporter-0.ebuild
deleted file mode 100644
index 9096283d34a1..000000000000
--- a/acct-user/redis_exporter/redis_exporter-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/redis_exporter"
-
-ACCT_USER_HOME=/var/lib/redis_exporter
-ACCT_USER_GROUPS=( "redis_exporter" )
-ACCT_USER_ID="298"
-
-acct-user_add_deps
diff --git a/acct-user/redmine/redmine-0-r1.ebuild b/acct-user/redmine/redmine-0-r1.ebuild
deleted file mode 100644
index 2c309ee4b3d1..000000000000
--- a/acct-user/redmine/redmine-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Redmine application user"
-ACCT_USER_ID=451
-ACCT_USER_GROUPS=( redmine )
-acct-user_add_deps
diff --git a/acct-user/redmine/redmine-0-r2.ebuild b/acct-user/redmine/redmine-0-r2.ebuild
new file mode 100644
index 000000000000..c46f454cb5c8
--- /dev/null
+++ b/acct-user/redmine/redmine-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Redmine application user"
+ACCT_USER_ID=451
+ACCT_USER_GROUPS=( redmine )
+acct-user_add_deps
diff --git a/acct-user/redsocks/redsocks-0-r1.ebuild b/acct-user/redsocks/redsocks-0-r1.ebuild
deleted file mode 100644
index b59a8084d4d4..000000000000
--- a/acct-user/redsocks/redsocks-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-proxy/redsocks"
-
-ACCT_USER_GROUPS=( "redsocks" )
-ACCT_USER_ID="154"
-
-acct-user_add_deps
diff --git a/acct-user/redsocks/redsocks-0-r2.ebuild b/acct-user/redsocks/redsocks-0-r2.ebuild
new file mode 100644
index 000000000000..bcaa7b06c23d
--- /dev/null
+++ b/acct-user/redsocks/redsocks-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-proxy/redsocks"
+
+ACCT_USER_GROUPS=( "redsocks" )
+ACCT_USER_ID="154"
+
+acct-user_add_deps
diff --git a/acct-user/reg/reg-0-r1.ebuild b/acct-user/reg/reg-0-r1.ebuild
deleted file mode 100644
index 57bb9a6ed18f..000000000000
--- a/acct-user/reg/reg-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-containers/reg"
-
-ACCT_USER_ID=503
-ACCT_USER_GROUPS=( reg )
-ACCT_USER_HOME=/var/lib/reg
-
-acct-user_add_deps
diff --git a/acct-user/reg/reg-0-r2.ebuild b/acct-user/reg/reg-0-r2.ebuild
new file mode 100644
index 000000000000..908843687070
--- /dev/null
+++ b/acct-user/reg/reg-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-containers/reg"
+
+ACCT_USER_ID=503
+ACCT_USER_GROUPS=( reg )
+ACCT_USER_HOME=/var/lib/reg
+
+acct-user_add_deps
diff --git a/acct-user/registry/registry-0-r1.ebuild b/acct-user/registry/registry-0-r1.ebuild
new file mode 100644
index 000000000000..0542f5c6e243
--- /dev/null
+++ b/acct-user/registry/registry-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-containers/docker-registry"
+
+ACCT_USER_GROUPS=( "registry" )
+ACCT_USER_ID="295"
+
+acct-user_add_deps
diff --git a/acct-user/registry/registry-0.ebuild b/acct-user/registry/registry-0.ebuild
deleted file mode 100644
index 5994a8162973..000000000000
--- a/acct-user/registry/registry-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-containers/docker-registry"
-
-ACCT_USER_GROUPS=( "registry" )
-ACCT_USER_ID="295"
-
-acct-user_add_deps
diff --git a/acct-user/root/root-0-r1.ebuild b/acct-user/root/root-0-r1.ebuild
deleted file mode 100644
index ea2e82dfcf29..000000000000
--- a/acct-user/root/root-0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=0
-ACCT_USER_ENFORCE_ID=yes
-ACCT_USER_SHELL="/bin/bash"
-ACCT_USER_HOME="/root"
-ACCT_USER_HOME_PERMS=0700
-ACCT_USER_GROUPS=( root )
-
-# Avoid reverting changes by the sysadmin.
-# https://bugs.gentoo.org/827813
-ACCT_USER_NO_MODIFY=1
-
-acct-user_add_deps
-
-pkg_prerm() {
-	# Don't lock out the superuser
-	:
-}
diff --git a/acct-user/root/root-0-r2.ebuild b/acct-user/root/root-0-r2.ebuild
new file mode 100644
index 000000000000..886f46d01e36
--- /dev/null
+++ b/acct-user/root/root-0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=0
+ACCT_USER_ENFORCE_ID=yes
+ACCT_USER_SHELL="/bin/bash"
+ACCT_USER_HOME="/root"
+ACCT_USER_HOME_PERMS=0700
+ACCT_USER_GROUPS=( root )
+
+# Avoid reverting changes by the sysadmin.
+# https://bugs.gentoo.org/827813
+ACCT_USER_NO_MODIFY=1
+
+acct-user_add_deps
+
+pkg_prerm() {
+	# Don't lock out the superuser
+	:
+}
diff --git a/acct-user/rplayd/rplayd-0-r1.ebuild b/acct-user/rplayd/rplayd-0-r1.ebuild
new file mode 100644
index 000000000000..d181450d048f
--- /dev/null
+++ b/acct-user/rplayd/rplayd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/rplay"
+
+ACCT_USER_GROUPS=( "rplayd" )
+ACCT_USER_ID="161"
+
+acct-user_add_deps
diff --git a/acct-user/rplayd/rplayd-0.ebuild b/acct-user/rplayd/rplayd-0.ebuild
deleted file mode 100644
index d0f4a9ffa47e..000000000000
--- a/acct-user/rplayd/rplayd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/rplay"
-
-ACCT_USER_GROUPS=( "rplayd" )
-ACCT_USER_ID="161"
-
-acct-user_add_deps
diff --git a/acct-user/rrdcached/rrdcached-0-r1.ebuild b/acct-user/rrdcached/rrdcached-0-r1.ebuild
new file mode 100644
index 000000000000..254b5384bb3f
--- /dev/null
+++ b/acct-user/rrdcached/rrdcached-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/rrdtool"
+
+ACCT_USER_HOME="/var/lib/rrdcached"
+ACCT_USER_ID="511"
+ACCT_USER_GROUPS=( "rrdcached" )
+
+acct-user_add_deps
diff --git a/acct-user/rrdcached/rrdcached-0.ebuild b/acct-user/rrdcached/rrdcached-0.ebuild
deleted file mode 100644
index 1ce6ab3ef294..000000000000
--- a/acct-user/rrdcached/rrdcached-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/rrdtool"
-
-ACCT_USER_HOME="/var/lib/rrdcached"
-ACCT_USER_ID="511"
-ACCT_USER_GROUPS=( "rrdcached" )
-
-acct-user_add_deps
diff --git a/acct-user/rslsync/rslsync-0-r1.ebuild b/acct-user/rslsync/rslsync-0-r1.ebuild
new file mode 100644
index 000000000000..58907429b95f
--- /dev/null
+++ b/acct-user/rslsync/rslsync-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-p2p/resilio-sync"
+
+ACCT_USER_GROUPS=( "rslsync" )
+ACCT_USER_HOME="/var/lib/resilio-sync"
+ACCT_USER_HOME_PERMS="0700"
+ACCT_USER_ID="175"
+
+acct-user_add_deps
diff --git a/acct-user/rslsync/rslsync-0.ebuild b/acct-user/rslsync/rslsync-0.ebuild
deleted file mode 100644
index c0b018b0637e..000000000000
--- a/acct-user/rslsync/rslsync-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-p2p/resilio-sync"
-
-ACCT_USER_GROUPS=( "rslsync" )
-ACCT_USER_HOME="/var/lib/resilio-sync"
-ACCT_USER_HOME_PERMS="0700"
-ACCT_USER_ID="175"
-
-acct-user_add_deps
diff --git a/acct-user/rspamd/rspamd-0-r1.ebuild b/acct-user/rspamd/rspamd-0-r1.ebuild
deleted file mode 100644
index 6c9d403c5892..000000000000
--- a/acct-user/rspamd/rspamd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for rspamd - Rapid spam filtering system"
-ACCT_USER_ID=237
-ACCT_USER_GROUPS=( rspamd )
-
-acct-user_add_deps
diff --git a/acct-user/rspamd/rspamd-0-r2.ebuild b/acct-user/rspamd/rspamd-0-r2.ebuild
new file mode 100644
index 000000000000..445b38c43475
--- /dev/null
+++ b/acct-user/rspamd/rspamd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for rspamd - Rapid spam filtering system"
+ACCT_USER_ID=237
+ACCT_USER_GROUPS=( rspamd )
+
+acct-user_add_deps
diff --git a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild b/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
deleted file mode 100644
index a77f8b72ddee..000000000000
--- a/acct-user/rstudio-server/rstudio-server-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for sci-mathematics/rstudio"
-ACCT_USER_ID=466
-ACCT_USER_GROUPS=( rstudio-server )
-
-acct-user_add_deps
diff --git a/acct-user/rstudio-server/rstudio-server-0-r2.ebuild b/acct-user/rstudio-server/rstudio-server-0-r2.ebuild
new file mode 100644
index 000000000000..bc297edcdd2d
--- /dev/null
+++ b/acct-user/rstudio-server/rstudio-server-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for sci-mathematics/rstudio"
+ACCT_USER_ID=466
+ACCT_USER_GROUPS=( rstudio-server )
+
+acct-user_add_deps
diff --git a/acct-user/rt/rt-0-r1.ebuild b/acct-user/rt/rt-0-r1.ebuild
new file mode 100644
index 000000000000..ebc3c57938be
--- /dev/null
+++ b/acct-user/rt/rt-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/rt"
+
+ACCT_USER_GROUPS=( "rt" )
+ACCT_USER_ID="126"
+
+acct-user_add_deps
diff --git a/acct-user/rt/rt-0.ebuild b/acct-user/rt/rt-0.ebuild
deleted file mode 100644
index 0cb1f523ec0b..000000000000
--- a/acct-user/rt/rt-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/rt"
-
-ACCT_USER_GROUPS=( "rt" )
-ACCT_USER_ID="126"
-
-acct-user_add_deps
diff --git a/acct-user/rtkit/rtkit-0-r1.ebuild b/acct-user/rtkit/rtkit-0-r1.ebuild
deleted file mode 100644
index 49a940185f8c..000000000000
--- a/acct-user/rtkit/rtkit-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the Realtime Policy and Watchdog Daemon"
-ACCT_USER_ID=133
-ACCT_USER_GROUPS=( rtkit )
-
-acct-user_add_deps
diff --git a/acct-user/rtkit/rtkit-0-r2.ebuild b/acct-user/rtkit/rtkit-0-r2.ebuild
new file mode 100644
index 000000000000..e37c9fff14f8
--- /dev/null
+++ b/acct-user/rtkit/rtkit-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the Realtime Policy and Watchdog Daemon"
+ACCT_USER_ID=133
+ACCT_USER_GROUPS=( rtkit )
+
+acct-user_add_deps
diff --git a/acct-user/rundeck/rundeck-0-r1.ebuild b/acct-user/rundeck/rundeck-0-r1.ebuild
new file mode 100644
index 000000000000..076ebd251f6a
--- /dev/null
+++ b/acct-user/rundeck/rundeck-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/rundeck-bin"
+
+ACCT_USER_ID=109
+ACCT_USER_HOME=/var/lib/rundeck
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_GROUPS=( rundeck )
+
+acct-user_add_deps
diff --git a/acct-user/rundeck/rundeck-0.ebuild b/acct-user/rundeck/rundeck-0.ebuild
deleted file mode 100644
index 9c34344b34ff..000000000000
--- a/acct-user/rundeck/rundeck-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/rundeck-bin"
-
-ACCT_USER_ID=109
-ACCT_USER_HOME=/var/lib/rundeck
-ACCT_USER_SHELL=/bin/bash
-ACCT_USER_GROUPS=( rundeck )
-
-acct-user_add_deps
diff --git a/acct-user/rwhoisd/rwhoisd-0-r1.ebuild b/acct-user/rwhoisd/rwhoisd-0-r1.ebuild
new file mode 100644
index 000000000000..7bb46f1728e4
--- /dev/null
+++ b/acct-user/rwhoisd/rwhoisd-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/rwhoisd"
+
+ACCT_USER_GROUPS=( "rwhoisd" )
+ACCT_USER_HOME="/var/rwhoisd"
+ACCT_USER_ID="258"
+
+acct-user_add_deps
diff --git a/acct-user/rwhoisd/rwhoisd-0.ebuild b/acct-user/rwhoisd/rwhoisd-0.ebuild
deleted file mode 100644
index b7b112a8db4a..000000000000
--- a/acct-user/rwhoisd/rwhoisd-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/rwhoisd"
-
-ACCT_USER_GROUPS=( "rwhoisd" )
-ACCT_USER_HOME="/var/rwhoisd"
-ACCT_USER_ID="258"
-
-acct-user_add_deps
diff --git a/acct-user/sabnzbd/sabnzbd-0-r1.ebuild b/acct-user/sabnzbd/sabnzbd-0-r1.ebuild
deleted file mode 100644
index ee5b6e7c09f5..000000000000
--- a/acct-user/sabnzbd/sabnzbd-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="SABnzbd program user"
-
-ACCT_USER_ID=397
-ACCT_USER_HOME="/var/lib/${PN}"
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( sabnzbd )
-
-acct-user_add_deps
diff --git a/acct-user/sabnzbd/sabnzbd-0-r2.ebuild b/acct-user/sabnzbd/sabnzbd-0-r2.ebuild
new file mode 100644
index 000000000000..271ae1c22ae7
--- /dev/null
+++ b/acct-user/sabnzbd/sabnzbd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="SABnzbd program user"
+
+ACCT_USER_ID=397
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( sabnzbd )
+
+acct-user_add_deps
diff --git a/acct-user/sagan/sagan-0-r1.ebuild b/acct-user/sagan/sagan-0-r1.ebuild
deleted file mode 100644
index 9ad8931530f3..000000000000
--- a/acct-user/sagan/sagan-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the Sagan log monitoring system"
-ACCT_USER_ID=317
-ACCT_USER_GROUPS=( sagan )
-
-acct-user_add_deps
diff --git a/acct-user/sagan/sagan-0-r2.ebuild b/acct-user/sagan/sagan-0-r2.ebuild
new file mode 100644
index 000000000000..4f81071a3b94
--- /dev/null
+++ b/acct-user/sagan/sagan-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the Sagan log monitoring system"
+ACCT_USER_ID=317
+ACCT_USER_GROUPS=( sagan )
+
+acct-user_add_deps
diff --git a/acct-user/samplicator/samplicator-0-r1.ebuild b/acct-user/samplicator/samplicator-0-r1.ebuild
new file mode 100644
index 000000000000..7b60d91482a0
--- /dev/null
+++ b/acct-user/samplicator/samplicator-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/samplicator"
+
+ACCT_USER_GROUPS=( "samplicator" )
+ACCT_USER_HOME="/etc/samplicator"
+ACCT_USER_ID="179"
+
+acct-user_add_deps
diff --git a/acct-user/samplicator/samplicator-0.ebuild b/acct-user/samplicator/samplicator-0.ebuild
deleted file mode 100644
index cbdb6485cf39..000000000000
--- a/acct-user/samplicator/samplicator-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/samplicator"
-
-ACCT_USER_GROUPS=( "samplicator" )
-ACCT_USER_HOME="/etc/samplicator"
-ACCT_USER_ID="179"
-
-acct-user_add_deps
diff --git a/acct-user/sancp/sancp-0-r1.ebuild b/acct-user/sancp/sancp-0-r1.ebuild
new file mode 100644
index 000000000000..012908badf47
--- /dev/null
+++ b/acct-user/sancp/sancp-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-analyzer/sancp"
+ACCT_USER_ID=382
+ACCT_USER_GROUPS=( sancp )
+
+acct-user_add_deps
diff --git a/acct-user/sancp/sancp-0.ebuild b/acct-user/sancp/sancp-0.ebuild
deleted file mode 100644
index 804e4057270e..000000000000
--- a/acct-user/sancp/sancp-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-analyzer/sancp"
-ACCT_USER_ID=382
-ACCT_USER_GROUPS=( sancp )
-
-acct-user_add_deps
diff --git a/acct-user/saned/saned-0-r1.ebuild b/acct-user/saned/saned-0-r1.ebuild
new file mode 100644
index 000000000000..43a593335a48
--- /dev/null
+++ b/acct-user/saned/saned-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for media-gfx/sane-backends"
+
+ACCT_USER_GROUPS=( "scanner" )
+ACCT_USER_ID="409"
+
+acct-user_add_deps
diff --git a/acct-user/saned/saned-0.ebuild b/acct-user/saned/saned-0.ebuild
deleted file mode 100644
index cf6954c61297..000000000000
--- a/acct-user/saned/saned-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for media-gfx/sane-backends"
-
-ACCT_USER_GROUPS=( "scanner" )
-ACCT_USER_ID="409"
-
-acct-user_add_deps
diff --git a/acct-user/sanlock/sanlock-0-r1.ebuild b/acct-user/sanlock/sanlock-0-r1.ebuild
deleted file mode 100644
index 839e34bd9bc5..000000000000
--- a/acct-user/sanlock/sanlock-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="shared storage lock manager"
-ACCT_USER_ID=340
-ACCT_USER_HOME=/dev/null
-ACCT_USER_GROUPS=( ${PN} disk )
-
-acct-user_add_deps
diff --git a/acct-user/sanlock/sanlock-0-r2.ebuild b/acct-user/sanlock/sanlock-0-r2.ebuild
new file mode 100644
index 000000000000..8a98a7cacb31
--- /dev/null
+++ b/acct-user/sanlock/sanlock-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="shared storage lock manager"
+ACCT_USER_ID=340
+ACCT_USER_HOME=/dev/null
+ACCT_USER_GROUPS=( ${PN} disk )
+
+acct-user_add_deps
diff --git a/acct-user/sauerbraten/sauerbraten-0-r1.ebuild b/acct-user/sauerbraten/sauerbraten-0-r1.ebuild
deleted file mode 100644
index 1e35c084b798..000000000000
--- a/acct-user/sauerbraten/sauerbraten-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
-ACCT_USER_ID=286
-ACCT_USER_GROUPS=( sauerbraten )
-
-acct-user_add_deps
diff --git a/acct-user/sauerbraten/sauerbraten-0-r2.ebuild b/acct-user/sauerbraten/sauerbraten-0-r2.ebuild
new file mode 100644
index 000000000000..657f44fd672f
--- /dev/null
+++ b/acct-user/sauerbraten/sauerbraten-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Group for Sauerbraten (FOSS game engine (Cube 2))"
+ACCT_USER_ID=286
+ACCT_USER_GROUPS=( sauerbraten )
+
+acct-user_add_deps
diff --git a/acct-user/scanlogd/scanlogd-0-r1.ebuild b/acct-user/scanlogd/scanlogd-0-r1.ebuild
new file mode 100644
index 000000000000..9e823b440fbc
--- /dev/null
+++ b/acct-user/scanlogd/scanlogd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/scanlogd"
+
+ACCT_USER_GROUPS=( "scanlogd" )
+ACCT_USER_ID="166"
+
+acct-user_add_deps
diff --git a/acct-user/scanlogd/scanlogd-0.ebuild b/acct-user/scanlogd/scanlogd-0.ebuild
deleted file mode 100644
index 21ec18b7a255..000000000000
--- a/acct-user/scanlogd/scanlogd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/scanlogd"
-
-ACCT_USER_GROUPS=( "scanlogd" )
-ACCT_USER_ID="166"
-
-acct-user_add_deps
diff --git a/acct-user/scponly/scponly-0-r1.ebuild b/acct-user/scponly/scponly-0-r1.ebuild
deleted file mode 100644
index 329ccf735996..000000000000
--- a/acct-user/scponly/scponly-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for chrooted scponly"
-ACCT_USER_ID=239
-ACCT_USER_GROUPS=( scponly )
-# Not a typo.  scponly uses the trailing // to identify the chroot dir.
-ACCT_USER_HOME=/var/chroot/scponly//
-ACCT_USER_HOME_OWNER=root:root
-
-acct-user_add_deps
diff --git a/acct-user/scponly/scponly-0-r2.ebuild b/acct-user/scponly/scponly-0-r2.ebuild
new file mode 100644
index 000000000000..ed12f0b4e2c6
--- /dev/null
+++ b/acct-user/scponly/scponly-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for chrooted scponly"
+ACCT_USER_ID=239
+ACCT_USER_GROUPS=( scponly )
+# Not a typo.  scponly uses the trailing // to identify the chroot dir.
+ACCT_USER_HOME=/var/chroot/scponly//
+ACCT_USER_HOME_OWNER=root:root
+
+acct-user_add_deps
diff --git a/acct-user/sddm/sddm-0-r1.ebuild b/acct-user/sddm/sddm-0-r1.ebuild
new file mode 100644
index 000000000000..ee5313288ddd
--- /dev/null
+++ b/acct-user/sddm/sddm-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for x11-misc/sddm"
+
+ACCT_USER_GROUPS=( "sddm" "video" )
+ACCT_USER_HOME="/var/lib/sddm"
+ACCT_USER_ID="219"
+
+acct-user_add_deps
diff --git a/acct-user/sddm/sddm-0.ebuild b/acct-user/sddm/sddm-0.ebuild
deleted file mode 100644
index dbfdeb4679ec..000000000000
--- a/acct-user/sddm/sddm-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for x11-misc/sddm"
-
-ACCT_USER_GROUPS=( "sddm" "video" )
-ACCT_USER_HOME="/var/lib/sddm"
-ACCT_USER_ID="219"
-
-acct-user_add_deps
diff --git a/acct-user/sendpage/sendpage-0-r1.ebuild b/acct-user/sendpage/sendpage-0-r1.ebuild
new file mode 100644
index 000000000000..b0fc5897e520
--- /dev/null
+++ b/acct-user/sendpage/sendpage-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dialup/sendpage"
+
+ACCT_USER_GROUPS=( "sms" )
+ACCT_USER_ID="406"
+
+acct-user_add_deps
diff --git a/acct-user/sendpage/sendpage-0.ebuild b/acct-user/sendpage/sendpage-0.ebuild
deleted file mode 100644
index 02b16c3ad728..000000000000
--- a/acct-user/sendpage/sendpage-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-dialup/sendpage"
-
-ACCT_USER_GROUPS=( "sms" )
-ACCT_USER_ID="406"
-
-acct-user_add_deps
diff --git a/acct-user/serf/serf-0-r1.ebuild b/acct-user/serf/serf-0-r1.ebuild
new file mode 100644
index 000000000000..08b4db34860a
--- /dev/null
+++ b/acct-user/serf/serf-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-admin/serf"
+
+ACCT_USER_HOME=/var/lib/serf
+ACCT_USER_GROUPS=( "serf" )
+ACCT_USER_ID="314"
+
+acct-user_add_deps
diff --git a/acct-user/serf/serf-0.ebuild b/acct-user/serf/serf-0.ebuild
deleted file mode 100644
index 69ba27af0770..000000000000
--- a/acct-user/serf/serf-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-admin/serf"
-
-ACCT_USER_HOME=/var/lib/serf
-ACCT_USER_GROUPS=( "serf" )
-ACCT_USER_ID="314"
-
-acct-user_add_deps
diff --git a/acct-user/sguil/sguil-0-r1.ebuild b/acct-user/sguil/sguil-0-r1.ebuild
new file mode 100644
index 000000000000..9c178d7f2dba
--- /dev/null
+++ b/acct-user/sguil/sguil-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/sguil-sensor"
+
+ACCT_USER_GROUPS=( "sguil" )
+ACCT_USER_HOME="/var/lib/sguil"
+ACCT_USER_ID="165"
+
+acct-user_add_deps
diff --git a/acct-user/sguil/sguil-0.ebuild b/acct-user/sguil/sguil-0.ebuild
deleted file mode 100644
index 01910dcc0edd..000000000000
--- a/acct-user/sguil/sguil-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/sguil-sensor"
-
-ACCT_USER_GROUPS=( "sguil" )
-ACCT_USER_HOME="/var/lib/sguil"
-ACCT_USER_ID="165"
-
-acct-user_add_deps
diff --git a/acct-user/sigh/sigh-0-r1.ebuild b/acct-user/sigh/sigh-0-r1.ebuild
new file mode 100644
index 000000000000..c28ea40470f1
--- /dev/null
+++ b/acct-user/sigh/sigh-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=363
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/sigh/sigh-0.ebuild b/acct-user/sigh/sigh-0.ebuild
deleted file mode 100644
index 13f119b89edf..000000000000
--- a/acct-user/sigh/sigh-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=363
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/sks/sks-0-r1.ebuild b/acct-user/sks/sks-0-r1.ebuild
new file mode 100644
index 000000000000..5844d199183a
--- /dev/null
+++ b/acct-user/sks/sks-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the SKS OpenPGP keyserver"
+ACCT_USER_ID=370
+ACCT_USER_GROUPS=( sks )
+
+acct-user_add_deps
diff --git a/acct-user/sks/sks-0.ebuild b/acct-user/sks/sks-0.ebuild
deleted file mode 100644
index 5f78df813304..000000000000
--- a/acct-user/sks/sks-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the SKS OpenPGP keyserver"
-ACCT_USER_ID=370
-ACCT_USER_GROUPS=( sks )
-
-acct-user_add_deps
diff --git a/acct-user/slurm/slurm-0-r1.ebuild b/acct-user/slurm/slurm-0-r1.ebuild
deleted file mode 100644
index 76604870735c..000000000000
--- a/acct-user/slurm/slurm-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the slurm - Highly Scalable Resource Manager"
-ACCT_USER_ID=400
-ACCT_USER_HOME=/var/lib/slurm
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( slurm )
-
-acct-user_add_deps
diff --git a/acct-user/slurm/slurm-0-r2.ebuild b/acct-user/slurm/slurm-0-r2.ebuild
new file mode 100644
index 000000000000..2a2d155f5fec
--- /dev/null
+++ b/acct-user/slurm/slurm-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the slurm - Highly Scalable Resource Manager"
+ACCT_USER_ID=400
+ACCT_USER_HOME=/var/lib/slurm
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( slurm )
+
+acct-user_add_deps
diff --git a/acct-user/smmsp/smmsp-0-r2.ebuild b/acct-user/smmsp/smmsp-0-r2.ebuild
deleted file mode 100644
index e0eda5440e18..000000000000
--- a/acct-user/smmsp/smmsp-0-r2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for sendmail daemon"
-ACCT_USER_ID=209
-ACCT_USER_GROUPS=( smmsp )
-
-acct-user_add_deps
diff --git a/acct-user/smmsp/smmsp-0-r3.ebuild b/acct-user/smmsp/smmsp-0-r3.ebuild
new file mode 100644
index 000000000000..8a12ba2c6cc4
--- /dev/null
+++ b/acct-user/smmsp/smmsp-0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for sendmail daemon"
+ACCT_USER_ID=209
+ACCT_USER_GROUPS=( smmsp )
+
+acct-user_add_deps
diff --git a/acct-user/smokeping/smokeping-0-r1.ebuild b/acct-user/smokeping/smokeping-0-r1.ebuild
new file mode 100644
index 000000000000..e53ca960d5b6
--- /dev/null
+++ b/acct-user/smokeping/smokeping-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/smokeping"
+
+ACCT_USER_GROUPS=( "smokeping" )
+ACCT_USER_HOME="/var/lib/smokeping"
+ACCT_USER_ID="164"
+
+acct-user_add_deps
diff --git a/acct-user/smokeping/smokeping-0.ebuild b/acct-user/smokeping/smokeping-0.ebuild
deleted file mode 100644
index b3c157563d54..000000000000
--- a/acct-user/smokeping/smokeping-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-analyzer/smokeping"
-
-ACCT_USER_GROUPS=( "smokeping" )
-ACCT_USER_HOME="/var/lib/smokeping"
-ACCT_USER_ID="164"
-
-acct-user_add_deps
diff --git a/acct-user/smsd/smsd-0-r1.ebuild b/acct-user/smsd/smsd-0-r1.ebuild
new file mode 100644
index 000000000000..69987ac6919d
--- /dev/null
+++ b/acct-user/smsd/smsd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=359
+ACCT_USER_GROUPS=( sms )
+ACCT_USER_HOME=/var/spool/sms
+
+acct-user_add_deps
diff --git a/acct-user/smsd/smsd-0.ebuild b/acct-user/smsd/smsd-0.ebuild
deleted file mode 100644
index ecad0ea94087..000000000000
--- a/acct-user/smsd/smsd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=359
-ACCT_USER_GROUPS=( sms )
-ACCT_USER_HOME=/var/spool/sms
-
-acct-user_add_deps
diff --git a/acct-user/smtpd/smtpd-0-r1.ebuild b/acct-user/smtpd/smtpd-0-r1.ebuild
deleted file mode 100644
index 1a15db05401e..000000000000
--- a/acct-user/smtpd/smtpd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="daemon user for smtpd"
-ACCT_USER_ID=25
-ACCT_USER_GROUPS=( smtpd )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/smtpd/smtpd-0-r2.ebuild b/acct-user/smtpd/smtpd-0-r2.ebuild
new file mode 100644
index 000000000000..58eb0dfaa32e
--- /dev/null
+++ b/acct-user/smtpd/smtpd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="daemon user for smtpd"
+ACCT_USER_ID=25
+ACCT_USER_GROUPS=( smtpd )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/smtpq/smtpq-0-r1.ebuild b/acct-user/smtpq/smtpq-0-r1.ebuild
deleted file mode 100644
index 6ba87dc3739b..000000000000
--- a/acct-user/smtpq/smtpq-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="queue user for smtpd"
-ACCT_USER_ID=252
-ACCT_USER_GROUPS=( smtpq )
-ACCT_USER_HOME=/var/empty
-
-acct-user_add_deps
diff --git a/acct-user/smtpq/smtpq-0-r2.ebuild b/acct-user/smtpq/smtpq-0-r2.ebuild
new file mode 100644
index 000000000000..fcf4136aa1eb
--- /dev/null
+++ b/acct-user/smtpq/smtpq-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="queue user for smtpd"
+ACCT_USER_ID=252
+ACCT_USER_GROUPS=( smtpq )
+ACCT_USER_HOME=/var/empty
+
+acct-user_add_deps
diff --git a/acct-user/snapclient/snapclient-0-r1.ebuild b/acct-user/snapclient/snapclient-0-r1.ebuild
new file mode 100644
index 000000000000..8d1da6fe79b3
--- /dev/null
+++ b/acct-user/snapclient/snapclient-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Client user for media-sound/snapcast"
+
+ACCT_USER_GROUPS=( "audio" )
+ACCT_USER_HOME_OWNER="snapserver"
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_ID=373
+
+acct-user_add_deps
diff --git a/acct-user/snapclient/snapclient-0.ebuild b/acct-user/snapclient/snapclient-0.ebuild
deleted file mode 100644
index 9bd49cef21f7..000000000000
--- a/acct-user/snapclient/snapclient-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Client user for media-sound/snapcast"
-
-ACCT_USER_GROUPS=( "audio" )
-ACCT_USER_HOME_OWNER="snapserver"
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_ID=373
-
-acct-user_add_deps
diff --git a/acct-user/snapserver/snapserver-0.ebuild b/acct-user/snapserver/snapserver-0-r1.ebuild
similarity index 100%
rename from acct-user/snapserver/snapserver-0.ebuild
rename to acct-user/snapserver/snapserver-0-r1.ebuild
diff --git a/acct-user/sndiod/sndiod-0-r1.ebuild b/acct-user/sndiod/sndiod-0-r1.ebuild
new file mode 100644
index 000000000000..5e796716760b
--- /dev/null
+++ b/acct-user/sndiod/sndiod-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Daemon user for sndio"
+ACCT_USER_ID=461
+ACCT_USER_GROUPS=( audio )
+
+acct-user_add_deps
diff --git a/acct-user/sndiod/sndiod-0.ebuild b/acct-user/sndiod/sndiod-0.ebuild
deleted file mode 100644
index 19dbeba029c6..000000000000
--- a/acct-user/sndiod/sndiod-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Daemon user for sndio"
-ACCT_USER_ID=461
-ACCT_USER_GROUPS=( audio )
-
-acct-user_add_deps
diff --git a/acct-user/sniproxy/sniproxy-0-r1.ebuild b/acct-user/sniproxy/sniproxy-0-r1.ebuild
new file mode 100644
index 000000000000..5bda56cd6a17
--- /dev/null
+++ b/acct-user/sniproxy/sniproxy-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=366
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/sniproxy/sniproxy-0.ebuild b/acct-user/sniproxy/sniproxy-0.ebuild
deleted file mode 100644
index d7566da9196d..000000000000
--- a/acct-user/sniproxy/sniproxy-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=366
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild b/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..f1b3d5a78eab
--- /dev/null
+++ b/acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/snmp_exporter"
+
+ACCT_USER_ID=108
+ACCT_USER_GROUPS=( snmp_exporter )
+
+acct-user_add_deps
diff --git a/acct-user/snmp_exporter/snmp_exporter-0.ebuild b/acct-user/snmp_exporter/snmp_exporter-0.ebuild
deleted file mode 100644
index cc920e57202e..000000000000
--- a/acct-user/snmp_exporter/snmp_exporter-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/snmp_exporter"
-
-ACCT_USER_ID=108
-ACCT_USER_GROUPS=( snmp_exporter )
-
-acct-user_add_deps
diff --git a/acct-user/snort/snort-0-r1.ebuild b/acct-user/snort/snort-0-r1.ebuild
new file mode 100644
index 000000000000..6b52f5bbce84
--- /dev/null
+++ b/acct-user/snort/snort-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for snort"
+ACCT_USER_ID=328
+ACCT_USER_GROUPS=( snort )
+
+acct-user_add_deps
diff --git a/acct-user/snort/snort-0.ebuild b/acct-user/snort/snort-0.ebuild
deleted file mode 100644
index 553fa786a9b0..000000000000
--- a/acct-user/snort/snort-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for snort"
-ACCT_USER_ID=328
-ACCT_USER_GROUPS=( snort )
-
-acct-user_add_deps
diff --git a/acct-user/sobby/sobby-0-r1.ebuild b/acct-user/sobby/sobby-0-r1.ebuild
new file mode 100644
index 000000000000..4a8e1a4efd95
--- /dev/null
+++ b/acct-user/sobby/sobby-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running sobby"
+ACCT_USER_ID=322
+ACCT_USER_GROUPS=( sobby )
+ACCT_USER_HOME=/var/lib/sobby
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/sobby/sobby-0.ebuild b/acct-user/sobby/sobby-0.ebuild
deleted file mode 100644
index e3bb30a78d14..000000000000
--- a/acct-user/sobby/sobby-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for running sobby"
-ACCT_USER_ID=322
-ACCT_USER_GROUPS=( sobby )
-ACCT_USER_HOME=/var/lib/sobby
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/sobexsrv/sobexsrv-0-r1.ebuild b/acct-user/sobexsrv/sobexsrv-0-r1.ebuild
new file mode 100644
index 000000000000..fab5653ea299
--- /dev/null
+++ b/acct-user/sobexsrv/sobexsrv-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sobexsrv: a secure OBEX server"
+ACCT_USER_ID=387
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME="/var/spool/sobexsrv"
+
+acct-user_add_deps
diff --git a/acct-user/sobexsrv/sobexsrv-0.ebuild b/acct-user/sobexsrv/sobexsrv-0.ebuild
deleted file mode 100644
index 613bd931349c..000000000000
--- a/acct-user/sobexsrv/sobexsrv-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sobexsrv: a secure OBEX server"
-ACCT_USER_ID=387
-ACCT_USER_GROUPS=( ${PN} )
-ACCT_USER_HOME="/var/spool/sobexsrv"
-
-acct-user_add_deps
diff --git a/acct-user/sockd/sockd-0-r1.ebuild b/acct-user/sockd/sockd-0-r1.ebuild
deleted file mode 100644
index 2b3b94b74510..000000000000
--- a/acct-user/sockd/sockd-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-proxy/dante"
-
-ACCT_USER_GROUPS=( "sockd" )
-ACCT_USER_ID="214"
-
-acct-user_add_deps
diff --git a/acct-user/sockd/sockd-0-r2.ebuild b/acct-user/sockd/sockd-0-r2.ebuild
new file mode 100644
index 000000000000..582e473c1667
--- /dev/null
+++ b/acct-user/sockd/sockd-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-proxy/dante"
+
+ACCT_USER_GROUPS=( "sockd" )
+ACCT_USER_ID="214"
+
+acct-user_add_deps
diff --git a/acct-user/sogo/sogo-0-r1.ebuild b/acct-user/sogo/sogo-0-r1.ebuild
deleted file mode 100644
index bb9f732e18a1..000000000000
--- a/acct-user/sogo/sogo-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for gnustep-apps/sogo"
-ACCT_USER_ID=475
-ACCT_USER_GROUPS=( sogo )
-ACCT_USER_HOME="/var/lib/sogo"
-ACCT_USER_SHELL=/bin/bash
-
-acct-user_add_deps
diff --git a/acct-user/sogo/sogo-0-r2.ebuild b/acct-user/sogo/sogo-0-r2.ebuild
new file mode 100644
index 000000000000..47590bc2fc6d
--- /dev/null
+++ b/acct-user/sogo/sogo-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for gnustep-apps/sogo"
+ACCT_USER_ID=475
+ACCT_USER_GROUPS=( sogo )
+ACCT_USER_HOME="/var/lib/sogo"
+ACCT_USER_SHELL=/bin/bash
+
+acct-user_add_deps
diff --git a/acct-user/soju/soju-0-r1.ebuild b/acct-user/soju/soju-0-r1.ebuild
new file mode 100644
index 000000000000..73240ed21963
--- /dev/null
+++ b/acct-user/soju/soju-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_USER_ID=526
+ACCT_USER_HOME=/var/lib/soju
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( soju )
+
+acct-user_add_deps
diff --git a/acct-user/soju/soju-0.ebuild b/acct-user/soju/soju-0.ebuild
deleted file mode 100644
index 2ca7f2de748b..000000000000
--- a/acct-user/soju/soju-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the net-irc/soju IRC bouncer"
-ACCT_USER_ID=526
-ACCT_USER_HOME=/var/lib/soju
-ACCT_USER_HOME_PERMS=0755
-ACCT_USER_GROUPS=( soju )
-
-acct-user_add_deps
diff --git a/acct-user/sonarr/sonarr-0-r1.ebuild b/acct-user/sonarr/sonarr-0-r1.ebuild
new file mode 100644
index 000000000000..7343294d3a08
--- /dev/null
+++ b/acct-user/sonarr/sonarr-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for sonarr"
+ACCT_USER_HOME=/var/lib/sonarr
+ACCT_USER_ID=515
+ACCT_USER_GROUPS=( sonarr )
+
+acct-user_add_deps
diff --git a/acct-user/sonarr/sonarr-0.ebuild b/acct-user/sonarr/sonarr-0.ebuild
deleted file mode 100644
index 1cae0d6f268f..000000000000
--- a/acct-user/sonarr/sonarr-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for sonarr"
-ACCT_USER_HOME=/var/lib/sonarr
-ACCT_USER_ID=515
-ACCT_USER_GROUPS=( sonarr )
-
-acct-user_add_deps
diff --git a/acct-user/spamd/spamd-0-r1.ebuild b/acct-user/spamd/spamd-0-r1.ebuild
deleted file mode 100644
index e4fcb0a0378a..000000000000
--- a/acct-user/spamd/spamd-0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the SpamAssassin daemon"
-
-ACCT_USER_ID=337
-ACCT_USER_GROUPS=( "${PN}" )
-# The spamd daemon runs as this user. Use a real home directory so
-# that it can hold SA configuration.
-#
-# Since spamd's home contains user-modifiable config files, it's
-# a violation of the Linux FHS for it to be here, but it's been
-# decided it can't be in /home/.
-#
-# - https://github.com/gentoo/gentoo/pull/14055#issuecomment-582929503
-# - https://archives.gentoo.org/gentoo-dev/message/790294f7a46496aecd0056289c4b6d08
-#
-ACCT_USER_HOME="/var/lib/spamd"
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/spamd/spamd-0-r2.ebuild b/acct-user/spamd/spamd-0-r2.ebuild
new file mode 100644
index 000000000000..0b184739667c
--- /dev/null
+++ b/acct-user/spamd/spamd-0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the SpamAssassin daemon"
+
+ACCT_USER_ID=337
+ACCT_USER_GROUPS=( "${PN}" )
+# The spamd daemon runs as this user. Use a real home directory so
+# that it can hold SA configuration.
+#
+# Since spamd's home contains user-modifiable config files, it's
+# a violation of the Linux FHS for it to be here, but it's been
+# decided it can't be in /home/.
+#
+# - https://github.com/gentoo/gentoo/pull/14055#issuecomment-582929503
+# - https://archives.gentoo.org/gentoo-dev/message/790294f7a46496aecd0056289c4b6d08
+#
+ACCT_USER_HOME="/var/lib/spamd"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/spectrum/spectrum-0-r1.ebuild b/acct-user/spectrum/spectrum-0-r1.ebuild
deleted file mode 100644
index 08902275a61d..000000000000
--- a/acct-user/spectrum/spectrum-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the Spectrum messaging transport"
-
-ACCT_USER_GROUPS=( "spectrum" )
-ACCT_USER_HOME="/var/lib/spectrum2"
-ACCT_USER_ID="486"
-
-acct-user_add_deps
diff --git a/acct-user/spectrum/spectrum-0-r2.ebuild b/acct-user/spectrum/spectrum-0-r2.ebuild
new file mode 100644
index 000000000000..54a2098366ef
--- /dev/null
+++ b/acct-user/spectrum/spectrum-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Spectrum messaging transport"
+
+ACCT_USER_GROUPS=( "spectrum" )
+ACCT_USER_HOME="/var/lib/spectrum2"
+ACCT_USER_ID="486"
+
+acct-user_add_deps
diff --git a/acct-user/spire/spire-0-r1.ebuild b/acct-user/spire/spire-0-r1.ebuild
deleted file mode 100644
index da8dc43e7824..000000000000
--- a/acct-user/spire/spire-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for spiffe runtime environment"
-ACCT_USER_ID=271
-ACCT_USER_GROUPS=( spire )
-
-acct-user_add_deps
diff --git a/acct-user/spire/spire-0-r2.ebuild b/acct-user/spire/spire-0-r2.ebuild
new file mode 100644
index 000000000000..18e15e27892e
--- /dev/null
+++ b/acct-user/spire/spire-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for spiffe runtime environment"
+ACCT_USER_ID=271
+ACCT_USER_GROUPS=( spire )
+
+acct-user_add_deps
diff --git a/acct-user/spread/spread-0-r1.ebuild b/acct-user/spread/spread-0-r1.ebuild
new file mode 100644
index 000000000000..14694ac04946
--- /dev/null
+++ b/acct-user/spread/spread-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/spread"
+
+ACCT_USER_GROUPS=( "spread" )
+ACCT_USER_ID="159"
+
+acct-user_add_deps
diff --git a/acct-user/spread/spread-0.ebuild b/acct-user/spread/spread-0.ebuild
deleted file mode 100644
index 25e453efacf3..000000000000
--- a/acct-user/spread/spread-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/spread"
-
-ACCT_USER_GROUPS=( "spread" )
-ACCT_USER_ID="159"
-
-acct-user_add_deps
diff --git a/acct-user/sqlgrey/sqlgrey-0-r1.ebuild b/acct-user/sqlgrey/sqlgrey-0-r1.ebuild
deleted file mode 100644
index b0a125d82524..000000000000
--- a/acct-user/sqlgrey/sqlgrey-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for SQLGrey"
-
-ACCT_USER_ID=336
-ACCT_USER_GROUPS=( sqlgrey )
-ACCT_USER_HOME="/var/spool/sqlgrey"
-
-acct-user_add_deps
diff --git a/acct-user/sqlgrey/sqlgrey-0-r2.ebuild b/acct-user/sqlgrey/sqlgrey-0-r2.ebuild
new file mode 100644
index 000000000000..097a202f2595
--- /dev/null
+++ b/acct-user/sqlgrey/sqlgrey-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for SQLGrey"
+
+ACCT_USER_ID=336
+ACCT_USER_GROUPS=( sqlgrey )
+ACCT_USER_HOME="/var/spool/sqlgrey"
+
+acct-user_add_deps
diff --git a/acct-user/squid/squid-0-r1.ebuild b/acct-user/squid/squid-0-r1.ebuild
deleted file mode 100644
index 97e03021f293..000000000000
--- a/acct-user/squid/squid-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for squid web proxy cache"
-ACCT_USER_ID=301
-ACCT_USER_HOME=/var/cache/squid
-ACCT_USER_GROUPS=( squid )
-
-acct-user_add_deps
diff --git a/acct-user/squid/squid-0-r2.ebuild b/acct-user/squid/squid-0-r2.ebuild
new file mode 100644
index 000000000000..e009bd51a92d
--- /dev/null
+++ b/acct-user/squid/squid-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for squid web proxy cache"
+ACCT_USER_ID=301
+ACCT_USER_HOME=/var/cache/squid
+ACCT_USER_GROUPS=( squid )
+
+acct-user_add_deps
diff --git a/acct-user/sshd/sshd-0-r1.ebuild b/acct-user/sshd/sshd-0-r1.ebuild
deleted file mode 100644
index 06703c1956ba..000000000000
--- a/acct-user/sshd/sshd-0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ssh"
-
-ACCT_USER_ID=22
-ACCT_USER_HOME=/var/empty
-ACCT_USER_HOME_OWNER=root:root
-ACCT_USER_GROUPS=( sshd )
-
-acct-user_add_deps
diff --git a/acct-user/sshd/sshd-0-r2.ebuild b/acct-user/sshd/sshd-0-r2.ebuild
new file mode 100644
index 000000000000..1f398feda6db
--- /dev/null
+++ b/acct-user/sshd/sshd-0-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ssh"
+
+ACCT_USER_ID=22
+ACCT_USER_HOME=/var/empty
+ACCT_USER_HOME_OWNER=root:root
+ACCT_USER_GROUPS=( sshd )
+
+acct-user_add_deps
diff --git a/acct-user/sstpc/sstpc-0-r1.ebuild b/acct-user/sstpc/sstpc-0-r1.ebuild
new file mode 100644
index 000000000000..177d09eeb1f7
--- /dev/null
+++ b/acct-user/sstpc/sstpc-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/sstp-client"
+
+ACCT_USER_GROUPS=( "sstpc" )
+ACCT_USER_ID="257"
+
+acct-user_add_deps
diff --git a/acct-user/sstpc/sstpc-0.ebuild b/acct-user/sstpc/sstpc-0.ebuild
deleted file mode 100644
index 328b3ce93fc7..000000000000
--- a/acct-user/sstpc/sstpc-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/sstp-client"
-
-ACCT_USER_GROUPS=( "sstpc" )
-ACCT_USER_ID="257"
-
-acct-user_add_deps
diff --git a/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild b/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild
new file mode 100644
index 000000000000..7ec9267bc6f2
--- /dev/null
+++ b/acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing discovery server"
+ACCT_USER_ID=497
+ACCT_USER_HOME=/var/lib/syncthing-discosrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local rver
+		for rver in ${REPLACING_VERSIONS} ; do
+			if ver_test "${rver}" -lt 1; then
+				ewarn "The home directory of this user has changed to /var/lib/syncthing-discosrv"
+				ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+				break
+			fi
+		done
+	fi
+}
diff --git a/acct-user/stdiscosrv/stdiscosrv-1.ebuild b/acct-user/stdiscosrv/stdiscosrv-1.ebuild
deleted file mode 100644
index fc1db7a4a130..000000000000
--- a/acct-user/stdiscosrv/stdiscosrv-1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Syncthing discovery server"
-ACCT_USER_ID=497
-ACCT_USER_HOME=/var/lib/syncthing-discosrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		local rver
-		for rver in ${REPLACING_VERSIONS} ; do
-			if ver_test "${rver}" -lt 1; then
-				ewarn "The home directory of this user has changed to /var/lib/syncthing-discosrv"
-				ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
-				break
-			fi
-		done
-	fi
-}
diff --git a/acct-user/steamcmd/steamcmd-0-r1.ebuild b/acct-user/steamcmd/steamcmd-0-r1.ebuild
deleted file mode 100644
index d86f0daa649d..000000000000
--- a/acct-user/steamcmd/steamcmd-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the SteamCMD server"
-
-ACCT_USER_GROUPS=( "steamcmd" )
-ACCT_USER_HOME="/opt/steamcmd"
-ACCT_USER_ID="489"
-
-acct-user_add_deps
diff --git a/acct-user/steamcmd/steamcmd-0-r2.ebuild b/acct-user/steamcmd/steamcmd-0-r2.ebuild
new file mode 100644
index 000000000000..c587360a5303
--- /dev/null
+++ b/acct-user/steamcmd/steamcmd-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the SteamCMD server"
+
+ACCT_USER_GROUPS=( "steamcmd" )
+ACCT_USER_HOME="/opt/steamcmd"
+ACCT_USER_ID="489"
+
+acct-user_add_deps
diff --git a/acct-user/stg/stg-0-r1.ebuild b/acct-user/stg/stg-0-r1.ebuild
new file mode 100644
index 000000000000..5c899c73be93
--- /dev/null
+++ b/acct-user/stg/stg-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/stargazer"
+
+ACCT_USER_GROUPS=( "stg" )
+ACCT_USER_ID="176"
+
+acct-user_add_deps
diff --git a/acct-user/stg/stg-0.ebuild b/acct-user/stg/stg-0.ebuild
deleted file mode 100644
index db254cc77e7e..000000000000
--- a/acct-user/stg/stg-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for net-misc/stargazer"
-
-ACCT_USER_GROUPS=( "stg" )
-ACCT_USER_ID="176"
-
-acct-user_add_deps
diff --git a/acct-user/strelaysrv/strelaysrv-1-r1.ebuild b/acct-user/strelaysrv/strelaysrv-1-r1.ebuild
new file mode 100644
index 000000000000..57f5a650afb1
--- /dev/null
+++ b/acct-user/strelaysrv/strelaysrv-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing relay server"
+ACCT_USER_ID=496
+ACCT_USER_HOME=/var/lib/syncthing-relaysrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local rver
+		for rver in ${REPLACING_VERSIONS} ; do
+			if ver_test "${rver}" -lt 1; then
+				ewarn "The home directory of this user has changed to /var/lib/syncthing-relaysrv"
+				ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+				break
+			fi
+		done
+	fi
+}
diff --git a/acct-user/strelaysrv/strelaysrv-1.ebuild b/acct-user/strelaysrv/strelaysrv-1.ebuild
deleted file mode 100644
index c4b804d8160c..000000000000
--- a/acct-user/strelaysrv/strelaysrv-1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the Syncthing relay server"
-ACCT_USER_ID=496
-ACCT_USER_HOME=/var/lib/syncthing-relaysrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		local rver
-		for rver in ${REPLACING_VERSIONS} ; do
-			if ver_test "${rver}" -lt 1; then
-				ewarn "The home directory of this user has changed to /var/lib/syncthing-relaysrv"
-				ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
-				break
-			fi
-		done
-	fi
-}
diff --git a/acct-user/stubby/stubby-0-r1.ebuild b/acct-user/stubby/stubby-0-r1.ebuild
deleted file mode 100644
index bfc4ccc9dbcc..000000000000
--- a/acct-user/stubby/stubby-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Stubby program user (from net-dns/getdns)"
-ACCT_USER_ID=476
-ACCT_USER_GROUPS=( stubby )
-
-acct-user_add_deps
diff --git a/acct-user/stubby/stubby-0-r2.ebuild b/acct-user/stubby/stubby-0-r2.ebuild
new file mode 100644
index 000000000000..c2edde79f5ef
--- /dev/null
+++ b/acct-user/stubby/stubby-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Stubby program user (from net-dns/getdns)"
+ACCT_USER_ID=476
+ACCT_USER_GROUPS=( stubby )
+
+acct-user_add_deps
diff --git a/acct-user/stunnel/stunnel-0-r1.ebuild b/acct-user/stunnel/stunnel-0-r1.ebuild
deleted file mode 100644
index efd92922c779..000000000000
--- a/acct-user/stunnel/stunnel-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for stunnel"
-ACCT_USER_ID=341
-ACCT_USER_GROUPS=( stunnel )
-
-acct-user_add_deps
diff --git a/acct-user/stunnel/stunnel-0-r2.ebuild b/acct-user/stunnel/stunnel-0-r2.ebuild
new file mode 100644
index 000000000000..06aa05483ac0
--- /dev/null
+++ b/acct-user/stunnel/stunnel-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for stunnel"
+ACCT_USER_ID=341
+ACCT_USER_GROUPS=( stunnel )
+
+acct-user_add_deps
diff --git a/acct-user/subsonic/subsonic-0-r1.ebuild b/acct-user/subsonic/subsonic-0-r1.ebuild
deleted file mode 100644
index 6ca134e7f2a6..000000000000
--- a/acct-user/subsonic/subsonic-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/subsonic-bin"
-
-ACCT_USER_GROUPS=( "subsonic" )
-ACCT_USER_HOME="/var/lib/subsonic"
-ACCT_USER_ID="136"
-
-acct-user_add_deps
diff --git a/acct-user/subsonic/subsonic-0-r2.ebuild b/acct-user/subsonic/subsonic-0-r2.ebuild
new file mode 100644
index 000000000000..c5c61c23e2b7
--- /dev/null
+++ b/acct-user/subsonic/subsonic-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/subsonic-bin"
+
+ACCT_USER_GROUPS=( "subsonic" )
+ACCT_USER_HOME="/var/lib/subsonic"
+ACCT_USER_ID="136"
+
+acct-user_add_deps
diff --git a/acct-user/suricata/suricata-0-r1.ebuild b/acct-user/suricata/suricata-0-r1.ebuild
deleted file mode 100644
index 37142d57f340..000000000000
--- a/acct-user/suricata/suricata-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Suricata IDS"
-ACCT_USER_ID=477
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/suricata/suricata-0-r2.ebuild b/acct-user/suricata/suricata-0-r2.ebuild
new file mode 100644
index 000000000000..8542433ac1cb
--- /dev/null
+++ b/acct-user/suricata/suricata-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Suricata IDS"
+ACCT_USER_ID=477
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/svn/svn-0-r1.ebuild b/acct-user/svn/svn-0-r1.ebuild
deleted file mode 100644
index 6f7d567a7edf..000000000000
--- a/acct-user/svn/svn-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=399
-ACCT_USER_GROUPS=( svnusers )
-
-acct-user_add_deps
diff --git a/acct-user/svn/svn-0-r2.ebuild b/acct-user/svn/svn-0-r2.ebuild
new file mode 100644
index 000000000000..ccadd54c2705
--- /dev/null
+++ b/acct-user/svn/svn-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=399
+ACCT_USER_GROUPS=( svnusers )
+
+acct-user_add_deps
diff --git a/acct-user/svxlink/svxlink-0-r1.ebuild b/acct-user/svxlink/svxlink-0-r1.ebuild
new file mode 100644
index 000000000000..a1db366fdc42
--- /dev/null
+++ b/acct-user/svxlink/svxlink-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the svxlink server"
+ACCT_USER_ID=247
+ACCT_USER_GROUPS=( svxlink )
+
+acct-user_add_deps
diff --git a/acct-user/svxlink/svxlink-0.ebuild b/acct-user/svxlink/svxlink-0.ebuild
deleted file mode 100644
index 347fb69f8eca..000000000000
--- a/acct-user/svxlink/svxlink-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the svxlink server"
-ACCT_USER_ID=247
-ACCT_USER_GROUPS=( svxlink )
-
-acct-user_add_deps
diff --git a/acct-user/swift/swift-0-r1.ebuild b/acct-user/swift/swift-0-r1.ebuild
deleted file mode 100644
index efee86cef2da..000000000000
--- a/acct-user/swift/swift-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="USER for swift - Openstack object storage backend"
-ACCT_USER_ID=449
-ACCT_USER_GROUPS=( swift )
-
-acct-user_add_deps
diff --git a/acct-user/swift/swift-0-r2.ebuild b/acct-user/swift/swift-0-r2.ebuild
new file mode 100644
index 000000000000..f3e36ece0c61
--- /dev/null
+++ b/acct-user/swift/swift-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="USER for swift - Openstack object storage backend"
+ACCT_USER_ID=449
+ACCT_USER_GROUPS=( swift )
+
+acct-user_add_deps
diff --git a/acct-user/synapse/synapse-0-r1.ebuild b/acct-user/synapse/synapse-0-r1.ebuild
new file mode 100644
index 000000000000..ad0ebb7a6709
--- /dev/null
+++ b/acct-user/synapse/synapse-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-im/synapse"
+ACCT_USER_ID=519
+ACCT_USER_GROUPS=( synapse )
+
+acct-user_add_deps
diff --git a/acct-user/synapse/synapse-0.ebuild b/acct-user/synapse/synapse-0.ebuild
deleted file mode 100644
index 0fb650ac5752..000000000000
--- a/acct-user/synapse/synapse-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="A user for net-im/synapse"
-ACCT_USER_ID=519
-ACCT_USER_GROUPS=( synapse )
-
-acct-user_add_deps
diff --git a/acct-user/syncthing/syncthing-0-r1.ebuild b/acct-user/syncthing/syncthing-0-r1.ebuild
deleted file mode 100644
index a97b75e13343..000000000000
--- a/acct-user/syncthing/syncthing-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the system-wide net-p2p/syncthing server"
-ACCT_USER_ID=499
-ACCT_USER_HOME=/var/lib/syncthing
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( syncthing )
-
-acct-user_add_deps
diff --git a/acct-user/syncthing/syncthing-0-r2.ebuild b/acct-user/syncthing/syncthing-0-r2.ebuild
new file mode 100644
index 000000000000..bb5f5ae16039
--- /dev/null
+++ b/acct-user/syncthing/syncthing-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the system-wide net-p2p/syncthing server"
+ACCT_USER_ID=499
+ACCT_USER_HOME=/var/lib/syncthing
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild
deleted file mode 100644
index 24e1948da8c3..000000000000
--- a/acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=194
-ACCT_USER_GROUPS=( systemd-coredump )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild b/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild
new file mode 100644
index 000000000000..c6a2b8a225e9
--- /dev/null
+++ b/acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=194
+ACCT_USER_GROUPS=( systemd-coredump )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
deleted file mode 100644
index b05096297b8b..000000000000
--- a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=191
-ACCT_USER_GROUPS=( systemd-journal-remote )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
new file mode 100644
index 000000000000..79477b5fc172
--- /dev/null
+++ b/acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=191
+ACCT_USER_GROUPS=( systemd-journal-remote )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-network/systemd-network-0-r1.ebuild b/acct-user/systemd-network/systemd-network-0-r1.ebuild
deleted file mode 100644
index bf308627c415..000000000000
--- a/acct-user/systemd-network/systemd-network-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=192
-ACCT_USER_GROUPS=( systemd-network )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-network/systemd-network-0-r2.ebuild b/acct-user/systemd-network/systemd-network-0-r2.ebuild
new file mode 100644
index 000000000000..d4ed5bb35fb1
--- /dev/null
+++ b/acct-user/systemd-network/systemd-network-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=192
+ACCT_USER_GROUPS=( systemd-network )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-oom/systemd-oom-0-r1.ebuild b/acct-user/systemd-oom/systemd-oom-0-r1.ebuild
new file mode 100644
index 000000000000..4cdc4a3944c7
--- /dev/null
+++ b/acct-user/systemd-oom/systemd-oom-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=198
+ACCT_USER_GROUPS=( systemd-oom )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-oom/systemd-oom-0.ebuild b/acct-user/systemd-oom/systemd-oom-0.ebuild
deleted file mode 100644
index 9c3f3e365120..000000000000
--- a/acct-user/systemd-oom/systemd-oom-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=198
-ACCT_USER_GROUPS=( systemd-oom )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild
deleted file mode 100644
index 5eb0b3096dbe..000000000000
--- a/acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=193
-ACCT_USER_GROUPS=( systemd-resolve )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild b/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild
new file mode 100644
index 000000000000..c8316cff5ac1
--- /dev/null
+++ b/acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=193
+ACCT_USER_GROUPS=( systemd-resolve )
+
+acct-user_add_deps
diff --git a/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild
deleted file mode 100644
index 3a09984648ac..000000000000
--- a/acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=195
-ACCT_USER_GROUPS=( systemd-timesync )
-
-acct-user_add_deps
diff --git a/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild b/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild
new file mode 100644
index 000000000000..3f4554bdacbd
--- /dev/null
+++ b/acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=195
+ACCT_USER_GROUPS=( systemd-timesync )
+
+acct-user_add_deps
diff --git a/acct-user/taskd/taskd-0-r1.ebuild b/acct-user/taskd/taskd-0-r1.ebuild
new file mode 100644
index 000000000000..a40214d5f105
--- /dev/null
+++ b/acct-user/taskd/taskd-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/taskd"
+
+ACCT_USER_GROUPS=( "taskd" )
+ACCT_USER_HOME="/var/lib/taskd"
+ACCT_USER_ID="152"
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/taskd/taskd-0.ebuild b/acct-user/taskd/taskd-0.ebuild
deleted file mode 100644
index 013b234af3d5..000000000000
--- a/acct-user/taskd/taskd-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-misc/taskd"
-
-ACCT_USER_GROUPS=( "taskd" )
-ACCT_USER_HOME="/var/lib/taskd"
-ACCT_USER_ID="152"
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/teamspeak/teamspeak-0-r1.ebuild b/acct-user/teamspeak/teamspeak-0-r1.ebuild
deleted file mode 100644
index b0495444ce4f..000000000000
--- a/acct-user/teamspeak/teamspeak-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for the TeamSpeak server"
-
-ACCT_USER_GROUPS=( "teamspeak" )
-ACCT_USER_HOME="/opt/teamspeak3-server"
-ACCT_USER_ID="488"
-
-acct-user_add_deps
diff --git a/acct-user/teamspeak/teamspeak-0-r2.ebuild b/acct-user/teamspeak/teamspeak-0-r2.ebuild
new file mode 100644
index 000000000000..4d3115689ebc
--- /dev/null
+++ b/acct-user/teamspeak/teamspeak-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the TeamSpeak server"
+
+ACCT_USER_GROUPS=( "teamspeak" )
+ACCT_USER_HOME="/opt/teamspeak3-server"
+ACCT_USER_ID="488"
+
+acct-user_add_deps
diff --git a/acct-user/telegraf/telegraf-0-r1.ebuild b/acct-user/telegraf/telegraf-0-r1.ebuild
deleted file mode 100644
index 7cfacc19c7c4..000000000000
--- a/acct-user/telegraf/telegraf-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for telegraf"
-ACCT_USER_ID=428
-ACCT_USER_GROUPS=( telegraf )
-
-acct-user_add_deps
diff --git a/acct-user/telegraf/telegraf-0-r2.ebuild b/acct-user/telegraf/telegraf-0-r2.ebuild
new file mode 100644
index 000000000000..a5b9ca2670f9
--- /dev/null
+++ b/acct-user/telegraf/telegraf-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for telegraf"
+ACCT_USER_ID=428
+ACCT_USER_GROUPS=( telegraf )
+
+acct-user_add_deps
diff --git a/acct-user/tenshi/tenshi-0-r1.ebuild b/acct-user/tenshi/tenshi-0-r1.ebuild
new file mode 100644
index 000000000000..4b78147bf97d
--- /dev/null
+++ b/acct-user/tenshi/tenshi-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-admin/tenshi"
+
+ACCT_USER_GROUPS=( "tenshi" )
+ACCT_USER_HOME="/var/lib/tenshi"
+ACCT_USER_ID="283"
+
+acct-user_add_deps
diff --git a/acct-user/tenshi/tenshi-0.ebuild b/acct-user/tenshi/tenshi-0.ebuild
deleted file mode 100644
index e28212db5350..000000000000
--- a/acct-user/tenshi/tenshi-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for app-admin/tenshi"
-
-ACCT_USER_GROUPS=( "tenshi" )
-ACCT_USER_HOME="/var/lib/tenshi"
-ACCT_USER_ID="283"
-
-acct-user_add_deps
diff --git a/acct-user/thttpd/thttpd-0-r1.ebuild b/acct-user/thttpd/thttpd-0-r1.ebuild
new file mode 100644
index 000000000000..b1c643e901c1
--- /dev/null
+++ b/acct-user/thttpd/thttpd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/thttpd"
+
+ACCT_USER_GROUPS=( "thttpd" )
+ACCT_USER_ID="155"
+
+acct-user_add_deps
diff --git a/acct-user/thttpd/thttpd-0.ebuild b/acct-user/thttpd/thttpd-0.ebuild
deleted file mode 100644
index 4dcafd47f24b..000000000000
--- a/acct-user/thttpd/thttpd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/thttpd"
-
-ACCT_USER_GROUPS=( "thttpd" )
-ACCT_USER_ID="155"
-
-acct-user_add_deps
diff --git a/acct-user/timidity/timidity-0-r1.ebuild b/acct-user/timidity/timidity-0-r1.ebuild
new file mode 100644
index 000000000000..b5ce42f013a5
--- /dev/null
+++ b/acct-user/timidity/timidity-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for media-sound/timidity++"
+
+ACCT_USER_GROUPS=( "nobody" )
+ACCT_USER_HOME="/var/lib/timidity"
+ACCT_USER_HOME_PERMS="0700"
+ACCT_USER_ID="306"
+
+acct-user_add_deps
diff --git a/acct-user/timidity/timidity-0.ebuild b/acct-user/timidity/timidity-0.ebuild
deleted file mode 100644
index c4e6822876db..000000000000
--- a/acct-user/timidity/timidity-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for media-sound/timidity++"
-
-ACCT_USER_GROUPS=( "nobody" )
-ACCT_USER_HOME="/var/lib/timidity"
-ACCT_USER_HOME_PERMS="0700"
-ACCT_USER_ID="306"
-
-acct-user_add_deps
diff --git a/acct-user/tinydns/tinydns-0-r1.ebuild b/acct-user/tinydns/tinydns-0-r1.ebuild
new file mode 100644
index 000000000000..91a3a9c097d3
--- /dev/null
+++ b/acct-user/tinydns/tinydns-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=227
+ACCT_USER_GROUPS=( nofiles )
+
+acct-user_add_deps
diff --git a/acct-user/tinydns/tinydns-0.ebuild b/acct-user/tinydns/tinydns-0.ebuild
deleted file mode 100644
index 2a0ffd69000c..000000000000
--- a/acct-user/tinydns/tinydns-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=227
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/tinyproxy/tinyproxy-0-r1.ebuild b/acct-user/tinyproxy/tinyproxy-0-r1.ebuild
new file mode 100644
index 000000000000..20c6ba419bd0
--- /dev/null
+++ b/acct-user/tinyproxy/tinyproxy-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-proxy/tinyproxy"
+ACCT_USER_ID=186
+ACCT_USER_GROUPS=( tinyproxy )
+
+acct-user_add_deps
diff --git a/acct-user/tinyproxy/tinyproxy-0.ebuild b/acct-user/tinyproxy/tinyproxy-0.ebuild
deleted file mode 100644
index fe5783267fe3..000000000000
--- a/acct-user/tinyproxy/tinyproxy-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="uid for net-proxy/tinyproxy"
-ACCT_USER_ID=186
-ACCT_USER_GROUPS=( tinyproxy )
-
-acct-user_add_deps
diff --git a/acct-user/tomcat/tomcat-0-r1.ebuild b/acct-user/tomcat/tomcat-0-r1.ebuild
new file mode 100644
index 000000000000..ab1a33ae6172
--- /dev/null
+++ b/acct-user/tomcat/tomcat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Apache Tomcat"
+ACCT_USER_ID=265
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/tomcat/tomcat-0.ebuild b/acct-user/tomcat/tomcat-0.ebuild
deleted file mode 100644
index fd230aa19e0b..000000000000
--- a/acct-user/tomcat/tomcat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Apache Tomcat"
-ACCT_USER_ID=265
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/tor/tor-0-r1.ebuild b/acct-user/tor/tor-0-r1.ebuild
deleted file mode 100644
index 86496b34fe7c..000000000000
--- a/acct-user/tor/tor-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for tor daemon"
-ACCT_USER_ID=43
-ACCT_USER_GROUPS=( tor )
-
-acct-user_add_deps
diff --git a/acct-user/tor/tor-0-r2.ebuild b/acct-user/tor/tor-0-r2.ebuild
new file mode 100644
index 000000000000..9a356fc4f42d
--- /dev/null
+++ b/acct-user/tor/tor-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for tor daemon"
+ACCT_USER_ID=43
+ACCT_USER_GROUPS=( tor )
+
+acct-user_add_deps
diff --git a/acct-user/tox/tox-0-r1.ebuild b/acct-user/tox/tox-0-r1.ebuild
deleted file mode 100644
index b75ed771a3c5..000000000000
--- a/acct-user/tox/tox-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for package net-libs/tox"
-
-ACCT_USER_ID=236 #day-month of first tox commit
-ACCT_USER_GROUPS=( tox )
-
-acct-user_add_deps
diff --git a/acct-user/tox/tox-0-r2.ebuild b/acct-user/tox/tox-0-r2.ebuild
new file mode 100644
index 000000000000..f2e835541b0c
--- /dev/null
+++ b/acct-user/tox/tox-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for package net-libs/tox"
+
+ACCT_USER_ID=236 #day-month of first tox commit
+ACCT_USER_GROUPS=( tox )
+
+acct-user_add_deps
diff --git a/acct-user/tpm/tpm-0-r1.ebuild b/acct-user/tpm/tpm-0-r1.ebuild
new file mode 100644
index 000000000000..7423e856b40f
--- /dev/null
+++ b/acct-user/tpm/tpm-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=347
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/var/lib/${PN}
+
+acct-user_add_deps
diff --git a/acct-user/tpm/tpm-0.ebuild b/acct-user/tpm/tpm-0.ebuild
deleted file mode 100644
index 6a4401d03020..000000000000
--- a/acct-user/tpm/tpm-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=347
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/var/lib/${PN}
-
-acct-user_add_deps
diff --git a/acct-user/transmission/transmission-1-r1.ebuild b/acct-user/transmission/transmission-1-r1.ebuild
deleted file mode 100644
index 2f1db989b988..000000000000
--- a/acct-user/transmission/transmission-1-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=169
-ACCT_USER_GROUPS=( transmission )
-
-acct-user_add_deps
diff --git a/acct-user/transmission/transmission-1-r2.ebuild b/acct-user/transmission/transmission-1-r2.ebuild
new file mode 100644
index 000000000000..1f899e09ded8
--- /dev/null
+++ b/acct-user/transmission/transmission-1-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=169
+ACCT_USER_GROUPS=( transmission )
+
+acct-user_add_deps
diff --git a/acct-user/trickster/trickster-0-r1.ebuild b/acct-user/trickster/trickster-0-r1.ebuild
new file mode 100644
index 000000000000..9be7fc094450
--- /dev/null
+++ b/acct-user/trickster/trickster-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/trickster"
+
+ACCT_USER_ID=119
+ACCT_USER_GROUPS=( trickster )
+
+acct-user_add_deps
diff --git a/acct-user/trickster/trickster-0.ebuild b/acct-user/trickster/trickster-0.ebuild
deleted file mode 100644
index fa378b29a456..000000000000
--- a/acct-user/trickster/trickster-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/trickster"
-
-ACCT_USER_ID=119
-ACCT_USER_GROUPS=( trickster )
-
-acct-user_add_deps
diff --git a/acct-user/trojan/trojan-0-r1.ebuild b/acct-user/trojan/trojan-0-r1.ebuild
new file mode 100644
index 000000000000..233972ae9f97
--- /dev/null
+++ b/acct-user/trojan/trojan-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/trojan"
+ACCT_USER_ID=326
+ACCT_USER_GROUPS=( trojan )
+
+acct-user_add_deps
diff --git a/acct-user/trojan/trojan-0.ebuild b/acct-user/trojan/trojan-0.ebuild
deleted file mode 100644
index 4f3784fb3d3e..000000000000
--- a/acct-user/trojan/trojan-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/trojan"
-ACCT_USER_ID=326
-ACCT_USER_GROUPS=( trojan )
-
-acct-user_add_deps
diff --git a/acct-user/tss/tss-0-r1.ebuild b/acct-user/tss/tss-0-r1.ebuild
deleted file mode 100644
index 55a6438895df..000000000000
--- a/acct-user/tss/tss-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="Trusted Software Stack for TPMs user"
-ACCT_USER_ID=59
-ACCT_USER_GROUPS=( tss )
-
-acct-user_add_deps
diff --git a/acct-user/tss/tss-0-r2.ebuild b/acct-user/tss/tss-0-r2.ebuild
new file mode 100644
index 000000000000..d5b5b705be41
--- /dev/null
+++ b/acct-user/tss/tss-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Trusted Software Stack for TPMs user"
+ACCT_USER_ID=59
+ACCT_USER_GROUPS=( tss )
+
+acct-user_add_deps
diff --git a/acct-user/ttrssd/ttrssd-0-r1.ebuild b/acct-user/ttrssd/ttrssd-0-r1.ebuild
new file mode 100644
index 000000000000..6068ea16c406
--- /dev/null
+++ b/acct-user/ttrssd/ttrssd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/tt-rss"
+ACCT_USER_ID=386
+ACCT_USER_GROUPS=( ttrssd )
+
+acct-user_add_deps
diff --git a/acct-user/ttrssd/ttrssd-0.ebuild b/acct-user/ttrssd/ttrssd-0.ebuild
deleted file mode 100644
index 1d4f4efcaaf8..000000000000
--- a/acct-user/ttrssd/ttrssd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/tt-rss"
-ACCT_USER_ID=386
-ACCT_USER_GROUPS=( ttrssd )
-
-acct-user_add_deps
diff --git a/acct-user/turnserver/turnserver-0-r1.ebuild b/acct-user/turnserver/turnserver-0-r1.ebuild
deleted file mode 100644
index d84de4a708a1..000000000000
--- a/acct-user/turnserver/turnserver-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for a turn server like coturn"
-
-ACCT_USER_GROUPS=( "turnserver" )
-ACCT_USER_ID="235"
-
-acct-user_add_deps
diff --git a/acct-user/turnserver/turnserver-0-r2.ebuild b/acct-user/turnserver/turnserver-0-r2.ebuild
new file mode 100644
index 000000000000..7b96d5e1bdb3
--- /dev/null
+++ b/acct-user/turnserver/turnserver-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for a turn server like coturn"
+
+ACCT_USER_GROUPS=( "turnserver" )
+ACCT_USER_ID="235"
+
+acct-user_add_deps
diff --git a/acct-user/tvheadend/tvheadend-0-r1.ebuild b/acct-user/tvheadend/tvheadend-0-r1.ebuild
deleted file mode 100644
index 371ace1855fc..000000000000
--- a/acct-user/tvheadend/tvheadend-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for tvheadend"
-ACCT_USER_ID=462
-ACCT_USER_GROUPS=( video )
-ACCT_USER_HOME=/var/lib/tvheadend
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/tvheadend/tvheadend-0-r2.ebuild b/acct-user/tvheadend/tvheadend-0-r2.ebuild
new file mode 100644
index 000000000000..81c83454fa65
--- /dev/null
+++ b/acct-user/tvheadend/tvheadend-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for tvheadend"
+ACCT_USER_ID=462
+ACCT_USER_GROUPS=( video )
+ACCT_USER_HOME=/var/lib/tvheadend
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/ulogd/ulogd-0-r1.ebuild b/acct-user/ulogd/ulogd-0-r1.ebuild
new file mode 100644
index 000000000000..b188dd0e935b
--- /dev/null
+++ b/acct-user/ulogd/ulogd-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ulogd"
+ACCT_USER_ID=311
+ACCT_USER_GROUPS=( ulogd )
+
+acct-user_add_deps
diff --git a/acct-user/ulogd/ulogd-0.ebuild b/acct-user/ulogd/ulogd-0.ebuild
deleted file mode 100644
index 0058aa8e7aff..000000000000
--- a/acct-user/ulogd/ulogd-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ulogd"
-ACCT_USER_ID=311
-ACCT_USER_GROUPS=( ulogd )
-
-acct-user_add_deps
diff --git a/acct-user/ultimaker/ultimaker-0-r1.ebuild b/acct-user/ultimaker/ultimaker-0-r1.ebuild
deleted file mode 100644
index 547a4b09a66d..000000000000
--- a/acct-user/ultimaker/ultimaker-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ultimaker"
-ACCT_USER_ID=369
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/ultimaker/ultimaker-0-r2.ebuild b/acct-user/ultimaker/ultimaker-0-r2.ebuild
new file mode 100644
index 000000000000..9d9286777842
--- /dev/null
+++ b/acct-user/ultimaker/ultimaker-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ultimaker"
+ACCT_USER_ID=369
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild b/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild
new file mode 100644
index 000000000000..2ea65c1a449e
--- /dev/null
+++ b/acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for unbound-telemetry"
+ACCT_USER_ID=279
+ACCT_USER_GROUPS=( unbound-telemetry unbound )
+
+acct-user_add_deps
diff --git a/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild b/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild
deleted file mode 100644
index 5c4d78d7b701..000000000000
--- a/acct-user/unbound-telemetry/unbound-telemetry-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for unbound-telemetry"
-ACCT_USER_ID=279
-ACCT_USER_GROUPS=( unbound-telemetry unbound )
-
-acct-user_add_deps
diff --git a/acct-user/unbound/unbound-0-r1.ebuild b/acct-user/unbound/unbound-0-r1.ebuild
deleted file mode 100644
index 13a6f407ad87..000000000000
--- a/acct-user/unbound/unbound-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="unbound program user"
-
-ACCT_USER_ID=391
-ACCT_USER_HOME="/etc/${PN}"
-ACCT_USER_HOME_OWNER="root:${PN}"
-ACCT_USER_HOME_PERMS=0750
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
diff --git a/acct-user/unbound/unbound-0-r2.ebuild b/acct-user/unbound/unbound-0-r2.ebuild
new file mode 100644
index 000000000000..df1e218524b2
--- /dev/null
+++ b/acct-user/unbound/unbound-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="unbound program user"
+
+ACCT_USER_ID=391
+ACCT_USER_HOME="/etc/${PN}"
+ACCT_USER_HOME_OWNER="root:${PN}"
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/unifi-video/unifi-video-0-r1.ebuild b/acct-user/unifi-video/unifi-video-0-r1.ebuild
new file mode 100644
index 000000000000..61784923cdd6
--- /dev/null
+++ b/acct-user/unifi-video/unifi-video-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Unifi Video"
+ACCT_USER_ID=348
+ACCT_USER_GROUPS=( unifi-video )
+
+acct-user_add_deps
diff --git a/acct-user/unifi-video/unifi-video-0.ebuild b/acct-user/unifi-video/unifi-video-0.ebuild
deleted file mode 100644
index eb80d98698e0..000000000000
--- a/acct-user/unifi-video/unifi-video-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Unifi Video"
-ACCT_USER_ID=348
-ACCT_USER_GROUPS=( unifi-video )
-
-acct-user_add_deps
diff --git a/acct-user/unifi/unifi-0-r1.ebuild b/acct-user/unifi/unifi-0-r2.ebuild
similarity index 100%
rename from acct-user/unifi/unifi-0-r1.ebuild
rename to acct-user/unifi/unifi-0-r2.ebuild
diff --git a/acct-user/unrealircd/unrealircd-0-r1.ebuild b/acct-user/unrealircd/unrealircd-0-r1.ebuild
deleted file mode 100644
index b405153f3985..000000000000
--- a/acct-user/unrealircd/unrealircd-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-ACCT_USER_ID=494
-ACCT_USER_GROUPS=( unrealircd )
-
-acct-user_add_deps
diff --git a/acct-user/unrealircd/unrealircd-0-r2.ebuild b/acct-user/unrealircd/unrealircd-0-r2.ebuild
new file mode 100644
index 000000000000..a0ce96a834d8
--- /dev/null
+++ b/acct-user/unrealircd/unrealircd-0-r2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=494
+ACCT_USER_GROUPS=( unrealircd )
+
+acct-user_add_deps
diff --git a/acct-user/upmpdcli/upmpdcli-0-r1.ebuild b/acct-user/upmpdcli/upmpdcli-0-r1.ebuild
new file mode 100644
index 000000000000..29d8cc165013
--- /dev/null
+++ b/acct-user/upmpdcli/upmpdcli-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for upmpdcli"
+ACCT_USER_ID=372
+ACCT_USER_GROUPS=( upmpdcli )
+
+acct-user_add_deps
diff --git a/acct-user/upmpdcli/upmpdcli-0.ebuild b/acct-user/upmpdcli/upmpdcli-0.ebuild
deleted file mode 100644
index 8ec71887042a..000000000000
--- a/acct-user/upmpdcli/upmpdcli-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for upmpdcli"
-ACCT_USER_ID=372
-ACCT_USER_GROUPS=( upmpdcli )
-
-acct-user_add_deps
diff --git a/acct-user/uptimed/uptimed-0-r2.ebuild b/acct-user/uptimed/uptimed-0-r2.ebuild
deleted file mode 100644
index cc93c4ae6ea6..000000000000
--- a/acct-user/uptimed/uptimed-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for uptime daemon"
-
-ACCT_USER_ID="220"
-ACCT_USER_GROUPS=( "uptimed" )
-
-acct-user_add_deps
diff --git a/acct-user/uptimed/uptimed-0-r3.ebuild b/acct-user/uptimed/uptimed-0-r3.ebuild
new file mode 100644
index 000000000000..c1c42c2dc37c
--- /dev/null
+++ b/acct-user/uptimed/uptimed-0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for uptime daemon"
+
+ACCT_USER_ID="220"
+ACCT_USER_GROUPS=( "uptimed" )
+
+acct-user_add_deps
diff --git a/acct-user/usbmux/usbmux-0-r1.ebuild b/acct-user/usbmux/usbmux-0-r1.ebuild
deleted file mode 100644
index 6607c1e3c5c8..000000000000
--- a/acct-user/usbmux/usbmux-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the usbmuxd daemon"
-ACCT_USER_ID=418
-ACCT_USER_GROUPS=( usb plugdev )
-
-acct-user_add_deps
diff --git a/acct-user/usbmux/usbmux-0-r2.ebuild b/acct-user/usbmux/usbmux-0-r2.ebuild
new file mode 100644
index 000000000000..e3eef86c0e7e
--- /dev/null
+++ b/acct-user/usbmux/usbmux-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the usbmuxd daemon"
+ACCT_USER_ID=418
+ACCT_USER_GROUPS=( usb plugdev )
+
+acct-user_add_deps
diff --git a/acct-user/ushare/ushare-0-r1.ebuild b/acct-user/ushare/ushare-0-r1.ebuild
new file mode 100644
index 000000000000..86e0e2ed7b1b
--- /dev/null
+++ b/acct-user/ushare/ushare-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for uShare"
+ACCT_USER_ID=349
+ACCT_USER_GROUPS=( ushare )
+
+acct-user_add_deps
diff --git a/acct-user/ushare/ushare-0.ebuild b/acct-user/ushare/ushare-0.ebuild
deleted file mode 100644
index aaa047c4f218..000000000000
--- a/acct-user/ushare/ushare-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for uShare"
-ACCT_USER_ID=349
-ACCT_USER_GROUPS=( ushare )
-
-acct-user_add_deps
diff --git a/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..ec75b2e127f1
--- /dev/null
+++ b/acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/uwsgi_exporter"
+
+ACCT_USER_GROUPS=( "uwsgi_exporter" )
+ACCT_USER_ID="289"
+
+acct-user_add_deps
diff --git a/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild b/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild
deleted file mode 100644
index 616326db2f4b..000000000000
--- a/acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/uwsgi_exporter"
-
-ACCT_USER_GROUPS=( "uwsgi_exporter" )
-ACCT_USER_ID="289"
-
-acct-user_add_deps
diff --git a/acct-user/vacation/vacation-0-r1.ebuild b/acct-user/vacation/vacation-0-r1.ebuild
new file mode 100644
index 000000000000..a08d55604bb1
--- /dev/null
+++ b/acct-user/vacation/vacation-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/postfixadmin"
+
+ACCT_USER_GROUPS=( "vacation" )
+ACCT_USER_ID="125"
+
+acct-user_add_deps
diff --git a/acct-user/vacation/vacation-0.ebuild b/acct-user/vacation/vacation-0.ebuild
deleted file mode 100644
index 318ff1bf4acb..000000000000
--- a/acct-user/vacation/vacation-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for www-apps/postfixadmin"
-
-ACCT_USER_GROUPS=( "vacation" )
-ACCT_USER_ID="125"
-
-acct-user_add_deps
diff --git a/acct-user/varnish/varnish-0-r1.ebuild b/acct-user/varnish/varnish-0-r1.ebuild
deleted file mode 100644
index 009609104d11..000000000000
--- a/acct-user/varnish/varnish-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for varnish"
-ACCT_USER_ID=474
-ACCT_USER_GROUPS=( varnish )
-ACCT_USER_HOME=/var/lib/varnish
-ACCT_USER_HOME_PERMS=0750
-
-acct-user_add_deps
diff --git a/acct-user/varnish/varnish-0-r2.ebuild b/acct-user/varnish/varnish-0-r2.ebuild
new file mode 100644
index 000000000000..5727e7795c24
--- /dev/null
+++ b/acct-user/varnish/varnish-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for varnish"
+ACCT_USER_ID=474
+ACCT_USER_GROUPS=( varnish )
+ACCT_USER_HOME=/var/lib/varnish
+ACCT_USER_HOME_PERMS=0750
+
+acct-user_add_deps
diff --git a/acct-user/vault/vault-0-r1.ebuild b/acct-user/vault/vault-0-r1.ebuild
deleted file mode 100644
index baa714562281..000000000000
--- a/acct-user/vault/vault-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for vault"
-ACCT_USER_ID=410
-ACCT_USER_GROUPS=( vault )
-
-acct-user_add_deps
diff --git a/acct-user/vault/vault-0-r2.ebuild b/acct-user/vault/vault-0-r2.ebuild
new file mode 100644
index 000000000000..a47d6ed16eec
--- /dev/null
+++ b/acct-user/vault/vault-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for vault"
+ACCT_USER_ID=410
+ACCT_USER_GROUPS=( vault )
+
+acct-user_add_deps
diff --git a/acct-user/vault_exporter/vault_exporter-0-r1.ebuild b/acct-user/vault_exporter/vault_exporter-0-r1.ebuild
new file mode 100644
index 000000000000..a1be409f83a2
--- /dev/null
+++ b/acct-user/vault_exporter/vault_exporter-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for app-metrics/vault_exporter"
+
+ACCT_USER_GROUPS=( "vault_exporter" )
+ACCT_USER_ID="323"
+
+acct-user_add_deps
diff --git a/acct-user/vault_exporter/vault_exporter-0.ebuild b/acct-user/vault_exporter/vault_exporter-0.ebuild
deleted file mode 100644
index 876469c0a6aa..000000000000
--- a/acct-user/vault_exporter/vault_exporter-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for app-metrics/vault_exporter"
-
-ACCT_USER_GROUPS=( "vault_exporter" )
-ACCT_USER_ID="323"
-
-acct-user_add_deps
diff --git a/acct-user/vboxguest/vboxguest-0-r1.ebuild b/acct-user/vboxguest/vboxguest-0-r1.ebuild
deleted file mode 100644
index 1abd618bc469..000000000000
--- a/acct-user/vboxguest/vboxguest-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for virtualbox-guest-additions"
-ACCT_USER_ID=305
-ACCT_USER_GROUPS=( vboxguest )
-ACCT_USER_SHELL="/bin/sh"
-
-acct-user_add_deps
diff --git a/acct-user/vboxguest/vboxguest-0-r2.ebuild b/acct-user/vboxguest/vboxguest-0-r2.ebuild
new file mode 100644
index 000000000000..dc0bced73287
--- /dev/null
+++ b/acct-user/vboxguest/vboxguest-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for virtualbox-guest-additions"
+ACCT_USER_ID=305
+ACCT_USER_GROUPS=( vboxguest )
+ACCT_USER_SHELL="/bin/sh"
+
+acct-user_add_deps
diff --git a/acct-user/vdr/vdr-0-r1.ebuild b/acct-user/vdr/vdr-0-r1.ebuild
deleted file mode 100644
index 7871f9fcef97..000000000000
--- a/acct-user/vdr/vdr-0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user user-info
-
-ACCT_USER_ID=452
-ACCT_USER_HOME=/var/lib/vdr
-ACCT_USER_GROUPS=( vdr audio cdrom video )
-
-DESCRIPTION="VDR (VideoDiskRecorder) service user"
-IUSE="graphlcd legacy-homedir remote serial systemd"
-
-acct-user_add_deps
-
-pkg_setup() {
-	# if user wants to preserve his existing vdr installation,
-	# he can set USE=legacy-homedir
-	use legacy-homedir && ACCT_USER_HOME=/var/vdr
-
-	# media-plugins/vdr-graphlcd
-	use graphlcd && ACCT_USER_GROUPS+=( lp usb )
-
-	# media-plugins/vdr-remote, _only_ when systemd is installed
-	if use remote; then
-		if use systemd; then
-			ACCT_USER_GROUPS+=( input )
-		else
-			einfo "use-flag remote has no effect on systemd systems"
-		fi
-	fi
-
-	# media-plugins/vdr-serial: add group to access /dev/ttyS*
-	# on systemd systems: add "dialout"
-	# non-systemd systems: add "uucp"
-	if use serial; then
-		if use systemd; then
-			ACCT_USER_GROUPS+=( dialout )
-		else
-			ACCT_USER_GROUPS+=( uucp )
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# if useflag legacy-homedir is _not_ set, check if user vdr exists and what his homedir is
-	if ! use legacy-homedir; then
-		local EXISTING_HOME=$(egethome vdr)
-		if [[ "${EXISTING_HOME}" = "/var/vdr" ]]; then
-			ewarn "The user \"vdr\" exists on this system, his current home directory is \"/var/vdr\""
-			ewarn "The new default home directory for user vdr is \"/var/lib/vdr\""
-			ewarn "You have three options to continue:"
-			ewarn " - set USE=legacy-homedir for ${CATEGORY}/${PN} to continue to use /var/vdr"
-			ewarn " - move /var/vdr to /var/lib/vdr manually and repeat to install ${CATEGORY}/${PN}"
-			ewarn " - move /var/vdr to /var/vdr.old or anywhere else (to keep it as your backup), repeat to"
-			ewarn "   install ${CATEGORY}/${PN} and let the installation create a fresh /var/lib/vdr"
-			ewarn "the emerge will stop here."
-			die "user action required"
-		fi
-	fi
-	acct-user_pkg_preinst
-}
diff --git a/acct-user/vdr/vdr-0-r2.ebuild b/acct-user/vdr/vdr-0-r2.ebuild
new file mode 100644
index 000000000000..7c25955a8feb
--- /dev/null
+++ b/acct-user/vdr/vdr-0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user user-info
+
+ACCT_USER_ID=452
+ACCT_USER_HOME=/var/lib/vdr
+ACCT_USER_GROUPS=( vdr audio cdrom video )
+
+DESCRIPTION="VDR (VideoDiskRecorder) service user"
+IUSE="graphlcd legacy-homedir remote serial systemd"
+
+acct-user_add_deps
+
+pkg_setup() {
+	# if user wants to preserve his existing vdr installation,
+	# he can set USE=legacy-homedir
+	use legacy-homedir && ACCT_USER_HOME=/var/vdr
+
+	# media-plugins/vdr-graphlcd
+	use graphlcd && ACCT_USER_GROUPS+=( lp usb )
+
+	# media-plugins/vdr-remote, _only_ when systemd is installed
+	if use remote; then
+		if use systemd; then
+			ACCT_USER_GROUPS+=( input )
+		else
+			einfo "use-flag remote has no effect on systemd systems"
+		fi
+	fi
+
+	# media-plugins/vdr-serial: add group to access /dev/ttyS*
+	# on systemd systems: add "dialout"
+	# non-systemd systems: add "uucp"
+	if use serial; then
+		if use systemd; then
+			ACCT_USER_GROUPS+=( dialout )
+		else
+			ACCT_USER_GROUPS+=( uucp )
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# if useflag legacy-homedir is _not_ set, check if user vdr exists and what his homedir is
+	if ! use legacy-homedir; then
+		local EXISTING_HOME=$(egethome vdr)
+		if [[ "${EXISTING_HOME}" = "/var/vdr" ]]; then
+			ewarn "The user \"vdr\" exists on this system, his current home directory is \"/var/vdr\""
+			ewarn "The new default home directory for user vdr is \"/var/lib/vdr\""
+			ewarn "You have three options to continue:"
+			ewarn " - set USE=legacy-homedir for ${CATEGORY}/${PN} to continue to use /var/vdr"
+			ewarn " - move /var/vdr to /var/lib/vdr manually and repeat to install ${CATEGORY}/${PN}"
+			ewarn " - move /var/vdr to /var/vdr.old or anywhere else (to keep it as your backup), repeat to"
+			ewarn "   install ${CATEGORY}/${PN} and let the installation create a fresh /var/lib/vdr"
+			ewarn "the emerge will stop here."
+			die "user action required"
+		fi
+	fi
+	acct-user_pkg_preinst
+}
diff --git a/acct-user/vdradmin/vdradmin-0-r1.ebuild b/acct-user/vdradmin/vdradmin-0-r1.ebuild
deleted file mode 100644
index 5e76895dfb57..000000000000
--- a/acct-user/vdradmin/vdradmin-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-misc/vdradmin-am"
-
-ACCT_USER_ID=453
-ACCT_USER_GROUPS=( vdradmin )
-
-acct-user_add_deps
-
-DEPEND+=" acct-group/vdradmin "
-RDEPEND+=" acct-group/vdradmin "
diff --git a/acct-user/vdradmin/vdradmin-0-r2.ebuild b/acct-user/vdradmin/vdradmin-0-r2.ebuild
new file mode 100644
index 000000000000..59912a877e0d
--- /dev/null
+++ b/acct-user/vdradmin/vdradmin-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-misc/vdradmin-am"
+
+ACCT_USER_ID=453
+ACCT_USER_GROUPS=( vdradmin )
+
+acct-user_add_deps
+
+DEPEND+=" acct-group/vdradmin "
+RDEPEND+=" acct-group/vdradmin "
diff --git a/acct-user/vnstat/vnstat-0-r1.ebuild b/acct-user/vnstat/vnstat-0-r1.ebuild
new file mode 100644
index 000000000000..d141e2298d5d
--- /dev/null
+++ b/acct-user/vnstat/vnstat-0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for vnstat network monitoring"
+ACCT_USER_ID=229
+ACCT_USER_GROUPS=( vnstat )
+
+acct-user_add_deps
diff --git a/acct-user/vnstat/vnstat-0.ebuild b/acct-user/vnstat/vnstat-0.ebuild
deleted file mode 100644
index c1ed848bd7f3..000000000000
--- a/acct-user/vnstat/vnstat-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for vnstat network monitoring"
-ACCT_USER_ID=229
-ACCT_USER_GROUPS=( vnstat )
-
-acct-user_add_deps
diff --git a/acct-user/vpopmail/vpopmail-0-r1.ebuild b/acct-user/vpopmail/vpopmail-0-r1.ebuild
deleted file mode 100644
index 01a50ab30112..000000000000
--- a/acct-user/vpopmail/vpopmail-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for vpopmail"
-ACCT_USER_ID=89
-ACCT_USER_HOME=/var/vpopmail
-ACCT_USER_GROUPS=( vpopmail )
-
-acct-user_add_deps
diff --git a/acct-user/vpopmail/vpopmail-0-r2.ebuild b/acct-user/vpopmail/vpopmail-0-r2.ebuild
new file mode 100644
index 000000000000..1992b9dc7f63
--- /dev/null
+++ b/acct-user/vpopmail/vpopmail-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for vpopmail"
+ACCT_USER_ID=89
+ACCT_USER_HOME=/var/vpopmail
+ACCT_USER_GROUPS=( vpopmail )
+
+acct-user_add_deps
diff --git a/acct-user/wesnoth/wesnoth-0-r1.ebuild b/acct-user/wesnoth/wesnoth-0-r1.ebuild
deleted file mode 100644
index cf9126ff0b8f..000000000000
--- a/acct-user/wesnoth/wesnoth-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="user for games-strategy/wesnoth"
-ACCT_USER_ID=419
-ACCT_USER_GROUPS=( wesnoth )
-ACCT_USER_SHELL="/bin/bash"
-
-acct-user_add_deps
diff --git a/acct-user/wesnoth/wesnoth-0-r2.ebuild b/acct-user/wesnoth/wesnoth-0-r2.ebuild
new file mode 100644
index 000000000000..f7391c12fca0
--- /dev/null
+++ b/acct-user/wesnoth/wesnoth-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for games-strategy/wesnoth"
+ACCT_USER_ID=419
+ACCT_USER_GROUPS=( wesnoth )
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps
diff --git a/acct-user/wwwoffle/wwwoffle-0-r1.ebuild b/acct-user/wwwoffle/wwwoffle-0-r1.ebuild
new file mode 100644
index 000000000000..0af0edc9861f
--- /dev/null
+++ b/acct-user/wwwoffle/wwwoffle-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-proxy/wwwoffle"
+
+ACCT_USER_GROUPS=( "wwwoffle" )
+ACCT_USER_HOME="/var/spool/wwwoffle"
+ACCT_USER_ID="251"
+
+acct-user_add_deps
diff --git a/acct-user/wwwoffle/wwwoffle-0.ebuild b/acct-user/wwwoffle/wwwoffle-0.ebuild
deleted file mode 100644
index f5b8f4755b25..000000000000
--- a/acct-user/wwwoffle/wwwoffle-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-proxy/wwwoffle"
-
-ACCT_USER_GROUPS=( "wwwoffle" )
-ACCT_USER_HOME="/var/spool/wwwoffle"
-ACCT_USER_ID="251"
-
-acct-user_add_deps
diff --git a/acct-user/x2goprint/x2goprint-0-r1.ebuild b/acct-user/x2goprint/x2goprint-0-r1.ebuild
deleted file mode 100644
index 3f4463098a69..000000000000
--- a/acct-user/x2goprint/x2goprint-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/x2goserver"
-ACCT_USER_ID=292
-ACCT_USER_GROUPS=( x2goprint )
-ACCT_USER_HOME="/var/spool/x2goprint"
-
-acct-user_add_deps
diff --git a/acct-user/x2goprint/x2goprint-0-r2.ebuild b/acct-user/x2goprint/x2goprint-0-r2.ebuild
new file mode 100644
index 000000000000..adfa585f2ef9
--- /dev/null
+++ b/acct-user/x2goprint/x2goprint-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/x2goserver"
+ACCT_USER_ID=292
+ACCT_USER_GROUPS=( x2goprint )
+ACCT_USER_HOME="/var/spool/x2goprint"
+
+acct-user_add_deps
diff --git a/acct-user/x2gouser/x2gouser-0-r1.ebuild b/acct-user/x2gouser/x2gouser-0-r1.ebuild
deleted file mode 100644
index e386b7496085..000000000000
--- a/acct-user/x2gouser/x2gouser-0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-misc/x2goserver"
-ACCT_USER_ID=291
-ACCT_USER_GROUPS=( x2gouser )
-ACCT_USER_HOME="/var/lib/x2go"
-
-acct-user_add_deps
diff --git a/acct-user/x2gouser/x2gouser-0-r2.ebuild b/acct-user/x2gouser/x2gouser-0-r2.ebuild
new file mode 100644
index 000000000000..b510b563a401
--- /dev/null
+++ b/acct-user/x2gouser/x2gouser-0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/x2goserver"
+ACCT_USER_ID=291
+ACCT_USER_GROUPS=( x2gouser )
+ACCT_USER_HOME="/var/lib/x2go"
+
+acct-user_add_deps
diff --git a/acct-user/xrootd/xrootd-0-r1.ebuild b/acct-user/xrootd/xrootd-0-r1.ebuild
deleted file mode 100644
index a0267ea66311..000000000000
--- a/acct-user/xrootd/xrootd-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the XRootD server"
-ACCT_USER_ID=469
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/xrootd/xrootd-0-r2.ebuild b/acct-user/xrootd/xrootd-0-r2.ebuild
new file mode 100644
index 000000000000..3e5b2c648ea4
--- /dev/null
+++ b/acct-user/xrootd/xrootd-0-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the XRootD server"
+ACCT_USER_ID=469
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/yubihsm-connector/yubihsm-connector-0.ebuild b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
similarity index 100%
rename from acct-user/yubihsm-connector/yubihsm-connector-0.ebuild
rename to acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
diff --git a/acct-user/zabbix/zabbix-0-r1.ebuild b/acct-user/zabbix/zabbix-0-r1.ebuild
new file mode 100644
index 000000000000..e446f599587e
--- /dev/null
+++ b/acct-user/zabbix/zabbix-0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Zabbix"
+ACCT_USER_ID=329
+# see https://www.zabbix.com/documentation/current/manual/installation/install
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=770
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/zabbix/zabbix-0.ebuild b/acct-user/zabbix/zabbix-0.ebuild
deleted file mode 100644
index 35b1bc820d1e..000000000000
--- a/acct-user/zabbix/zabbix-0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for Zabbix"
-ACCT_USER_ID=329
-# see https://www.zabbix.com/documentation/current/manual/installation/install
-ACCT_USER_HOME=/var/lib/${PN}
-ACCT_USER_HOME_PERMS=770
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/zeppelin/zeppelin-0-r1.ebuild b/acct-user/zeppelin/zeppelin-0-r1.ebuild
deleted file mode 100644
index 22a7f3d7ceee..000000000000
--- a/acct-user/zeppelin/zeppelin-0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for system-wide www-apps/zeppelin-bin"
-ACCT_USER_ID=224
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/home/zeppelin
-ACCT_USER_SHELL=/bin/sh
-
-acct-user_add_deps
diff --git a/acct-user/zeppelin/zeppelin-0-r2.ebuild b/acct-user/zeppelin/zeppelin-0-r2.ebuild
new file mode 100644
index 000000000000..582d17bb219c
--- /dev/null
+++ b/acct-user/zeppelin/zeppelin-0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for system-wide www-apps/zeppelin-bin"
+ACCT_USER_ID=224
+ACCT_USER_GROUPS=( "${PN}" )
+ACCT_USER_HOME=/home/zeppelin
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/zetcd/zetcd-0-r1.ebuild b/acct-user/zetcd/zetcd-0-r1.ebuild
new file mode 100644
index 000000000000..1062f1a71837
--- /dev/null
+++ b/acct-user/zetcd/zetcd-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for sys-cluster/zetcd"
+
+ACCT_USER_GROUPS=( "zetcd" )
+ACCT_USER_ID="253"
+
+acct-user_add_deps
diff --git a/acct-user/zetcd/zetcd-0.ebuild b/acct-user/zetcd/zetcd-0.ebuild
deleted file mode 100644
index 2570323db374..000000000000
--- a/acct-user/zetcd/zetcd-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for sys-cluster/zetcd"
-
-ACCT_USER_GROUPS=( "zetcd" )
-ACCT_USER_ID="253"
-
-acct-user_add_deps
diff --git a/acct-user/ziproxy/ziproxy-0-r1.ebuild b/acct-user/ziproxy/ziproxy-0-r1.ebuild
new file mode 100644
index 000000000000..aa9df06ff0dc
--- /dev/null
+++ b/acct-user/ziproxy/ziproxy-0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=367
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/ziproxy/ziproxy-0.ebuild b/acct-user/ziproxy/ziproxy-0.ebuild
deleted file mode 100644
index ea999861d750..000000000000
--- a/acct-user/ziproxy/ziproxy-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=367
-ACCT_USER_GROUPS=( "${PN}" )
-
-acct-user_add_deps
diff --git a/acct-user/znc/znc-0-r1.ebuild b/acct-user/znc/znc-0-r1.ebuild
deleted file mode 100644
index 9848611f21f2..000000000000
--- a/acct-user/znc/znc-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-irc/znc"
-ACCT_USER_ID=421
-ACCT_USER_GROUPS=( ${PN} )
-# The systemd unit needs HOME to be set
-# https://bugs.gentoo.org/521916
-ACCT_USER_HOME=/var/lib/znc
-ACCT_USER_HOME_PERMS=0700
-
-acct-user_add_deps
diff --git a/acct-user/znc/znc-0-r2.ebuild b/acct-user/znc/znc-0-r2.ebuild
new file mode 100644
index 000000000000..9381b0301b03
--- /dev/null
+++ b/acct-user/znc/znc-0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-irc/znc"
+ACCT_USER_ID=421
+ACCT_USER_GROUPS=( ${PN} )
+# The systemd unit needs HOME to be set
+# https://bugs.gentoo.org/521916
+ACCT_USER_HOME=/var/lib/znc
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/zookeeper/zookeeper-0-r1.ebuild b/acct-user/zookeeper/zookeeper-0-r1.ebuild
new file mode 100644
index 000000000000..668e3452c457
--- /dev/null
+++ b/acct-user/zookeeper/zookeeper-0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-cluster/zookeeper-bin"
+
+ACCT_USER_GROUPS=( "zookeeper" )
+ACCT_USER_HOME="/var/lib/zookeeper"
+ACCT_USER_ID="211"
+
+acct-user_add_deps
diff --git a/acct-user/zookeeper/zookeeper-0.ebuild b/acct-user/zookeeper/zookeeper-0.ebuild
deleted file mode 100644
index a1b678140d58..000000000000
--- a/acct-user/zookeeper/zookeeper-0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="A user for sys-cluster/zookeeper-bin"
-
-ACCT_USER_GROUPS=( "zookeeper" )
-ACCT_USER_HOME="/var/lib/zookeeper"
-ACCT_USER_ID="211"
-
-acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c7b7c93d69e0..da7401f1217c 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild b/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
index 12b1245c52d6..0a8afdb32b5f 100644
--- a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
@@ -60,6 +60,10 @@ BDEPEND="$(python_gen_cond_dep '
 	)
 ')"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-mkdocs_google_fonts.patch
+)
+
 # test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py:
 #  - quite a few of these tests use the network;
 #  - test_command_dependency[shell] only works if Molecule has previously been installed;
diff --git a/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch
new file mode 100644
index 000000000000..2b3f6af82dcc
--- /dev/null
+++ b/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch
@@ -0,0 +1,10 @@
+--- a/mkdocs.yml
++++ b/mkdocs.yml
+@@ -19,6 +19,7 @@
+     - navigation.indexes
+     - navigation.tracking
+     - toc.integrate
++  font: false
+   palette:
+     - media: "(prefers-color-scheme: light)"
+       primary: teal
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index f664c62b0872..4d3243630164 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 555013ab7424..b9bf643e7418 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,2 +1 @@
-DIST btrbk-0.31.2.tar.xz 107124 BLAKE2B a05ef8a665d50b0f9637b1bc7026f0ca0f8364377b4165dae09cd27790dc139aaea1096a54719d948adda5050f91580650bf58db70a086cfdd14b73559fad9f3 SHA512 f953fe1a231f7a28c2d98cf124e3d52cc6d0810e6cb1673b90f335e07cd7473d0302ec227361f902c40a36dab5c075c675d2ee0543a23c37cb1e4baaf74efea0
 DIST btrbk-0.32.6.tar.xz 111804 BLAKE2B f23e5f60e63bb1a9d5cc2f1339ac3e40a9cae5c0e3f626f1ad0e7396b8f9ebb00bce319835c9c708cdfe3c1cad3ef4e90985cb9c633be7091ffdbde93a10412c SHA512 5a21b3728aded1610ef9106d0460db12b07bbc6d62be199081baba92413b30ba0f7b4a77612d0bbb0910863be85f2c68eab3d02fabf1ea5a7f5fb22aeb1f7a38
diff --git a/app-backup/btrbk/btrbk-0.31.2-r1.ebuild b/app-backup/btrbk/btrbk-0.31.2-r1.ebuild
deleted file mode 100644
index ea8c728c5fd7..000000000000
--- a/app-backup/btrbk/btrbk-0.31.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	virtual/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	sys-fs/btrfs-progs"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.6-r1.ebuild b/app-backup/btrbk/btrbk-0.32.6-r1.ebuild
index 7234202a4dc8..03aa2217e2bf 100644
--- a/app-backup/btrbk/btrbk-0.32.6-r1.ebuild
+++ b/app-backup/btrbk/btrbk-0.32.6-r1.ebuild
@@ -31,6 +31,7 @@ src_compile() {
 	emake clean
 	use doc && emake -C doc
 }
+
 src_install() {
 	local targets="install-bin install-etc install-share install-systemd"
 	use doc && targets="${targets} install-man install-doc"
@@ -41,6 +42,7 @@ src_install() {
 		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
 		${targets}
 }
+
 pkg_preinst() {
 	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
 		upgrade_0_26_0_warning="1"
@@ -49,6 +51,7 @@ pkg_preinst() {
 		upgrade_0_27_0_warning="1"
 	fi
 }
+
 pkg_postinst() {
 	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
 		ewarn "If you are using raw targets, make sure to run the"
diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index 0fa19175e32b..93122c48a06d 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -31,6 +31,7 @@ src_compile() {
 	emake clean
 	use doc && emake -C doc
 }
+
 src_install() {
 	local targets="install-bin install-etc install-share install-systemd"
 	use doc && targets="${targets} install-man install-doc"
@@ -41,6 +42,7 @@ src_install() {
 		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
 		${targets}
 }
+
 pkg_preinst() {
 	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
 		upgrade_0_26_0_warning="1"
@@ -49,6 +51,7 @@ pkg_preinst() {
 		upgrade_0_27_0_warning="1"
 	fi
 }
+
 pkg_postinst() {
 	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
 		ewarn "If you are using raw targets, make sure to run the"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index fd1ec95ef72c..7f82aff448b3 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 4581cb6de081..dab768773b90 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.3.5.tar.xz 741036 BLAKE2B 3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a SHA512 656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
 DIST qca-2.3.6.tar.xz 745864 BLAKE2B a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8 SHA512 018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c
diff --git a/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch b/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch
deleted file mode 100644
index c9c581e87a10..000000000000
--- a/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/904234
-https://invent.kde.org/libraries/qca/-/commit/33a35a699928318032f62eab0e39e263c604ad9e
-https://invent.kde.org/libraries/qca/-/commit/714073747c4a3ccff7a8c85c72872bdf6bd3db4a
-
-From 33a35a699928318032f62eab0e39e263c604ad9e Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sat, 22 Oct 2022 13:51:17 +0200
-Subject: [PATCH] hashunittest: run sha384longtest only for providers that
- support sha384
-
-Fixes commit bdb0e9d37d78ec8e01d4008dba5243afe9029346 that accidentally
-left the wrong logic when refactoring the file, and makes the check as
-done in the other longtest tests.
---- a/unittest/hashunittest/hashunittest.cpp
-+++ b/unittest/hashunittest/hashunittest.cpp
-@@ -581,7 +581,7 @@ void HashUnitTest::sha384longtest()
-     fillerString.fill('a', 1000);
- 
-     foreach (QString provider, providersToTest) {
--        if (!QCA::isSupported("sha384", provider)) {
-+        if (QCA::isSupported("sha384", provider)) {
-             // QTime t;
-             // t.start();
-             QCA::Hash shaHash(QStringLiteral("sha384"), provider);
--- 
-GitLab
-
-From 714073747c4a3ccff7a8c85c72872bdf6bd3db4a Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Mon, 20 Feb 2023 00:19:19 +0100
-Subject: [PATCH] Remove test that openssl has decided it's wrong
-
---- a/unittest/pkits/pkits.cpp
-+++ b/unittest/pkits/pkits.cpp
-@@ -256,6 +256,9 @@ void Pkits::pkits4_1_4()
- 
- void Pkits::pkits4_1_5()
- {
-+    // openssl has decided that they don't want to support this ¯\_(ツ)_/¯
-+    // https://github.com/openssl/openssl/issues/20233
-+#if 0
-     QStringList providersToTest;
-     providersToTest.append(QStringLiteral("qca-ossl"));
- 
-@@ -298,6 +301,7 @@ void Pkits::pkits4_1_5()
-             QCOMPARE(cert.validate(trusted, untrusted), QCA::ValidityGood);
-         }
-     }
-+#endif
- }
- 
- void Pkits::pkits4_1_6()
--- 
-GitLab
diff --git a/app-crypt/qca/qca-2.3.5-r1.ebuild b/app-crypt/qca/qca-2.3.5-r1.ebuild
deleted file mode 100644
index 14304dc07d6c..000000000000
--- a/app-crypt/qca/qca-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.14:5
-	botan? ( dev-libs/botan:2= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	pkcs11? (
-		>=dev-libs/openssl-1.1
-		dev-libs/pkcs11-helper
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		virtual/latex-base
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-pgp-test.patch"
-	"${FILESDIR}/${PN}-2.3.5-openssl3-tests.patch"
-)
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
-		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
-		$(qca_plugin_use botan)
-		$(qca_plugin_use gcrypt)
-		$(qca_plugin_use gpg gnupg)
-		$(qca_plugin_use logger)
-		$(qca_plugin_use nss)
-		$(qca_plugin_use pkcs11)
-		$(qca_plugin_use sasl cyrus-sasl)
-		$(qca_plugin_use softstore)
-		$(qca_plugin_use ssl ossl)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
diff --git a/app-crypt/sequoia-sq/Manifest b/app-crypt/sequoia-sq/Manifest
index 905f9d0f5af0..15641516ee86 100644
--- a/app-crypt/sequoia-sq/Manifest
+++ b/app-crypt/sequoia-sq/Manifest
@@ -1,9 +1,12 @@
+DIST addr2line-0.20.0.crate 39558 BLAKE2B 1f66fcb361161599a87f874a3bf28a05614e235488d02205d4c8e207ae193280949ad957fd0eb383a49f4c1bc287569454d3c6872ed6e31c081e6fd03f8d460e SHA512 f9794772a31dd01096b168b4b4ffe311d4850c69fd77dd72c1e532a94ef7b23c31cccb9033848822521510f1fcc2ad0fdd824cf7efb9ed43828dc0165165b319
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aead-0.5.2.crate 15509 BLAKE2B 0214f3e8ee85a7e18c7d20f9a3fcbdbb9e5af6fdfdcb427e915279b505556dbd2df6d09d5c90561417c56796236a56ab24b2b11389745bc03a0a6da45c0e8636 SHA512 61926a615618e64efd0e9342d729a89f80d6e092dda50e018252a06147e2ca0dc2a989136416f57ae02019695757dfa3d3f3cf3799f138e440662744ecab4a44
 DIST aes-0.8.2.crate 124158 BLAKE2B 78c56840065aacd6b6025b25a68035b063ea96a1a7bae0d754c7a754976d44804a498f85b8acc6752cde365cbf468095e27ed3a7c032a39d3057b995e1cb9d29 SHA512 992ed1b3d2ccb52de06f48de344ce1643bb31b48b00e57d447f89175d854ecaed0942651f358b6bf088966f019c3fc23ad9fa2c812255776472602bb833c9865
+DIST aes-0.8.3.crate 124679 BLAKE2B 7a352a9c5452ed91b32ed82a7450013ba0f0db4d990d37bfa78782e9c031d2a33d0b7680625881566ecc4b7048a44854759163d2e5c962783fffed1ca7d38a78 SHA512 89aa691fb6060c37ae8bdc2db8c7ba87a7c5201a776c247bb499fca0fa2b0c062601144af49eb781342a97760a124cc24dbfc38ccecd16493270f47d96282cc0
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6 SHA512 ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5
 DIST aho-corasick-1.0.1.crate 167320 BLAKE2B f148004140d4f705e93f448020b97c434b93fea6ae34fd74b1f394b076c2727a87f5ec54542a0f52822d716c10ada3c68ae8f50a46c455fc6e828b10b5650ecc SHA512 7cea5b2305b90aebc54f78446cfc91f275b1be8489d2d80c3baa9ff8b913f9b2296adbdf4aefb0d8fce8f57812963fb9450b200d133a9d61e100cef324068070
+DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b
 DIST aligned-0.4.1.crate 8532 BLAKE2B 2233dc2c754fe650f4402c7f54fc2bdf5b9b0e562fd9d22f4d1f2f835422e4ffdae98e0ec5868e6024910b1af361fa59f7ee12f9aadad256b7cc418fa34ab2c4 SHA512 5b51cc1d6a4857f719951c32e173a0a91651e43e4c8e8d2e1282f7fa780d103dfc6b22c8633aeddac92e9f942e6620ec37419e822739975499a29d7d20f2a072
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
@@ -12,27 +15,35 @@ DIST as-slice-0.2.1.crate 6942 BLAKE2B bf012f6069b5c483daad74f556515472ed54f91dc
 DIST ascii-canvas-3.0.0.crate 10575 BLAKE2B fc40c40551e3e1b2bec6ae5a85ee8b0a1ab1ef3425cdd19ec6dd47d849205004781a2c8f51470417fe7556cf8524cc63b84a532532c5081604adbcd92d286b44 SHA512 216056640604f5faba6d46e2c94ff75234fec83d3bc2dc7cf34dd279706362874e3a513c717b23bc591da07cc3088458913c4e9aa5f280550c93d261095c8703
 DIST assert_cmd-2.0.8.crate 24347 BLAKE2B b69beb301a11e893ee1c7b59a08ac7860c16a598dc404d7bfd38b2554790898cfb82d1e602750e9b720b4122154e4da140c7b077645786f0a788796d5dafe272 SHA512 886d789af9fe7f8155d393e2742c7982d5c0bb8d44a09f66e5552faed2effcedd000d567f9f00e08ad6d7c17fac9374d7a234ba001f38c9cf444ee41dbe07428
 DIST async-trait-0.1.68.crate 28625 BLAKE2B 30ed53ddb60967201755cded9fbd87cf1ec58071019227069bd501f5242d18d906cf5b05488e8611f1167237e03c472bb90e28d396306985ab2afd9be379f2ea SHA512 4f4390ab76a6150f7115cd4bfb132be48a846d768aee8c54bff6a18ae3bc52cad5a96119ad621ceabd055af0210629894343f09fff35c68cb9c4f28d08c7006a
+DIST async-trait-0.1.70.crate 28703 BLAKE2B ce8e62c9832049b37ec28f42215bc1adf8a9f81f92158d47e7eee15e1fb434c42feb2c43b6ac0affbe722d6438dfe6c556958b8d6c82aa6caeacb75b264945e2 SHA512 d4883df042bde56dfed8a979c3473aec0b6c68a85ec8dd387bbc064f69b5929642f1a09773dfd3637b4ec26a04006df8217a930d4b4789f6bc7a37068e904ecd
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST backtrace-0.3.68.crate 79891 BLAKE2B 38ec5881bdd8f2ee55db9da423e030603a6ad0b50edeb37e0899ca781bbc9f54fdd00e4f27f8589cc34ceaefac05f26fdcdf693cc08d9d06a2811783ba7c5c2a SHA512 4c4e5d47154e64d2192a6358d0861097e31b5a53d5863b03dd38562dccda7cbec584e006ce29563cadfd03b0031ed7a16fa43328f515cc66a296048c9a2f5d89
 DIST base16ct-0.2.0.crate 10240 BLAKE2B a8097674e84bb85fa72ea752d71446fc39e695fea9acc0f98178bb4e6569180f9acb4c7a9820708359d1c4733b57af6448015cce83f8c610985e6d2f7858fc33 SHA512 efe7c810102646733cb24c5cab62bd58d797e77b117d0fa5d651c34630f77de4d768fb99c981af5968393734bc32a2c1944a719f9f1a192b5062c0af8bb3413a
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST base64-0.21.0.crate 72180 BLAKE2B c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2 SHA512 60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f
+DIST base64-0.21.2.crate 76389 BLAKE2B 6da080dfc31c5b2ebdbfd336be6e71373918f9388c85649133363a60ee1647b6ad67c7dfd461b6ee842c3633e40593b6ac2f313585b3e8e07dbd690739f433f9 SHA512 3f85bdf846e2f8a2e0f2335749bab58c904479a29311143580f1de42455799d04606dedbf64d355af580d77867d7b895e1078463c7cc5a5fbd9ded9d7cbf3559
 DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c
 DIST bindgen-0.63.0.crate 201856 BLAKE2B a99470e5878c90d0ff4cdcba5d16177eb765822041203c7224f9baf1fda23f83d92c3b9cd83759ed9ca779f9d3961509b4d7e038b716b9d68bf6563743ca8141 SHA512 43ac3067b3635c968c3a4bf6d665d633b9b80ff4eec36aad353019fc16e25c2338ea3f00a7fb077ae0dc055d10ea3ed6c304055a18dcf0c31bf980c26b110796
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.2.1.crate 35798 BLAKE2B 9ed2e0764edb3f164385e4420e8c9a133757194ee2763743692520d2389ee81c987a081db68510963d66a02555d20bc6decd83f707309040a7295522ddfa35f3 SHA512 413b602edb82f8a4553735e46feefe323137b742d003368e037406157f916e5a5ea002d015a27cf8d41accca75f103c6712e2268fe2853d4d5e93e7264682182
+DIST bitflags-2.3.3.crate 34320 BLAKE2B da9f42fc888e31d50d0b2f0d0cc1bddfa97e0c2d3eac60fd2cc451670f000b5148e58c3c40c348ef1bd516c7a568bcc3a97742ac5bdb9ef4772048eb922171af SHA512 8f063ba2bc3f638ca9200722e1c4370102589fb07aef25efcf63993fbf283cc86d554d11d24719f728ecabe540a47a90ce4113d8719f8e773f2344a66d21ff78
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
 DIST block-padding-0.3.3.crate 8504 BLAKE2B d62481c25fd8680cdf0ad0bc259bd3777c3985ee91d5bb4995f484a15d4a9bde21c5d20f8c2efd0eb340aa0b8c7faac0f3fd817202ef4350d17994f478715eae SHA512 0849c99f2027f4e1a12872d2210310e9669f98929c99690febfeec90c0199b2274e20a5f83824f200f75f2553be2029ca85b0c5d0db4d9d477ffee9a71dd3b7c
 DIST blowfish-0.9.1.crate 16734 BLAKE2B edb9ef86b168259d37ae74ca5f961d4a2f79f0bd83c64a157b1605655001a8e82a1b40b0e03a24719dd9cc273fd50d1ad6a406b47b1925a9c2c687c119bcae0c SHA512 e005212e2cd0233321f1e84170829c6e05b4f4e47b81342e0fef7e12ac05f09dc6db288b6b28ea2826e9d19afa49366b74b186f2f20db6da77b57f09e124e3a8
 DIST botan-0.10.2.crate 37821 BLAKE2B ece9ef7a4f354511ce1d84b83ff6e17d5c0b2b12c2578543b68886a0cb4a6c3c235b97397961c7d5ece6ae7fc3f9a9b4d2a9d73d4386e09bb642a8337496de7a SHA512 4ef19ce2f861ff90e003c01c51bca20b883f82630c39d58dffa6d9dd78522339568f1c99c69a499e5d3a80dc615649573cbc26580f195038e613fdb2b78a14e4
+DIST botan-0.10.3.crate 37817 BLAKE2B 7f9f9b4cd22586cafa06f57d97716cf6236d4b90b0bfc73d6ef2f339b859a6465023bdf6f376ab212ad894d0f04f9407120cb5a84d022ea9de14893ac960432e SHA512 f7e79fff69af56082b5db38cdc301c629008ffe154564f8579619dabc8dd6f2e28020c4f568d1061a5a36df0434b6278f2e9cec4851a05865eaa13b5849531ed
 DIST botan-sys-0.10.2.crate 8142 BLAKE2B af1307f2f03e40a63cb29c17352938da6258519905d6e60b944392f7a510e6690698af3ff83b42772aa181b8c1b092109236ae05da6d4956ab8d0c7416368839 SHA512 b2c67c67ba89e593a19bca6015888e9d6c8e834a7742ba2ed583ad437cf00672860fccd9ab6a6bb082a39a0f6c4c0365aaac36c3ce7b2acb72a36471401c4780
+DIST botan-sys-0.10.3.crate 8141 BLAKE2B ca98209a83fc0ceae7a01a9ce1a012784327372ae67006413b031f016ed716052b25e037b51671662dd42f2d03bedd40e2a7b31e92f9ac578471e01720b139aa SHA512 8a0cc911ca814a84faa44d3350385349504b8a10dca7e97d2f2a74a68042d595715662dc64fce3c8564c06d3c72f7c07123d83a665638da4c40e9cbb5e21cea5
 DIST bstr-1.4.0.crate 345921 BLAKE2B 39a3cb366a7ceb784b7a6626f81338e8047498c5755ed60fce1f6460ea5aa907ab5df4bcf30a07ed699c7af7d2d0dbc48b2c5cb674b863c22fd63b5080b52fae SHA512 98dc7bdcc1a307eae2ed202b2b785a4ad27719c4b3289408edc710beabedb78d16b3042b41de04fca5dbdba19d8567df69c35431e33a3c02924820e1a601df36
+DIST bstr-1.5.0.crate 346060 BLAKE2B 55f8b92b16947a02834a56d463d2f24f6857b9bfb590bcd250bcba4f0cbb06fd50793d6767e90d95bf48dd50b3e6f447096f8afd70890d54b27fdd6ccf1d99cd SHA512 6bd1be4fd785f7e576b4ae4a7203b1c1ff698d01f56b1f09b40dc1629f0ba7c958bfa9f6ca3cceef4fb51120707ae0fac9622126e1cdc477ee0802a57b34cd13
 DIST buffered-reader-1.1.4.crate 61347 BLAKE2B ff722a8346bb4b644c0b463168337620c82e28763c2251afe7bb14ddbb981217b83495d18b5f6389beb7e268045d6a3daa9f9ad5703e2eac9fb90075a235ee15 SHA512 1d5cffd9c02f0f4cdb550764c75cd22df44012264710530fb36a9c77a5d64d803c14ce7a4f1244511b3895147e2f70f9dd8e7ad705222712f9846459ff36b746
 DIST buffered-reader-1.2.0.crate 62127 BLAKE2B 8ca2e10f69121a08169e082b34e2412502673f24f2c373c66c49e24160b340e9078fe16b9dccc4f1cc51f3f0867d9e605c04bb002abb61b8891618b95f79e8e3 SHA512 4e7f9d75720b10a04577220ead4ca96e0c34a573469f80a50288e156d7aa99a1820850aa69c3f2db0505d0204bbd3aa6bd4b5823925481f0358d13936ad54770
 DIST bumpalo-3.12.1.crate 81653 BLAKE2B 26ca1df07c8f55a4362e844bb80cabf1efb6627ed0f489f280178e03d0c8bb600303529c05e5c2a9bab79115510eddddf446f4baa717352babd68b6a3200b7bb SHA512 1f57591bddd5d4c856d5ad1ae71f9306d8c37681a72172b6be35b4d6fffa7f30b086d88b37d8f512e2256cb7d37dc992ee83bd071e4ff84182e5e226dc92e4bd
 DIST bumpalo-3.12.2.crate 81706 BLAKE2B 50aa1e5f8f1208bd50b8fb0580bb5c5a7baadf36c0a0d8ad041c48b127896b75437118decfb1138e694964b89c8c0f66144cbd44037a67ef376fed312e08ebe8 SHA512 a0571501d2b2cbe25b862197295fddf14dbbbba7472965ab6006fb7cfcdf0f76df3b5e505888c0f1a0be99870b87afe5881a80df4f75756d2d9b65791d94d566
+DIST bumpalo-3.13.0.crate 82114 BLAKE2B 62a930b165e853aeeb40558079f570c75ed13ff5e8436d99309dc6252aa28ae69d327c4b438913d6c7543bc156f2714f0c1e80d759ea0d44babe24ef0f268ac0 SHA512 419368d6ca37474c2867751fe5706d0c747326bebce323d571cfc07ee0f022d8e8a7ef5692091b0fa804995b081998dafc55da19a53e51135a767bc0afdb9605
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000
 DIST bzip2-0.4.4.crate 34197 BLAKE2B b69f8ad38b44eb4912b33d53467492b0ebe6ed740451bdfe9133e71c47a8dbd85b1110a9607c4cc627fbabc44cd86fe0396bb545864632ffb6169f9cfa547b6c SHA512 9cd2b9159bd0b42ac908ecad41f0a737272af94ae0d6dcfe182d2f44bcea4632d32b0456f02322047ea9d6f46377db6cd083f468782bccd6126bcc75cb852555
@@ -54,16 +65,20 @@ DIST clap_mangen-0.2.6.crate 14563 BLAKE2B 866190295fbac8044875169e6e73a8c114d6b
 DIST cmac-0.7.2.crate 44847 BLAKE2B ab8539f41e720f132b2da3176e9c533a2309cbb3dcdb027af4c5bdd6ac68e4a2a97f53efda52236527a15786b73bd96ad940385002412330d7cde60e3492a6fc SHA512 9e55f9f9323dff330ef45da953bc35da79ff8fe643b3984479dbab10b35e05e4d613f7329c46bc119fefa589d8f5f3bb268a7e7f0853003c1e192fe324e83315
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
 DIST const-oid-0.9.2.crate 44606 BLAKE2B d254b1d50d3d72a842e247fcf6cd0bd4ebb036db2a1580b2737ad9f0134288997ebc5f17b7b9f3c5bc532f8fedbb9aed0ae2a6a672dc23e66ed3902fd3c96f74 SHA512 ad75da209947af32b4020ef73a04c7ecc74600fe7ea70f33d1486f4346e7a3fb1d5e3a586b373f49b8b494215dfaff251b8d40181bd95e43373e8bd887fb6708
+DIST const-oid-0.9.3.crate 44851 BLAKE2B 46635a53a2b09f322bbd47048fa31186e7b74d689fa2cf9b1aac5c06673aa97c49a1c53055bc53d401cf96c93f8937b5c192b9abbafa01cd75944f096d444937 SHA512 c4a8f088803a3ac23e2eb9d4d64aebf2e79dd7bca4521b61363af68b900990b41fac2d7d3adff930a58c1e55b427405ca0d93b5fdfcadc3a2e970e118fe64d41
 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
 DIST cpufeatures-0.2.7.crate 11563 BLAKE2B 917f8ce2675519b4d5d89fe09b02e147f00a915d195158a690b292376bcc2937dee8f76778506556ecde0187c74ca8c046973f44e1f34e4c8bb6809d2d4347b7 SHA512 46988efd895b88751200dd9693a1040f698c8b2ecd5d3d4ae1d8055e719aff262afea764083dabf1d8202a51e7e16b4f51adcffc8a2424c841b58840b6669490
+DIST cpufeatures-0.2.9.crate 11895 BLAKE2B 1e369466bce2ddf7be6bbe219997628223a3a114914e5ed44b44f3fb6d6a084fbb47cc50ecb109287b074e159c675ae89356cb68cd843b41b502ebe824febca0 SHA512 88235b7d7152f4578a321ebc4f83f69070206b2acaf0e6331b52e1a6633e96edc787f9a409ac2e2799106a259166a302150fa4ddc88352b7739d50ac6ca9038f
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-0.8.2.crate 10502 BLAKE2B 487a7a5f197898ebea0fd41a413647db0fc3380790cfdfc6cb7cf3caef48197bb7c2498579ce676d3c5796480a8541ae37ae03f009d768a6157246b1f7d63a33 SHA512 bd2e54372595daeaddcaa26802780959465bd571cac64f23256b7ecc68ff5c0161a36740a51386ee54abe7c509ad1ff870b6f6877a7921f4335661f2c554c3a0
 DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4
 DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672
 DIST crossbeam-epoch-0.9.14.crate 48524 BLAKE2B 439eec7e5e0364af0fe0a34ffc9354ae289798ffa7480bc656d4a610101e1ef2d5f484d84f82c87f961bd622434c36adfb7a87f7fbd2c71077b732cc7cc765ad SHA512 543cb60cff7c0823733f6ace191b137a04025a2b40fe4fea5eb273772009627fb705aecf742bc59e01367d4c15a14aca73aa2caf7f4b509f4b25947e14fd1e19
+DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde
 DIST crossbeam-queue-0.3.8.crate 16731 BLAKE2B 80a8647bf491adc1a5dc736f662c01e77bcceb4bb2b876eaf684cb2a742a2f46d09e1221f6ca8b19340ddc9ed3a10bf07a08305a5bf069338d00873b1296ad96 SHA512 3c4e855184f8e2656305a59463f0170aab99f9c2df1001f54341b62e05e533864f384477a7a9cbc2b8b1a36bbe4b8076531c11b1492485029ef81ade6e7cbf8b
 DIST crossbeam-utils-0.8.15.crate 42326 BLAKE2B 23e6bd2a6535c6fccf7b7d17487fdd4095c92a3f3ae383a72dd6d90c1c49c2ec8d96dc01a94c7127b2681bfaef843585b3ae8665ecbc43b2e7db8434e31c6c8b SHA512 adb9ce1886396bc637299cb8122d102bcc9e561f25d67ef73e98c9ed8a8b13b78bc0f5bbacab19d015e1a7690bc0201f08b3d8e82393ec347e7f2933eb622533
+DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-bigint-0.5.2.crate 69069 BLAKE2B 0b946127d82a3474379a9eb75d41c860fdc972ddd5781cdce0e564a417da710d8fa6b3c1eef3a23c3e930e41e151a3cf4728b93b97657e30337ff03999427173 SHA512 8f36c974789faea7e8e0ee45978cd59d8fea85394948499ba9431f2f8c75a503e327ea7e0a123c810863ae454ba62944fe1a4a4575908e4958fa071337999205
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
@@ -76,13 +91,16 @@ DIST cxx-build-1.0.94.crate 84842 BLAKE2B 39b8a11b925244410ac2dca3be5a27576ea67f
 DIST cxxbridge-flags-1.0.94.crate 5253 BLAKE2B f7746ca703e95f8b6197655aae08b88509132b89d035c62420e3d0cc4857687171063e2da69a787938188dc5e40fccd2b50713ed929f3f097efbc5b5956b5263 SHA512 9d577cf6bd2afa2301e8c227f201c138a379457624833c3cad4e75c7ed046544b363ac4bd0f7a1a2142ab1c9d879b56ccfd681a3962be917099db5ee4c63fb02
 DIST cxxbridge-macro-1.0.94.crate 59873 BLAKE2B 9a29a2818cdd6047b49002c10542e2d04702ceb41823a12e27b151bcc524a05377390c65164e53062630d7ad9f849ec71070118de5eb348c98072e301dbd1416 SHA512 59120f8d0f498539a16921d18e0e53a745f4ee58f4ed40465b13722188d28975820adc3c632a4592c6813771056fe084674daee6c56940e50f6e9c492c4fd90d
 DIST data-encoding-2.3.3.crate 19117 BLAKE2B d77962932be4aefd5855db78379b56a9fdeb784a9916a3e4d0bf3b085a8b3286396122066ad875395bf3be3fe026422fdf5554ca67e0f1b53d9fba36c11c14cb SHA512 5922cdfaaa9b4c3b2faa68e86018653dac7bccef3f2a1e16f6c599dc8c3e98a644f29c3a9082234d3a58f9feb0eb54842e57ab62ceadcf287c43f7eed1906d93
+DIST data-encoding-2.4.0.crate 19165 BLAKE2B fa870d377fe74c40e5739e6c063bd39ba5d824c4e452e1c490f911b2fd90cc0748aabe731b41eb2a9fc41eb061ac4144ccccee5586e99d556a0e4ab0171650c6 SHA512 b16c4bd5999a4f1281d6691ce05f8bc2a109cf422dd4fa4e7b26b573b2a4b7e33e2fb246681846bbf85fcb6361c115f509898724eb6526f1f49f55acb4f9ad7a
 DIST dbl-0.3.2.crate 6336 BLAKE2B bb912351efaf270363c2a6cefe4da42ae8c6a552690b566e5a7b70115721efd2ef42801500d534de0245b6feff5b6895bed74924c86eda3c5e9a5322f32e1392 SHA512 efed499069e1eacb709598b9a250be353d65dd9a1a27c7fac6d23af6262af0fda60b121c283b9318f301be2d80194ec1ce33733daa554f54ed3f690478d37cfe
 DIST der-0.7.5.crate 82874 BLAKE2B 4af70a870e59e859fd2d3b4ccaf98b1b211776879b86c7496b57bfef038ab41df420f13e15fe5b6afd7793c149783dce8dae7160a90ccaf3986b2f27cc04c140 SHA512 7cf3e1bfee07bc406f95c86aae1f7dec668b8caf09e7bf2b5b34fd7aba84486550e51ed1427cbf38d9089a1e4a5bef9d3ad04bee049925d9afc6bff917e3245a
+DIST der-0.7.7.crate 83774 BLAKE2B 16b91f56d56fe1b11bd9e86579cae6cd11715d16143e5dbc38be19f9c050eb624095f0b5d740308c4c55ac13f9e02bc70581eea33b48a3cfaaacd833dda3a033 SHA512 2d5b5e759155dbebc2529b44e6316f9775ac9b60f9eb6ae54f9d12d40b2dafa70d0c2f3c9912a35593d78933c3a76dad3a686b35bc47034db96fc5eae2729547
 DIST des-0.8.1.crate 38783 BLAKE2B e85ae2d87866a537baf593afeb4e8c9aa2d6d7e239ceb0db077176455d8bae8e7e1617cec084360ebd7b1f1b47245beaa5dc7a4021d920ed1e8a07dde836c3f7 SHA512 2d54b2eecc3fb269f3fd17231088644d685feb81473043131f5bc68b5f682f726065426dc710f76e8c25cec9de597c90a30790ea3a62163a9e9539115e16c88f
 DIST deunicode-0.4.3.crate 109535 BLAKE2B e71874d5983659ce8324cc671a5b7ed86a960a9618ec4d1085d052f8e4b2c9ac92997cd425d7969abcc35c6905f1d54ef371452c899319a39d245a5b36e156c8 SHA512 f3b9ca2055cd64d2f3035799f809976a0909e59b38ebec62b56e9037f32582f5cc99b72b1774dfbcc72e4d978570946cec46eb034fe71145c67e2241b9f84cd5
 DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST digest-0.10.6.crate 19527 BLAKE2B 402009105a6ac055be062769dd4f162aabb977b9afe29f451eeb3e6b5dd1a579c371c5ec996b9c1bdba3b4ded83830ed2e1934a0505480bffba1e0d16775a8f7 SHA512 21d3c1dc64e640300c51e8a009af464d6e3cd2b10aa67c87a038165c11409d6e5faad1967236724a9a4cab8fdd88826cac1db4798245fd53ac2ff1a9b2b68b76
+DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
 DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1
@@ -96,10 +114,12 @@ DIST dyn-clone-1.0.11.crate 11771 BLAKE2B 06e4d872c6a3f8fbdabaefce706b5214641c45
 DIST eax-0.5.0.crate 14882 BLAKE2B e0c4a922cf71aa5ae09f8dc434301242443004895a638eca6237d437f4ee72250036423a21e01eee6f2d27b3d11e943dc68788b0b125ae3ba88918d407cecc3e SHA512 d43f2356586a94915a901e700fc9fd84a4be019c605c7675fc1ae79140b9af161cd30ebc68d35dc10306893ae385d51aedfc42a62aef16050271f2022d9c55c3
 DIST ecb-0.1.1.crate 6128 BLAKE2B c7ebb70cd94d6f83ec956e7131dd62ffc2888a2704a1884395cef5cf8797d9507a46dbbc51c7bc09d0b90a3cfbf119053bbc7a5f7729fd4274a7718f54f1ed3f SHA512 96a100b52683c77ba4d6b052fb91e1656796453f2aab091c0af4c606953f73d66b25838aa68b9a284f9792fc1ea50128a9e74da6fe3ef92dac72e3f08ccee1e4
 DIST ecdsa-0.16.6.crate 30382 BLAKE2B 4c18e8182e4eb99bf67874af60e363553ea615ecd8987fd6e515c06d6dac46803f87fcdc101067c17eca4bec11d3b663ff7727dde017c39179b1fbd0d7c3b4a5 SHA512 400bfe7ec5cb513799f5f008d5d5933ebea1de44d33652e023bc036e149b27b16022f6785b8313cff0b22f67f40dc8d50a0ab0ff369aef118a9e8174f87761a5
+DIST ecdsa-0.16.7.crate 30682 BLAKE2B f72a2ecd548fac9ef25db77fd56584c6ae33052501c6d2cf0373dfaf343290724eba0ed35b97decb7a42cfefa1ce1c8c6f00741ad2f22a6f783031be2580b32b SHA512 93d7c274cae3c36a563deb2ea0ab97fb58bccd135b7bafc309bf1c2c8c4f6acd4f223e0ce22f5a227851debdea0ed3b5f88901578e7dd49d4af206ebe2aa0056
 DIST ed25519-1.5.3.crate 17118 BLAKE2B 5c68ad4ddcb4ea042d4f978389d1f2a732fb5bd05c0cf7a45c0223ff29385596d9d62e28a3a64137b7a8ea2567045e6b8e09af4e8067580885eb17972a0169af SHA512 91d65fd72015807085501fddda784fd6d9461f17eb1269d7a9be2d9434370f88211bf31feb931bf8c587ee602c4fb361f4b5fc47805b14aa276a7b1537d12cb0
 DIST ed25519-dalek-1.0.1.crate 29460 BLAKE2B b156de45f81957a0f631354b7b438e35592306045a00360df71ecc1ae3298eb737fbd436b2148c471f94dacd08ef1c04dc193feed82b1d9963809ac999decadb SHA512 e3d6c4e9a8f573783817e9ec905e5fcb76f743c91f45bfff486625cebca02e17b5fd2c222f03b73932f8bf5ed680e729e6eb81f541d3f32f6d82b7cec4df7fe5
 DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
 DIST elliptic-curve-0.13.4.crate 61463 BLAKE2B 9dac21c59ccbd76a761ca03d79fa52dcf4b0c9a6e8e58f8c09e174478a0cb6d70f4bacc19f109641c54351c5d1bc11c4dcfd2bec2b70763f35ea1e8e0fc1297a SHA512 e54bb972aaeb3b6a96f8c4e01b372f65f9096cfb2181f3d5cb55439bea809fc06c955cfe87cb12184e5329fa9970f799e06e2f45e08064823f7d84dabc01b0c0
+DIST elliptic-curve-0.13.5.crate 61528 BLAKE2B ba2d779fca6686453ef066b6d3d8c0aa9f0cb14e9f237639378da536aee67b6eafd017162c656cfad8eafd2e1a2b1edd02bfcfea70afc5003cf06ca101dfa8a9 SHA512 7bd65972318e51401c700ba6007bb658b46faf9c983889dc43449cc3ae817f8bbe9f38a549b80d3a785bcd921361476ef44f0f4335612a426299c57effd9b4fa
 DIST ena-0.14.2.crate 22991 BLAKE2B b609831e2f5dfb6602293cc3260098bf0dac09afd516a8e6062453724d7d3f516bf14811e81ac3e11efd917087dbbf4f9a3524fd30ba79cca85cee2c0c63d77a SHA512 e66eea99484c2b7fa2df7c8b3df3a10dd185163b781fa03b1695900a148a7c1a1676f7e6dfe2c5d18b61a90a6756de0bc42e9c873fc7a53de3dac799b7c23c01
 DIST endian-type-0.1.2.crate 2340 BLAKE2B 6048948b467403409807fec776add4366685282a277d4ca40c5fc901228c0652c5759210048b28a94c8bb04c39bb3b359d43254e953e5b476112da7e49151a5b SHA512 d8a9b125fb87099f8bcbaf3688e2feb1c463ce624cd3dd36396e75e7aff177ed5033ecc295c02f491be04dbf240aac376e79a5c7cb591c3b208c442e1c1e6bbd
 DIST enum-as-inner-0.5.1.crate 11707 BLAKE2B 1f64bafb1f59f5a98f577bf334ba40f06e5718af6a0a7a7ad159dfd367ea171610cd7a67756431e0dd1c016f7fa8b887561f1543d553617a40764e8e7b6c8e6f SHA512 9408f79d0a249725cd7858ca0c1e001baff276be10d0d2150c0c0344c767439a493712b66e9e79ccf0a6451256f968aa2ca39ce2eda09c5dc5c577dffd5d1037
@@ -123,8 +143,10 @@ DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11
+DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104
 DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
 DIST fs_at-0.1.6.crate 35741 BLAKE2B e40b72f15d0e7552535d495291aea554051536ab86a2f2f614fa433ea61dcfdf0da2428cf1e0c9efaff7faf8796a62605df2db8084ed15ab5e3bc2fa69ac0313 SHA512 24976b13818c9ff223363aa2679cdbf319ec6971e26d73b0fc03154801a0e8d1b1378137bbf740255dbc9787a1f3490435d285fa77a601ab88340ff16bebb3c0
+DIST fs_at-0.1.8.crate 35753 BLAKE2B a98a8f5f5177f1bb21346662b537ba9be04fc7d5745a8302a1347a76ec6cafdd3733492a8aad9bf1d63de2b01c8f6d1164e62efd4a254437709720bca4e04ade SHA512 af21106c82d4e34ec522b1f2b8a8f32c61bd49826ac63ed965b3fcc3c9a5c028f67dd759dc667fbdf06357b4dbd5cc78e4c70bf361048711901679796837ec86
 DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99
 DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0
 DIST futures-io-0.3.28.crate 8910 BLAKE2B 5554e9dd8548be47e7195ae8b223288cc2e765dc9feb703092972ec9e19ade825bc9d7093625a77c7dd2213df59e2c70ada84a84446b5a940c3e62daeb9dd57d SHA512 805177f2677a09d94ce5f010af9244e0e0dc285937e355a836179297c4c912a762f8d96bce57af388502810dcb67a772b7a522f5c6b21be3aa4b7ee46372d402
@@ -133,10 +155,13 @@ DIST futures-sink-0.3.28.crate 7852 BLAKE2B 752286cb15ff37e9bf4c6cc80c8ebfeb229d
 DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82
 DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4
 DIST generator-0.7.4.crate 29919 BLAKE2B 9d851e48f006f1dadad8f275843f06c1ea031eaaf92907b5e22255051865d54e55307adaa1744471598e6b693aa46de753ab38fa307eca622ba840ebb147ef3c SHA512 b5264d30f3873f45bb66c9f0dd9ff1fe961c4632f4659f2dfdd43d2e2dcf07ee0e11c2aed600aaff0eb6ceeda9af750d8ee6a33ce9c119d7a144a973617f0ffc
+DIST generator-0.7.5.crate 29947 BLAKE2B d6c68ecaa48f30e3657bab1315228194c679e6bdf71cf7ea28273ac20aa34ba416309d6253ac19cb5e940e7c058eed39eff1c0a5594103389136d10148bd1338 SHA512 fb634f5fa252acc3d22ff925cfc06f02c4c82c64c567c98fde9040b457b8248a6199d0ccbdf27d759e75134318c0bc1a9d9cb351af4edf5332cc184c90c89d3e
 DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
 DIST getrandom-0.2.9.crate 34457 BLAKE2B ccf7232ece1047000140ed6bb9a1afa784be87b5cf83e2f58dff77abcd79e34120b45336cb05e47fbfde36407957fe9da8b04971092ec05f67b321fde9142d29 SHA512 48e341125223945d1c02c4dfc54df303ae27d3ceca0d5a30b42065f5e40da600cb2010bb59e88af6b990d54b5eb4bf83ae5bbd27e13e56363f5f68be03ea9082
+DIST gimli-0.27.3.crate 287904 BLAKE2B 97ba399c72cde7b11f0a103598747b58b242ebb808c60c037292b992e30d8fc5e212e5620c233e485adbca61cfc433a4697de3ca76c183ed517a93cad4f75c25 SHA512 b3782d510bbfcbcfd8801b4343a6864b91cf954808e935745caaf1b7e7b3f2f94814f1543de9a36a8d4e5c29d08d69be9361aa2b31e7a261d5dc6e7b66ef4ccd
 DIST git-testament-0.2.4.crate 8087 BLAKE2B 31329718dee9eb57ed5af1337c5e6169a058f762a1351fac032224146144909a9bb044d9b00ef5564937763a5c79439926547502453221073055a13b4c5891bc SHA512 e1753aab5b3913a4c87ba57a61031894ccb688ac6a2b0f3f1e657fa56c08144ae37feb9fe9e4fde129a9ad9c793be5cfb38a2c07d93c4412b6f9ab23b2d101ff
 DIST git-testament-derive-0.1.14.crate 6911 BLAKE2B 9817b668785ca91b97cd2938dfacb4ad30a7fdbc3b69e4f8323ad86f834dc07db1c0ecd5e92809528361590bc01cf2fc82953b62c15597b9ec8548d9a7518c74 SHA512 8f88a723aaea276ae09aa04f76d494d7d3bbdcadc05009baa70c5d93c558c60138901edeb69117293cbe2eb52aae71bf2caeded7d0edc0b0ffc071ce9acd0e47
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
@@ -144,11 +169,13 @@ DIST globset-0.4.10.crate 22923 BLAKE2B 10bb8db9ceae039143e36c2f1c3cef92848277ae
 DIST globwalk-0.8.1.crate 13705 BLAKE2B 4d0fcc805cfddb47af24f5d8f2c4f9bcbba48a8a523e565f7ce7bea767b6d108ae5e3f5cccf6647b497b3690f862e1652812b9d83ffd02c634119d5e03d1a7e6 SHA512 3235fdd9c24ffc54994a0b37862c44e16a4c9ef6a7e1a008c5d83dc62a9683ade97e451e4da7f6db710be2532339a55038fa3bb85dbe6685d1c807cf42f6d955
 DIST group-0.13.0.crate 16526 BLAKE2B 099ced5b8d16e6fefc331f2d89aee931ec5900a168dbe31bfbe29bd00304e8525fa5763dbcd60cb19ac6c62c8d77877f2d83e700c7ab18255b08c9b42be60d24 SHA512 359db06bee4cb51ffe799d9c408791e310e72fde3bb3fd447cf97482ebb909af07b43e9b728e3639d5497fc905b650bf00403b3a6b21515e6628c2466e0851e3
 DIST h2-0.3.18.crate 164556 BLAKE2B f56f1dd7b3beb8c9c0c5e6bb532ce84011b06a1886d112083aa4acfa2c036d4e00604fd55d863c0c52a4ac4fec2fe0e0d2e1a91a8e7e9b3ee703c1f4101f42ec SHA512 161701ee45571bde92a6c3899c8c161a00727d7963cc46aec2607ee057bd490240c6a6f476def9478b44ad4d7854591237d96240ca4d813d3650b07295f7be22
+DIST h2-0.3.20.crate 165260 BLAKE2B c8bfa3a762668f981326134e7632168961679bf45ffd5e792edea1f6fc78e2fa9ea3aa93d7961b27f4a1b214583cef0169a9af5a7a5854a870bb71f36f172bb6 SHA512 179a99bf8416cc263795b5c3957c4f722d53474de66c9da1729a0f0748db38f49211f28a065c9a5de23fa4c0da3d40a4ee4f7f182d4c9f601e512c70b1eac450
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hashlink-0.8.1.crate 26404 BLAKE2B 6dff33a44c6cfb19d0258cff5ecedd6677da0987f13b2071d816b22e0c707fa0b4c3efd26e9dc62516c29f8da29c321561a4b785a916c3f5349a061b26e7f17f SHA512 e6b0e843c3dab51225c90b7428fec00c5047d6ea15cb7987d7884271c0da6b5ef66e4d7aff3de764c41ad916724518e9a556b582f6ddc745151d983de0a95155
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
 DIST hermit-abi-0.3.1.crate 13793 BLAKE2B ece7865a09f566a95bfba5f1fba380bf12836c3761fc6d5a3d5543d3e50ca0eac81bb567d50b5643849cf1a752aa651a0db4c053c60faa8f1c74fe2f12819d71 SHA512 a55fe9230e4e8fef63284befff74108f206e76067257439d334d33068875368902dc690926a1feea15611f14123073867d7e9cd21397bc484cef849d6e1dfbf9
+DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6
 DIST hkdf-0.12.3.crate 170910 BLAKE2B 08d0c28891f780abb46936481251f217e9d8f2d17d04e6e504368fe9028300ed02f091cf6a0a0983eeb02dee04309f713f73278e9b0f1b918caa2cd998112753 SHA512 bba8bd837e994e5f5131d4269fb80fb84d789dc0ca68dd967d71e92576617c933ee8c355427b470ad71ab89178b1c36e8a7e122457287f023dd4073605784d3f
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
 DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2
@@ -160,37 +187,51 @@ DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d
 DIST humansize-2.1.3.crate 11953 BLAKE2B f5ed4a378fd6692a6241c84657f9ce5422ba7331be6fe79b3d94ec87827ecb8459a1b214f7ff6db00696fbb17bf921c718860de4139b969a0f386d7423c1a4b5 SHA512 0adb6825650fa074a0ff33a4090563987ef311de5ab23e12f715286d8198310d17cca9028f41b8ef0e17d15b939e50d165419853ffde6a7ccf977d33acd920fe
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST hyper-0.14.26.crate 195570 BLAKE2B 5a663a038d930c467fdfb2694eedd7f98e3ff994516102d5f6882407d3d6edc6f2195f905d707be1c644d7286f9f17188ae5f0fb02a2ff1a17d2621b0abef36e SHA512 7ffae47f5d4e98283202cf6dbb0ad8ffbcf9f0207c8e8aeece7432bda50f4e4d2b2fd97e85c89a42d23b9f607dae5c223d51f90b41b8b9b060bb84781ec0224b
+DIST hyper-0.14.27.crate 195700 BLAKE2B 4c079a6f99b1da3816c08df3935b5c9c1a3acf878111f4afffe67cbe816975aae0bd49577fa7cdc1bd55ed78dd2328cb1b0cc09064e9bf6caadde91403159912 SHA512 580f2589dc1f938d2563d3fdfd1cb2f1b11278333ac54e813e4dbe50a0e63952546385f057b20eb123516b2f74e19b62a3ed0cd546fdf868f6a5770cd95643a2
 DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
 DIST iana-time-zone-0.1.56.crate 19517 BLAKE2B 88a83a65b2e17afff6491953c1ec508168e3cb0d720992c7958aa98ffec263d3b32f4ad07664703b1e429d96faa211a50c557d5a1398a849c45ab9df796f8e4c SHA512 d1bc3ccc17c6d3abc44f8662a15b5c84f5381f90dceb5e14a826595706178ba0f8cbf7cfa86d3b7e967a51ef75a27cb868fda7a3531be9bd6e77e813580131e8
+DIST iana-time-zone-0.1.57.crate 19785 BLAKE2B 2304a63e4d3a477125ed07fccd5a84832f775c4a0fbd60a995e6f1850aaf3f5047c6f70975c9f6334f96def12770d470677e1f536e9817f8ab1df8a312622cfe SHA512 79bc0fe559dce022cd3c15ffc3b6f870c14a40de6d5a61b4a5a6ad28fe7efce82a16ac5102073a3510f3ba683843475f7fb8a4029bbafbc1cc25e48b98ce2fe8
 DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369
+DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
 DIST idea-0.5.1.crate 23243 BLAKE2B 3db4dc0fe83e1cb408e7e2b69996e6d58af18d43efc2cf4b04227f5465ca2446e805b12bc760f10f0acca284f6d79045a9173e1593977f04690de680acb9fe4d SHA512 f5d7254816210734f4c6f4e74801b38ecb44765cc97692843444975e7e62d6975e021f7010c11e991bfe46e254478fc0ea08634759ea9ad5c37ec2c7ee8141cd
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
+DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb
 DIST ignore-0.4.20.crate 53551 BLAKE2B 9c2b8d729ac7952e84fad82935183face8f6397f925dbea37b83b438fb327534c64c565e2f5cdb98d0820413f5c50062173887f1cce93a50805ec5e2df43a807 SHA512 e90c5c356252fa1c573bb92971477f2805e4167c3e7878e7da6756ae14463cca328a6614d448cf9a3a28abc5bf0f7c62313a8cb8103a04bb1c3bac0d0924f658
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST inout-0.1.3.crate 10743 BLAKE2B ac2fa5cadd98088ea3f6eb94ca46b3a9ceb6547ba49f0de311d86474d71024d1a087ce9b8d44ec808008db69146e9c81446bcfeebeb2fd74d2e8d0ad2c4975ed SHA512 1db5bc2bd87aae145b3b0be6669a9a722df2aac8f970fda210aaf945c372e641b941cee822917926dfa1ab8381c6e99cc7df4b18d2f4e2fbef17fdec36ed2beb
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST io-lifetimes-1.0.10.crate 37294 BLAKE2B 9b8836c4bf30e6d102fd9973ac66f067c3ff8bc2806e55f26368ebdc9854f2e9cc6eecc8014f9a0b22a968a6eea8be243fcb7a641d2d0dfc747ee08a6a1450bb SHA512 4b2cde9522780a408c5d4e6406286bc5dd3a0de1a99675129e9856e5d889498a127fd5dd7c937a7542135abc2213b60bfb6258b7871b8709dcdd79d60455bea9
+DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
 DIST ipconfig-0.3.1.crate 23904 BLAKE2B 2dde11775d976c009e74f005a3a8689e5631d1d922665fd488e907356479fccdda7f5bc27cb1aa0bc15b81e5ffea05b55d0299ea44d8ab4e02a47823b2c6723e SHA512 6ca490d52dde70c270776f1e4a1ca57a722b2a77d9f2fd6a1511b964bf86ad9109d3ac26564debd30bb51c6ae3b91cf594273e7915a339c09ddafc5ff2e47427
+DIST ipconfig-0.3.2.crate 24468 BLAKE2B dbaedc8f4ec23fbbe48a8c79f16fa1575b8374f055237447d12eb009694067a82bd54b503f73f9520e9b731dbf2b7797ee2d6fe2c07ad3946146b32cdc68ad0e SHA512 6029a7d453db77bcf397580fd44c5c777ce6c288c251376cb591174e9fe0aa66b49925764050cc9bcb2d656a8f6c4af0cbcd6685b2ea4616c2d2cf8de9bd67bf
 DIST ipnet-2.7.2.crate 27044 BLAKE2B 0adfa02e7ffeb48bf977206e63583fc5e20719bc7b850b4f3b2c9f934af83034478c96df1a5c2c3edecf4c58362f25cac42808191af0ad0d7a66fedef91dc45a SHA512 53cc9dcfaf4d4e83a436b739319d892e1b0e45cdf85a36ac6a8a1594b38caff719074b2c6008361b1cd40bf03fc705e9149aea54b4c75f88af2da9f20706e39e
+DIST ipnet-2.8.0.crate 27474 BLAKE2B 143208136453b9c97fac5f1166f395dbbf3bdb6185768fcd8e5d4bff867802bb1ae09294d4d7585e26b7726561f84f4a2ce1f6a730c8906d34a5a5c5f50ce8b4 SHA512 18773715f0acad731885e551a402432a6fb29f120575ddde380cd8af8d332acf2b5be4657d1a321ae7a6226fa0ae58feb6ac295b6e4cd255144465c2ea2c0692
 DIST is-terminal-0.4.7.crate 8356 BLAKE2B f0f42d6f6204c68bc8a9e1290b9b059ec55f5aa2f83f6966711a5f986852befe21ac9281fd611e65cb4fcbf35dfb212748785c7258c44602e7e390c51f09dec5 SHA512 56c00b2942963f8a0b5c40c96a885f85565fb09e247bfd5a3e77ca5c9e0e0e40a17a8d809c0541177e8b496fef87baac4b86c751765491ffffdb631515d8acf5
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31
+DIST itoa-1.0.8.crate 10465 BLAKE2B e518264938d044e24a4d72cab788de717c36cc7396fdbf2805fe3a3e0cdfc361c4f6fedee7bcebea6fbacff254e073da26b2400a073fa75f75523b8ed9de9938 SHA512 6171bfcd70634a2587740c145a15790e12807d2c756a25e74950daf9dd36acc662f12836c5b87e20483b4d020bc0d98a352b8e9787b0b8544bf1ee1b6a0c2c8e
 DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16
+DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64
 DIST lalrpop-0.19.12.crate 226898 BLAKE2B 192e6f5775f19dcb074306c24628741553af7a46817bbb8df6f95d3720c0a3ebc43f1cdc39abee6530841d3957228d2f1efdecbc4261e44e320b7a92fe198b58 SHA512 024acbeae8379bbdd170e7afdc674453bcc997e5fecb745fa77d45a689814317d920e544872611eac6fdaf949a0696d32f9362746e370c0eb81d75e19d2f8b98
 DIST lalrpop-util-0.19.12.crate 10178 BLAKE2B 4b515edd3d9ab8bf5ccd4a0c6ae4aff81a11def178be7d8afe5f8baf1484d07c14e8bd1baeebcf47f8a19995aba1163c6613cb20d4537bea8caf15d489969f4a SHA512 0c67a5ec42956a9ce243bf662674cf918219ad9194f377c4dd0d4f62f5846f7666e1332d767429f5215659a6463e3f8ee40d662ca66af646ebfaeac6c1821ce4
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.143.crate 681601 BLAKE2B edce6a36697c4c0f9b31e6c380235c0f36c39b98316cc35ed341ed2d4d95aa2a50dad3e9d0d44330e6a5cea77191f97e79703f298f3e1cbebed1a0eaba71014b SHA512 245590127b37b5c3f66392f8f143f872f769f283c77b68b88e23d5e14aa1b9770347021f4d81e81225ca4ed09db6e925d47602131edd83c6d995875766824b6e
+DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
 DIST libloading-0.7.4.crate 27580 BLAKE2B 491faef2659270b10bb88ac46e0453f747f35e78d7f28b7d6d9151177b4c7a7aec0a1efdf702eda0988c31e9dafff2990eba4e6a9b0b695c535ea9086ccf36e7 SHA512 34439d9eca68bac8fcbe2bc94a70e07550e7e95d713ab74ed60ba6736ec807fd9c9135c178d436fbeb39afb074b2a9b05775d953340845c088f5f8712f5f56a1
 DIST libm-0.2.6.crate 113690 BLAKE2B 5828bf7a14fc62b28da148284988292646909bba60b2d82bbc6ee482fe0791576133d9666edb1b57bd5208469c78f2b2560223631fad4dc74b7e0d42627ca5d2 SHA512 6ba263c95f1c555e66fbc5a5f7d0f2aca4e20f6aaeca27c3baa4d17aa00b88830334736fc58d268d98e50bcab65220507b0d8e7973fcdbf14600ab3f20c34a56
+DIST libm-0.2.7.crate 115688 BLAKE2B e180347d10847c40a88e43d321e08561df053e6fea0cea2cac480c4162c2f31d8697b4572a384edae323d43781d3c6462b2d77220dd71b2fd0da3a2757487db1 SHA512 b7adbf657be812451fc50cd5e5f92b7a71d43b4e48761bd2738d65498c9abad851f8e86d3be06ae75cf39c7798c23cafe767bc5fd40f596774e858f69fcb46d9
 DIST libsqlite3-sys-0.26.0.crate 4840390 BLAKE2B 2b6ec9f110afaa17cfeb787f1d99a5bf5e6f062502ce80d31d212dffebde3be5cc9f4bdaeebb9e0ce0f363b0df5e86e5115a2c6e528710b1babb628cc1bc39fa SHA512 8c1cbadad1b14979555121423cc8245ebb6cb4bd72ef93202c5188c4d799cfb35f7ed8e9d7ac420a86cd1a3da7f15426aaa928b6c16510592d8739b54ab324dc
 DIST line-col-0.2.1.crate 3915 BLAKE2B 7723ef44a9e7f1cf875db5dc496133b4c1b282850d9e5595d90f35f9ecd4dc83e3f3fda500702d177153d02cb243f2816b624e2bac21880f145a1dd5c37e1554 SHA512 386827d209d462f38929b0615921764ffe77ddb116b322c61f4220fe4eb19c3ba62e1a235263afd22b01416f2005073964d7ccbc775366f735e3d7306547b427
 DIST link-cplusplus-1.0.8.crate 7674 BLAKE2B cbb93184d9deadd4912f6e03dfb7bb9d37f01b6d8d47dc9744724c848f297adb9cafb1599c2bbaffbff336f883e9a24c3cb4f11745ec4716a9a2c8cfa05f6305 SHA512 690afe063eb9726faa03443bfd01789a559aa10ded4bb3714ef7b13095005c817ad019fcc62b5f7b286c974a81e387ca3342d238e60ed7ab237c3628383a661e
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
 DIST linux-raw-sys-0.3.7.crate 1013423 BLAKE2B e77b372a391c0389674331647f8f479d96ebfff99f6bbe60b6d8935e035834026e15c056f098c91ed328e512b72b7e25b04534841aac26e658991e41fb9963d6 SHA512 49a84d3e57f3e3985fbb82a2d59df55bd7a259a65a2b2dc180b6a32e92eb1dedad0edfdda1fbd51698dfa31b1ac06777338910c63564a14d1e85d9b7344d21dc
+DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
+DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
+DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038
 DIST loom-0.5.6.crate 72186 BLAKE2B 0d31e1533b954c59c7c46a3158587dff2b9ad53c73d369a9134cf731c9d4d239f0755221cec50ab15e3cd42a35f0b7eaebeccf07285b0a89675df8c0d5cffe56 SHA512 e4dfb7d4b07acd33b6db8e6fa54f66d33782060c553a71723329bc9e5c1e3afc10de882f3ce3b882c0b6b84b9eb19f4d6699e534961192e0933f88093247a4a7
 DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
 DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6
@@ -199,13 +240,17 @@ DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346f
 DIST md-5-0.10.5.crate 14573 BLAKE2B d757d4f0bca7f1226380654bea1f51b4c7cb28f6b6e039094511a49dbc714f7663c9ea1987bd2a89173a1ed66365fb648725e6a9c12c49161b88074ddf52fd21 SHA512 3d362db0dc16e5d172dd581c9daebeeef39392a605a4c7e7527c2c0378aa8538def33dcac9a1431ea4ef2a5057b8785444b2a89da0b37b18f9f8f6e94273262b
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
+DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST memsec-0.6.3.crate 5512 BLAKE2B ed2a36cb139098be66fda58f052c2cf22bc025e34b9ac2b11a1a8f848d94df6165f205543ea30a5e7b347b85fe41670973155f68c970dde145b41fda551c5644 SHA512 6d4ed30d9b975b00a3eb4b92bb1c7b83269c2fcec7629975334e53b7683ee28e4432ba4390d1590d88d1c4a0e689dcab38f338a6bdcefd3bfaba75067b819d8f
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
 DIST mio-0.8.6.crate 93658 BLAKE2B 32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b5104ab7a1a3b84dfd299bc7bf7f3671aaae0a2759a56120740915d380aff05af5f5f8b9e8e22fbcfa8203 SHA512 45b3d2a911b66be556dfb79d87ffcc57ee5f33a03fb30f319631796090caf8779e94cda37fc7a76685c69483f1cc7616c15440b71bfcc51239928d8879873f6e
+DIST mio-0.8.8.crate 94264 BLAKE2B f70334d3daa8794079c865c5e91d9b32fee2b90af95a6690f7cbe0765818ed9a0f5d539f3390119565c3ed47025979657e30ee2e871760a776829dcddb59783c SHA512 448a05f19a147fe119965f7f1aaf24c2a40ed816ddf2e5c95ba3bdaded5e2812314c64a50dc7baada93bb005b65159cb6597f82a407936885ea376bb128b0c9a
 DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
 DIST nettle-7.2.2.crate 575136 BLAKE2B d82c6675a304bd2c8dd2184f101dfa09bf72d5ca1293e17df38146807fd7cbb131c4858f24a251292723a5b916ccf43cb8b660e0ec5d5f2ea61f8be9921799f2 SHA512 d799680c0035cdf46be176fa4a4411a0a8e76aadd5e249b683edf85b8e0530ed36c1735352043e4764a64fc432d4e6669cea6fe5fa54e8c3c8d5c97f2932cfd4
+DIST nettle-7.3.0.crate 580277 BLAKE2B f70a60e47a633a399843a7d2cae466c3695e09f442968009c93a26aa40a806966c693765cd3f9e361e3e8550efd54e4c72d7ac3263eb159da850f55b7a8c52f0 SHA512 658b7c72eaa86c574ccec8c10ea4aa37480c1d7b92711a96274c7ea75d89c96d669d2e05145598c835a1f34ffb1b2be005cef278f7bf103b8d2c8b8d96213cb6
 DIST nettle-sys-2.1.1.crate 28024 BLAKE2B 479bc5479a835abf0d959835cd2b57913180a9d0022a78af01f295f5db864ba82e3b240b63fd54fbcb51794f937595baa1fb0e41319a291ea5ed8707fa524dea SHA512 a9a299ae3e55d54603430fdd46c0b26d07ce21ebd94c759e76407ac97f5b9568808bdcf43d4981b550f6a416860e703314867a25939d985418bde922644bc288
+DIST nettle-sys-2.2.0.crate 28559 BLAKE2B 87da765ad2e88e595a6fbaad4f3d972e72c0a1fe4b5e16efd91e9c0f601c307c3891586f27e9f6096224775253479a4e63b37f2c73133e5ee9122b53ca863625 SHA512 db72ab5f0bfd79230489d1310ba6d91ff55ec8d7229f0c21cc309fcf50aba6c8db44fda946c01642b4b9d348c7d113d77d3c13f7cc395f7fde7e9c50cbb6e90f
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST nibble_vec-0.1.0.crate 11796 BLAKE2B 2e80648e4e18d17fdd41671acc1e166a8337fe1ec1765e5a7f08c19fbcb23ce43b11d1cb396b867b9a2c0ae58e30225d9b13fa337793d8c32abf99969e7c11af SHA512 21bc50bfa5f11f50b19a20691346f098db083ceb6891faed72fb91d2e911cee060ad4d19ee1c98792c5809cb6ab2bd65061bc051a1dea75d9096060b87497f67
 DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704
@@ -215,34 +260,48 @@ DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa
 DIST normpath-1.1.1.crate 19786 BLAKE2B 39c955c41283051e414f8576fdaa51f11f0ab5a23bfb7f6aaaac38fd9474912721c546810c02da335a9095fdd6d8e37ff2f5fad2aa93d93c21b4be76267088fa SHA512 05f1f498f571c57c2307d201d5fa15c72fd2f297b7854757107bb27684470d43a4d40137d31c735018dd2ba50c11f23dfd5e989909e809bdedcd7bbf018385ca
 DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
 DIST num-bigint-dig-0.8.2.crate 123759 BLAKE2B 1b32e9bf4e6bd079c9836565e9d1b7b89acd888907b789cd6c5cad4f0a088519d8fb84bf0de8c7656e9ab3fab439d7f537d43b5506382e04727290ba158528aa SHA512 455f66517dea45e9785168f4e51c6ebcc612ade7ae4f02c05fd4c77abed015703ad9ad398cba042ad129d6712a4b9b49b0e7c5151181e0fdc0f465c06ded687a
+DIST num-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-iter-0.1.43.crate 10655 BLAKE2B 41ee6d80f38f0767e134835ac84dacee8b50395b29c3e620b74cf4a843cfedfa71dc690e787b291a2b08750cd8386f1dad768e1b506ce088df33cf9e51b90a8e SHA512 97ac20f16d4518c8cbe944e5c80089fa6bb75d4632fb9f3c9d9891aaddb0e0f2209f6e854317f3d3b41bfb330c9d3ed830f3797f0120d4b1863b1d6fa3b9c07b
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
+DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
+DIST object-0.31.1.crate 272843 BLAKE2B 1f2e8ce0bfc2f428889df856bf8fcefcdc754d5c9a934a65b65903ed10c143daa1408e97a1f190996ea451541d215d4e4d7a53c5d2c8d9a6c9ffe4ac6513a56c SHA512 e9cc2eb5ba516e4a08cf3fd5f496d05bc74ddbf1846d6b6ad6fd25a689aa315652fc5710be6bc68fdd678673b7ec8d63b4ce999f1fcfd5b281154bc25a915e9c
 DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
 DIST once_cell-1.17.2.crate 33335 BLAKE2B 8f1bf825fd618fa1070c3497264085bd354c9b470aab08663179cf2eacd1778b6dde0c54247aa5c8091be97c40d3da20e56dd92981318a0c0ce85d41c3a740d0 SHA512 8a00338f5aabe766fe5cd741cafd8c2ff544d60d081e5706b0965db6c86e00cc7b5fa0f73d8aa54cd1f4506a0858de589ceb4bd32afa7046dd3a1fbcf52b69d7
+DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST openpgp-cert-d-0.1.0.crate 11172 BLAKE2B 97e2e1fb00ae9401f3dd13ce20e6f97dc8609fb5550dd91c0a4db37daa0e8d19d10b01c67b133d8043719b2b9e872d908acd5571a377062246392b35de384749 SHA512 bef579a914438ee62ae92f150e3b6297a523f67a7374333b2ae37eb2a263c6e0787064aba49d91ee0c4805d6d0a205308f118028f8ee9942cc6c241c4a5d17ee
 DIST openssl-0.10.52.crate 257165 BLAKE2B b4accd62f52caa549b3d89109ed3a1e8a9916d30c63f4f0b7574b64855d0fe5a009648ba423de389778bf2c9f11171bb31389a3fb15fc26e548d886f271f6fef SHA512 92ba2341c5cfa42ccd1e537ff222e560fe3246eba35523575f6d3d6891aff6a88a07ee8836e2d192f6b1ef32dbb4385d5ba67777e6ce72b9c04800476e92aa11
+DIST openssl-0.10.55.crate 258750 BLAKE2B 288d8d0edd23415be5aacbdda538d43bf4b0f3dd12f2217f23e1b8a8a69ea4f731e93fabba70e07c29716faa8798437bcaaa893374df8523b8af3f36debbb76a SHA512 397a970f254eca152fd4d8166ad7554c1bae2593e27150132c4b8757fc439a2ec61e45b92440408a92334bd17c57e0adda64680ebd8084ea346ac713257454fb
 DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-sys-0.9.87.crate 65702 BLAKE2B 578cab5b9bb3cb4dde866f3492aa3ca36fef7eb5d367ca46f3f93f388121ce131cd85b0b59a703e9bf989a7b891784fb54270027acc00f217356b3d2d9a60bd6 SHA512 b2f8fdd679aac50b2f830db32ca09e203c7d40a6bc0d83dcf66efe641a38a65e86d8ba9881b4fb073069fa54a7ff206e24d28b29788a2cce0c60e5e1e3d3ac39
+DIST openssl-sys-0.9.90.crate 66197 BLAKE2B 4cb5f74619b595ad224e33679023b3ba73cb99f8cb81516124dfb9b03ef8af9ed2d20b705acfee4e2cd08387fe20133f20a55114ffdb4b14b94e7b2142529909 SHA512 6b0eccecca799093f15fbcd17f3f37b7b4c83bb11fea1c77b1eb3e4cd1c9ad46e9c5f0c01ded7b22c4d2bb5e8d0d864f15163d481fcc973d6d06b41707fe7dc1
 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
 DIST os_str_bytes-6.5.0.crate 23166 BLAKE2B 60f5beced502b7bcf165dd2bca2989f9039fc22cda80bbb09d2ed0eb115831c6e0f80292e656f4bf9c0b0635ad10210c88c1b23bcbb59b8d2729b6cda473ecd7 SHA512 cde7779ba24304256cc57de78208af4d26bc91dae7fbb9c85e3f67c3e35cb6268caf3fc9eef530a8d3cbdc951ec3534223f3559d2a013561912231ebdb1801b2
+DIST os_str_bytes-6.5.1.crate 22778 BLAKE2B 1d3daa82b41e6e360ec17051be2c5b1a394fe49ae349b2888e6f30fccf99d102c71357f76c3f68118de59e24480221b352a223ed01f26f11bf707b1c7de81941 SHA512 6d7a4475398daaae4e3d55ad58a8fba729517acf5744a5a6296f477207ee91e5bc36c2b54e58f6f9b15ce9bc75286e9ba62a59d577f0171d8151d3aaa01311b8
 DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
 DIST p256-0.13.2.crate 63434 BLAKE2B 8c0d6997b60299382f1da2b7caa1b0353b787352bc3de9ec7168bf224ff7ca15b2ffa28f99377eb11cb6cec3481e5d28c68042ac88c1cea27e84aa8fff5e0658 SHA512 4105c597346e2bc74ad7b7173d13b3b46cf4a1df87ea1699586cb7d09beb1b9f8d152b2bd0bc6849c69771fe4d320dc15a9e275470923b495971e9aae54b0ca9
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
+DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd SHA512 8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST pem-rfc7468-0.7.0.crate 24159 BLAKE2B 478d355dd970b9705ebcf44d74d61ae0694db6de16b2018548fda88546f53e35b965ff72d939def399a49fe97d3c8317a10385ace94b3d552797ec64ace1eb8f SHA512 f47d3b6c7c8bf4547916acc2a3d6671f6c1308e74641419c8f1df810d8bd940aba8f94d361e4cbef3eae3b7f11587cd3996a11be3be41d19111abfcde7a9272a
 DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
+DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd
 DIST pest-2.6.0.crate 110060 BLAKE2B 03a70d540985f607d234e3dbd474e12f1b69fbd1853b270eb58e218f8659f096cb66ba0132eba058bb41f75abbec45395829149681e69266762ffaa709c4b84e SHA512 4ca4bbb381732f7b2a893a2c398e45532d0b88db26294895e272bef22c77f49cbf8e6e9723eefff9402435c184a7df9c2e6c9a08ae475ad84477ee0883466fea
+DIST pest-2.7.0.crate 110274 BLAKE2B d40ce45c0c558c25cc0b1f686ca46a24a1a6d54f0184d7ee49331fc6df0d2f30fcdd8a266ee91ef5e12aff680ddb2c455992838b4ba1305db3411767af666648 SHA512 51d3cfd4cefb3a37d7e32d217f1ec0b1007e5a57c3ae4b39b9d89e4db38d755becebca8c65a3312c268cb333ec94101ac0bae6470b04e665406c577f07cdda43
 DIST pest_derive-2.6.0.crate 18660 BLAKE2B a89b55611faae634c60966dd2374d1c60d77e60af7942471d7e6f85aa844b9b609d0c6388b613fcc644b6638bc2d5ced85271a1ad3bdc8c289ad590f3049c578 SHA512 9e6eae1ec19a330206de35e1519455239d8811072b644a18875a5438744e76a354a79edce665e01c4ab45514c8802a32e518b83d49bd4131909c46430f5c02f0
+DIST pest_derive-2.7.0.crate 30867 BLAKE2B 90857123f424a6e0c3caf886575d3427f24eae51db8c446a1bac7fe2207e5096741df1e4ea63f63b86018dba1b29cb29e7087575aa7296eee5183c140c9236c8 SHA512 0d6fa04202a6744c9103af769b049c6aa6aaadb96ebc31419eae6a89ecc132bef73c76b604b692c1495fed0844aa3519e973b70b74bd3e604e61712ceb70cf2c
 DIST pest_generator-2.6.0.crate 17257 BLAKE2B 7f00856facec873586d57677dd2f486642d79fc0fe56c3d56f7b570da08a423573fa42713c542716e7931adb74a9d88dcd63b0c2625583d5652f6bdf7a3bad43 SHA512 aba6b2519d5394856df1249371e72353412dd8688f93ae109e0e466a43447579905ed3a3f9228c22c2d1bda60a0e7b2df5833afaeb3de2edd65cd4c5a4dd75f3
+DIST pest_generator-2.7.0.crate 17331 BLAKE2B e201f5fcd3d4c291b5471e81fe155890c351d8368424de39bcc910bc5ed5957e6683aa52b8d61039a66f786ad6133ad2afefecefc4060715c46d0ae730ff251c SHA512 39961fefa597d64ed9884ca325c87a0eb7be7a6ea5f49a324d7ccd28c71d771e9df4be752a6770d9b7a9dfa43334384e2683b86c8e76c275c1bc9af004394f2f
 DIST pest_meta-2.6.0.crate 34051 BLAKE2B ce170a7dd30c03bbda9a7d422ac162df883be77f1ec2c9630a6eab57363a5574f1b7827548791f8476f7475c66e12b8eaaea7db84c72465de6e5330db10fb488 SHA512 89bfb10304155d55d02c72ef6e5b8719fddf74163b833281cdf965b3b74fcab98ad2451323957cff1c97eefc4b380fe5e673e72ea9a19ca4abc4026a4d3a6fdb
+DIST pest_meta-2.7.0.crate 37255 BLAKE2B db460f71832dc36c1b6bab58fbc553e323b187c4d773cd22a61c112cd68e44bdec09ae8ea8f0d3e7d83c32c9321ae75e1dbba26183c84df00e77abbd210d35ae SHA512 35a7e20fb9ebfd1eeaaa9be74a404e3c38fecee02059d8fcbf34c062045883bb7cb6bd6668f0a31bfc96e319777cc4a293c4b6f5afa21e7e4c68a90860921f9c
 DIST petgraph-0.6.3.crate 185740 BLAKE2B dc3d4a0c29662f761bfc107d9654619a3443b07890e0caea5851a6dfab2f071181ab94c521d641197e159098885363d7ed4e1c9c34333fd1339c7484c2237c4e SHA512 9b624ab93ebd06fcda716b1e79dd82c5594a11c71ea0ad806b6b708fee3f432ee174ac292c5af3bb0c84b411c26564ad11436624a52ac4e74ed40432778c21e8
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
 DIST pikchr-0.1.1.crate 75225 BLAKE2B 3a4dd9834c922723ee2ba620bf39fc9c41df65650504fc6f015f1ef086fff5b36c1baf2656daff9d1db86c106e55b9ec2bd91687c692e2a183068a359e33db48 SHA512 d3421eb1c5f5c4d8b53e77dcd5d7aa6f05e169959b075b06724b5d370171f9d60a509095185e04202fb31735df7ab658c34752e7cca6162488c4d850aea97991
+DIST pin-project-lite-0.2.10.crate 28026 BLAKE2B a8e9cb7b276da5f375113606948ad0253d0ebbd1ca5a9b59b1c71cab67ca514ee32b542fe9e6915b33d0387a8bc9f04149fc32227f9a828f16bae966a0cbf26a SHA512 8800c296f4d152324bbcbcfc4e8b7c3199ad8af5a73cd86f89893bb9759d67e1a614676aef0ee93cbff2e7af788a3cace3b05a2cbd1f1cc32c59e4138f7d5437
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkcs1-0.7.5.crate 35790 BLAKE2B 0cee88bc3406b60d225593b4b01a4eca11d14a916bd589843300f6130729e7926d2af32b9b7d03e98b6934775e30e5627754e7e32e1785f59c8ede36c28ea40d SHA512 a3584ce492116d6e617a733a0d3d5696404aa7b10ae95070313b4a41dbc21d0940850870b711e375ac8b54fdd179b4083d61c48e902e6efd8a3a11cb630076a3
@@ -254,12 +313,16 @@ DIST predicates-2.1.5.crate 24165 BLAKE2B a0eb1aa0f26d51140155b8b5e7141a253e298a
 DIST predicates-core-1.0.5.crate 7773 BLAKE2B 6214146a1aa53c127dc4c0ed1bda847c1be41e88f833a6c5095fbdb37abbba9f1726095f3e168a0ce3bded5b458e73a73c1dc467ecc2a31c7b3716b01bd00858 SHA512 d94481797f2fa307391aed01d5276db04663ceac54150f922c8fdc046c3b1417cd93d767843df95985e69e0ba1202a0df82ea1820f9c67b15a91f2feb2e3e7d0
 DIST predicates-tree-1.0.7.crate 8145 BLAKE2B c36af3d8c2c378833515f955970733ca6d71fd7b317f9310e451e32ab6e68d6fed2455b38558b0a9f889126a331301eb631821562fae6e4fea3abe1caa9d7a67 SHA512 0e66884edaa68e5339cae5461beab273d10b0acf9162827b26d6860cdcbaa10cee0412e6bb8191dad84f59d12e01a0684646b66b793b2c9c183244c96c05b6b4
 DIST primeorder-0.13.1.crate 19936 BLAKE2B c49efd4577baa0f573190f4124f74595f4444fcc6ffba7cc28931ff9eacf7efc7666f0b76bcac9a0156c2d37582724b44c06eaeaebba8793f1e503c30ac2810a SHA512 993a1761139a30ddd1baffa797716cb343508fba2fd74a57de8246a06d52f2ba10038d843c7a58c649d27e2edb21d2330e800ff61bfa1a1a9e126de910e9ee78
+DIST primeorder-0.13.2.crate 20139 BLAKE2B b6539be08d6e732143c45403c68add90dd19cbcd34f6bdc98e28383d314ef3aa2c27b5d988790525507033842567a8339ba7c8c933e705189bde2077e6b9d287 SHA512 8d7005b3463442f6e982e7cce91851cf60abb9da7fa20b148a660f2727f0229c6af33411fefba6a3c956325ccaca593a8e13a0f8d905b1ea26bc3f53fcbe9b11
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03
+DIST proc-macro2-1.0.63.crate 44867 BLAKE2B 54fc0f4f4e328c78609f5c0e26a8e6b1e5f1ad989d68e63d21e094bc20e1be6950d5df98ffb601c89bd3d137f6c05a3d1de74070e493002e793bf159b96f29de SHA512 3855011d0d42e8fe591e7552d224b692d79b194c4452fe9d8f92ed85e5437c0a3524a38e66301412be482cfcfbd468b071a03cf584a1618284dfcdcac9713102
 DIST pulldown-cmark-0.9.2.crate 115824 BLAKE2B cc8b8cac890b333a864ecb1444128b1aa187392b296c54ccb0c3048d79d17aa7f53bd0ac31f0c6492544ea78636deefaf3ad44804a1c79008e17b27fe1e61fad SHA512 2268a3284da5def75b906373a3c70927bc68ecde7b641231d96ff9437785732134568abaf0b6f81c582dc56498da4e677a7b2e2f1914cd42b345db0a06d75c60
+DIST pulldown-cmark-0.9.3.crate 117339 BLAKE2B 0b4105a9452139865723a66e434804da7fec35771a90335debe579164ce7ddd78192949db77ad5427ff80b44805a8fa5ca497e6b4111344aaa014faaa508904f SHA512 2f5acf1b6f345ea2f82c6daeb4b73c93c2772dcfb7ccff6fba9e51b8840b0662202eb3bd1c917f8f81be1ba86b58fb3d5f87616dbdca991e0ef6fc249dc888fe
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
+DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b
 DIST radix_trie-0.2.1.crate 251366 BLAKE2B 14b50e45eacbc5b42cdde8a4f8e8642adfdfa3cc569c3fe0e3aa1fdab901713b3929d706dc0aede1b679762fb8fb1af345efca15befc9234322db434c8a3923c SHA512 f6f54511860b6b878c83de4455bdbd71289599dba93234d5c7469342f3401cba99a9ea6bca2d32df2e31ba657f40e42e7d5fd7de66786ddd2814e22fe867f9d8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -274,9 +337,11 @@ DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379
 DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST regex-1.8.1.crate 248412 BLAKE2B 4f1355104def09ec8f7a7d604fb08d0a39af36cdbb5160c63329e8c06ef2d2ad1063fc7280c90ba3748e1766b65f52fd6da24e439d5262209a6137bcbe2eda9c SHA512 fe83c2497b786314cbd9ead0d85a39ca87ae92225e444a41ba381fe80aa381a88806e2c20e1c468b8b59503fdf1c2b7e5bf6eaae0ddf9f14a70c1ca2773e8830
+DIST regex-1.8.4.crate 249562 BLAKE2B ad6d1221412beb65eb760ae905d4becc5583ae4d030c67b061626afdd3d4389c24123000688039fc6c8c1d091ff307b4a46f4b0eb84f1c258d0612c51aa2627d SHA512 6fa873671bc188906334202027fdd4d15923fcea88aa85d56a63e3a36bcf6aa77ae61c596f9154dee6c69e03bf3f3441e4ce26304d5a8e0ac47d710bf7af4a5a
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
 DIST regex-syntax-0.7.1.crate 339705 BLAKE2B 59dcdb9e0f5a2008db491756fb353745bf4dbaba0d3a8a6782960c990065e1870cc120d7a7e220991b78f89053aa63b1a9c326f5ae3526d47679e4ae30ae5e66 SHA512 ff61e4a075550fce3a16e516f8222a489dfe2bdf9431220c98c33b1f9e6b19da7bc1ca6bf34031235d6f1ad06882b63d606874a14d2e27c615701ecc2f4cdd9a
+DIST regex-syntax-0.7.2.crate 339778 BLAKE2B 0b9533e4e4bfae1304a7ab5e2c8bc0bc3038367dbcab7bc19e680bc4945146f1eca3baa1c5bbff6ac60447b54059228a5790cad20ae33f16b9dab794a5f76140 SHA512 3065cec128ae6ce427d13b68066fc02357c21f7d1517c1669295f857395eea3297344fb2171c96d15dfe48050785249b7b8b8138fbe5b4a65c8427968347c128
 DIST remove_dir_all-0.8.2.crate 19074 BLAKE2B 1ccbc24f5e687d4c816d10e69abfd0a28d35d05e38d626e53e3b1a695ba94e503dd837efc964ada43f4ed9d95ca84f2e715bb92a39333bf2f958fccbacbbbd40 SHA512 db20998b6db76ead161b69ad4f92cc7139a67285b1d7cd7a3631b4c46450503b378a597d3e27c618dd5a4f77c0b3f20a25036ad495c88a9a1d134a6af58f0134
 DIST resolv-conf-0.7.0.crate 17352 BLAKE2B 32b565a11d5d752e2cce2ac7b44e483b8a682220c99a9ca34d0a440d87cb5a874c407d474e47757f128bc5d78ea57940452eb099ea6fa433d8f6d1fe881f4302 SHA512 538b97f88fee8b82f15845f9a596e09757e3c2869c4e8708ddff97e19348e9f88d4bcf75e810d2aee47113fa64d550a9fe2deac6fc38d95242ebc20228e9b5f4
 DIST rfc6979-0.4.0.crate 9140 BLAKE2B 662d967b1d818439e972d19bd251a4e3609c65bae945b4d11c0ff4966e9fcfaecb739d0b63bd767cda6a22e77a52f3386f02cb27c5c76ce9008837c882f8df33 SHA512 fb68114f5f8c1e7b921ed175fc01813531a584b8cb2df1264b72e1925bd66b4c021714b3627fbbcf3fabc26e4d6578c4d246369a0c98049d4058dca4cbabb20f
@@ -284,20 +349,30 @@ DIST ripemd-0.1.3.crate 16601 BLAKE2B b72f950d20e0f6f19e5e4dac9da24a5fdfe3dfa441
 DIST roadmap-0.5.0.crate 9231 BLAKE2B 79236b04a372bbb8766e7fe8e3155d27cc77ad91960ba438c21521e44b521d7f17a203fae5ed439dcbfc8cdb8e626151efdf77ca584e329559a3ac1adfa4528d SHA512 9f9495647546ca86f91d72735585014fe026c2d1276880443a8c37431dc0509b2612703b05b59be07239e64124512e1a60a1f8596da6b0f52ab3b25f92ad8e94
 DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
 DIST rpassword-6.0.1.crate 11505 BLAKE2B e637ad3199e65e8ea44eec0ab7115073a68acdadd4c39e2f583c52989912487145c43cf91f7066b1aacbcb52f74e244139cb81a0525281d2059eacfb92c47a2d SHA512 280487f364bd0ab28abe0264e7698fe188e763cc9bb4a67f904d534f8f60c8b7e1baf22854492d67385d37e87051caabed7b5a219103be950eb04cb595352c1c
+DIST rpassword-7.2.0.crate 8857 BLAKE2B 224a0920b93252a835f81e60fc90e28c8baf6224175e3d9098e48385e62c958b96c93808fcd6ea7612fcc975ab048546ea77c1a9ab9240d2cb236850f324aa4c SHA512 b220b45143d43d8ae8d975b8e89022281cef6cac7db07df6577d9fbff6881c1d7e3c20b3a23bf746e77be5e9d8ae54baf9aa7f14aef6370f0165783e72bc8113
 DIST rsa-0.9.1.crate 72407 BLAKE2B 85cdc730fb9a5cfbad362c720777fdc49aed2c2c6ca87a4e1ad0984754650d753a18df6a3728fa435e82df22d72ac1e00ea64d6f3d698b44438b3760b04ce197 SHA512 31a47e189f29d695440933660cf21d4d1a8eb7666719524afb89923d06da864a7e1cca97cde48fa791a0c4564b94564628ff3ac8fa97e9a9fc1cb20109747f1e
+DIST rsa-0.9.2.crate 72758 BLAKE2B adec4cba9305bd952626919cbb1165154f64d3c0bdf3fcf69160a3787e6780d83eb19f939384fb8a6b3f30291e358c6631c623e9222bb00e72365bf79f319111 SHA512 b6592035cc8a93af66f994e5a6fbbc914c0e8630cb44f5024676b68c8137e74c7b4648c494e349a4bac221004468a9eed642b02c06252d91dbe4a5b08692eb91
+DIST rtoolbox-0.0.1.crate 9430 BLAKE2B 3ccd51b85e63cf495bd46350c4197544e898304b2a9ee88f824fb63be4783c1cf56e783af8381cb78bb26f72ed07e21f52fba22b8e3ad0c5aaf5dbb344a47f79 SHA512 d33fd7b3dd169554d34b877eac11b524861a40e5a75c2bcb7b24945ddba40e6d15f3b609561d612720650769efe74d00edc9d0a39b3aecdb71196be9b5397b71
 DIST rusqlite-0.29.0.crate 137156 BLAKE2B 83ab57daff2f03dce2720cfc5eb253231f721bf3af609ff15c66ee9be9578533765fc368af94040fc1f7a635578c14b310d93e568f894495a1aa46a73bf9c22a SHA512 63e5722f7391a335773d2fe554ebf285f388ecdce7279f767f9c3293bc776abedd15badfaa29c4abaa356707667ffda11dd14bf50fb4bae670df0e102283e055
+DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustix-0.37.19.crate 323809 BLAKE2B 6a01e5128910c4b1333359efdacd5d0c1f0cf0ac4f2615e6891c10e7de3ce8df5ca50955a3e5c27f3b85d3ffee9fe28105aac3baa4fadd05172645e9f7ddb853 SHA512 e1c00f97414313580dfb7a616cd0e9a64d87950b4d4e6b536b5eaea93b8741f769ef62d4ee1461af8266758f9bdc136a445abbb05c8355a11d338a166b498722
+DIST rustix-0.37.22.crate 327978 BLAKE2B 1ce6f7c3ddfb23fb4fcd95ea0d52aca23e1ed02e406f6dbc1f466bc6dc836d42fc174b8d75bd9bd2b6e3cc1a22353fa24e81c7b953b9fe1f15f99d42234d6ef9 SHA512 37c1f847d10adae476998525657c7d3ccb31ef4872826404c1b70db0ec7cc294f22082a712034e1afed54025374ebef0e5aeebb00f8631e6ba4385d4201bb183
 DIST rustversion-1.0.12.crate 17278 BLAKE2B ceefd32afcabec344a1bb87d818fa22b84c986367ebe58bfa54389080194141489e1c87397a34eab4d60d660c9e0d75eca3958225640d4e6a061c96d27778c6c SHA512 eb55f3c0324359e897ad07a5182426d68a067ea41461b62a44f98c2864d5a5d0f47733f88d977a6f537e39a801beaa3b5a6041230828c3213085b562edab133d
+DIST rustversion-1.0.13.crate 17267 BLAKE2B f2cc10a9d998b95bedaecb60298b11637724058634b00844d7e3e77dc321d8c7578bab9a9362b94c6b4b30558df538578fe7a4a05a130fb16795e913b3fda8bf SHA512 4705face9c4e2570c6a7c8bd61ccfe1ce68bcc7bd11dcbb9e7321744de38277d1f66429b59498adad3cbfc25de68dbf194c2d244ab74003830ba5fcda47e621a
 DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13
+DIST ryu-1.0.14.crate 46861 BLAKE2B 208fa87e54e3c6831193ddefcdfa7e9731a3b72de6ea23a4af708a15487cf4d6cbc49fd3681da078390741595ff5d44b02e607cab6ea9e37e7f5f05c7275b4a9 SHA512 9832c760d1ac674ba362639968962928971231d696e450738045ca36ae2780116ad865b2bdd96e36f14d8f92e12107dc8b75be90c74d76e3bb834a94bd6e5599
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.21.crate 41719 BLAKE2B 8e3ce88c460b44839a46304c5ce6c02ec518a1f094165ae8589107cd32b79553e1c7aab581cb07fed4ef5935822ae4af8141f63d70e1f898a10e75377b1a057c SHA512 7457d4accd0096c791240aa19970307c6448486a22303e3b20b7fb25c326e50edb8564781e3d81ecb4a7626796ef78233c224f9baccc0de03f0eae2086624880
+DIST schannel-0.1.22.crate 41642 BLAKE2B ccb512f6c6765e5245dcee607b7886411710aa89d317cbaed2f511f74a927a0083042653e070c9d4b976ec83a74f3f37218f3ecb621781ee367b774596227f68 SHA512 6ec962cbd25f25dcee5e31b5012e61d38b97a7e8651a5439ab4cbc8ab33a0e2ce04fa22e06a82ef8750001c6659937ffd8dccb0cbd6971f68b0c354d0075aaa0
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scratch-1.0.5.crate 8013 BLAKE2B 64bad5081da3765fab34b582c679fdb345d592adbdba09071357dd3306eaa55d885a4f282732972b6f856ef9cfbcf73a18e9f5b2591ab05ef9104119299d4159 SHA512 522e24868568e9e3c4c6a9b0af4e1890d5ca6753ea68660e13bdc95b98c30576058dc949d20a5df95a6313378083ca138c7bfbde5c60916a011cf9697180692d
 DIST sec1-0.7.2.crate 17935 BLAKE2B deb59ed300c697b0a8cfce31ec6a9edfda08896b72d12dd9350acacfc64571c6a68e8429005656a289caa3c73f2a08531b63efb60af7e253bc611b3281103bb4 SHA512 c6c0c589c9f0a177f4eb71fe1db1922865b721fb4d086a8c64d43b2ae70f76a5f688116ba2134d841112010a2d1dc8d0226782c52b7e6fc9f412f8d7941a2bcd
 DIST security-framework-2.8.2.crate 77045 BLAKE2B 8581e0056fc0422aef0122e4948d6244eebdad0935c73ac1b01fe31de19f730325f11446dc3dbf5f1ec4400de099eed1d61caef5b8e318365c4dbf9dabab3be3 SHA512 6abaf2129cff62220f152786a36fd4728c72fb2b55f3f75b396ffdf4344902077c8c0784eaaf07e2a4d9311f833298b46372a968b798dd838ea495668fde1be3
+DIST security-framework-2.9.1.crate 78844 BLAKE2B e75c6322b1077fea47e2a83ada6b84ef9f00ef6ce31729b821998694cbefa088d501a264784edf69e45212062b016c214c37f965e933bcba11d23d1ecb2e313a SHA512 fa309080138ef4aa7c5a2278456647743ed40ffa7827a0f081e3f11ba61d0184501be20e1bde25c0c3d5568de3d7ad9bc8ac7a939bc8dac95bcd4714ade6c966
 DIST security-framework-sys-2.8.0.crate 17911 BLAKE2B ed066e2cb8986930bdcf55060fcb5a34f826aa27d51ba4236f8a8e56de8fe3a2b33be8da14c64c0809f46c0dce02a20729e6863af2261a04006ac65a291ddea7 SHA512 5e670f5f5d54f2bc11e05435b975d5d26d990d6f7446613dcd5be88c3cd52baeb702931cfc663fd5018c8c99f4619c23e57f31eea60b15d3a5e7ce01a291886c
+DIST security-framework-sys-2.9.0.crate 18197 BLAKE2B 9eb2881c86bbef77120177a2548a50e6bc5410910ce808183491d9c6f606c1c8c0ddce9e8b910eb2043293d9993456568a27b7d46b2a08926eca2193ffdce07e SHA512 152133eb3bf66a37046de74df94bba856696c76c6c50b9cad2bb09ac3d6b73d1e23aef8c18fcf050ffb43e7246313cc6ed563a0af8b55e58ba62ae549a6ad9ee
 DIST sequoia-autocrypt-0.25.0.crate 41164 BLAKE2B 6c653d920a3519d85ab894d9e3b43ec437da4f3b519a8a5e5f1d00a3cf862eba086946d6cfbf19112cc5bba1525e60efcee91b6712c3909020a4f0bd1b6caf9c SHA512 e964b5346860b532853e711ff708ea6717cd3c5839b1bc95775e182d2d6872290a2f5ad5b92173de328e7b175e1f0a35c2a20d8634f845b5d3ea8a0c47816490
 DIST sequoia-autocrypt-0.25.1.crate 41241 BLAKE2B 5fcb7131447b2e11aceeef037743b0a368693a92fca3b4296bd6d0d76fca5ef89c059556dc2591c944b2e9f545fd4e1a8008def5ccb1110b293e3a0f93954141 SHA512 a8835ddf7c782abbedc182d1d6062e23d420898480277f01869fe7d06ca5338ef1199c41b11091e4eec9ec304106ce1d09cc033ee298d4f72c918688584e3705
 DIST sequoia-cert-store-0.3.2.crate 152710 BLAKE2B c51dea54e429815453d389a7f7aea471aa3c52eb3a8f50b5b6c71dea984ba48ea45d5c1cac2260eb7967bde2f9c841ea562acfd020973f399f247ca557cd3fae SHA512 da8b247aef940d93eb29a0b6c9ccc11759a87876eb7b9bb4a9629b95bcf6da086175e61393040a8a7cdc7ac5e42cfe535a4d3a8e85d07c3c9bc45e25bcf64211
@@ -307,18 +382,23 @@ DIST sequoia-openpgp-1.16.0.crate 2937534 BLAKE2B 127ff229f0374fc07fe30dffa98a18
 DIST sequoia-policy-config-0.6.0.crate 42529 BLAKE2B b58960a3296d1c3289036a2218e842bb63bfef11968ccae7c42cb61869e04d26fb52736876bcf32d276177c488d0be4d9ff3ed50fbfb0ba68bff3c0410a460cd SHA512 499d350426f80627278310b2eded6a69a7ad833058129ea5ed9ebd0255621ff70f9f04228fc8ca79830e6ec11d14b121bb3e5a6c5fc2721135d725bdf0d886ee
 DIST sequoia-sq-v0.30.0.tar.bz2 242631 BLAKE2B fbc7f8853aae291dbf1f8faaf2f9cd0b48c67b83c13bd342976112c08d8cebb1c4288d0f843a1ff2a50b380add695bf020feea0444f9ff485060a277c986cddc SHA512 39a50e037e2be05c17cf430e59db7a3c13e34a8ea75a31a914b0301ae2669dd00dd7ef34062a34b27b24508d0ad0132b577dbe607e0beadd951595f3cce45419
 DIST sequoia-sq-v0.30.1.tar.bz2 243190 BLAKE2B b413e8f3b2fc272c3584f489cdcf3a96676a278ade2ba5973ec6326385bd0fe35932e09c3a571668122e22c27b1d7486f80ea20a85401eb8ae8634cbff41ef88 SHA512 ccab6d04ddfdd20e80c30fb898224155aac7a518db1a9e75ddb0cb6bfab38c263cbfe71c05b49e98f571aa150bcaff9f215047e457fb642f0dce9886db48d22e
+DIST sequoia-sq-v0.31.0.tar.bz2 349019 BLAKE2B 1c7319f121befe52458c17b4ba51b82c6fe0f5d08c97c698dbe37564b0b07b8fdec785bdf27e602097df743d4285fb47e1d97674edb469f6d917fcf05ac5f0d2 SHA512 608ae3a0ff1147b325e8d08534aafa39b91033b4a03312ce89000405511cca7b530936e36e4874e4735cd58d13d6caf035f8eb8aa7f24a19b2c71cd8913cd937
 DIST sequoia-wot-0.8.1.crate 1074907 BLAKE2B 08cd855b4d7ffd8c128d71e77d7de048e6d360b82b2b34abf2651ae409bb9007780321e1bcb3f0345df1538e39345f138cceea6f824ab46bc216ada028349a99 SHA512 d31cb68b8189aec05f7c24e7ff6fcca9ec9f1b0e0bf85dfc17d9b0813dc1ce49075cff2758e01e3cc6f1e8c6f4cd5e426200ac5820414fb0888ddef0bc9610e7
 DIST serde-1.0.162.crate 77030 BLAKE2B 27e6a9bfabcd66a2250be36ac9987ec12a864c15eabea4bb793f796a19d85db097bf46426462fbdd22ccde24af3581638c2e14634701a0b14a3bfcc624c40a8d SHA512 e9b112999b69a14f1d05cce985448378c889a497dfa00f86e0c611b17d98fe7d942e9142fdf8c95c6d0a32e2016b3f384b52efae3bd75012c12299b02d055578
 DIST serde-1.0.163.crate 77030 BLAKE2B 0d7ead66faab8ae01c693c9bbcadfd0a7a736c8bf46f50ef43ba261eec9e0f0c43477feadb2e134f0ed6dda3115dcbc3d22daa28592f343739f1ea03d9c25723 SHA512 752738ef5f67f1b4435bdd4e76e740ba192bd93e83cac55fd667809af26ceaf02db7083aaf7b2074644b38964021af206000b6130199e7994c12c9c57cd31a34
+DIST serde-1.0.166.crate 76998 BLAKE2B 481ef3c3db29be71f571bf5003301682bc91208aef7cea2c0fe40b5e344ebb82c4a9b4e54a8dbe33395c0a66b1885785632e3768bad57f8d7cc789eb80b977bc SHA512 b754064fbd08d9afc487f3c2665c9c58e5d44980b49fabbedc1dda8285b08a33400e88b843def1469c02db6931435bda140435998696651e352b65fe4145d66d
 DIST serde-aux-4.2.0.crate 11614 BLAKE2B b4a165f19dff616b6a4eef9874c642e89d6898e9704d521934b5a5b01d66c6c77cff0827dbbcde067e08e74b681e4970aa43d331be5abf5679e9f0f3ccd4a440 SHA512 b13b36a08f1138f158a2604d5ebbd0ac4c4f84bf73409a581d0575e168da910e8b5ee931b64691ce91206766074f1bcb48fa72723dae628abdc30e8736261876
 DIST serde_derive-1.0.162.crate 55076 BLAKE2B 1d83bd6a397b27c412f07462e4898e4aad2f724acf5d2d3a295efa3b311bd94186aefb2bd2ce5b5ca74e779814c87e694b005ea25a65695388d4a30bce00ff32 SHA512 edd1bd42b130df0625cd762a827ab44ee49420c704eb581205f6010270550a9f22eeb3b658a52645877537d29b81b324ec209f21aa3bcd09a2749007b27cde4a
 DIST serde_derive-1.0.163.crate 54447 BLAKE2B 284d02fcbdd05c53c8da737fac422fd61ff53669b140686d1732ef727a1e873945b1ebdb85fbda1d79f2c563b2c7b81d3ac51c76fe0cf5205dc6ab4d46a9d4d8 SHA512 744c4235330781c8d9c6ab4f49f6ddd11fcd70b97c97fcbf1434ccac02ba7d29eacfed21ee8e005f5541dd8ab4a34023e95d85231f11c5f4d6e24fcf806f7283
+DIST serde_derive-1.0.166.crate 54810 BLAKE2B 3c50869badc037bb2c0e493707edf2e05b4721dad00b9b7ce9b7ed7ae66b4fc8eced33ef9b3eb21ef442d386ecfe91c739d42debfcd7dd281d221875757ae592 SHA512 aae1bad870a5919c43feaff61924ed2d7c4a8f23bfca5d5b06bc5f5df71967dd1c996402760028fac83d633f8fe45ff50de07957d93af89d4218992b483995a8
+DIST serde_json-1.0.100.crate 145170 BLAKE2B 0a15476563643e2b9fa3a2416bf21ce0be62f05d7f483b566eff806c01e19ff82016ecbc970a636252798316f2fec40465ca85c74759cc83b23d147e05016f4e SHA512 182b0a2c77a7c06d0c88e629acd56b16e50bdecac2a066d2b6a3a2a41b50dd6bb147e943df7eb3e26c2b7a99f656f1af98e8c2a83d991c5356b46f3573b94b88
 DIST serde_json-1.0.96.crate 144652 BLAKE2B 2754e63479aa07507015dcb0f989d6447f5b2c01e5f02cf8a843d90c90c6fd0acd3ecb68d80d76c249efdabe0bd0670649a9e576269928d2276ba00a3153131d SHA512 39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e
 DIST serde_yaml-0.8.26.crate 40670 BLAKE2B 78ed7b0d45677e2ff5bb94e9a12be0ab72eb2229e064a3e357a7ea3566648f10fc6c2ad5c07ce6067841392c97d4034da5d54d51939a08d81f64815ccd798642 SHA512 f6bde42539fe35dcb09fd506149c564f2056102f15ce275034b33c40ae666e22d6beaecfed8a0048704547f153fe13d52b8b305c95a61007784ee42f6a8372dd
 DIST serde_yaml-0.9.21.crate 64229 BLAKE2B 60cc70c9a4ae9070749d7789788ce72b6b57010e962f502f1292e18430d60c7a090b4bc17cec8d819b6cc6f6ce7cc6e466fcd8b73cf0cd132d0eca64ddea5ca8 SHA512 8a68459e0260a7904f6630d168daab7e4e8cd8b9e45b56194379f158bb100e969ec9b581d60cf25ca3422d0d54e7767dbed771e030cd731c7b23680a0b64c155
 DIST sha-1-0.10.1.crate 12018 BLAKE2B ea3d41ab252d2d0f857326fa4e21c0ddedc80864811bcd3bab19d4cc5c9a48c7a94379f1d64f8bea00fa392fe977f535b2019e234121b4fa145b9bfbae91d6a6 SHA512 325e98435b79b88ff6e835e665ccc8c386a0ba9ea17c7b05e8ff42f0f5d70589ed2e874dc4ab60b45c7f7d67a896ad051dfddc6efd90bab7f3c165f9f964e8c2
 DIST sha1collisiondetection-0.2.7.crate 821703 BLAKE2B 6a51a0547e4f6760d49a2216f9e00c680e74425b8ce032defc0aca3c08e3b24efa1f4c6ec165603db7b8ea1aef3a022ed9b01f0ea90bf6f4a609220dc1267800 SHA512 7b7edc81dd4ed8994eaa2686c8922dc3e6c83497f5715c4aaafd30f509dd324f9c09ccc0bad5fe54c2ab501b6988386aac6b9493f2276fba856a87a7eccc7977
 DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c
+DIST sha2-0.10.7.crate 22541 BLAKE2B 918a8f4042c57e4f8931d645ba758f6e7da911d02482c78d6ef3a12e8068e7f3a08526580824ab548628fa7e75bc64f17bb12f1ceb167861a781ab9813eafbd4 SHA512 c33d6bdecaf49d0f60276531e845231425f62d2ec18c4d53c43e49f506a2dcb2548f5866c6642806b6b64f008a481c48920b7b4fc867df7443dc31b44f297fdc
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
@@ -332,6 +412,7 @@ DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f0
 DIST smart-default-0.7.1.crate 8435 BLAKE2B 52951725b6ac1167cd8deba62ff92c475bbe0956ff4ebb20ff8e5ba812f2d94a5b0a6c4e0f4b65db7d6a0334a5cb6100ac38bc2076b6f885bb235ce2385e5fb0 SHA512 f9fdbf067568db78b13ab48b6373d432563a3293c74fe99532676d9980eafea1648b3b9aba46e82ffc2b9cb31d9b51eaadd088bce06be372b50c4471774a7fdc
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f
+DIST socket2-0.5.3.crate 52588 BLAKE2B 03692b67f27530670048db0920e26da4d95373a3aaa81ffe840b09e73a5730e2cec4fa43c25e63db0a6164c67d6fe555b0fcf1c9f7ce6a231d2972f5224a4d50 SHA512 63cb78d66b057587e4b3b50b9c618db1a202102c72b52b79c2e9f9a401dc1c28fe4523a0f6483b38ca8a3d24d1e2fca0b7176d96fef6ec1b922ae7c4afacc324
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST spki-0.7.2.crate 16270 BLAKE2B 95e0a36569f2d8941717c1b5ef1f346d2c5017f469d4fa5450fcea781eff102178acb2bd0ce226fa042a7c1457c121c42f3757a4af34912dbca0406060c56bf7 SHA512 25eab1b8590ed849ce1e93ac286e51532cfbaedc8c4ba98449ada0d675c8bef3bdeafc942fdf574aa8def0d148b7a6c694c69cbf37a9a3da12540b3be67d7fdb
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
@@ -344,12 +425,16 @@ DIST subplot-build-0.7.1.crate 2195 BLAKE2B ac31d4b2ac5fbafe1c55622e1b4310596334
 DIST subplotlib-0.7.1.crate 22414 BLAKE2B 95b1fe5aaa914268410270b3e053d2498c3ef947cdac127a52036fc52dc47aaf74918145caeee1bb94aeb04ddda30b8bc7e2c304d2236de698127a7628183702 SHA512 20d7985b9af81f6faed5462cd4ef1b6d2b67212fdab24b3bc4c606b67ae809448cbc121bb7e05b38bea7129598814bf1fcb86eb9fb82ca4dfb713c0bd3fb6417
 DIST subplotlib-derive-0.7.1.crate 4467 BLAKE2B 4b3ed7941d4d71deeeab39e49bebf51f4d9a0b0b6df17d9d8edfac02aac4bd18c4786c4e9ff8c64d699be00db8f2a39d25dc4190bcfd4efd07441e0a7283eb8e SHA512 0d16bec1ef630386d180248d672fa35960898613544dd14f43a29eae6ddf75aa08bc98f7969a1bbdf1c92bfea3c8eb40096a16cf4a392116ea6826d66de0d981
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
+DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0
 DIST subtle-ng-2.5.0.crate 12728 BLAKE2B 4025dd4c9f3c60d1811c3b78a941a48e6124d2742609b088be1cf62c42650e8571591f1ad5d0e3e5e5737621a3e040ffaf52b6c8b754591022704935561c1fd5 SHA512 5da944cbc152970cca47c0d46550bafd591669d7ef2af61021d9e74b5ed184daefb44fdc207f1eb4886502dc7e4aff1dc295b0136e6b4dd45a0335c3daae0902
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.15.crate 240785 BLAKE2B ee2a2250e7083770f8fcb5ac0b387a28bab041e56dc9a835bdc366d39830cbd464aec156b47947331864220d78856f74e94c24061bd0c4fc908584efd355bce6 SHA512 19520d13b417ad2cabaf7e31f45271d41f26158607d0ab21e76a04e824133c64f4acba0f8c044c675028832563ed7cc73fd88d519520ef3834008dbb3d04663b
+DIST syn-2.0.23.crate 241166 BLAKE2B de55798634899162388667e4a68a6525904057a480a6bcd741d0bd0f83ba0d0feed3f9a1bd768ca591602ece1e79866a076b6ca218f86b2cf4827d81224d6ad6 SHA512 3f46b2ae62b2e3378024d057130e48b7ae03316ea38ce1d7d4e6dac9337befd84c9eb20518562917643304de43bbd716c34f508a86dbe21081cccb934b4072a0
 DIST tempfile-3.5.0.crate 31129 BLAKE2B 6d32584819794dbbb1f30970577ca2c82cf79979f94b070327285ae8bca6f8e3ea2402d2034290472f284ce039a3a578bfdfa81a53b5c49b587dbdb40960f6fe SHA512 8e8775a9727e32f6931b3289d2b8aefa5ede7b224ae2e1937da3aff371ef5f6078587f060eb36793e9779249992a97acc39c02c6095c41467929e39ada12c7db
+DIST tempfile-3.6.0.crate 31812 BLAKE2B a40a18a810e957b576d2fa8c78c192fa68f0c70d7305a476512fe0602e449e1668b434f0a8a0c0e98b4930054a92c009437581c1984d1ec6496026cd03847e06 SHA512 69b0d8a5619201620245899849b807841e90c24aff08bf9ffac76469ee5f4d6fd3b4258d5903bd0261fa771df88cc83e869faff27a413188571258aba1a249cb
 DIST tempfile-fast-0.3.4.crate 8991 BLAKE2B 98fae1979a2be1aef1d9c6abafdffb6b90df92328af5c74d19ea4991539f8c3be7cd823e980c13e90f16300611d222c1d81b7eac4c55b7a3da3c38abe385cc36 SHA512 b0d44bbf78e9991784a9d20f3f3ea8d5e59e95d74d782889a3f38f732a0fb06920ec81295c8abdff7603675c55c43c3ff7d9f4bcc094f403ad83bfb96a9ceb1f
 DIST tera-1.18.1.crate 102781 BLAKE2B 5786208d30876ca787c7fbb6bd758c48ea02079e146d355c9b205e1672cadf788556ca04ca2ad9bfb472207e88b0e039320ca2ab60c43674d5ef9d0be8188024 SHA512 493e0868a9e02b8f0b7a61cb7a73bb70eceff1c5a1d3a282da174e590796c3610ef2c8769dd007244265243cdb0bd0f850e6f5e3dab0ce1746c57e5b97796a04
+DIST tera-1.19.0.crate 105650 BLAKE2B 37876e1bf6e783f78a971d0e25986083f9e93aa5bccb5b912176b4be694d8cd41ffed3765371df36d9de388998769d6f8d9fdca73e3e56f19c8f3284c9137745 SHA512 3c3b777be08204879a1b3e70aa0c78cf5bd58c5ddc2a462095a770360fd86a4a197aa571a39e1fef587594032d20f0a489bb0655754413fecc479f2aadfebd88
 DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
@@ -357,17 +442,22 @@ DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0c
 DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
 DIST textwrap-0.15.2.crate 53191 BLAKE2B 6f9488a5d44e8bcdb63eefe6b7d95772ef84196b0002dc12257fcc0ea79c50225478af865551617f2346005cfe73bd0604aa18e9996ec076f27569054f41776a SHA512 1c5190d136fc9fdab1fca36dbfd3ce9228c0bc2a10780d1a7fa64cf5c6ff30d4c0e3827c2253c50e8a5c980a15441679edf65f024f2b997dcd61e32f2acc624a
 DIST thiserror-1.0.40.crate 18709 BLAKE2B 8057ebcd11546f8b3ae5d760c1dd1764386f3c29dc43bc7a4aef20604970c65356daef137734e80260051d41e39979943bfda496459696b924a95f455159704c SHA512 db1b1fab3aa61dc6bbc672670eb70cee2f838fa713d3a927022900eddde253108d123bded1aa6df8d314e1aa2f8ff37bc72fc9b0803fe3a56447a64290ab2a91
+DIST thiserror-1.0.41.crate 18734 BLAKE2B 4b2fb42333441ce6a93e74c08615293b58c1d614783a328591a6852144c164311c4e660f6f41c99b1279475066f854fe2c764f857fb69cf16ecd18a5770f7b89 SHA512 3f185746f2783f7f25b986e0aa1d8c3137f6aa2997a40531f04b2fbc00cb380226b0916bb266c8697a10d20d042c7dfa0fe7e767e6ca37346169c67ecfdf4a82
 DIST thiserror-impl-1.0.40.crate 15138 BLAKE2B 7590428b5a97efde6a823440a9c91e1d1835b20df4ad8a700c1eeddd98516f1203605853fc6dc65528c5fd92480d04f9a8412aa7c20a524cb94435b0a0032f1d SHA512 9027f2d4127864c34d2d92ad3b2753a95893d26f5b2dcdec869884a98232c5304db1700a38112ced258e5f3832218cdea3a4bb21223098e1b20d06af1fd7edd2
+DIST thiserror-impl-1.0.41.crate 15078 BLAKE2B 53d95c0ecfd2c9d50f618e572eac0a6faa7735fd9afdc8e2a9a7d730ceda83a7222be979d592811fe4a25fe4d992a261d6479df9bcc11abffa4a88571f7647ca SHA512 bf30f7391757f6424d585b28cc2501d962d0d85b6a903baa7d9ef9d4cb96c3b71db67719777aace08fe91fdeedd241905a4d9dc5de5fc97d099968e902191c9b
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST time-0.1.45.crate 28911 BLAKE2B d43e2431752881f6885d572017f461b304d07ee5ef0d8b4898e62b47c8154268839c3bf69b141159090cfc0d90bd0113d6084fe99ea1f2b1e20668528ce21112 SHA512 e643fb8649f3efdaa1b0b6abc6a140d55ac550a55cad99d0cce9415dc51e155fb1ea240953eeaba5dc47ec73c49ab7f2962af79c693436289de0eb3ff60985ee
 DIST time-0.3.17.crate 99048 BLAKE2B a10a4b8d0edf8ca5f073f0840060a487a60a162341be3454e069eae48fd43b9b7bcfdb9bfd7d31380d8beb1c5364bfc9b774f3f438327d49f04eb452d2932e9a SHA512 c69ec373a79038315d0257203be16539f5efcfc0ceb9ce2cc0413f3d6ab6ff39881720c310f12cada17536ccecc4501f081890290d15282514b26fafc02abe69
+DIST time-0.3.20.crate 111856 BLAKE2B d4fd3d3f9fb164b26317fa26788014419902147c7f17816a09565590245acf72019fb57e88d4f4ad4a399c5dc92247af9e915fc5d2168710f81673ed609a055d SHA512 689099bcd5cfea6b92d88584d92e7c15163f427f621c653026e3b3f8066a3932836de3f8be9716a41b77f1d36a9fa6c3e2a42ab011d21ca38efeb55522a39145
 DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c576553b202d178a64d46396958745b00c9f2aa60a6eb609d663e48b1f9bd1f7ebe58ff6e22540e96b2b1c7f2 SHA512 f7e181a40a0052d7aedf78219a46f8876618342c710e819748a87a5bc0728e5b2fc7ba08e38ebfa6a17d6fb60382003bb35745ff1eabac1c8f8b47d186a383db
 DIST time-macros-0.2.6.crate 19163 BLAKE2B 536e71931deb698a123c2a6ec58b8fcee8b1b46c80bd9712fe2f76b0b8ae9f15c216b69814c334d0f855d32d4c31a595c6297e16471fa4735bcedf6d158182f6 SHA512 5b6877ae37c602ffcd4d1f1367ab2c28bc906ee9635218fc01e5ec3b74e3cd14873f9029ada835f8658c04ca7cdf628a6c088a191119d4bc459b4c37e1f0fd10
+DIST time-macros-0.2.8.crate 24295 BLAKE2B 6b54c83b11db8c8490383764a0e6f3a2c3f17c44adab2d19e69dc3fc5b27c5a44bd57bd0e6885c54ae493bd5e2c05a6237f72be93a3a2fbf297c47c02d28c61d SHA512 4e604f926a620b1caeba90bc5de1129f6a6bb4548890d6e31306ac419c7b6d421b548b3887a929da3209fad28cba8d57b989503e52f16af243375d545b5aefde
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST tokio-1.28.0.crate 660469 BLAKE2B c8e8da9fac7dea4a339c7118f6287abe52526c8d299c3a58e4d7e09953e898da30a911a589434de3dde42c652c7b5414c10be1d249ef476a23ff0eafe7baa1fa SHA512 65abc21094a8401553405c8bb65facecdfc74f628c65a8f0f39b01a368e6b9b838fb8457261974accb194a0e50b415d417e585bf616851ffeffcabd916a3b6ed
 DIST tokio-1.28.2.crate 660565 BLAKE2B cd0ef19422856248ec9a8c6a70fabb300064377fb3a7dc73c36b46a18941ffab10627422bf0a17a40952696f5ba179af51b39855d06807fb749c192eccf82fd6 SHA512 434a74d93e5069b0081538289478a1fa7929f3fef9f7db01105df5be57aa30bfb7cb234be2a087028e3ac6da350eb564d70544cd004f2a1a3857b725f5734d03
+DIST tokio-1.29.1.crate 693627 BLAKE2B 31564e39fda61ab60899879b6900cd51b0f8c45d6b4c09527455826ce8ea70b028e8a95a0d7ca96a84a51eada59c20c15b22682fef60576dc63b6c157edb3316 SHA512 915385a79155f595afe802e292bd0a7dc1c3d58935d9c1d743bd51baf5e94268fd52bc2d5d93b20b7d0224dc7c1b9dcab4c66aae369cb2774a6c0c04ccfcf386
 DIST tokio-macros-2.1.0.crate 11472 BLAKE2B ae03d8812bc2b8f833e0ca77f1df8edeb8e0476c06f8f5104fa632ce77369ec54a80ff3da86439192971bf2e11147eade3765c447d76238b768732702004db95 SHA512 e2a24c1befd512d68b5d8b26a3f1d940dd10bfe0979b5d61a71052478d9fd19b28eb7bcbeaca4cf3c9736fd3da0386c899e3a619f47c2d9f7e6b497140586b9d
 DIST tokio-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914
 DIST tokio-util-0.7.8.crate 101644 BLAKE2B bfd0b10b2ef7d1264262f78e406aaab07a1e060885dd7d9694b3cc34b6ae9f3d46946bbdc5aa3dbd0f6164973fc3305b20da04f37176250e874b3259860cfe51 SHA512 7b1501dd224b4a6749a5296751d83e6d57bae238a92430c32017813ab82c358086a555fd7d34537cc944c240ba73d4fb94864a5743dca05c138f834d45ee245e
@@ -375,7 +465,9 @@ DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedc
 DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
 DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75
 DIST tracing-attributes-0.1.24.crate 31841 BLAKE2B 8473fcad6bfd2f7df0fc4db41a5f71c4c128f4a0b485d21803aa421119afb3d9d5782515332c8c3349c24324c97449a80041a7f6d185c9dc48650b5b9182d585 SHA512 925bb3840ccb093dea2625802e5ee3a5f4bc3eafe2a8715670b1f14d2f4a01eff0c50f11368507247bcade02748eee8585975d156f5d2c932231c6e2ed89c0f5
+DIST tracing-attributes-0.1.26.crate 32060 BLAKE2B 80e96f77194d90c324867155a22ad4b6831551ace5832434eb83268cc1919b5aedd7d193e00ce7b8764724d446bbcf0f94d01a94e1347321df8eb6858c4132c3 SHA512 ddb9f5efb33627586cef49e3bd45d45b643cdc0e280c970a32f92c8ebe3bd51428ee395c43613911e23841ffab36daad322f2a874732491aaf6a95bd5035fb44
 DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65
+DIST tracing-core-0.1.31.crate 61263 BLAKE2B feec046ddd3e04995bfe24defd6ae1187fd7ad78d80d69031178f67ed534e9aa6ab6aaea92dad509f57e220df5f6f025ab8f96bbc957834126f53dcad36580c3 SHA512 66fcd0b4f32de3816b1dcbeda1af26fae0a79d088894637984dc6a0ca65b609f5f166cea376601f6a75f8e3a281da6d4450dc796aa0a7177ad615330237e2bed
 DIST tracing-log-0.1.3.crate 20549 BLAKE2B 1e2b5f1d96983b0dcf3e61f71132536e21dc19af0d532dcff7cc91db45e60cbdc1f8b5b7a7b2c13214dda4e3becd4f3d62262def1b608a99fa330ccf1d716323 SHA512 440cb8ddd5823cd0d86b68bbbf29f6886d5800f95d0aaa9477f98f188013fd009c2b9bc982b17efd08abd071bc70ca511f988b9db8c21d8e3d323fb67614d289
 DIST tracing-subscriber-0.3.17.crate 191711 BLAKE2B f55c8e8c70ca67f57cb3c8a411519f317b9961620e3f7db3a3933d549cb64a5871624c21231bd6a0974c94ecaee2904d2304ac9fde3aa8463f0fcbf99f94b5f9 SHA512 53a2a760d833f729e042b4f76b56c93ff7c50ddba968dfa9294f24425fe9a3dfc6c3b95a526ebd78df852b48b76c85d2f4f7be9170d75a6eea8734f77218e727
 DIST trust-dns-client-0.22.0.crate 87899 BLAKE2B 59a13584416e8faee5e86e04c606e390e78e75064fe2c9eaa4582d34caca1eb81a30fe690952c5020e97ed4ddbc11a47038094ae699283f4488415e7e7fe2db1 SHA512 6923459ef2f9442293afce645d0508f83cde5a1013e232d96e5291161e15c54ce9f00ebc2a0af199846a37aca206574686d2964e37e316d2bbeee6ac68012f9d
@@ -394,6 +486,7 @@ DIST unic-ucd-segment-0.9.0.crate 39262 BLAKE2B 73a2f0bfeb17ee731c17e7eb4b7188a8
 DIST unic-ucd-version-0.9.0.crate 2246 BLAKE2B c546ee182387db997e6cd699a25bc201fc943306d8e87f96edc1a3dc1cd5ab8ad96f34e8275721a5604765aa6fb6f81e3d8d9eae690d04e5ba71325a769b065b SHA512 153219ff18be02e23ff3dc90bba11fa8c7cda11b972e0d84500d9a0742fb7d84466f2cc63ee278a24098c39634e50742af3317cd942f4ea882ef5a2a8e003d7b
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9
+DIST unicode-ident-1.0.10.crate 42039 BLAKE2B 3365850e1991b9e572c6917a35f3c85523d921d5ebd9fa7025fbc1ce2a0518b06aaa9f3e3bfafb47d357226b5b9964145c7f1b5ddc16cb7280542f6c96f650ec SHA512 5dcc24e138a86f84cb05290332d02953b0ca18839ead1e74b0319bc361ea449700e04d62a51e435cba266121e463643e017718d3023a84f844a59e4ca4475686
 DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
 DIST unicode-linebreak-0.1.4.crate 74962 BLAKE2B 2b6b1f262da1100a06552ae24588a6a1f6d34cd9cf398ff182da48116644807cdfbd703770659d70a375102f9526c77ea3e7fc80e7fe5405ccf93bd8153af518 SHA512 4c4a1cb4d8d9563740a6a5bc8ea5db8bab88b1cfbd751fdf33dbdb3923478a4bb716e3ce7441aca0d84426894834959cbc845f3cc2bc1379c5935019dc3f703d
 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
@@ -401,6 +494,7 @@ DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa53
 DIST unicode-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c
 DIST unsafe-libyaml-0.2.8.crate 61459 BLAKE2B 42b695c512b871bbb3127d9c71eee34abb02e66024d488e7e9379af5c7f7a2e9ef191243976765dba73c20f35fe74efcbb42f05b2471c162c5e109b182d53e6a SHA512 cead338c7cf7e72ca875323828a8802287d0645fb89942973b78d1e1e240374de3b0b227e53b1e7e8db12517ab0a79b73b643246570057559f4cd69ec79a4e7d
 DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
+DIST url-2.4.0.crate 75670 BLAKE2B 8cfff1d8ae0b7353ab4f539e2df1f15dde3c75f347c36bc5c4c8ea45a0cfcb31950b073b50acb34a14cd3d7a11b665c3a73a3d070cc590ce740c561f0e6e92d2 SHA512 acef524d2c00d2fd68ec6385ca2a44b740f60724256750d8b0ea609dec7f9d59303069f315f04a5205925a27274ec7709f3818a2237ea0023845e9a12905694c
 DIST utf8-width-0.1.6.crate 2935 BLAKE2B 819dffbf5203508fa3c30d8904295cc550cb7569d11346d8066061763982c7c78f3a0a7d6733c8e9ed38f943625b3c50f84da87b6f7a1d042db9a34cb57ebdd3 SHA512 2c51e38c7fa2a2c113ff74164067e49e2e615048144f3065c228a965804029447f7a1e65d926facccb8332a2ab2be02fffb7413d8eee6f883d941909b350844c
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
@@ -408,15 +502,22 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.3.crate 23125 BLAKE2B 3bd354b9796a31bd4c8f4ca695514101a7837ae2134fa1ffec20df1cc946a67b38c6b50affbc2cb79ffee0934474d8269378dab5ac49a4943ccf8c7aaa51db11 SHA512 2b6e1e27c16e310f636eb1c9ee58435509fb8f7a6c5beba4dd13d87aa1d91599a593bfe720a675d536ce63e217c31e240a57122455d8e18de1282a9e7fc3defe
 DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
+DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d
+DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705
 DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058
+DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94
 DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43
+DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6
 DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5
+DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33
 DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010
+DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008
 DIST widestring-0.5.1.crate 41338 BLAKE2B 4d202d15df38056a004ebdc721bbe5d0fd6ab28f957dff269f0b90ab3dd08d7521dd94d00b1b21c5cba438592462989e9d360f4b566faf075fbb091982dd344c SHA512 ef39fc053cd98c070e502d0c53acf27965a06583805fb6d8b1228f76063ed343382500917ae33231470c5af3d2223070d36f394758bd6faf4e298cb981cbe3bb
+DIST widestring-1.0.2.crate 79706 BLAKE2B 64423d0c485d1596015e9fcee691222a2a69b85a1b13a91651c50c1e3c5ec61c5105232904c6239bb442a2b3f2e808379d802856b93bb62ec8779cbf3db77655 SHA512 cbebac37d87808e791d7839ad69e0b86af49b0e8a354a22e11797915c719937ed5b0cb638e5afc9d710cd1e073eaa9f7db76cd3ca1ec35a71b565f0b8f55407b
 DIST win-crypto-ng-0.5.0.crate 44655 BLAKE2B debe6023dcbb4a9248350c497790bd6c9765d3e1c4cff860f74fcf8348677075cf6e0f85ee1f1b4c3b96de336ddcad4998cc6aa972f46a7d0388bc65f7e4c749 SHA512 05edc0189cef0a335bfe641311773c9b414a160a352b9c13606302e47cc2de779175316443ce74660106b18121010d68968a462fa02f824f2f0f0ee2237d7786
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
@@ -428,6 +529,7 @@ DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33ae
 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
 DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9
 DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22
+DIST windows-targets-0.48.1.crate 6902 BLAKE2B 8e6cd47dea52131c66983cbf4982e88f7bd30416dfae4e380f7afb39f67ee0ac88d40769668dd5aba40d4415f9f00cbc2ac98d598506fed26029f5ec4df3a2c5 SHA512 e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2
 DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1
 DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
 DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63
@@ -443,6 +545,7 @@ DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d15799780
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
+DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787
 DIST x25519-dalek-ng-1.1.1.crate 84463 BLAKE2B 545366ca74d0895e6373dfa994628352d1090ffa2fdc12670d7433338f17ccfbd834ecb7d442333066bcc2dae7da705c440cc16f0be6818167b0cf0e90a5fe77 SHA512 65373a5642098b48eac6834c7ed6a1e0c4a2941ed73d5db670de5479d091cc2258697d92bc6ae4c51ef21bd000e78ffbd312bfb306e100185ecfb391ac96276d
 DIST xxhash-rust-0.8.6.crate 18569 BLAKE2B 35ef46ca26bf4155b9eb9b5e6b108c588af52b39a9e093b28c87360056547d2e9a4ebf73e17208b441aec848e00307a8dbfa179abae512e444e4788734425b95 SHA512 d073b4aab435fe60f2d297b25fb5eb03262ba1b8b95a852b19cf8e35388a86eba7df20f5e4df46beb6d27e01570d050cebafc2b7b629717ddb96eaaf482f6af2
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.31.0.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.31.0.ebuild
new file mode 100644
index 000000000000..895294e7b787
--- /dev/null
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.31.0.ebuild
@@ -0,0 +1,511 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.20.0
+	adler@1.0.2
+	aead@0.5.2
+	aes@0.8.3
+	ahash@0.7.6
+	aho-corasick@0.7.20
+	aho-corasick@1.0.2
+	aligned@0.4.1
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anyhow@1.0.71
+	as-slice@0.2.1
+	ascii-canvas@3.0.0
+	assert_cmd@2.0.8
+	async-trait@0.1.70
+	autocfg@1.1.0
+	backtrace@0.3.68
+	base16ct@0.2.0
+	base64@0.13.1
+	base64@0.21.2
+	base64ct@1.6.0
+	bindgen@0.63.0
+	bit-set@0.5.3
+	bit-vec@0.6.3
+	bitflags@1.3.2
+	bitflags@2.3.3
+	block-buffer@0.10.4
+	block-buffer@0.9.0
+	block-padding@0.3.3
+	blowfish@0.9.1
+	botan-sys@0.10.3
+	botan@0.10.3
+	bstr@1.5.0
+	buffered-reader@1.2.0
+	bumpalo@3.13.0
+	byteorder@1.4.3
+	bytes@1.4.0
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.4
+	cast5@0.11.1
+	cc@1.0.79
+	cexpr@0.6.0
+	cfb-mode@0.8.2
+	cfg-if@1.0.0
+	chrono@0.4.26
+	cipher@0.4.4
+	clang-sys@1.6.1
+	clap@4.0.32
+	clap_complete@4.0.7
+	clap_derive@4.0.21
+	clap_lex@0.3.0
+	clap_mangen@0.2.6
+	cmac@0.7.2
+	const-oid@0.9.3
+	core-foundation-sys@0.8.4
+	core-foundation@0.9.3
+	cpufeatures@0.2.9
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.8
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.15
+	crossbeam-queue@0.3.8
+	crossbeam-utils@0.8.16
+	crossbeam@0.8.2
+	crunchy@0.2.2
+	crypto-bigint@0.5.2
+	crypto-common@0.1.6
+	ctr@0.9.2
+	curve25519-dalek-ng@4.1.1
+	curve25519-dalek@3.2.0
+	cvt@0.1.2
+	data-encoding@2.4.0
+	dbl@0.3.2
+	der@0.7.7
+	des@0.8.1
+	deunicode@0.4.3
+	diff@0.1.13
+	difflib@0.4.0
+	digest@0.10.7
+	digest@0.9.0
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@4.0.0
+	dirs@5.0.1
+	doc-comment@0.3.3
+	dot-writer@0.1.3
+	dyn-clone@1.0.11
+	eax@0.5.0
+	ecb@0.1.1
+	ecdsa@0.16.7
+	ed25519-dalek@1.0.1
+	ed25519@1.5.3
+	either@1.8.1
+	elliptic-curve@0.13.5
+	ena@0.14.2
+	endian-type@0.1.2
+	enum-as-inner@0.5.1
+	enumber@0.3.0
+	env_logger@0.10.0
+	errno-dragonfly@0.1.2
+	errno@0.3.1
+	fallible-iterator@0.2.0
+	fallible-streaming-iterator@0.1.9
+	fastrand@1.9.0
+	fd-lock@3.0.12
+	fehler-macros@1.0.0
+	fehler@1.0.0
+	ff@0.13.0
+	file_diff@1.0.0
+	filetime@0.2.21
+	fixedbitset@0.4.2
+	flate2@1.0.26
+	float-cmp@0.9.0
+	fnv@1.0.7
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form_urlencoded@1.2.0
+	fs2@0.4.3
+	fs_at@0.1.8
+	futures-channel@0.3.28
+	futures-core@0.3.28
+	futures-io@0.3.28
+	futures-macro@0.3.28
+	futures-sink@0.3.28
+	futures-task@0.3.28
+	futures-util@0.3.28
+	generator@0.7.5
+	generic-array@0.14.7
+	getopts@0.2.21
+	getrandom@0.1.16
+	getrandom@0.2.10
+	gimli@0.27.3
+	git-testament-derive@0.1.14
+	git-testament@0.2.4
+	glob@0.3.1
+	globset@0.4.10
+	globwalk@0.8.1
+	group@0.13.0
+	h2@0.3.20
+	hashbrown@0.12.3
+	hashlink@0.8.1
+	heck@0.4.1
+	hermit-abi@0.3.2
+	hkdf@0.12.3
+	hmac@0.12.1
+	hostname@0.3.1
+	html-escape@0.2.13
+	http-body@0.4.5
+	http@0.2.9
+	httparse@1.8.0
+	httpdate@1.0.2
+	humansize@2.1.3
+	humantime@2.1.0
+	hyper-tls@0.5.0
+	hyper@0.14.27
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.57
+	idea@0.5.1
+	idna@0.2.3
+	idna@0.3.0
+	idna@0.4.0
+	ignore@0.4.20
+	indexmap@1.9.3
+	inout@0.1.3
+	instant@0.1.12
+	io-lifetimes@1.0.11
+	ipconfig@0.3.2
+	ipnet@2.8.0
+	is-terminal@0.4.7
+	itertools@0.10.5
+	itoa@1.0.8
+	js-sys@0.3.64
+	lalrpop-util@0.19.12
+	lalrpop@0.19.12
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.147
+	libloading@0.7.4
+	libm@0.2.7
+	libsqlite3-sys@0.26.0
+	line-col@0.2.1
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.3.8
+	lock_api@0.4.10
+	log@0.4.19
+	loom@0.5.6
+	lru-cache@0.1.2
+	match_cfg@0.1.0
+	matchers@0.1.0
+	matches@0.1.10
+	md-5@0.10.5
+	memchr@2.5.0
+	memoffset@0.9.0
+	memsec@0.6.3
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.1
+	mio@0.8.8
+	native-tls@0.2.11
+	nettle-sys@2.2.0
+	nettle@7.3.0
+	new_debug_unreachable@1.0.4
+	nibble_vec@0.1.0
+	nix@0.26.2
+	no-std-compat@0.4.1
+	nom@7.1.3
+	normalize-line-endings@0.3.0
+	normpath@1.1.1
+	nu-ansi-term@0.46.0
+	num-bigint-dig@0.8.4
+	num-integer@0.1.45
+	num-iter@0.1.43
+	num-traits@0.2.15
+	num_cpus@1.16.0
+	object@0.31.1
+	once_cell@1.18.0
+	opaque-debug@0.3.0
+	openpgp-cert-d@0.1.0
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.90
+	openssl@0.10.55
+	option-ext@0.2.0
+	os_str_bytes@6.5.1
+	overload@0.1.1
+	p256@0.13.2
+	parking_lot@0.12.1
+	parking_lot_core@0.9.8
+	peeking_take_while@0.1.2
+	pem-rfc7468@0.7.0
+	percent-encoding@2.3.0
+	pest@2.7.0
+	pest_derive@2.7.0
+	pest_generator@2.7.0
+	pest_meta@2.7.0
+	petgraph@0.6.3
+	phf_shared@0.10.0
+	pikchr@0.1.1
+	pin-project-lite@0.2.10
+	pin-utils@0.1.0
+	pkcs1@0.7.5
+	pkcs8@0.10.2
+	pkg-config@0.3.27
+	ppv-lite86@0.2.17
+	precomputed-hash@0.1.1
+	predicates-core@1.0.5
+	predicates-tree@1.0.7
+	predicates@2.1.5
+	primeorder@0.13.2
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.63
+	pulldown-cmark@0.9.3
+	quick-error@1.2.3
+	quote@1.0.29
+	radix_trie@0.2.1
+	rand@0.7.3
+	rand@0.8.5
+	rand_chacha@0.2.2
+	rand_chacha@0.3.1
+	rand_core@0.5.1
+	rand_core@0.6.4
+	rand_hc@0.2.0
+	rayon-core@1.11.0
+	rayon@1.7.0
+	redox_syscall@0.2.16
+	redox_syscall@0.3.5
+	redox_users@0.4.3
+	regex-automata@0.1.10
+	regex-syntax@0.6.29
+	regex-syntax@0.7.2
+	regex@1.8.4
+	remove_dir_all@0.8.2
+	resolv-conf@0.7.0
+	rfc6979@0.4.0
+	ripemd@0.1.3
+	roadmap@0.5.0
+	roff@0.2.1
+	rpassword@7.2.0
+	rsa@0.9.2
+	rtoolbox@0.0.1
+	rusqlite@0.29.0
+	rustc-demangle@0.1.23
+	rustc-hash@1.1.0
+	rustix@0.37.22
+	rustversion@1.0.13
+	ryu@1.0.14
+	same-file@1.0.6
+	schannel@0.1.22
+	scoped-tls@1.0.1
+	scopeguard@1.1.0
+	sec1@0.7.2
+	security-framework-sys@2.9.0
+	security-framework@2.9.1
+	sequoia-autocrypt@0.25.1
+	sequoia-cert-store@0.3.2
+	sequoia-net@0.27.0
+	sequoia-openpgp@1.16.0
+	sequoia-policy-config@0.6.0
+	sequoia-wot@0.8.1
+	serde-aux@4.2.0
+	serde@1.0.166
+	serde_derive@1.0.166
+	serde_json@1.0.100
+	serde_yaml@0.8.26
+	serde_yaml@0.9.21
+	sha-1@0.10.1
+	sha1collisiondetection@0.2.7
+	sha2@0.10.7
+	sha2@0.9.9
+	sharded-slab@0.1.4
+	shell-words@1.1.0
+	shlex@1.1.0
+	signature@1.6.4
+	signature@2.1.0
+	siphasher@0.3.10
+	slab@0.4.8
+	slug@0.1.4
+	smallvec@1.10.0
+	smawk@0.3.1
+	socket2@0.4.9
+	socket2@0.5.3
+	spin@0.5.2
+	spki@0.7.2
+	stable_deref_trait@1.2.0
+	state@0.5.3
+	static_assertions@1.1.0
+	string_cache@0.8.7
+	strsim@0.10.0
+	subplot-build@0.7.1
+	subplot@0.7.1
+	subplotlib-derive@0.7.1
+	subplotlib@0.7.1
+	subtle-ng@2.5.0
+	subtle@2.5.0
+	syn@1.0.109
+	syn@2.0.23
+	tempfile-fast@0.3.4
+	tempfile@3.6.0
+	tera@1.19.0
+	term@0.7.0
+	termcolor@1.2.0
+	terminal_size@0.2.6
+	termtree@0.4.1
+	textwrap@0.15.2
+	thiserror-impl@1.0.41
+	thiserror@1.0.41
+	thread_local@1.1.4
+	time-core@0.1.0
+	time-macros@0.2.8
+	time@0.1.45
+	time@0.3.20
+	tiny-keccak@2.0.2
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.1.0
+	tokio-native-tls@0.3.1
+	tokio-util@0.7.8
+	tokio@1.29.1
+	toml@0.5.11
+	tower-service@0.3.2
+	tracing-attributes@0.1.26
+	tracing-core@0.1.31
+	tracing-log@0.1.3
+	tracing-subscriber@0.3.17
+	tracing@0.1.37
+	trust-dns-client@0.22.0
+	trust-dns-proto@0.22.0
+	trust-dns-resolver@0.22.0
+	try-lock@0.2.4
+	twofish@0.7.1
+	typenum@1.16.0
+	ucd-trie@0.1.5
+	unescape@0.1.0
+	unic-char-property@0.9.0
+	unic-char-range@0.9.0
+	unic-common@0.9.0
+	unic-segment@0.9.0
+	unic-ucd-segment@0.9.0
+	unic-ucd-version@0.9.0
+	unicase@2.6.0
+	unicode-bidi@0.3.13
+	unicode-ident@1.0.10
+	unicode-linebreak@0.1.4
+	unicode-normalization@0.1.22
+	unicode-width@0.1.10
+	unicode-xid@0.2.4
+	unsafe-libyaml@0.2.8
+	url@2.4.0
+	utf8-width@0.1.6
+	valuable@0.1.0
+	vcpkg@0.2.15
+	version_check@0.9.4
+	wait-timeout@0.2.0
+	walkdir@2.3.3
+	want@0.3.1
+	wasi@0.10.0+wasi-snapshot-preview1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.87
+	wasm-bindgen-macro-support@0.2.87
+	wasm-bindgen-macro@0.2.87
+	wasm-bindgen-shared@0.2.87
+	wasm-bindgen@0.2.87
+	widestring@1.0.2
+	win-crypto-ng@0.5.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.45.0
+	windows-sys@0.48.0
+	windows-targets@0.42.2
+	windows-targets@0.48.1
+	windows@0.48.0
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.0
+	winreg@0.50.0
+	x25519-dalek-ng@1.1.1
+	xxhash-rust@0.8.6
+	yaml-rust@0.4.5
+	zbase32@0.1.2
+	zeroize@1.6.0
+	zeroize_derive@1.4.2
+"
+
+LLVM_MAX_SLOT=16
+
+inherit bash-completion-r1 cargo llvm
+
+DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
+HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
+SRC_URI="
+	https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
+	${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}"/${PN}-v${PV}
+
+LICENSE="GPL-2+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ LGPL-3+ MIT MIT-0
+	MPL-2.0 Unicode-DFS-2016
+	|| ( GPL-2 GPL-3 LGPL-3 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+QA_FLAGS_IGNORED="usr/bin/sq"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	dev-libs/openssl:=
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/clang
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+# Clang needed for bindgen
+BDEPEND="
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	virtual/pkgconfig
+"
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_compile() {
+	# Setting CARGO_TARGET_DIR is required to have the build system
+	# create the bash and zsh completion files.
+	CARGO_TARGET_DIR="${S}/target" cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+
+	doman target/$(usex debug debug release)/build/sequoia-sq-*/out/*.1
+
+	newbashcomp target/sq.bash sq
+
+	insinto /usr/share/zsh/site-functions
+	doins target/_sq
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins target/sq.fish
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 8331a6e1b9eb..b0b8c9464dde 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/python-docs/Manifest b/app-doc/python-docs/Manifest
index fa5aebce7bfd..e5b25b7fa839 100644
--- a/app-doc/python-docs/Manifest
+++ b/app-doc/python-docs/Manifest
@@ -1,11 +1,5 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
-DIST python-3.10.10-docs-html.tar.bz2 7387634 BLAKE2B 27b340b02412fc8a6f2911c2faf1da64511955432046a8580472b0445adb8272584f99c7fe41469932c948485ccdb799aea76cc9596f5a122342afccff2f7c83 SHA512 4678fc3a33e0bd53419894e98a3132f18635693dcf91846c6911a163ebd693b9af42d78ffc27fd5e522eca7376097555271b6bd85a21d1231d6b7523f4620534
-DIST python-3.10.11-docs-html.tar.bz2 7390187 BLAKE2B 02f1cea9a25fbf764d07a909575b1bd5ab4a79c493e149a1c4e747dc20ea59cf6a4db0d9dee4f38527f6c829965bc07d45abb91c0f5cd39069ae83bc7458b426 SHA512 65941e05977391a729effaaaace979447ec4db6638b16bcf508b19ba997caa8fedaa5ab9fc7888e565d5982bdf305e4c8525074c925a60394910e3678f9eead0
 DIST python-3.10.12-docs-html.tar.bz2 7433462 BLAKE2B 8078af52a2ee8c2f308a30a2ceed2241080fa790c9e581809c85a5abb399522ae90b1126612b4cc1ce46d049e91b8d79d05e29337d55473c491dad1a2b80be5c SHA512 e6b02bdce8c96fa168f0faa2435773496ddf761072c93c2944870bafc0ddb49afea5fad73cf6000119bc01435fa558a19f70e5abebe1a51e7c9547911aa336fb
-DIST python-3.11.2-docs-html.tar.bz2 7779519 BLAKE2B d9e1faa1414b18923c08686097d4d65613768c404f712a8ca104f546938016afe5e47bdec25296db1792f1ec49a11ed9899b062b9fdb24e93b2f60d6f49ae82c SHA512 0a6b54b0e3579f640a78e9255ff60b6b18f36752b8949f0f19e5c2fb84c33775c761bed907fb45dc606e5bc894068086cac4935574e89421bee55e8b2127d7d8
-DIST python-3.11.3-docs-html.tar.bz2 7779259 BLAKE2B 4d8530d77df2c93f29f7c6d45c519830806c13a2df0daa651b92157ea0343cc4124e06b88c436fa4ca53c45020bee5395b166438d8ad0a757b6722e609c53792 SHA512 23cf287d2bdcfe03bb36b4f63443dbd9895ff645c418a2bd73e5145d4656b0b16ae432be2bc52a70d71f1912c5da85ebc738c07cf6b209ea7e0d0bb781e4e48f
 DIST python-3.11.4-docs-html.tar.bz2 7831799 BLAKE2B 81245e6f47f9179ac8fcf8c1e8a2d6f28c2f7924984d541af71684b4a00896ab38280150a04b8ed051a62ee957cd7613fe28ba79c23624b9bf00d1e7587d7e6c SHA512 b00fa45da239d804e12dcfd5f248b0feb060c2c6e7003913ba6b29a5d198e439dd59ac779c0e4417ccfa90f3654dd3233804974f47efda4fb5891fbe1c6a9f6f
-DIST python-3.8.16-docs-html.tar.bz2 6697934 BLAKE2B 99fb1b8e95c3719b1146e845051fa6b9fbf61fabfdd1fe6d93a44e6a46f4b4e44c9ce0adef89cfdeafc8b67d290adda21d295f492a8f54c069ad86fba4952c0b SHA512 aaffc1f4d56be0ff7fbd35c7ca690d9089f9686d957669852aff1406efad2bee52b2b965ffd652780da6048ff9d89e6bbc421e92588841b89d73af43ad4970fb
 DIST python-3.8.17-docs-html.tar.bz2 6737444 BLAKE2B f6f9a4da13837ecede50eb4d2074b1c6d2be616449f81712e3c551d61d56ac0e314aca84dbcae7d07e89d6f316bec5a6d0797fa0b0f8bf98632ff3c0b6ffad06 SHA512 ab29fc066df0edcaf40dab079cf8fcaa68b895da053ce9cf3d8d776510d804ccfb17ba04e5464ed5edaeb938aaac8aa51bba67c7c3dff80f65cc67bd2d902a1a
-DIST python-3.9.16-docs-html.tar.bz2 6965048 BLAKE2B 14d30cf5c444b993409751d17959bc46668d2b6e5be76e10d36adb0b8704a2a3908d829e8aa12d384efab31f8b60b462f711f2fa6adf8bc84fbdfe25e4cbc703 SHA512 38828ca880e3ed84a705dba465430f1b9623fec830662805008847c5d44ce04225ea7c2173d3eb138fd98e134fa2bb9ed84788e2b1d045bf9cf20e78e12d4472
 DIST python-3.9.17-docs-html.tar.bz2 7021842 BLAKE2B 7a5e3426ea47929289078f9fd2c4fc6b833ba172701ebe9d85f6f821d28bc0bbde1cf88fc99807cc9f7031039c10f451280baf3892040b28ad4733c1e53995fb SHA512 900b82f558b08058390d52b18aa2bcee4a8e74fa9555e36fc924c822506c80f002e90d51b1e6263c0dde612937b6d419e76952288ad923ffcca8562c927a8e76
diff --git a/app-doc/python-docs/python-docs-3.10.10.ebuild b/app-doc/python-docs/python-docs-3.10.10.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.10.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.10.11.ebuild b/app-doc/python-docs/python-docs-3.10.11.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.10.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.10.12.ebuild b/app-doc/python-docs/python-docs-3.10.12.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/app-doc/python-docs/python-docs-3.10.12.ebuild
+++ b/app-doc/python-docs/python-docs-3.10.12.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.11.2.ebuild b/app-doc/python-docs/python-docs-3.11.2.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.11.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.11.3.ebuild b/app-doc/python-docs/python-docs-3.11.3.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.11.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.11.4.ebuild b/app-doc/python-docs/python-docs-3.11.4.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/app-doc/python-docs/python-docs-3.11.4.ebuild
+++ b/app-doc/python-docs/python-docs-3.11.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.8.16.ebuild b/app-doc/python-docs/python-docs-3.8.16.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.8.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.8.17.ebuild b/app-doc/python-docs/python-docs-3.8.17.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/app-doc/python-docs/python-docs-3.8.17.ebuild
+++ b/app-doc/python-docs/python-docs-3.8.17.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.9.16.ebuild b/app-doc/python-docs/python-docs-3.9.16.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.9.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.9.17.ebuild b/app-doc/python-docs/python-docs-3.9.17.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/app-doc/python-docs/python-docs-3.9.17.ebuild
+++ b/app-doc/python-docs/python-docs-3.9.17.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 992a825b2e95..8d4f63f45180 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/pymacs/pymacs-0.26-r4.ebuild b/app-emacs/pymacs/pymacs-0.26-r4.ebuild
new file mode 100644
index 000000000000..3f6d1c1d330d
--- /dev/null
+++ b/app-emacs/pymacs/pymacs-0.26-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit elisp distutils-r1
+
+DESCRIPTION="A tool that allows both-side communication between Python and Emacs Lisp"
+HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs
+	https://github.com/dgentry/Pymacs/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dgentry/${PN^}.git"
+else
+	SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}"/${P^}
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		>=dev-python/docutils-0.7
+		virtual/latex-base
+	)
+"
+
+DOCS=( ${PN}.rst )
+SITEFILE="50${PN}-gentoo.el"
+
+python_configure() {
+	emake PYSETUP=: PYTHON=${EPYTHON} prepare
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	elisp_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	elisp_src_compile
+
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py ${PN}.pdf
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	elisp_src_install
+
+	use doc && dodoc ${PN}.pdf
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f266b8910a6c..258b1ce35ff8 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.30.0-r1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.30.0-r1.ebuild
new file mode 100644
index 000000000000..2f2696ced6ca
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.30.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder"
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
index 10b17cd396dd..2f2696ced6ca 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9,10,11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 inherit distutils-r1
 
@@ -30,6 +30,7 @@ RDEPEND="${CDEPEND}
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	app-emulation/qemu
diff --git a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
index 7dcde0ab5956..91dad4ae4f16 100644
--- a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	>=sys-libs/libosinfo-0.2.10[introspection]
-		$(python_gen_cond_dep '
+	$(python_gen_cond_dep '
 		dev-libs/libxml2[python,${PYTHON_USEDEP}]
 		dev-python/argcomplete[${PYTHON_USEDEP}]
 		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 149a17abda7b..d5fd49307e4c 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	>=sys-libs/libosinfo-0.2.10[introspection]
-		$(python_gen_cond_dep '
+	$(python_gen_cond_dep '
 		dev-libs/libxml2[python,${PYTHON_USEDEP}]
 		dev-python/argcomplete[${PYTHON_USEDEP}]
 		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index ab7f513d5e36..fc5c88b41388 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,12 +1,10 @@
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.10.tar.xz 29225368 BLAKE2B 78058ccb707ddd63052ab3114e27435f94957b7badbe3001f8123fd536f5b937006b26e2133390ea5d995e9cb8c54940c907dacf910160c085e2bf3f29772caf SHA512 5f141fb63a598482f512ebefef83500c2fa17a5dea87cb25e600e5167820a5990e12aeaec4a18c1467d64f7c122bf54705aa6fa6a2e6b2b4a463fe182f9b0e6e
 DIST wine-8.11.tar.xz 29236492 BLAKE2B db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5 SHA512 f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
-DIST wine-8.7.tar.xz 29158096 BLAKE2B 73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c SHA512 0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
-DIST wine-8.8.tar.xz 29181484 BLAKE2B 43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac SHA512 e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
+DIST wine-8.12.tar.xz 29276732 BLAKE2B c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869 SHA512 6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.9.tar.xz 29198080 BLAKE2B dfad284f554c164ac8f95d7c36d8b999217c6375f7720ed05e512e3f16cbc5a08325dad4e56dd59a17b27e53ab3a8331d54dd17b24e459b34d9e408ba93a52f3 SHA512 4de85654d2d5c9d48fa2a748eb9bee4477f0ba7fbd2c5dd40ea69662d8f6dfbb6432d1ec9109233d24608dc9554bad525c1e1ecdc86a5d00d133772810b12261
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203 SHA512 76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.10.tar.gz 9703684 BLAKE2B 1af11df98cc811741148de9d62a37a352c305d05bdb29b3df5e6a9a2a6597a9cc3ed63109523188cf09f01a97873d077760b1761d3251ac2657c77c92c975373 SHA512 89282f9edeb47a904f11796cfeda6853bc492701b6ce1a65211ffebf25c5539516c49b687e0ea024a99d3fc6251ed348a14f644babeb64b6dffdd6032e493859
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f SHA512 fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
-DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5 SHA512 42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
-DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d SHA512 7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5
+DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2 SHA512 11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
 DIST wine-staging-8.9.1.tar.gz 9700492 BLAKE2B 4382cc7226e734f8f592da80d2fba485052f39b829f61a51c523098a185a47a451c7e91badaa792de9ddf4fd80c16fd5d6091cc2d962ecaf455d6bc3d0010efc SHA512 abb25718f965241c1404430c1dffa398c2ffd180328e5456fc58a070f90f818a10285ad5515d74727a43f6de9f6c19129acd6ed6ba866d7b240886bbcabcd990
diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild b/app-emulation/wine-staging/wine-staging-8.12.ebuild
new file mode 100644
index 000000000000..940bb93e3836
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -0,0 +1,387 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
+	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="
+		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${WINE_P}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+	kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	+truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite
+	xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? (
+		|| (
+			games-emulation/dosbox
+			games-emulation/dosbox-staging
+		)
+	)
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )"
+# gitapply.sh prefers git but can fallback to patch+extras
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		dev-vcs/git
+		(
+			sys-apps/gawk
+			sys-apps/util-linux
+		)
+	)
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900334)
+	res_getservers # false positive
+)
+QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+		git-r3_src_unpack
+
+		# hack: use subshell to preserve state (including what git-r3 unpack
+		# sets) for smart-live-rebuild as this is not the repo to look at
+		(
+			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
+			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+			EGIT_CHECKOUT_DIR=${S}
+			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
+			git-r3_src_unpack
+		)
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	local patchinstallargs=(
+		--all
+		--no-autoconf
+		${MY_WINE_STAGING_CONF}
+	)
+
+	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
+
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use mingw || filter-flags -fno-plt # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# use *FLAGS for mingw, but strip unsupported
+			: "${CROSSCFLAGS:=$(
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				# -mavx with mingw-gcc has a history of obscure issues and
+				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
+				# crashes with -march=skylake >=wine-8.10, similar issues with
+				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+				append-cflags -mno-avx
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{C,LD}FLAGS
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	if use mingw; then
+		# don't let portage try to strip PE files with the wrong
+		# strip executable and instead handle it here (saves ~120MB)
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+		if use strip; then
+			ebegin "Stripping Windows (PE) binaries"
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+			eend ${?} || die
+		fi
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild b/app-emulation/wine-staging/wine-staging-8.7.ebuild
deleted file mode 100644
index 3d3ed519862c..000000000000
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=7.4.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/wine-${PV}"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
-	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
-	+truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite
-	xinerama"
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )" # bug #551124 for truetype
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )"
-# gitapply.sh prefers git but can fallback to patch+extras
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	dev-lang/perl
-	sys-devel/binutils
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
-	res_getservers # false positive
-)
-QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-		EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-		EGIT_CHECKOUT_DIR=${S}
-		einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local patchinstallargs=(
-		--all
-		--no-autoconf
-		-W winemenubuilder-Desktop_Icon_Path #652176
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
-	filter-lto # build failure
-	use mingw || filter-flags -fno-plt # build failure
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
-	# https://github.com/gentoo/gentoo/pull/28355
-	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
-		append-ldflags -fuse-ld=bfd
-
-	# build using upstream's way (--with-wine64)
-	# order matters: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		pe_arch=i386
-		if (( bits == 64 )); then
-			pe_arch=x86_64
-			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
-
-		if use mingw; then
-			# CROSSCC is no longer recognized by Wine, but still use for now
-			# (future handling for CROSS* variables is subject to changes)
-			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
-
-			# use *FLAGS for mingw, but strip unsupported
-			: "${CROSSCFLAGS:=$(
-				# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
-				append-cflags '-fno-strict-aliasing'
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-mfunction-return=thunk*' #878849
-				# -mavx with mingw-gcc has a history of obscure issues and
-				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-				# crashes with -march=skylake >=wine-8.10, similar issues with
-				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-				append-cflags -mno-avx
-				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
-			: "${CROSSLDFLAGS:=$(
-				filter-flags '-fuse-ld=*'
-				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
-			export CROSS{C,LD}FLAGS
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
-	if use abi_x86_64 && use !abi_x86_32; then
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	# don't let portage try to strip PE files with the wrong
-	# strip executable and instead handle it here (saves ~120MB)
-	if use mingw; then
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-		use debug ||
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
-	fi
-
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-staging/wine-staging-8.8.ebuild b/app-emulation/wine-staging/wine-staging-8.8.ebuild
deleted file mode 100644
index 84fd9d3669c3..000000000000
--- a/app-emulation/wine-staging/wine-staging-8.8.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=7.4.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/wine-${PV}"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
-	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
-	+truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite
-	xinerama"
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )" # bug #551124 for truetype
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )"
-# gitapply.sh prefers git but can fallback to patch+extras
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	dev-lang/perl
-	sys-devel/binutils
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
-	res_getservers # false positive
-)
-QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-		EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-		EGIT_CHECKOUT_DIR=${S}
-		einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local patchinstallargs=(
-		--all
-		--no-autoconf
-		-W winemenubuilder-Desktop_Icon_Path #652176
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
-	filter-lto # build failure
-	use mingw || filter-flags -fno-plt # build failure
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
-	# https://github.com/gentoo/gentoo/pull/28355
-	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
-		append-ldflags -fuse-ld=bfd
-
-	# build using upstream's way (--with-wine64)
-	# order matters: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		pe_arch=i386
-		if (( bits == 64 )); then
-			pe_arch=x86_64
-			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
-
-		if use mingw; then
-			# CROSSCC is no longer recognized by Wine, but still use for now
-			# (future handling for CROSS* variables is subject to changes)
-			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
-
-			# use *FLAGS for mingw, but strip unsupported
-			: "${CROSSCFLAGS:=$(
-				# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
-				append-cflags '-fno-strict-aliasing'
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-mfunction-return=thunk*' #878849
-				# -mavx with mingw-gcc has a history of obscure issues and
-				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-				# crashes with -march=skylake >=wine-8.10, similar issues with
-				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-				append-cflags -mno-avx
-				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
-			: "${CROSSLDFLAGS:=$(
-				filter-flags '-fuse-ld=*'
-				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
-			export CROSS{C,LD}FLAGS
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
-	if use abi_x86_64 && use !abi_x86_32; then
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	# don't let portage try to strip PE files with the wrong
-	# strip executable and instead handle it here (saves ~120MB)
-	if use mingw; then
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-		use debug ||
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
-	fi
-
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index c3a9cd0a79f8..38d735ed7fa9 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index ecc0fd740ea7..18c9fee18b40 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,2 +1,2 @@
-DIST manpages-l10n-4.17.0.tar.bz2 108073280 BLAKE2B 4604b0c406cf16bb87ef5b7d1f43868b0ecfa085cfdfd6717e2156bd953ead0fa33d6960b78cd9e98a8e8c448c7c01bc669b91b04b3a11cc58c52c2963812f86 SHA512 e53fb8198bdf9ca2380c5cc487b2864b361011d3293202245fed4af1644563e478428547cd7c307be2556d0aeb88f7fad8ecaa34e837326319d4adb554473372
 DIST manpages-l10n-4.18.1.tar.bz2 110701567 BLAKE2B 107529345eabf24a2c63ef859504ff5b0d0a44fbb521f82053e03ab7c6e8ca7d1c147d36554a488f5b99d25b1aa326c50b2d61d2c1d2b7f0de959447647a372a SHA512 7975aa7118eaefee3dceba5f60be5a413abb9a48d1ec51c536bda9a742ece897196df17633349b55aac37b76319d0360f7dadbe9191514551cb7d0496710a690
+DIST manpages-l10n-4.19.0.tar.bz2 112228176 BLAKE2B fd00f3b2881814ac80cb3da07202b5d7a9842b197b1313f70780e33af6b6a10981497fb1d75fb0d8d9d84e99533ce9702cf2bc6191d8dd9f1d11ac3209bea629 SHA512 036f9dd647504c168b0a9aaed757dbb583c2a3ca5431cddb370b1c8bac220228037a699420d6c2e184b046784d3eea2e96b439649e2617b6160e485d4d358011
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0-r1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0-r1.ebuild
deleted file mode 100644
index 3e9c89a0d4f5..000000000000
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A somewhat comprehensive collection of man page translations"
-HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
-SRC_URI="https://salsa.debian.org/manpages-l10n-team/${PN/-}/-/archive/${PV}/${P/-}.tar.bz2"
-S="${WORKDIR}/${P/-}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro ru sr sv uk vi)
-IUSE="${MY_L10N[@]/#/l10n_}"
-REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
-
-RDEPEND="virtual/man
-	l10n_de? ( !app-i18n/man-pages-de )
-	l10n_fr? ( !app-i18n/man-pages-fr )
-	l10n_it? ( !app-i18n/man-pages-it )
-	l10n_nl? ( !app-i18n/man-pages-nl )
-	l10n_pl? ( !app-i18n/man-pages-pl )
-	l10n_ru? ( !app-i18n/man-pages-ru )"
-
-BDEPEND="app-text/po4a
-	dev-lang/perl"
-
-DOCS=(AUTHORS.md CHANGES.md CONTRIBUTING.md COPYRIGHT.md README.md)
-
-src_prepare() {
-	default
-	sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
-
-	# some packages have their own translations
-	local f noinst_manpages=(
-		# app-arch/xz-utils
-		xz.1
-		xzdec.1
-		xzdiff.1
-		xzgrep.1
-		xzless.1
-		xzmore.1
-		# sys-apps/shadow
-		groups.1
-		su.1
-		# sys-apps/sysvinit
-		last.1
-		mesg.1
-		mountpoint.1
-		utmpdump.1
-		wall.1
-		halt.8
-		killall5.8
-		runlevel.8
-		shutdown.8
-		sulogin.8
-		# sys-process/procps
-		free.1
-		pgrep.1
-		pmap.1
-		ps.1
-		pwdx.1
-		tload.1
-		uptime.1
-		sysctl.conf.5
-		sysctl.8
-		vmstat.8
-		# sys-process/psmisc
-		fuser.1
-		killall.1
-		peekfd.1
-		prtstat.1
-		pslog.1
-		pstree.1
-	)
-
-	for f in "${noinst_manpages[@]}"; do
-		rm po/*/"man${f##*.}/${f}.po" || die
-	done
-}
-
-src_configure() {
-	econf --enable-compression=none
-}
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.19.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.19.0.ebuild
new file mode 100644
index 000000000000..c0c044b759b6
--- /dev/null
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.19.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A somewhat comprehensive collection of man page translations"
+HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
+SRC_URI="https://salsa.debian.org/manpages-l10n-team/${PN/-}/-/archive/${PV}/${P/-}.tar.bz2"
+S="${WORKDIR}/${P/-}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# fa and ko omitted because of build failures (patches are welcome!)
+MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro ru sr sv uk vi)
+IUSE="${MY_L10N[@]/#/l10n_}"
+# require at least one language lest we install an empty package
+# pkgcheck warning: RequiredUseDefaults
+REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
+
+RDEPEND="virtual/man
+	l10n_it? ( !app-i18n/man-pages-it )
+	l10n_ru? ( !app-i18n/man-pages-ru )"
+
+BDEPEND="app-text/po4a
+	dev-lang/perl"
+
+DOCS=(AUTHORS.md CHANGES.md CONTRIBUTING.md COPYRIGHT.md README.md)
+
+src_prepare() {
+	default
+	sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
+
+	# some packages have their own translations
+	local f noinst_manpages=(
+		# app-arch/xz-utils
+		xz.1
+		xzdec.1
+		xzdiff.1
+		xzgrep.1
+		xzless.1
+		xzmore.1
+		# sys-apps/shadow
+		groups.1
+		su.1
+		# sys-apps/sysvinit
+		last.1
+		mesg.1
+		mountpoint.1
+		utmpdump.1
+		wall.1
+		halt.8
+		killall5.8
+		runlevel.8
+		shutdown.8
+		sulogin.8
+		# sys-process/procps
+		free.1
+		pgrep.1
+		pmap.1
+		ps.1
+		pwdx.1
+		tload.1
+		uptime.1
+		sysctl.conf.5
+		sysctl.8
+		vmstat.8
+		# sys-process/psmisc
+		fuser.1
+		killall.1
+		peekfd.1
+		prtstat.1
+		pslog.1
+		pstree.1
+	)
+
+	for f in "${noinst_manpages[@]}"; do
+		rm po/*/"man${f##*.}/${f}.po" || die
+	done
+}
+
+src_configure() {
+	econf --enable-compression=none
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1f6a28683692..59c1f9ee1495 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index d79155890139..910a5cb33b3e 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -1,6 +1,7 @@
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
+DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e
 DIST aho-corasick-1.0.1.crate 167320 BLAKE2B f148004140d4f705e93f448020b97c434b93fea6ae34fd74b1f394b076c2727a87f5ec54542a0f52822d716c10ada3c68ae8f50a46c455fc6e828b10b5650ecc SHA512 7cea5b2305b90aebc54f78446cfc91f275b1be8489d2d80c3baa9ff8b913f9b2296adbdf4aefb0d8fce8f57812963fb9450b200d133a9d61e100cef324068070
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST ansi_colours-1.2.1.crate 21866 BLAKE2B b1a2ad5aa797b59fc6f2c090f1c0da6937ade5099367c67c704cd91db62829f86f7bd7dedfd654074df29dd192e4f4d438cd90beb6db51a7605045278741bd69 SHA512 dd89084c997aa42acbde2b885ea414fc7edbeab6de9749abde2270322147fe4850532d916145418e911f5f0950fc3a3f0fd16fb63c40b8ce14c1085017879f73
@@ -20,6 +21,7 @@ DIST bit_field-0.10.2.crate 10568 BLAKE2B 4dc92498b5f2befb9e3d8d5a7bcac478b7f905
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
 DIST broot-1.22.1.tar.gz 11147450 BLAKE2B aa3f5cc12d308ed470d35db2e99d65b084dd23abbd471a330c0c1f03fcec70b68ee4b28c2feae6ac8f2caf604e47a8e03b2a5749f35bb9348d2380c5e7ebcf66 SHA512 f8925ba6e6b4cee6fb73de24b35b9c107be1b568424a8db43a29919ae0e83e7648ec935f0f2962aaf70c1bf5d89f6e522fdeb6c4d60f6b5051e696bd09918149
+DIST broot-1.23.0.tar.gz 11243983 BLAKE2B be9e85b74adfc965db7bb78942a3300ddf623b4594d92757509e23c5c45a23710bbfbf05d2eee4ac062687854674c78cecc9c11fd2bdaf9cfff9c433df77f8e2 SHA512 dc140d9ed4295df2f6c512fdebb3008cc7dac600ae975530a07fb0d79a667116985d0b01066d1c5baa536b2c2f942745d57fa2909bd6e4ad9fd4310624a17dd3
 DIST bstr-1.4.0.crate 345921 BLAKE2B 39a3cb366a7ceb784b7a6626f81338e8047498c5755ed60fce1f6460ea5aa907ab5df4bcf30a07ed699c7af7d2d0dbc48b2c5cb674b863c22fd63b5080b52fae SHA512 98dc7bdcc1a307eae2ed202b2b785a4ad27719c4b3289408edc710beabedb78d16b3042b41de04fca5dbdba19d8567df69c35431e33a3c02924820e1a601df36
 DIST bumpalo-3.12.2.crate 81706 BLAKE2B 50aa1e5f8f1208bd50b8fb0580bb5c5a7baadf36c0a0d8ad041c48b127896b75437118decfb1138e694964b89c8c0f66144cbd44037a67ef376fed312e08ebe8 SHA512 a0571501d2b2cbe25b862197295fddf14dbbbba7472965ab6006fb7cfcdf0f76df3b5e505888c0f1a0be99870b87afe5881a80df4f75756d2d9b65791d94d566
 DIST bytemuck-1.13.1.crate 42309 BLAKE2B 055e031a677823c110e44446e1e371632a0a5a8227ef7053e964bd3f9967705bdedf96b14178818021ffc09182ead805a68813a8a2b9cf7a70b6e8daf733eac4 SHA512 eb0a7e423a3f903fb831369e0c6d1e5fbffd7eff1b56bb7d1ffe4e5e18850cdfb9a7f9bdcfd53ce10b1c659dff11c59190b7b85ad89ca60485878548621f01c0
@@ -56,6 +58,7 @@ DIST csv2svg-0.1.9.crate 167230 BLAKE2B 8c7366db4f6afda6dad43ceb596706d15ed8c2a6
 DIST custom_error-1.9.2.crate 10826 BLAKE2B 24186a381d6df9d0262e123208f8bfda21dadded4fada889aea627c07e9812f8b16ce383dcd4ffed87f8a71a06bd92ea2ef12a0f835c67a82a436f9078c53f6b SHA512 6e91d3b1f82f7bcc5d4f3d22aa1f3cef150be130bf6f7785eee7511b8f6581384d82f532049570aed76278486ecee17d9896e1da9d3fce18d54b189fcb0a3984
 DIST data-url-0.2.0.crate 20553 BLAKE2B 45e2bd07e86b9b3e8c8c4545e6a436ebb65c4b5f1c69b2958185aac252c864c38089f869135ffe97282fabfa7637855cb40f88eca9271324906b53bd4fdf3d8b SHA512 d467554849093d731c273f997605e110fe6786203c950e3ea112361e14fdc4061a8e92427f16b1df0642b232ef17dddb0b6d4c6720f097416cd7a3ba6711c375
 DIST deser-hjson-1.1.1.crate 17432 BLAKE2B 39c86e94d00019521e6e22c2391e219846a40a1857c019ec39b7b5c81409a0a6f983c9f923b6c7d9c21727a4de552103c64972ba25f2465c5ff9326d031f3ff0 SHA512 dc68f3dd50e0902f6114feb49405f81b2c30874a7bdb91d03bae36418e015b24fa9ac7cee82d821ea411ce0a1f1029aaa3a21263969bc93490ba80a8d7d32852
+DIST deser-hjson-1.2.0.crate 17792 BLAKE2B 56b3f36f120e6440fa06aa1404c54a1ebd0112f1f263a786973c6c5775adb23b91b2e8765bb0454773c3195ea66264e7d04decfa05099f7355edc8dd5c58117e SHA512 db434c52333a1e4efec44cb56e7f6646f8b1eaf68226ac2a588b7480e7b959e40fbf273d97f0b0ae25a03d900cf1d7c9488ff7990a8cc4d920cbb404a1f6557b
 DIST directories-4.0.1.crate 16040 BLAKE2B 57368021712e652af2dbc64e3b219ac072c2fd5e5f7f882ac36649e0e804b5345c3f9afcd6d75caec3851a371f6eec3101e80a125f6ad20c045fd105980922f8 SHA512 babe4e23759b2e01a284a14aa1b45ba9d705ad7257246fe8c1ee6a071f48192c58a30b7d09c222268be83f7ebb59c0cc91e8b1342c1f9f0a96ec079fd264f8d5
 DIST directories-next-2.0.0.crate 15153 BLAKE2B 8bbd996cfa72d75fe7177a9d8be7fb6b96ff3fc456b7e06db61cc463a83290765d68f09da3bf8b9e958553b1940ef35f3a4a45d179918ead92f604dd05512470 SHA512 5a0c094dd2e858c59c93655d5abce1282866ced1e7657397c62f959078adc544bb895dbcd2ed578ad7dd0122d8025deb0bbdad955ab2aaf43d9a0dc7d37162d8
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
@@ -129,6 +132,7 @@ DIST memmap2-0.6.1.crate 27120 BLAKE2B 912be3bdeadc6f2b0beac284c7c65998f6c35a0b1
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
 DIST minimad-0.11.0.crate 20969 BLAKE2B 37209b4a86580d3d2caf93b798d237b8acd9677c27a9f51681cb6b465a11d526e7d6bd34851d16922469649b30b7b42de612b8af3926ea7a37dfd20ab87604f8 SHA512 ea6be2e1c82cf6bbfd8aa0ea0c4135aa7ee05c8cce00b17f7ffe40d8bf76b0b4ace4c1660c81215a27ae7302ea1bf78afaa9e1ac8735610a8f95d97f1f12f2fc
+DIST minimad-0.12.0.crate 21057 BLAKE2B 5443af4ffa152eef06bbaf38be27ca79af64d8fa7de630a7c79bf6dc2cb5477ae5a8a6a2428c2bbea3d2b7ae23e27956019a049ed15a0358a08a3c64445b44a5 SHA512 7daa9ce49f29619fef391648647a785ae634b2ee762a0b9dc0b1b0f508683d9bbd118c873bfe4080d7177759ebeec73a59f08b9acd2683fe0e0875eadbdc1efa
 DIST minimad-0.9.1.crate 19494 BLAKE2B e2380d676d1635409d013dda401289f52c0db05e6e0318c8c73ef109c7d5c4f99ebc731d2164a22d19ef63af020887faa792c552c4f5e116abf9043c47b6a197 SHA512 6b98b28322db8bcac5e1b6a095baf335e8049eff8430fdf5ec50c78589e971b32abe5821dc2151d39c3ae64a1f47c16f677c78b53393f9eaf321a59a32a1ccf8
 DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
 DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
@@ -227,6 +231,7 @@ DIST tempfile-3.5.0.crate 31129 BLAKE2B 6d32584819794dbbb1f30970577ca2c82cf79979
 DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
 DIST termimad-0.20.6.crate 354740 BLAKE2B 30ad3454bf06bb588f53622f259af2ee34a4a97a4d489935fd63ec486306830f246cfa3dfc2ef5d7f22e8744347e70edde1a4aacaf07d966ef88ecdd75e698d3 SHA512 fad62b61c7f21539bbed64a9bc78a46575f8b17fbb626b52880d9672fae698f79041f37b55bbcd8b86fd870e96024b62a8d274523219239fe6cea9341542faca
 DIST termimad-0.22.0.crate 356094 BLAKE2B 6089abf408b9ccf67d78a8c551784cc735c9775053c595e4b6e84011c004046f9fc81210eb5e6fd19d5ca214b28df27cdda7b1f35a812f93d09411fa76b5c84a SHA512 50652aa1d021b5015eeac62fff13baffba40b88ba51ef702d5aa2bc0fd42dfd1c20daee38800a1721c26563920b5a8329e746daa5d9637fd1b54780f4bdbbb2c
+DIST termimad-0.23.1.crate 356236 BLAKE2B 1e166418484997de62f2dbfaeb0bc5189ddbbceec10ddf35ffab28958007287f27734b91c4d73e8ed8f14eb27deb7ae4e683ff3f038fbf715765d3cbbbac1dbe SHA512 4432a1ec5100786c7c394a0e920b0ad8f1ca129adaf86756d96f51e2e3210cc05b128a8887f8e98fe753c8cf80f4f6a4bee6bb736aaed8902d32f5249036317b
 DIST terminal-clipboard-0.4.0.crate 6188 BLAKE2B a76f4353b6baf0b4ccf2988913fca3b63fc51fcf24004b3c0e2f31044653a3f3b35f89bac1691b20b0fd8ed3aa5debea278edf14c3a8d3d7cbf63e4b6bbf65fa SHA512 dd434455b7507245392b7a8fba10cc74ef011ea6f2dd3cffd62113865b52f4b5fb296494ca54e57ecc715eacd2784d6c66c8ef455b315dbdc482c5b7ebd87dd5
 DIST terminal-light-1.1.1.crate 39344 BLAKE2B 92cd28f4e3a64a995815bddc98baa916bef6e271d32499ee648c795ddcdc71ddbfcb5523e4941224e6aff650aca36850cc6eabb08a6c107352adde607e9f4afd SHA512 c25f4abfe4c51ccf7aef1d80848964ad5d80e472c18ed114f25e9047a31120ffd0478f8a8457985d06bfd05ac12d5945bf9c508b9af022c64c8e3a5e6b6f1eb3
 DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
diff --git a/app-misc/broot/broot-1.23.0.ebuild b/app-misc/broot/broot-1.23.0.ebuild
new file mode 100644
index 000000000000..60d8c1e7a882
--- /dev/null
+++ b/app-misc/broot/broot-1.23.0.ebuild
@@ -0,0 +1,370 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+ahash-0.4.7
+ahash-0.8.3
+aho-corasick-1.0.1
+android_system_properties-0.1.5
+ansi_colours-1.2.1
+anyhow-1.0.71
+argh-0.1.10
+argh_derive-0.1.10
+argh_shared-0.1.10
+arrayref-0.3.7
+arrayvec-0.7.2
+atty-0.2.14
+autocfg-1.1.0
+base64-0.13.1
+base64-0.21.0
+bet-1.0.2
+bincode-1.3.3
+bit_field-0.10.2
+bitflags-1.3.2
+block-0.1.6
+bstr-1.4.0
+bumpalo-3.12.2
+bytemuck-1.13.1
+byteorder-1.4.3
+cc-1.0.79
+cfg-if-1.0.0
+char_reader-0.1.1
+chrono-0.4.24
+clap-3.2.25
+clap_complete-3.2.5
+clap_derive-3.2.25
+clap_lex-0.2.4
+cli-log-2.0.0
+clipboard-win-4.5.0
+clipboard_macos-0.1.0
+color_quant-1.1.0
+coolor-0.5.0
+core-foundation-sys-0.8.4
+crc32fast-1.3.2
+crokey-0.4.3
+crokey-proc_macros-0.4.0
+crossbeam-0.8.0
+crossbeam-channel-0.5.8
+crossbeam-deque-0.8.3
+crossbeam-epoch-0.9.14
+crossbeam-queue-0.3.8
+crossbeam-utils-0.8.15
+crossterm-0.23.2
+crossterm_winapi-0.9.0
+crunchy-0.2.2
+csv-1.2.1
+csv-core-0.1.10
+csv2svg-0.1.9
+custom_error-1.9.2
+data-url-0.2.0
+deser-hjson-1.2.0
+directories-4.0.1
+directories-next-2.0.0
+dirs-sys-0.3.7
+dirs-sys-next-0.1.2
+doc-comment-0.3.3
+either-1.8.1
+errno-0.3.1
+errno-dragonfly-0.1.2
+error-code-2.3.1
+exr-1.6.3
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+fastrand-1.9.0
+file-size-1.0.3
+flate2-1.0.26
+float-cmp-0.9.0
+flume-0.10.14
+fnv-1.0.7
+fontconfig-parser-0.5.2
+fontdb-0.14.1
+form_urlencoded-1.1.0
+futures-core-0.3.28
+futures-sink-0.3.28
+getrandom-0.2.9
+gif-0.12.0
+git2-0.14.4
+glassbench-0.3.5
+glob-0.3.1
+half-2.2.1
+hashbrown-0.12.3
+hashbrown-0.9.1
+hashlink-0.6.0
+heck-0.4.1
+hermit-abi-0.1.19
+hermit-abi-0.2.6
+hermit-abi-0.3.1
+iana-time-zone-0.1.56
+iana-time-zone-haiku-0.1.2
+id-arena-2.2.1
+idna-0.3.0
+image-0.24.6
+imagesize-0.12.0
+include_dir-0.7.3
+include_dir_macros-0.7.3
+indexmap-1.9.3
+instant-0.1.12
+io-lifetimes-1.0.10
+is_executable-1.0.1
+itoa-1.0.6
+jobserver-0.1.26
+jpeg-decoder-0.3.0
+js-sys-0.3.63
+kurbo-0.9.5
+lazy-regex-2.5.0
+lazy-regex-proc_macros-2.4.1
+lazy_static-1.4.0
+lebe-0.5.2
+lfs-core-0.11.1
+libc-0.2.144
+libgit2-sys-0.13.5+1.4.5
+libsqlite3-sys-0.20.1
+libz-sys-1.1.9
+line-wrap-0.1.1
+linked-hash-map-0.5.6
+linux-raw-sys-0.3.7
+lock_api-0.4.9
+log-0.4.17
+malloc_buf-0.0.6
+memchr-2.5.0
+memmap2-0.6.1
+memoffset-0.6.5
+memoffset-0.8.0
+minimad-0.9.1
+minimad-0.12.0
+miniz_oxide-0.5.4
+miniz_oxide-0.6.2
+miniz_oxide-0.7.1
+mio-0.8.6
+nanorand-0.7.0
+nix-0.22.3
+num-integer-0.1.45
+num-rational-0.4.1
+num-traits-0.2.15
+num_cpus-1.15.0
+objc-0.2.7
+objc-foundation-0.1.1
+objc_id-0.1.1
+once_cell-1.17.1
+onig-6.4.0
+onig_sys-69.8.1
+open-1.7.1
+opener-0.5.2
+os_str_bytes-6.5.0
+parking_lot-0.12.1
+parking_lot_core-0.9.7
+pathdiff-0.2.1
+percent-encoding-2.2.0
+phf-0.10.1
+phf_generator-0.10.0
+phf_macros-0.10.0
+phf_shared-0.10.0
+pico-args-0.5.0
+pin-project-1.1.0
+pin-project-internal-1.1.0
+pkg-config-0.3.27
+plist-1.4.3
+png-0.17.6
+ppv-lite86-0.2.17
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.20+deprecated
+proc-macro2-1.0.58
+proc-status-0.1.1
+qoi-0.4.1
+quick-xml-0.22.0
+quick-xml-0.28.2
+quote-1.0.27
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.4
+rayon-1.7.0
+rayon-core-1.11.0
+rctree-0.5.0
+redox_syscall-0.2.16
+redox_syscall-0.3.5
+redox_users-0.4.3
+regex-1.8.1
+regex-automata-0.1.10
+regex-syntax-0.6.29
+regex-syntax-0.7.1
+resvg-0.33.0
+rgb-0.8.36
+rosvgtree-0.3.0
+roxmltree-0.18.0
+rusqlite-0.24.2
+rustix-0.37.19
+rustybuzz-0.7.0
+ryu-1.0.13
+safemem-0.3.3
+same-file-1.0.6
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.163
+serde_derive-1.0.163
+serde_json-1.0.96
+signal-hook-0.3.15
+signal-hook-mio-0.2.3
+signal-hook-registry-1.4.1
+simd-adler32-0.3.5
+simplecss-0.2.1
+siphasher-0.3.10
+slotmap-1.0.6
+smallvec-1.10.0
+snafu-0.7.4
+snafu-derive-0.7.4
+spin-0.9.8
+splitty-1.0.1
+str-buf-1.0.6
+strict-0.1.4
+strict-num-0.1.0
+strsim-0.10.0
+svg-0.13.1
+svgfilters-0.4.0
+svgtypes-0.11.0
+syn-1.0.109
+syn-2.0.16
+syntect-no-panic-4.6.1
+tempfile-3.5.0
+termcolor-1.2.0
+termimad-0.20.6
+termimad-0.23.1
+terminal-clipboard-0.4.0
+terminal-light-1.1.1
+termux-clipboard-0.1.0
+textwrap-0.16.0
+thiserror-1.0.40
+thiserror-impl-1.0.40
+tiff-0.8.1
+time-0.1.45
+time-0.3.21
+time-core-0.1.1
+time-macros-0.2.9
+tiny-skia-0.9.1
+tiny-skia-path-0.9.0
+tinyvec-1.6.0
+tinyvec_macros-0.1.1
+toml-0.5.11
+ttf-parser-0.18.1
+ttf-parser-0.19.0
+umask-2.1.0
+unicode-bidi-0.3.13
+unicode-bidi-mirroring-0.1.0
+unicode-ccc-0.1.2
+unicode-general-category-0.6.0
+unicode-ident-1.0.8
+unicode-normalization-0.1.22
+unicode-script-0.5.5
+unicode-vo-0.1.0
+unicode-width-0.1.10
+url-2.3.1
+users-0.11.0
+usvg-0.33.0
+usvg-parser-0.33.0
+usvg-text-layout-0.33.0
+usvg-tree-0.33.0
+vcpkg-0.2.15
+version_check-0.9.4
+walkdir-2.3.3
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.11.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.86
+wasm-bindgen-backend-0.2.86
+wasm-bindgen-macro-0.2.86
+wasm-bindgen-macro-support-0.2.86
+wasm-bindgen-shared-0.2.86
+weezl-0.1.7
+which-4.4.0
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows-0.48.0
+windows-sys-0.45.0
+windows-sys-0.48.0
+windows-targets-0.42.2
+windows-targets-0.48.0
+windows_aarch64_gnullvm-0.42.2
+windows_aarch64_gnullvm-0.48.0
+windows_aarch64_msvc-0.42.2
+windows_aarch64_msvc-0.48.0
+windows_i686_gnu-0.42.2
+windows_i686_gnu-0.48.0
+windows_i686_msvc-0.42.2
+windows_i686_msvc-0.48.0
+windows_x86_64_gnu-0.42.2
+windows_x86_64_gnu-0.48.0
+windows_x86_64_gnullvm-0.42.2
+windows_x86_64_gnullvm-0.48.0
+windows_x86_64_msvc-0.42.2
+windows_x86_64_msvc-0.48.0
+x11-clipboard-0.5.3
+xcb-0.10.1
+xmlparser-0.13.5
+xmlwriter-0.1.0
+xterm-query-0.1.0
+xterm-query-0.2.0
+yaml-rust-0.4.5
+zune-inflate-0.2.54
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libgit2:=
+	sys-libs/zlib
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.65"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
+	local myfeatures=( $(usev X clipboard) )
+
+	cargo_src_configure --no-default-features
+}
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	insinto /usr/share/zsh/site-functions
+	doins _${PN}
+	doins _br
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+	doins br.fish
+}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index c250581b7256..d21cf246dbc7 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1 +1,2 @@
 DIST gramps-5.1.5.tar.gz 17425167 BLAKE2B f07fcb84c28f1def84c5568da6ac38a78def8657a0ee010163cb7e0899dd94ebb1c851e2c9d207fd9725754363ac7243a66f0de6e0d9708270d2d43c90485212 SHA512 8e36e8da7cfb41cc0c77881993cfc212a15bf9775dad3c8be131889b70360117e023b6837b91dad28fc03198080290a08c8089856c753246ff14c7fc3bca38be
+DIST gramps-5.1.6.tar.gz 17429153 BLAKE2B fe94d80ff209e1f27ec1cfa533e916514336c1d367435e0a9da4b8309efbc9c047302a67ec24e28237eaead67ff63e76bd1384ac1e3df10e08ae98aca126566b SHA512 419bbfa54ca3bf33e71fd579c84a56eebe4afc78ccd50c23b2d62869684709ccbf373e8da0e65835d9fc21a29d2d144597d6cf8c425e14c91574535d4b1ab64d
diff --git a/app-misc/gramps/gramps-5.1.6.ebuild b/app-misc/gramps/gramps-5.1.6.ebuild
new file mode 100644
index 000000000000..35795730b469
--- /dev/null
+++ b/app-misc/gramps/gramps-5.1.6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2001-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+# Sadly, PEP-517 mode breaks both the test suite and the installation of some of the data files
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif geo postscript +rcs +reports spell test"
+
+# Some of the tests fail unless the deprecated BerkeleyDB back-end is enabled.
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyicu[${PYTHON_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	')
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+	reports? ( media-gfx/graphviz[postscript?] )
+"
+BDEPEND="test? (
+	$(python_gen_cond_dep '
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.3-test_locale.patch
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the ${PF} variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test() {
+	# Gramps builds just fine out of tree but it confuses its test suite.
+	# The following at least lets the tests run properly in legacy mode.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	# Set a sane default locale for the tests which do not explicitly set one.
+	local -x LC_ALL=C.UTF-8
+
+	esetup.py test || die
+}
+
+# Ugly hack to work around Bug #717922
+python_install() {
+	local DISTUTILS_ARGS=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+		build
+	)
+	distutils-r1_python_install
+	echo -n "${EPREFIX}/usr/share" > "${D}$(python_get_sitedir)/gramps/gen/utils/resource-path" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2247f9d8e1e2..571284078681 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/mandoc/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild
index 9af875d1eed0..a4127ae75473 100644
--- a/app-text/mandoc/mandoc-1.14.6.ebuild
+++ b/app-text/mandoc/mandoc-1.14.6.ebuild
@@ -12,7 +12,8 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="cgi selinux system-man"
+IUSE="cgi selinux system-man test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/zlib
 	system-man? ( !sys-apps/man-db )
@@ -22,6 +23,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	cgi? ( app-text/highlight )
+	test? ( dev-lang/perl )
 "
 RDEPEND+=" selinux? ( sec-policy/selinux-makewhatis )"
 
@@ -107,6 +109,10 @@ src_compile() {
 	use cgi && emake man.cgi
 }
 
+src_test() {
+	emake regress
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	use cgi && emake DESTDIR="${D}" cgi-install www-install
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 97daa50cf0f6..c0562e72752e 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.3.ebuild
index 0a629fc03232..3940a9e7fc05 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.12.3.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.3.ebuild
@@ -44,7 +44,7 @@ src_configure() {
 }
 
 multilib_src_test() {
-	cp -p -R --reflink=auto "${S}/test" ./test || die
+	cp -p -R "${S}/test" ./test || die
 
 	emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
 }
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.6.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.6.ebuild
index d084d2656c17..b5c075454fdb 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.12.6.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.6.ebuild
@@ -44,7 +44,7 @@ src_configure() {
 }
 
 multilib_src_test() {
-	cp -p -R --reflink=auto "${S}/test" ./test || die
+	cp -p -R "${S}/test" ./test || die
 
 	GTEST_FILTER='-*.*_Online' emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
 }
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ed7af007cb97..3f1d071eb852 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/ruby/ruby-3.1.4-r4.ebuild b/dev-lang/ruby/ruby-3.1.4-r4.ebuild
new file mode 100644
index 000000000000..297b460621d7
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.1.4-r4.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20201225
+"
+
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31(-)]
+	>=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31(-)]
+	>=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby31(-)]
+	>=dev-ruby/rbs-2.1.0[ruby_targets_ruby31(-)]
+	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby31(-)]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby31(-)]
+	>=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31(-)]
+	>=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31(-)]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby31(-)]
+	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby31(-)]
+	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31(-)]
+	>=dev-ruby/json-2.6.1[ruby_targets_ruby31(-)]
+	>=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31(-)]
+	xemacs? ( app-xemacs/ruby-modes )
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/3.1/901-musl-*.patch
+	fi
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	# Remove tests that are known to fail or require a network connection
+	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb test/resolv/test_addr.rb \
+	   spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+	sed -i -e '/def test_test/askip "Depends on system setup"' test/ruby/test_file_exhaustive.rb || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+
+			# disable using security framework (GCC barfs on those headers)
+			sed -i \
+				-e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \
+				random.c || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules="win32,win32ole" myconf=
+
+	# Ruby's build system does interesting things with MAKEOPTS and doesn't
+	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
+	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
+	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
+	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
+	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
+	export MAKEOPTS="${makeopts_tmp}"
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--without-baseruby \
+		--with-compress-debug-sections=no \
+		--enable-mkmf-verbose \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		$(use_with valgrind) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	emake V=1 check
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md doc/NEWS* README*
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(30|31|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-3.2.2-r4.ebuild b/dev-lang/ruby/ruby-3.2.2-r4.ebuild
new file mode 100644
index 000000000000..a96b020a1723
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.2.2-r4.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( >=virtual/rust-1.58.1 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20221225
+"
+
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+
+BUNDLED_GEMS="
+	>=dev-ruby/debug-1.7.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/matrix-0.4.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/minitest-5.16.3[ruby_targets_ruby32(-)]
+	>=dev-ruby/net-ftp-0.2.0[ruby_targets_ruby32(-)]
+	>=dev-ruby/net-imap-0.3.4[ruby_targets_ruby32(-)]
+	>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/net-smtp-0.3.3[ruby_targets_ruby32(-)]
+	>=dev-ruby/power_assert-2.0.3[ruby_targets_ruby32(-)]
+	>=dev-ruby/prime-0.1.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby32(-)]
+	>=dev-ruby/rbs-2.8.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby32(-)]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby32(-)]
+	>=dev-ruby/test-unit-3.5.7[ruby_targets_ruby32(-)]
+	>=dev-ruby/typeprof-0.21.3[ruby_targets_ruby32(-)]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby32(-)]
+	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby32(-)]
+	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/json-2.6.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/rdoc-6.3.3[ruby_targets_ruby32(-)]
+	xemacs? ( app-xemacs/ruby-modes )
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
+	fi
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	# Remove tests that are known to fail or require a network connection
+	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+
+	# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
+	rm -rf tool/test/webrick || die
+
+	# Avoid test using the system ruby
+	sed -i -e '/test_dumb_terminal/aomit "Uses system ruby"' test/reline/test_reline.rb || die
+
+	# Avoid testing against hard-coded blockdev devices that most likely are not available
+	sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
+
+	# Avoid tests that require gem downloads
+	sed -i -e '/^test-syntax-suggest/ s/\$(TEST_RUNNABLE)/no/' common.mk || die
+	sed -i -e '/^check:/ s/\$(TEST_RUNNABLE)-\$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest//' common.mk || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+
+			# disable using security framework (GCC barfs on those headers)
+			sed -i \
+				-e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \
+				random.c || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules="win32,win32ole" myconf=
+
+	# Ruby's build system does interesting things with MAKEOPTS and doesn't
+	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
+	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
+	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
+	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
+	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
+	export MAKEOPTS="${makeopts_tmp}"
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--without-baseruby \
+		--with-compress-debug-sections=no \
+		--enable-mkmf-verbose \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support) \
+		$(use_enable jit yjit) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		$(use_with valgrind) \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	export LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 check
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md README*
+	dodoc -r doc
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(30|31|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index f385392f306b..28511a3df039 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,6 +1,7 @@
 DIST firefox-102.10.0esr.source.tar.xz 479026088 BLAKE2B b4d8eaa6d72b009d12b435781c360f043bca7554d8b069b8d858399ece03f20703d7e36427a3f92d0b801a94b1c3f132904f21e51ba4118116bbfa4e5668d651 SHA512 f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b
 DIST firefox-102.11.0esr.source.tar.xz 477769716 BLAKE2B b19db1b35e6c652e2cd44ec5219bd5c42aacd55987962dbcaf50b5ec54d2ac5066290264f938ba3d45ef111779b9f27b06736ae7df11fa62478ab2179acfe723 SHA512 fdfed404c87f33001c0ab50f9899fa80c897fac645be8ed832e426f412aafbf1468b1c8301bad463b3f5535b6d6f2005a96a748b6e2d6bf5afbc3b5bc10983d6
 DIST firefox-102.12.0esr.source.tar.xz 483008152 BLAKE2B ef5dcf7c7e6a46389a94b81f28d6b996bd56bc0a110f1e52dfbe00e5c766dad59a91494c3c2f2552a0cb1fef14c19bef6dcb6629e03f9e48d5163e75c59676b2 SHA512 2a85cf1e1c83a862c2886a63dcf3e3e8bca9dd3ed72c5d0223db52387fff3796bc0dcbb508adb8c10a30729f20554c5aac37f8ad045b0088a593d28e39d77fe5
+DIST firefox-102.13.0esr.source.tar.xz 485854020 BLAKE2B c835146f8eb5d45bcc5eebb5a510cc1b0b1f36ad7b47ed10eed743e9fddc2555f3458f19ab75ed12a510e896be727bf2bbee8521af439f323c48d8c1bbd82499 SHA512 745f4a77e4c898313f11118274d27513f4baa16bb42d5b71d9bd0dbe8957dbf39a5f7ae8442cd711aca9b597bc909c04b44cb8d9094c57aa34e285e64f834fde
 DIST firefox-102.6.0esr.source.tar.xz 478856656 BLAKE2B 2094bbb3ba00fc2d726a620e9946ca1ec98ad4c930ed611486ac92a7c74aa84da9c15b1353603eb36ce0a9098bd1f311dea2bea255f2bb6dd06fafbc7808d52c SHA512 c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308
 DIST firefox-102esr-patches-07j.tar.xz 23012 BLAKE2B 41b706f5ae8695ddd33e971cf1aa99317382a57618cf19163c5bca09ed5d430dba672ac51b7ab3072360452cc89ac50397bb7992882a61a3adda37022239e654 SHA512 7048353ea5504e34d9d3950e3e5e3125f631f95269d5c9e422ca052173a316718fdd4b57ea7980a452139b1192805cb598f47f398fb148a426a85a5e979c6cdd
 DIST firefox-102esr-patches-10j.tar.xz 21744 BLAKE2B 326f206dfcd5b6ea2f06f5f537505e23d358f6d7930f7e72fd8e54af88d97172170999c246af888278143810df42be9414541e47feb48b60732565a4ee38579e SHA512 5efa50b221abedbb84c1b3d19d8ac089ac5752448e8c90c6aed9f43bf3eee876b7e7050a1678bca65f6b23734c4945b016bf059a3921ad7290b0150538111bbd
diff --git a/dev-lang/spidermonkey/spidermonkey-102.13.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.13.0.ebuild
new file mode 100644
index 000000000000..192caae25e38
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-102.13.0.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-102esr-patches-10j.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-102-patches-05j.tar.xz"
+
+LLVM_MAX_SLOT=15
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="ssl,xml(+)"
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="firefox"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{juippis,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~{juippis,whissi}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+SLOT="$(ver_cut 1)"
+LICENSE="MPL-2.0"
+IUSE="clang cpu_flags_arm_neon debug +jit lto test"
+
+#RESTRICT="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/llvm:15
+			clang? (
+				sys-devel/clang:15
+				virtual/rust:0/llvm-15
+				lto? ( sys-devel/lld:15 )
+			)
+		)
+		(
+			sys-devel/llvm:14
+			clang? (
+				sys-devel/clang:14
+				virtual/rust:0/llvm-14
+				lto? ( sys-devel/lld:14 )
+			)
+		)
+	)
+	!clang? ( virtual/rust )
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+DEPEND=">=dev-libs/icu-71.1:=
+	dev-libs/nspr
+	sys-libs/readline:0=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/llvm:${LLVM_SLOT}" ; then
+		einfo "sys-devel/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+			einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use lto ; then
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+python_check_deps() {
+	if use test ; then
+		python_has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="4000M"
+	else
+		CHECKREQS_DISK_BUILD="3600M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use test ; then
+			CHECKREQS_DISK_BUILD="4000M"
+		else
+			CHECKREQS_DISK_BUILD="3600M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	# use prefix shell in wrapper linker scripts, bug #789660
+	hprefixify "${S}"/../../build/cargo-{,host-}linker
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+	eautoconf
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+
+		--disable-ctype
+		--disable-jemalloc
+		--disable-smoosh
+		--disable-strip
+
+		--enable-readline
+		--enable-release
+		--enable-shared-js
+
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	if use debug; then
+		myeconfargs+=( --disable-optimize )
+		myeconfargs+=( --enable-debug-symbols )
+	else
+		myeconfargs+=( --enable-optimize )
+		myeconfargs+=( --disable-debug-symbols )
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		myeconfargs+=( --enable-rust-simd )
+	fi
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Tell build system that we want to use LTO
+	if use lto ; then
+		if use clang ; then
+			myeconfargs+=( --enable-linker=lld )
+			myeconfargs+=( --enable-lto=cross )
+		else
+			myeconfargs+=( --enable-linker=bfd )
+			myeconfargs+=( --enable-lto=full )
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-lto
+
+	# Use system's Python environment
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	cp "${FILESDIR}"/spidermonkey-${SLOT}-known-test-failures.txt "${T}"/known_failures.list || die
+
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "non262/extensions/clone-errors.js" >> "${T}"/known_failures.list
+		echo "test262/built-ins/Date/UTC/fp-evaluation-order.js" >> "${T}"/known_failures.list
+		echo "test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js" >> "${T}"/known_failures.list
+	fi
+
+	${EPYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		${EPYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-lang/zig-bin/files/zig-0.10.1-musl-1.2.4-lfs64.patch b/dev-lang/zig-bin/files/zig-0.10.1-musl-1.2.4-lfs64.patch
new file mode 100644
index 000000000000..05a550a7920e
--- /dev/null
+++ b/dev-lang/zig-bin/files/zig-0.10.1-musl-1.2.4-lfs64.patch
@@ -0,0 +1,220 @@
+From https://github.com/ziglang/zig/commit/b20ccff515364cdb8f3e733cc950e53ab77656db Mon Sep 17 00:00:00 2001
+From: Andrew Kelley <andrew@ziglang.org>
+Date: Mon, 19 Jun 2023 15:17:01 -0700
+Subject: [PATCH] std.os: update logic for 64-bit symbol choice
+
+musl v1.2.4 dropped the "64"-suffixed aliases for legacy "LFS64" ("large
+file support") interfaces, so this commit changes the corresponding Zig
+logic to call the correct names.
+--- a/lib/std/os.zig
++++ b/lib/std/os.zig
+@@ -890,10 +890,7 @@ pub fn pread(fd: fd_t, buf: []u8, offset: u64) PReadError!usize {
+     };
+     const adjusted_len = @min(max_count, buf.len);
+ 
+-    const pread_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.pread64
+-    else
+-        system.pread;
++    const pread_sym = if (lfs64_abi) system.pread64 else system.pread;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     while (true) {
+@@ -966,10 +963,7 @@ pub fn ftruncate(fd: fd_t, length: u64) TruncateError!void {
+     }
+ 
+     while (true) {
+-        const ftruncate_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-            system.ftruncate64
+-        else
+-            system.ftruncate;
++        const ftruncate_sym = if (lfs64_abi) system.ftruncate64 else system.ftruncate;
+ 
+         const ilen = @bitCast(i64, length); // the OS treats this as unsigned
+         switch (errno(ftruncate_sym(fd, ilen))) {
+@@ -1034,10 +1028,7 @@ pub fn preadv(fd: fd_t, iov: []const iovec, offset: u64) PReadError!usize {
+ 
+     const iov_count = math.cast(u31, iov.len) orelse math.maxInt(u31);
+ 
+-    const preadv_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.preadv64
+-    else
+-        system.preadv;
++    const preadv_sym = if (lfs64_abi) system.preadv64 else system.preadv;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     while (true) {
+@@ -1311,10 +1302,7 @@ pub fn pwrite(fd: fd_t, bytes: []const u8, offset: u64) PWriteError!usize {
+     };
+     const adjusted_len = @min(max_count, bytes.len);
+ 
+-    const pwrite_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.pwrite64
+-    else
+-        system.pwrite;
++    const pwrite_sym = if (lfs64_abi) system.pwrite64 else system.pwrite;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     while (true) {
+@@ -1400,10 +1388,7 @@ pub fn pwritev(fd: fd_t, iov: []const iovec_const, offset: u64) PWriteError!usiz
+         }
+     }
+ 
+-    const pwritev_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.pwritev64
+-    else
+-        system.pwritev;
++    const pwritev_sym = if (lfs64_abi) system.pwritev64 else system.pwritev;
+ 
+     const iov_count = if (iov.len > IOV_MAX) IOV_MAX else @intCast(u31, iov.len);
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+@@ -1514,10 +1499,7 @@ pub fn openZ(file_path: [*:0]const u8, flags: u32, perm: mode_t) OpenError!fd_t
+         return open(mem.sliceTo(file_path, 0), flags, perm);
+     }
+ 
+-    const open_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.open64
+-    else
+-        system.open;
++    const open_sym = if (lfs64_abi) system.open64 else system.open;
+ 
+     while (true) {
+         const rc = open_sym(file_path, flags, perm);
+@@ -1730,10 +1712,7 @@ pub fn openatZ(dir_fd: fd_t, file_path: [*:0]const u8, flags: u32, mode: mode_t)
+         return openat(dir_fd, mem.sliceTo(file_path, 0), flags, mode);
+     }
+ 
+-    const openat_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.openat64
+-    else
+-        system.openat;
++    const openat_sym = if (lfs64_abi) system.openat64 else system.openat;
+ 
+     while (true) {
+         const rc = openat_sym(dir_fd, file_path, flags, mode);
+@@ -4117,10 +4096,7 @@ pub fn fstat(fd: fd_t) FStatError!Stat {
+         @compileError("fstat is not yet implemented on Windows");
+     }
+ 
+-    const fstat_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.fstat64
+-    else
+-        system.fstat;
++    const fstat_sym = if (lfs64_abi) system.fstat64 else system.fstat;
+ 
+     var stat = mem.zeroes(Stat);
+     switch (errno(fstat_sym(fd, &stat))) {
+@@ -4176,10 +4152,7 @@ pub fn fstatatZ(dirfd: fd_t, pathname: [*:0]const u8, flags: u32) FStatAtError!S
+         return fstatatWasi(dirfd, mem.sliceTo(pathname), flags);
+     }
+ 
+-    const fstatat_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.fstatat64
+-    else
+-        system.fstatat;
++    const fstatat_sym = if (lfs64_abi) system.fstatat64 else system.fstatat;
+ 
+     var stat = mem.zeroes(Stat);
+     switch (errno(fstatat_sym(dirfd, pathname, &stat, flags))) {
+@@ -4416,10 +4389,7 @@ pub fn mmap(
+     fd: fd_t,
+     offset: u64,
+ ) MMapError![]align(mem.page_size) u8 {
+-    const mmap_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.mmap64
+-    else
+-        system.mmap;
++    const mmap_sym = if (lfs64_abi) system.mmap64 else system.mmap;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     const rc = mmap_sym(ptr, length, prot, flags, fd, ioffset);
+@@ -4823,10 +4793,7 @@ pub fn lseek_SET(fd: fd_t, offset: u64) SeekError!void {
+         }
+     }
+ 
+-    const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.lseek64
+-    else
+-        system.lseek;
++    const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     switch (errno(lseek_sym(fd, ioffset, SEEK.SET))) {
+@@ -4870,10 +4837,7 @@ pub fn lseek_CUR(fd: fd_t, offset: i64) SeekError!void {
+             else => |err| return unexpectedErrno(err),
+         }
+     }
+-    const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.lseek64
+-    else
+-        system.lseek;
++    const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     switch (errno(lseek_sym(fd, ioffset, SEEK.CUR))) {
+@@ -4917,10 +4881,7 @@ pub fn lseek_END(fd: fd_t, offset: i64) SeekError!void {
+             else => |err| return unexpectedErrno(err),
+         }
+     }
+-    const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.lseek64
+-    else
+-        system.lseek;
++    const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     switch (errno(lseek_sym(fd, ioffset, SEEK.END))) {
+@@ -4964,10 +4925,7 @@ pub fn lseek_CUR_get(fd: fd_t) SeekError!u64 {
+             else => |err| return unexpectedErrno(err),
+         }
+     }
+-    const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.lseek64
+-    else
+-        system.lseek;
++    const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek;
+ 
+     const rc = lseek_sym(fd, 0, SEEK.CUR);
+     switch (errno(rc)) {
+@@ -6169,10 +6127,7 @@ pub fn sendfile(
+             // TODO we should not need this cast; improve return type of @min
+             const adjusted_count = @intCast(usize, adjusted_count_tmp);
+ 
+-            const sendfile_sym = if (builtin.link_libc)
+-                system.sendfile64
+-            else
+-                system.sendfile;
++            const sendfile_sym = if (lfs64_abi) system.sendfile64 else system.sendfile;
+ 
+             while (true) {
+                 var offset: off_t = @bitCast(off_t, in_offset);
+@@ -7050,10 +7005,7 @@ pub fn prctl(option: PR, args: anytype) PrctlError!u31 {
+ pub const GetrlimitError = UnexpectedError;
+ 
+ pub fn getrlimit(resource: rlimit_resource) GetrlimitError!rlimit {
+-    const getrlimit_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.getrlimit64
+-    else
+-        system.getrlimit;
++    const getrlimit_sym = if (lfs64_abi) system.getrlimit64 else system.getrlimit;
+ 
+     var limits: rlimit = undefined;
+     switch (errno(getrlimit_sym(resource, &limits))) {
+@@ -7067,10 +7019,7 @@ pub fn getrlimit(resource: rlimit_resource) GetrlimitError!rlimit {
+ pub const SetrlimitError = error{ PermissionDenied, LimitTooBig } || UnexpectedError;
+ 
+ pub fn setrlimit(resource: rlimit_resource, limits: rlimit) SetrlimitError!void {
+-    const setrlimit_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.setrlimit64
+-    else
+-        system.setrlimit;
++    const setrlimit_sym = if (lfs64_abi) system.setrlimit64 else system.setrlimit;
+ 
+     switch (errno(setrlimit_sym(resource, &limits))) {
+         .SUCCESS => return,
+@@ -7339,3 +7288,5 @@ pub fn ptrace(request: u32, pid: pid_t, addr: usize, signal: usize) PtraceError!
+         },
+     };
+ }
++
++const lfs64_abi = builtin.os.tag == .linux and builtin.link_libc and builtin.abi.isGnu();
diff --git a/dev-lang/zig-bin/zig-bin-0.10.1-r2.ebuild b/dev-lang/zig-bin/zig-bin-0.10.1-r2.ebuild
deleted file mode 100644
index 4674b943f38f..000000000000
--- a/dev-lang/zig-bin/zig-bin-0.10.1-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-SRC_URI="
-	amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz )
-	arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz )
-	arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz )
-	riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz )
-	x86? ( https://ziglang.org/download/${PV}/zig-linux-i386-${PV}.tar.xz )"
-
-# project itself: MIT
-# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
-# Files that are unnecessary for cross-compilation are removed by upstream
-# and therefore their licenses (if any special) are not included.
-# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
-# lib/libc/musl: MIT BSD-2
-# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
-# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
-LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc"
-
-IDEPEND="app-eselect/eselect-zig"
-# Zig provides its standard library in source form "/opt/zig-bin-{PV}/lib/",
-# and all other Zig libraries are meant to be consumed in source form,
-# because they can use compile-time mechanics (and it is easier for distributions to patch them)
-# Here we use this feature for fixing programs that use standard library
-# Note: Zig build system is also part of standard library, so we can fix it too
-#PATCHES=( )
-
-QA_PREBUILT="opt/${P}/zig"
-
-src_unpack() {
-	unpack ${A}
-
-	mv "${WORKDIR}/"* "${S}" || die
-}
-
-src_install() {
-	insinto /opt/
-
-	use doc && local HTML_DOCS=( "doc/langref.html" "doc/std/" )
-	einstalldocs
-	rm -r ./doc/ || die
-
-	doins -r "${S}"
-	fperms 0755 "/opt/${P}/zig"
-	dosym -r "/opt/${P}/zig" "/usr/bin/zig-bin-${PV}"
-}
-
-pkg_postinst() {
-	eselect zig update ifunset
-
-	elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
-	elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
-	elog "Upstream recommends:"
-	elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
-	elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
-	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
-	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
-}
-
-pkg_postrm() {
-	eselect zig update ifunset
-}
diff --git a/dev-lang/zig-bin/zig-bin-0.10.1-r3.ebuild b/dev-lang/zig-bin/zig-bin-0.10.1-r3.ebuild
new file mode 100644
index 000000000000..b5dcb9e26682
--- /dev/null
+++ b/dev-lang/zig-bin/zig-bin-0.10.1-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+SRC_URI="
+	amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz )
+	arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz )
+	arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz )
+	riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz )
+	x86? ( https://ziglang.org/download/${PV}/zig-linux-i386-${PV}.tar.xz )"
+
+# project itself: MIT
+# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
+# Files that are unnecessary for cross-compilation are removed by upstream
+# and therefore their licenses (if any special) are not included.
+# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
+# lib/libc/musl: MIT BSD-2
+# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
+# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
+LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+IDEPEND="app-eselect/eselect-zig"
+# Zig provides its standard library in source form "/opt/zig-bin-{PV}/lib/",
+# and all other Zig libraries are meant to be consumed in source form,
+# because they can use compile-time mechanics (and it is easier for distributions to patch them)
+# Here we use this feature for fixing programs that use standard library
+# Note: Zig build system is also part of standard library, so we can fix it too
+PATCHES=(
+	"${FILESDIR}/zig-0.10.1-musl-1.2.4-lfs64.patch"
+)
+
+QA_PREBUILT="opt/${P}/zig"
+
+src_unpack() {
+	unpack ${A}
+
+	mv "${WORKDIR}/"* "${S}" || die
+}
+
+src_install() {
+	insinto /opt/
+
+	use doc && local HTML_DOCS=( "doc/langref.html" "doc/std/" )
+	einstalldocs
+	rm -r ./doc/ || die
+
+	doins -r "${S}"
+	fperms 0755 "/opt/${P}/zig"
+	dosym -r "/opt/${P}/zig" "/usr/bin/zig-bin-${PV}"
+}
+
+pkg_postinst() {
+	eselect zig update ifunset
+
+	elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
+	elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
+	elog "Upstream recommends:"
+	elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
+	elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
+	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
+	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
+}
+
+pkg_postrm() {
+	eselect zig update ifunset
+}
diff --git a/dev-lang/zig/files/zig-0.10.1-musl-1.2.4-lfs64.patch b/dev-lang/zig/files/zig-0.10.1-musl-1.2.4-lfs64.patch
new file mode 100644
index 000000000000..05a550a7920e
--- /dev/null
+++ b/dev-lang/zig/files/zig-0.10.1-musl-1.2.4-lfs64.patch
@@ -0,0 +1,220 @@
+From https://github.com/ziglang/zig/commit/b20ccff515364cdb8f3e733cc950e53ab77656db Mon Sep 17 00:00:00 2001
+From: Andrew Kelley <andrew@ziglang.org>
+Date: Mon, 19 Jun 2023 15:17:01 -0700
+Subject: [PATCH] std.os: update logic for 64-bit symbol choice
+
+musl v1.2.4 dropped the "64"-suffixed aliases for legacy "LFS64" ("large
+file support") interfaces, so this commit changes the corresponding Zig
+logic to call the correct names.
+--- a/lib/std/os.zig
++++ b/lib/std/os.zig
+@@ -890,10 +890,7 @@ pub fn pread(fd: fd_t, buf: []u8, offset: u64) PReadError!usize {
+     };
+     const adjusted_len = @min(max_count, buf.len);
+ 
+-    const pread_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.pread64
+-    else
+-        system.pread;
++    const pread_sym = if (lfs64_abi) system.pread64 else system.pread;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     while (true) {
+@@ -966,10 +963,7 @@ pub fn ftruncate(fd: fd_t, length: u64) TruncateError!void {
+     }
+ 
+     while (true) {
+-        const ftruncate_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-            system.ftruncate64
+-        else
+-            system.ftruncate;
++        const ftruncate_sym = if (lfs64_abi) system.ftruncate64 else system.ftruncate;
+ 
+         const ilen = @bitCast(i64, length); // the OS treats this as unsigned
+         switch (errno(ftruncate_sym(fd, ilen))) {
+@@ -1034,10 +1028,7 @@ pub fn preadv(fd: fd_t, iov: []const iovec, offset: u64) PReadError!usize {
+ 
+     const iov_count = math.cast(u31, iov.len) orelse math.maxInt(u31);
+ 
+-    const preadv_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.preadv64
+-    else
+-        system.preadv;
++    const preadv_sym = if (lfs64_abi) system.preadv64 else system.preadv;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     while (true) {
+@@ -1311,10 +1302,7 @@ pub fn pwrite(fd: fd_t, bytes: []const u8, offset: u64) PWriteError!usize {
+     };
+     const adjusted_len = @min(max_count, bytes.len);
+ 
+-    const pwrite_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.pwrite64
+-    else
+-        system.pwrite;
++    const pwrite_sym = if (lfs64_abi) system.pwrite64 else system.pwrite;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     while (true) {
+@@ -1400,10 +1388,7 @@ pub fn pwritev(fd: fd_t, iov: []const iovec_const, offset: u64) PWriteError!usiz
+         }
+     }
+ 
+-    const pwritev_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.pwritev64
+-    else
+-        system.pwritev;
++    const pwritev_sym = if (lfs64_abi) system.pwritev64 else system.pwritev;
+ 
+     const iov_count = if (iov.len > IOV_MAX) IOV_MAX else @intCast(u31, iov.len);
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+@@ -1514,10 +1499,7 @@ pub fn openZ(file_path: [*:0]const u8, flags: u32, perm: mode_t) OpenError!fd_t
+         return open(mem.sliceTo(file_path, 0), flags, perm);
+     }
+ 
+-    const open_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.open64
+-    else
+-        system.open;
++    const open_sym = if (lfs64_abi) system.open64 else system.open;
+ 
+     while (true) {
+         const rc = open_sym(file_path, flags, perm);
+@@ -1730,10 +1712,7 @@ pub fn openatZ(dir_fd: fd_t, file_path: [*:0]const u8, flags: u32, mode: mode_t)
+         return openat(dir_fd, mem.sliceTo(file_path, 0), flags, mode);
+     }
+ 
+-    const openat_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.openat64
+-    else
+-        system.openat;
++    const openat_sym = if (lfs64_abi) system.openat64 else system.openat;
+ 
+     while (true) {
+         const rc = openat_sym(dir_fd, file_path, flags, mode);
+@@ -4117,10 +4096,7 @@ pub fn fstat(fd: fd_t) FStatError!Stat {
+         @compileError("fstat is not yet implemented on Windows");
+     }
+ 
+-    const fstat_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.fstat64
+-    else
+-        system.fstat;
++    const fstat_sym = if (lfs64_abi) system.fstat64 else system.fstat;
+ 
+     var stat = mem.zeroes(Stat);
+     switch (errno(fstat_sym(fd, &stat))) {
+@@ -4176,10 +4152,7 @@ pub fn fstatatZ(dirfd: fd_t, pathname: [*:0]const u8, flags: u32) FStatAtError!S
+         return fstatatWasi(dirfd, mem.sliceTo(pathname), flags);
+     }
+ 
+-    const fstatat_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.fstatat64
+-    else
+-        system.fstatat;
++    const fstatat_sym = if (lfs64_abi) system.fstatat64 else system.fstatat;
+ 
+     var stat = mem.zeroes(Stat);
+     switch (errno(fstatat_sym(dirfd, pathname, &stat, flags))) {
+@@ -4416,10 +4389,7 @@ pub fn mmap(
+     fd: fd_t,
+     offset: u64,
+ ) MMapError![]align(mem.page_size) u8 {
+-    const mmap_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.mmap64
+-    else
+-        system.mmap;
++    const mmap_sym = if (lfs64_abi) system.mmap64 else system.mmap;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     const rc = mmap_sym(ptr, length, prot, flags, fd, ioffset);
+@@ -4823,10 +4793,7 @@ pub fn lseek_SET(fd: fd_t, offset: u64) SeekError!void {
+         }
+     }
+ 
+-    const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.lseek64
+-    else
+-        system.lseek;
++    const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     switch (errno(lseek_sym(fd, ioffset, SEEK.SET))) {
+@@ -4870,10 +4837,7 @@ pub fn lseek_CUR(fd: fd_t, offset: i64) SeekError!void {
+             else => |err| return unexpectedErrno(err),
+         }
+     }
+-    const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.lseek64
+-    else
+-        system.lseek;
++    const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     switch (errno(lseek_sym(fd, ioffset, SEEK.CUR))) {
+@@ -4917,10 +4881,7 @@ pub fn lseek_END(fd: fd_t, offset: i64) SeekError!void {
+             else => |err| return unexpectedErrno(err),
+         }
+     }
+-    const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.lseek64
+-    else
+-        system.lseek;
++    const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek;
+ 
+     const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned
+     switch (errno(lseek_sym(fd, ioffset, SEEK.END))) {
+@@ -4964,10 +4925,7 @@ pub fn lseek_CUR_get(fd: fd_t) SeekError!u64 {
+             else => |err| return unexpectedErrno(err),
+         }
+     }
+-    const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.lseek64
+-    else
+-        system.lseek;
++    const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek;
+ 
+     const rc = lseek_sym(fd, 0, SEEK.CUR);
+     switch (errno(rc)) {
+@@ -6169,10 +6127,7 @@ pub fn sendfile(
+             // TODO we should not need this cast; improve return type of @min
+             const adjusted_count = @intCast(usize, adjusted_count_tmp);
+ 
+-            const sendfile_sym = if (builtin.link_libc)
+-                system.sendfile64
+-            else
+-                system.sendfile;
++            const sendfile_sym = if (lfs64_abi) system.sendfile64 else system.sendfile;
+ 
+             while (true) {
+                 var offset: off_t = @bitCast(off_t, in_offset);
+@@ -7050,10 +7005,7 @@ pub fn prctl(option: PR, args: anytype) PrctlError!u31 {
+ pub const GetrlimitError = UnexpectedError;
+ 
+ pub fn getrlimit(resource: rlimit_resource) GetrlimitError!rlimit {
+-    const getrlimit_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.getrlimit64
+-    else
+-        system.getrlimit;
++    const getrlimit_sym = if (lfs64_abi) system.getrlimit64 else system.getrlimit;
+ 
+     var limits: rlimit = undefined;
+     switch (errno(getrlimit_sym(resource, &limits))) {
+@@ -7067,10 +7019,7 @@ pub fn getrlimit(resource: rlimit_resource) GetrlimitError!rlimit {
+ pub const SetrlimitError = error{ PermissionDenied, LimitTooBig } || UnexpectedError;
+ 
+ pub fn setrlimit(resource: rlimit_resource, limits: rlimit) SetrlimitError!void {
+-    const setrlimit_sym = if (builtin.os.tag == .linux and builtin.link_libc)
+-        system.setrlimit64
+-    else
+-        system.setrlimit;
++    const setrlimit_sym = if (lfs64_abi) system.setrlimit64 else system.setrlimit;
+ 
+     switch (errno(setrlimit_sym(resource, &limits))) {
+         .SUCCESS => return,
+@@ -7339,3 +7288,5 @@ pub fn ptrace(request: u32, pid: pid_t, addr: usize, signal: usize) PtraceError!
+         },
+     };
+ }
++
++const lfs64_abi = builtin.os.tag == .linux and builtin.link_libc and builtin.abi.isGnu();
diff --git a/dev-lang/zig/zig-0.10.1-r2.ebuild b/dev-lang/zig/zig-0.10.1-r2.ebuild
deleted file mode 100644
index 6200470dec94..000000000000
--- a/dev-lang/zig/zig-0.10.1-r2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=15
-inherit edo cmake llvm check-reqs toolchain-funcs
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-# project itself: MIT
-# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
-# Files that are unnecessary for cross-compilation are removed by upstream
-# and therefore their licenses (if any special) are not included.
-# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
-# lib/libc/musl: MIT BSD-2
-# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
-# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
-LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc"
-
-BUILD_DIR="${S}/build"
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
-# (non-LLVM backends don't require these)
-# They are not required "on their own", so please don't add them here.
-# You can check https://github.com/ziglang/zig-bootstrap in future, to see
-# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/lld:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
-"
-
-RDEPEND="
-	${DEPEND}
-"
-
-IDEPEND="app-eselect/eselect-zig"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
-
-# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
-# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
-# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
-# (transpiled to C via C backend) for bootstrapping
-CHECKREQS_MEMORY="10G"
-
-PATCHES=(
-	"${FILESDIR}/zig-0.10.0-build-dir-install-stage3.patch"
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-ctarget_to_zigtarget() {
-	# Zig's Target Format: arch-os-abi
-	local CTARGET="${CTARGET:-${CHOST}}"
-
-	local ZIG_ARCH
-	case "${CTARGET%%-*}" in
-		i?86)		ZIG_ARCH=x86;;
-		sparcv9)	ZIG_ARCH=sparc64;;
-		*)		ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
-	esac
-
-	local ZIG_OS
-	case "${CTARGET}" in
-		*linux*)	ZIG_OS=linux;;
-		*apple*)	ZIG_OS=macos;;
-	esac
-
-	local ZIG_ABI
-	case "${CTARGET##*-}" in
-		gnu)		ZIG_ABI=gnu;;
-		solaris*)	ZIG_OS=solaris ZIG_ABI=none;;
-		darwin*)	ZIG_ABI=none;;
-		*)		ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
-	esac
-
-	echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
-}
-
-get_zig_mcpu() {
-	local ZIG_DEFAULT_MCPU=native
-	tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
-	echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
-}
-
-get_zig_target() {
-	local ZIG_DEFAULT_TARGET=native
-	tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
-	echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	elog "This version requires 10G of memory for building compiler."
-	elog "If you don't have enough memory, you can wait until 0.11.0 release"
-	elog "or (if you are risky) use 9999 version (currently requires only 4GB)"
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DZIG_USE_CCACHE=OFF
-		-DZIG_SHARED_LLVM=ON
-		-DZIG_TARGET_TRIPLE="$(get_zig_target)"
-		-DZIG_TARGET_MCPU="$(get_zig_mcpu)"
-		-DZIG_USE_LLVM_CONFIG=ON
-		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		cd "${BUILD_DIR}" || die
-		edo ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in "${S}/langref.html"
-		edo ./zig2 test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std"
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
-		-Drelease -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
-	local ZIG_TEST_STEPS=(
-		test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
-		test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
-		test-run-translated-c test-std
-	)
-
-	local step
-	for step in "${ZIG_TEST_STEPS[@]}" ; do
-		edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
-	done
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "langref.html" "std" )
-	cmake_src_install
-	cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
-	mv lib/zig/ lib2/ || die
-	rm -rf lib/ || die
-	mv lib2/ lib/ || die
-
-	dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
-}
-
-pkg_postinst() {
-	eselect zig update ifunset
-
-	elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
-	elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
-	elog "Upstream recommends:"
-	elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
-	elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
-	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
-	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
-}
-
-pkg_postrm() {
-	eselect zig update ifunset
-}
diff --git a/dev-lang/zig/zig-0.10.1-r3.ebuild b/dev-lang/zig/zig-0.10.1-r3.ebuild
new file mode 100644
index 000000000000..b85fc3c95232
--- /dev/null
+++ b/dev-lang/zig/zig-0.10.1-r3.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=15
+inherit edo cmake llvm check-reqs toolchain-funcs
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+	inherit git-r3
+else
+	SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+# project itself: MIT
+# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
+# Files that are unnecessary for cross-compilation are removed by upstream
+# and therefore their licenses (if any special) are not included.
+# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
+# lib/libc/musl: MIT BSD-2
+# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
+# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
+LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc"
+
+BUILD_DIR="${S}/build"
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
+# They are not required "on their own", so please don't add them here.
+# You can check https://github.com/ziglang/zig-bootstrap in future, to see
+# options that are passed to LLVM CMake building (excluding "static" ofc).
+DEPEND="
+	sys-devel/clang:${LLVM_MAX_SLOT}=
+	sys-devel/lld:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+"
+
+RDEPEND="
+	${DEPEND}
+"
+
+IDEPEND="app-eselect/eselect-zig"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
+
+# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
+# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
+# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
+# (transpiled to C via C backend) for bootstrapping
+CHECKREQS_MEMORY="10G"
+
+PATCHES=(
+	"${FILESDIR}/zig-0.10.0-build-dir-install-stage3.patch"
+	"${FILESDIR}/zig-0.10.1-musl-1.2.4-lfs64.patch"
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+ctarget_to_zigtarget() {
+	# Zig's Target Format: arch-os-abi
+	local CTARGET="${CTARGET:-${CHOST}}"
+
+	local ZIG_ARCH
+	case "${CTARGET%%-*}" in
+		i?86)		ZIG_ARCH=x86;;
+		sparcv9)	ZIG_ARCH=sparc64;;
+		*)		ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
+	esac
+
+	local ZIG_OS
+	case "${CTARGET}" in
+		*linux*)	ZIG_OS=linux;;
+		*apple*)	ZIG_OS=macos;;
+	esac
+
+	local ZIG_ABI
+	case "${CTARGET##*-}" in
+		gnu)		ZIG_ABI=gnu;;
+		solaris*)	ZIG_OS=solaris ZIG_ABI=none;;
+		darwin*)	ZIG_ABI=none;;
+		*)		ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
+	esac
+
+	echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
+}
+
+get_zig_mcpu() {
+	local ZIG_DEFAULT_MCPU=native
+	tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
+	echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
+}
+
+get_zig_target() {
+	local ZIG_DEFAULT_TARGET=native
+	tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
+	echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	elog "This version requires 10G of memory for building compiler."
+	elog "If you don't have enough memory, you can wait until 0.11.0 release"
+	elog "or (if you are risky) use 9999 version (currently requires only 4GB)"
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DZIG_USE_CCACHE=OFF
+		-DZIG_SHARED_LLVM=ON
+		-DZIG_TARGET_TRIPLE="$(get_zig_target)"
+		-DZIG_TARGET_MCPU="$(get_zig_mcpu)"
+		-DZIG_USE_LLVM_CONFIG=ON
+		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cd "${BUILD_DIR}" || die
+		edo ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in "${S}/langref.html"
+		edo ./zig2 test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std"
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
+		-Drelease -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
+	local ZIG_TEST_STEPS=(
+		test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+		test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+		test-run-translated-c test-std
+	)
+
+	local step
+	for step in "${ZIG_TEST_STEPS[@]}" ; do
+		edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+	done
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "langref.html" "std" )
+	cmake_src_install
+	cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
+	mv lib/zig/ lib2/ || die
+	rm -rf lib/ || die
+	mv lib2/ lib/ || die
+
+	dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
+}
+
+pkg_postinst() {
+	eselect zig update ifunset
+
+	elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
+	elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
+	elog "Upstream recommends:"
+	elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
+	elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
+	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
+	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
+}
+
+pkg_postrm() {
+	eselect zig update ifunset
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c940f091ecb8..3d748e93e51d 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest
index 62bc5186864f..7ae0aec964c8 100644
--- a/dev-libs/apache-arrow/Manifest
+++ b/dev-libs/apache-arrow/Manifest
@@ -1,6 +1,9 @@
 DIST apache-arrow-11.0.0.tar.gz 19956186 BLAKE2B dff0faecbde9e2d19f092fd0c48a7ac7a401da6dbfd17f30af1b35c9e3fd3e1ba5611311f5bcb08383368de195cff783a178a9397a63a1c4f740a81349f8b8d3 SHA512 46df4fb5a703d38d0a74fde9838e9f9702b24b442cb225517516c335a5ab18955699000bf0b2fc7d1698ada6d2e890ba3860933b6280f5160b0fce8a07484d0e
 DIST apache-arrow-12.0.0.tar.gz 20159048 BLAKE2B 43b4f36e1d1f84fc83c46a3627ad72cead38310f4325b8d21d17d726cd416016f0839d312c80737c0a921da6aefee537413e30309a656301c19834c2986d734e SHA512 f815be4fb20b6001ba5525270765fe239b5468708a7be34b93b60ee0ce63464727d183c9756fbc33bffd199019e1f06a7fddd306ce8388435cea7771070a2ca9
+DIST apache-arrow-12.0.1.tar.gz 20172604 BLAKE2B bf66761d33ceb778c2f53c2e643e0c2bb4448f29eaa94d17e9815628665f4965fde28bd47fce4a5874717d2161c3f8adbb2e8a0e6658a51ae6d617e4f09d202b SHA512 551ae200551fcc73b7deddcc5f0b06633159ab1308506901a9086e4e2e34e4437f26d609fdbacba0ebe7d1fe83bdb8e92a268e9e41575d655d5b2d4fbef7a7ce
 DIST apache-arrow-arrow-data-11.0.0.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
 DIST apache-arrow-arrow-data-12.0.0.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
+DIST apache-arrow-arrow-data-12.0.1.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
 DIST apache-arrow-parquet-data-11.0.0.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
 DIST apache-arrow-parquet-data-12.0.0.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
+DIST apache-arrow-parquet-data-12.0.1.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
diff --git a/dev-libs/apache-arrow/apache-arrow-12.0.1.ebuild b/dev-libs/apache-arrow/apache-arrow-12.0.1.ebuild
new file mode 100644
index 000000000000..9091784721ce
--- /dev/null
+++ b/dev-libs/apache-arrow/apache-arrow-12.0.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929
+PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac
+
+DESCRIPTION="A cross-language development platform for in-memory data."
+HOMEPAGE="https://arrow.apache.org/"
+SRC_URI="
+	mirror://apache/arrow/arrow-${PV}/${P}.tar.gz
+	test? (
+		https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz
+			-> ${PN}-parquet-data-${PV}.tar.gz
+		https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz
+			-> ${PN}-arrow-data-${PV}.tar.gz
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	brotli? ( app-arch/brotli )
+	bzip2? ( app-arch/bzip2 )
+	compute? ( dev-libs/libutf8proc )
+	dataset? (
+		dev-libs/libutf8proc
+		re2? ( dev-libs/re2 )
+	)
+	lz4? ( app-arch/lz4 )
+	parquet? (
+		dev-libs/libutf8proc
+		dev-libs/thrift
+		ssl? ( dev-libs/openssl )
+	)
+	snappy? ( app-arch/snappy )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/xsimd
+	>=dev-libs/boost-1.81.0
+	json? ( dev-libs/rapidjson )
+	test? (
+		dev-cpp/gflags
+		dev-cpp/gtest
+	)
+"
+
+REQUIRED_USE="test? (
+		json
+		parquet? ( zstd )
+	)
+	ssl? ( json )"
+
+S="${WORKDIR}/${P}/cpp"
+
+PATCHES=( "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" )
+
+src_prepare() {
+	# use Gentoo CXXFLAGS, specify docdir at src_configure.
+	sed -i \
+		-e '/SetupCxxFlags/d' \
+		-e '/set(ARROW_DOC_DIR.*)/d' \
+		CMakeLists.txt \
+		|| die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DARROW_BUILD_STATIC=OFF
+		-DARROW_BUILD_TESTS=$(usex test)
+		-DARROW_COMPUTE=$(usex compute)
+		-DARROW_CSV=ON
+		-DARROW_DATASET=$(usex dataset)
+		-DARROW_DEPENDENCY_SOURCE=SYSTEM
+		-DARROW_DOC_DIR=share/doc/${PF}
+		-DARROW_FILESYSTEM=ON
+		-DARROW_HDFS=ON
+		-DARROW_JEMALLOC=OFF
+		-DARROW_JSON=$(usex json)
+		-DARROW_PARQUET=$(usex parquet)
+		-DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl)
+		-DARROW_USE_CCACHE=OFF
+		-DARROW_USE_SCCACHE=OFF
+		-DARROW_WITH_BROTLI=$(usex brotli)
+		-DARROW_WITH_BZ2=$(usex bzip2)
+		-DARROW_WITH_LZ4=$(usex lz4)
+		-DARROW_WITH_RE2=$(usex re2)
+		-DARROW_WITH_SNAPPY=$(usex snappy)
+		-DARROW_WITH_ZLIB=$(usex zlib)
+		-DARROW_WITH_ZSTD=$(usex zstd)
+		-DCMAKE_CXX_STANDARD=17
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data"
+	export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data"
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	if use test; then
+		cd "${D}"/usr/$(get_libdir)
+		rm -r cmake/ArrowTesting || die
+		rm libarrow_testing* || die
+		rm pkgconfig/arrow-testing.pc || die
+	fi
+}
diff --git a/dev-libs/libxml2/libxml2-2.11.4.ebuild b/dev-libs/libxml2/libxml2-2.11.4.ebuild
index e2b87b99d880..42495d934e0e 100644
--- a/dev-libs/libxml2/libxml2-2.11.4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.11.4.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/libxslt/libxslt-1.1.38.ebuild b/dev-libs/libxslt/libxslt-1.1.38.ebuild
index e7d5b131b6cb..7cf82fd708d9 100644
--- a/dev-libs/libxslt/libxslt-1.1.38.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.38.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit libtool gnome.org
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/opensc/opensc-0.23.0-r1.ebuild b/dev-libs/opensc/opensc-0.23.0-r1.ebuild
index 6228764da876..ed186fc5319e 100644
--- a/dev-libs/opensc/opensc-0.23.0-r1.ebuild
+++ b/dev-libs/opensc/opensc-0.23.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git"
 else
 	SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ppc64 ~sparc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 59d2033e3de0..5c08d89f3561 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,2 +1 @@
-DIST qtkeychain-0.13.2.tar.gz 43494 BLAKE2B d90799df83e8bed7f4ee9cdf6c7f56c86b1aee7123735963c4e2f858a69bbf28bcd062c6a302f8687626b1884acde61d7f7882b985517b24a1358b57ea13cdcc SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb
 DIST qtkeychain-0.14.1.tar.gz 50743 BLAKE2B 76300eeefc98a40da762a65cdf0a5a406b55cb92e290bb91e643353c3d2efdee1387168805326def60a42196d5cfde4f0d6c36cb2e0c946fc331361891af08f7 SHA512 bf84b19090e667a2946297e63d9813574193d80e4eecbde2fdfca317a66da3f029b3abef326f4ffb32de032a48004f9cf1bc818468af612723d762652dc25eb6
diff --git a/dev-libs/qtkeychain/qtkeychain-0.13.2.ebuild b/dev-libs/qtkeychain/qtkeychain-0.13.2.ebuild
deleted file mode 100644
index 805cd6368bd5..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.13.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-DESCRIPTION="Qt API for storing passwords securely"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/1"
-IUSE="keyring"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( ChangeLog ReadMe.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=OFF
-		-DBUILD_TEST_APPLICATION=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex keyring)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/yajl/files/yajl-2.1.0-memory-leak.patch b/dev-libs/yajl/files/yajl-2.1.0-memory-leak.patch
new file mode 100644
index 000000000000..da059c405393
--- /dev/null
+++ b/dev-libs/yajl/files/yajl-2.1.0-memory-leak.patch
@@ -0,0 +1,23 @@
+From 23a122eddaa28165a6c219000adcc31ff9a8a698 Mon Sep 17 00:00:00 2001
+From: "zhang.jiujiu" <282627424@qq.com>
+Date: Tue, 7 Dec 2021 22:37:02 +0800
+Subject: [PATCH] fix memory leaks
+
+---
+ src/yajl_tree.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/yajl_tree.c b/src/yajl_tree.c
+index b9e66043..0e7bde98 100644
+--- a/src/yajl_tree.c
++++ b/src/yajl_tree.c
+@@ -456,6 +456,9 @@ yajl_val yajl_tree_parse (const char *input,
+              yajl_tree_free(v);
+         }
+         yajl_free (handle);
++	//If the requested memory is not released in time, it will cause memory leakage
++	if(ctx.root)
++	     yajl_tree_free(ctx.root);
+         return NULL;
+     }
+ 
diff --git a/dev-libs/yajl/yajl-2.1.0-r4.ebuild b/dev-libs/yajl/yajl-2.1.0-r4.ebuild
new file mode 100644
index 000000000000..fb59588a03ea
--- /dev/null
+++ b/dev-libs/yajl/yajl-2.1.0-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib multibuild
+
+DESCRIPTION="Small event-driven (SAX-style) JSON parser"
+HOMEPAGE="https://lloyd.github.io/yajl/"
+SRC_URI="https://github.com/lloyd/yajl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/lloyd-yajl-66cb08c"
+
+LICENSE="ISC"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-uclibc.patch # git master 5d4bf525
+	"${FILESDIR}"/${P}-pkg-config.patch # downstream
+	"${FILESDIR}"/${P}-memory-leak.patch # Bug 908036
+)
+
+src_prepare() {
+	cmake_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_test() {
+	cd "${S}"/test/parsing || die
+	./run_tests.sh "${BUILD_DIR}"/test/parsing/yajl_test || die
+}
+
+src_install() {
+	cmake-multilib_src_install
+	find "${D}" -name libyajl_s.a -delete || die
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 232bb4131897..b580b0887586 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/reason/reason-3.9.0-r1.ebuild b/dev-ml/reason/reason-3.9.0-r1.ebuild
new file mode 100644
index 000000000000..d5e02288741c
--- /dev/null
+++ b/dev-ml/reason/reason-3.9.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Simple, fast & type safe language that leverages JavaScript and OCaml"
+HOMEPAGE="https://reasonml.github.io/
+	https://github.com/reasonml/reason/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/reasonml/${PN}.git"
+else
+	SRC_URI="https://github.com/reasonml/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/dune-build-info:=
+	dev-ml/fix:=
+	dev-ml/menhir:=
+	dev-ml/merlin-extend:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ppx_derivers:=
+	dev-ml/ppxlib:=
+	dev-ml/utop:=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dune-install reason rtop
+
+	dodoc *.md docs/*.md
+}
diff --git a/dev-ml/reason/reason-3.9.0.ebuild b/dev-ml/reason/reason-3.9.0.ebuild
deleted file mode 100644
index 6516187ac47f..000000000000
--- a/dev-ml/reason/reason-3.9.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Simple, fast & type safe language that leverages JavaScript and OCaml"
-HOMEPAGE="https://reasonml.github.io/
-	https://github.com/reasonml/reason/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/reasonml/${PN}.git"
-else
-	SRC_URI="https://github.com/reasonml/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/fix:=
-	dev-ml/menhir:=
-	dev-ml/merlin-extend:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_derivers:=
-	dev-ml/ppxlib:=
-	dev-ml/utop:=
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	dune-install reason rtop
-
-	dodoc *.md docs/*.md
-}
diff --git a/dev-ml/timezone/timezone-0.16.0-r1.ebuild b/dev-ml/timezone/timezone-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..535ba4635b52
--- /dev/null
+++ b/dev-ml/timezone/timezone-0.16.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Time-zone handling for OCaml"
+HOMEPAGE="https://github.com/janestreet/timezone"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.14
+	dev-ml/core:${SLOT}
+	dev-ml/ppx_jane:${SLOT}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/timezone/timezone-0.16.0.ebuild b/dev-ml/timezone/timezone-0.16.0.ebuild
deleted file mode 100644
index db85989940f9..000000000000
--- a/dev-ml/timezone/timezone-0.16.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Time-zone handling for OCaml"
-HOMEPAGE="https://github.com/janestreet/timezone"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-R09DEPEND="
-	>=dev-lang/ocaml-4.14
-	dev-ml/core:${SLOT}
-	dev-ml/ppx_jane:${SLOT}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/Config-General/Config-General-2.650.0.ebuild b/dev-perl/Config-General/Config-General-2.650.0.ebuild
index f37c9fbf2e8e..b14176544b20 100644
--- a/dev-perl/Config-General/Config-General-2.650.0.ebuild
+++ b/dev-perl/Config-General/Config-General-2.650.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Config file parser module"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.110.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.110.0.ebuild
new file mode 100644
index 000000000000..a0de24a197e1
--- /dev/null
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.110.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=6.11
+inherit perl-module
+
+DESCRIPTION="Provide https support for LWP::UserAgent"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+RDEPEND="
+	>=dev-perl/IO-Socket-SSL-1.970.0
+	>=dev-perl/libwww-perl-6.60.0
+	>=dev-perl/Net-HTTP-6
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/Test-Needs-0.2.10
+		virtual/perl-Test-Simple
+		dev-perl/Test-RequiresInternet
+	)
+"
diff --git a/dev-perl/LWP-Protocol-https/Manifest b/dev-perl/LWP-Protocol-https/Manifest
index 554d94aac674..f941aae2a266 100644
--- a/dev-perl/LWP-Protocol-https/Manifest
+++ b/dev-perl/LWP-Protocol-https/Manifest
@@ -1 +1,2 @@
 DIST LWP-Protocol-https-6.10.tar.gz 33691 BLAKE2B 9436d81e2049b09bc7d0323f89ae41d7a7e0df6f2a01451a5badcbd3c2bb842935c947c543636415e11fcb5972203bb362de448b6888423cb1130fa3f472c4c4 SHA512 4d3c89dab6fadcb574c176977ca6debba177ee3f817e87319d9cd81e0a0b09214e271c2e97edc456dad2f4a1ebf8c6266a4ae52c3a93144880a5b32db97e7a31
+DIST LWP-Protocol-https-6.11.tar.gz 32599 BLAKE2B 1177b02a9a35bf9a7959eaa181b1fe156164c6d4a16043021a39e8691dd9fa677ec83401545fadeb4a49f9f989cb0ea801be94ba0cfe496b1a75868d0423dca4 SHA512 1e74c45898778c58d00eefbdd04a3ed47cf38164296278bec66c9b85f48ad635931873d2bf5423be8562df2c22b4bbf8eff0502bd29ba1c790bbbf76f3616ecf
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 5b622b8ce48b..7b188f6feb29 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/PerlIO-eol/Manifest b/dev-perl/PerlIO-eol/Manifest
index 29e9cc32fe63..9fa03e7e12cf 100644
--- a/dev-perl/PerlIO-eol/Manifest
+++ b/dev-perl/PerlIO-eol/Manifest
@@ -1,2 +1,3 @@
 DIST PerlIO-eol-0.17.tar.gz 16555 BLAKE2B f50752314d303fa5d5e42f10cc54a4e239242a1a613c3ea64a1453420c7f34e8d1f17d2bcaadb29db1d46fd54d800764479a6af98116f623e11825a393c3d512 SHA512 3be4ced8c173fd0dee327264b6ddd586231fb8c8acc3ee92dce4332db97f8a9649f2af07690e9083767f17c7ac21282a300aef89234048e43851be2b61db9da3
 DIST PerlIO-eol-0.18.tar.gz 16718 BLAKE2B 3e4a6706d7c00efa0776c1472e2dd7a14cd22ac60dbc6489626be22d9cb461ae8f2bce523fc535608ce5fbeb83d67862494a278934bd28d3f2483b4f363cb2e8 SHA512 4c5d639b6afbc8de52b31df2473d37e8d5338e9fe8b9245015f79ac8acf92955917e15ac77f8a757b1f8552bedccde26eb589cf558b533b0e12cf30e9c83fe45
+DIST PerlIO-eol-0.19.tar.gz 16817 BLAKE2B 3b0a2023d8ca29ad4752131839f6fc5599139307aa9a9a58085386740a03369b289df9e69e40dd54f307855fa88a65e53a8fb064d1e67c5de1d218640def1ed4 SHA512 b7aef61292e6721281dc32e0a08de5725bd9a0d7740be9bf8d5b26f7ba445e3eefc7129eae679e9d7cb9ac9b5119a98a5fdfd069855fed73931adff5fce0b154
diff --git a/dev-perl/PerlIO-eol/PerlIO-eol-0.190.0.ebuild b/dev-perl/PerlIO-eol/PerlIO-eol-0.190.0.ebuild
new file mode 100644
index 000000000000..2eb98c97309b
--- /dev/null
+++ b/dev-perl/PerlIO-eol/PerlIO-eol-0.190.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=0.19
+inherit perl-module
+
+DESCRIPTION="PerlIO layer for normalizing line endings"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	virtual/perl-Exporter
+	virtual/perl-XSLoader
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-File-Temp-0.190.0
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 7dd97c699ae8..cea0098e1613 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
index 726ee9acd625..e875c255ca4d 100644
--- a/dev-php/recaptcha/Manifest
+++ b/dev-php/recaptcha/Manifest
@@ -1,2 +1 @@
-DIST recaptcha-1.2.1.tar.gz 19935 BLAKE2B 43077b25d484940951bf070fa440b5d13c6992c2a157e06b81961b9692683a277d9507e44102dd0ba0cde66c892fd4736ed34cae4b001bdce0d4ab619828b432 SHA512 62df22a6f4b05006a6051db689994e455ada43f76406dd62c5c13f1d90ae64401e9d75c6a92f2c620a14c070d2b49199c20e70eb6284e42e676d37412a98abe4
 DIST recaptcha-1.2.4.tar.gz 21762 BLAKE2B 46c00ac95f2d2643a719b8ea4b53f33f92357406168e057dbdb87fb1419dd6626d1032113ba5842c69bdacb385887563b52290a55a861b57ddcf494e325c0595 SHA512 7c0bee86e532547900a0131c2c52d9d3e427eb0465d7ae5ca2bd3ccbeb7620c8b3216313e4ab382013045310f928364c1284a77eee2f2216d5b241e2d275597d
diff --git a/dev-php/recaptcha/recaptcha-1.2.1.ebuild b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
deleted file mode 100644
index 87981b66c8c7..000000000000
--- a/dev-php/recaptcha/recaptcha-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PHP client library for Google's reCAPTCHA service"
-HOMEPAGE="https://github.com/google/recaptcha"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/php"
-BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
-
-src_install() {
-	insinto "/usr/share/php/${PN}"
-	doins -r src/autoload.php src/ReCaptcha
-	dodoc CONTRIBUTING.md README.md
-	use examples && dodoc -r examples
-}
-
-src_test() {
-	phpunit || die "test suite failed"
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog "To use it in a script, require('${PN}/autoload.php'),"
-	elog "and then use the ${PN} class normally. Most of the examples in"
-	elog "the documentation should work without further modification."
-}
diff --git a/dev-php/recaptcha/recaptcha-1.2.4.ebuild b/dev-php/recaptcha/recaptcha-1.2.4.ebuild
index de078821e3da..2d48efba7a19 100644
--- a/dev-php/recaptcha/recaptcha-1.2.4.ebuild
+++ b/dev-php/recaptcha/recaptcha-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Arpeggio/Arpeggio-2.0.2.ebuild b/dev-python/Arpeggio/Arpeggio-2.0.2.ebuild
new file mode 100644
index 000000000000..b3fdfbe786aa
--- /dev/null
+++ b/dev-python/Arpeggio/Arpeggio-2.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Parser interpreter based on PEG grammars"
+HOMEPAGE="
+	https://pypi.org/project/Arpeggio/
+	https://github.com/textX/Arpeggio/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+DEPEND="
+	test? (
+		dev-python/memory_profiler[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Arpeggio/Manifest b/dev-python/Arpeggio/Manifest
index 4ae24bc19088..d9e14d575ac7 100644
--- a/dev-python/Arpeggio/Manifest
+++ b/dev-python/Arpeggio/Manifest
@@ -1 +1,2 @@
 DIST Arpeggio-2.0.0.tar.gz 767813 BLAKE2B b4eab5b0a049560e8f3d775f34e9d1beffc26d3969a11a2043d203852c77385adbbef876e212b09c6af8630f2b8de6dfb088760bf9ade332af981d4e8d8267ad SHA512 b5a75eea515b7dd0ad7dc261703300bd5b3e5a70f0946845f8828dbf7c76613aef926fed9538fe0f9a71c1666edc9f8cff31afddd551bea1d7b1b9ad7a9cc405
+DIST Arpeggio-2.0.2.tar.gz 766643 BLAKE2B 9cd3a40b10594868678b6e0e625a094a978deca22a0d251e348e25a7358afb64bdef337e1c93afcde00d1347a9b22faa694678217c3e2de49690e923f8f0ea73 SHA512 6f8ddf8ca19f968de84730ad4861585f333be8315e70b6bd320f838731cffbd28b5b6245edd869175834a95207f39b20674795f0f31b226c9387f4a0376c9adb
diff --git a/dev-python/Faker/Faker-18.10.1.ebuild b/dev-python/Faker/Faker-18.10.1.ebuild
deleted file mode 100644
index 48c456a2d7b5..000000000000
--- a/dev-python/Faker/Faker-18.10.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-18.11.1.ebuild b/dev-python/Faker/Faker-18.11.1.ebuild
deleted file mode 100644
index 48c456a2d7b5..000000000000
--- a/dev-python/Faker/Faker-18.11.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-18.11.2.ebuild b/dev-python/Faker/Faker-18.11.2.ebuild
index 48c456a2d7b5..710178d555ae 100644
--- a/dev-python/Faker/Faker-18.11.2.ebuild
+++ b/dev-python/Faker/Faker-18.11.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Faker-18.9.0.ebuild b/dev-python/Faker/Faker-18.9.0.ebuild
deleted file mode 100644
index 710178d555ae..000000000000
--- a/dev-python/Faker/Faker-18.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 19b0aefa8273..b731361e195b 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,5 +1,2 @@
-DIST Faker-18.10.1.tar.gz 1670142 BLAKE2B e1ecd65e0f4a26239d04761048faeeb40987cfe73ea3cfbc1344c5fb342a658efc994b4c5e53b171d68e8ac5c0550973913e2a83c728e24bd64e954509791ea9 SHA512 bfde74d2bbbc1b6055d094b0fc881bec7f050d2a980638a5ea577a345863737dd66b794204530d0db6daaf06e453e1d95ad07d479af62147176d535688b584b9
-DIST Faker-18.11.1.tar.gz 1670237 BLAKE2B 6c8572f4883d71a8f94535605ea53aba3fe2e0d9f8281cb207248a5a6d119055e49ce95b50d175e508d65b8186fe89ba0fbc21b0f9db19c4cc67c02defebbfdf SHA512 e8cc65d1a1efc70e76a3a1286950553bc8a998cdeaa06e45da58609f8418e34cc34c0d759f0488b84fbb94deaa4e1ba24e547ae5f9126c95a401f137fa660786
 DIST Faker-18.11.2.tar.gz 1670644 BLAKE2B 0496e9d2169932fd158b8eb62693d1c7f833c00c93fa75b35d747bec1a9e81247977b307faef6cb2526c0042716b080b160fc93cf8d9543a1e2bb3a477f815e6 SHA512 9b54485836d8e4cf66c0ebc9807770f77867a9ab634bc5a465811fe0c2d79c0ec1ab5360bb5f69e9f603026094b4c969a4ad1b98c0c6b21e7fb740d5a17af5b8
 DIST Faker-18.13.0.tar.gz 1672316 BLAKE2B c7b3a040276508c8d08c184e90dfd054d62ef635299e637476fedf0d3e01d0e311bd855c4df39dd449244c07c71a1fe216063c07a3abef69f8ec8fa967124769 SHA512 b5cd907d962f39d15001d0218993dd6b4f65ac6252fcb1c72bbb2905a585ad26d0f7c6807cef43b41ce430122fe4730d26f57f119bc3547a432d133e87d98beb
-DIST Faker-18.9.0.tar.gz 1667357 BLAKE2B e1086168201969a1a0410d7bb6e97bdf31d0f470d6e39f011b8d62733818a4d5108a1ea058d19f41922efafc0a056bffe14f76ff1a77c9599097a3d172d0accb SHA512 9ad60cc30121405fdac38ef479ca1f8bf9114a599575caeded5be4fb8fed80a3268ad02705217ab0ce006e017d2aae7be3c1b50cacddc49bc16cdeb9bc9347c9
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fe4615e32a19..632c351d29da 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 005379a0acaa..f7a7aec2dfda 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -2,4 +2,6 @@ DIST Nuitka-1.6.4.tar.gz 4254226 BLAKE2B ec20d567f83bd80c662fefd897c224712735b11
 DIST Nuitka-1.6.5.tar.gz 4250050 BLAKE2B 66586aa497da1174e0387a1050763760973a601d40cb5a36bdb030df60a2cde7908f30d173a871a136f9efe9798e3eb3ca03a945c2f1c7345c7ad87f3310f90f SHA512 20469e2872ffd4379ea0ce704fb6282aef8d6c5f8459067e0612248dc21de93b3de1282aab3ad5a285b5a198a9771b0b55897576a2420450753eddb3db827feb
 DIST Nuitka-1.6.6.tar.gz 4250403 BLAKE2B 027ccbaca57e5306ba150b5f9dbf31f2d8dc447a498369d70b824357ff9738375505f67c04b2317b09fefc568b0c4cebabfdffa219b64dfd734b435c31924c1a SHA512 c9b50cc40571b7d9477d972eef82aa72079fc6ef68040d8ff6cea2c51628797b6467174627f2376f6f8c14deb45fc8fcec2f43cbf3ae999a78b06cc1c887e8db
 DIST Nuitka-1.7.1.tar.gz 4275626 BLAKE2B 8cad1de66cfb540e0b536ca27278213a5192aecee56be34c52a9fca6cb493c8c1069823135d6d27dc8f0c1fe1d9d08faad3a9fafa6e4c01b0d04af5b818de495 SHA512 cf8a05e71d6fb62b2208b3b7e3c4e961cd46933e29e4c61b66fd1d39d6c6a10e37bff5a9d7822c9709623f4e1eb5303c58c33b34ad0ebe1b87615397f3e22b30
+DIST Nuitka-1.7.2.tar.gz 4275682 BLAKE2B 10f10cdfe00f7655f335a565b1e63c3d0ab90843cb60abe78dcbc8e2f0258160405be011c55aeffb18800af9bc7e16498e8eb8c73031f97e2586788b8675cc53 SHA512 3c95c70b5a66f614d302bbae50e3fff960aecb65c97ce1d77ad39080a8d27ac8f1c51b90e74c63ecf16f621fc06280ae0610ebe8f9615dd25a80d3beb4d23fa7
+DIST Nuitka-1.7.3.tar.gz 4275701 BLAKE2B 234b80253280b99b721c72338f95f2d51663680b974a29c4c66b63b5c67302ac02c2a465cff4be939a4a6c87b1c043bd6ba6e51d1aec1ac854886f0cc76820d3 SHA512 3e16e6a1ff51f87b420ff4430e6fb5a6b0d674414735965613651ce4f22c253b3d56aca0741fac8c9e66f22590bede09381c171dcee267acf05dcf0fc1024e81
 DIST Nuitka-1.7.tar.gz 4275155 BLAKE2B b293075412c8d858e157598d4fd5b6e776f09a62d2d03cf81c55fb5b22d336551d12173bc3cd3817849b6d83efff996d9d259dedaf5cc119eea2fc8e86916e22 SHA512 1b973550787c67ce507744f8e3df88cc91cdae61663aaa38c46acd6644ae1b3b425b1d88fe75867275845ea2022fc8ac3481685fe6056e5c932d407109b96084
diff --git a/dev-python/Nuitka/Nuitka-1.7.2.ebuild b/dev-python/Nuitka/Nuitka-1.7.2.ebuild
new file mode 100644
index 000000000000..f1bec277226a
--- /dev/null
+++ b/dev-python/Nuitka/Nuitka-1.7.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 flag-o-matic optfeature pypi
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/Nuitka/Nuitka-1.7.3.ebuild b/dev-python/Nuitka/Nuitka-1.7.3.ebuild
new file mode 100644
index 000000000000..f1bec277226a
--- /dev/null
+++ b/dev-python/Nuitka/Nuitka-1.7.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 flag-o-matic optfeature pypi
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index 87cd5958c2c5..85a877aa8959 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,2 +1 @@
-DIST PyQt-builder-1.15.0.tar.gz 3908159 BLAKE2B aa92682a33057708d46bbec0bd19650042915177ca7574680a14b90045052a818df053fd9776195439aced3e57700196e9d7fbeb8bed4b01c52f0b5bac286ef1 SHA512 6eea424bdeb6921cd56590f95912e6341e09c48bff240005b7288ba2014b422ca84992b3ad48323dc6d5145c70dbfe8681f132142bba01ce95defba1cbf157fa
 DIST PyQt-builder-1.15.1.tar.gz 3908326 BLAKE2B d84ababee2687515e6e1a1f24bc0ebfc7edf0896c15ee29422df3ffc9070d82f3e24073fad8111a4ce0eb980dfa5613e95bc551c0ae8753cc4f386bbe242aa5f SHA512 61ee73b6bb922c04739da60025ab50d35d345d2e298943305fcbd3926cda31d732cc5e5b0dbfc39f5eb85c0f0b091b8c3f5fee00dcc240d7849c5c4191c1368a
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.15.0.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.15.0.ebuild
deleted file mode 100644
index c923f27246e7..000000000000
--- a/dev-python/PyQt-builder/PyQt-builder-1.15.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
-
-if [[ ${PV} == *_pre* ]]; then
-	MY_P=${PN}-${PV/_pre/.dev}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.7.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-python_prepare_all() {
-	# don't install prebuilt Windows DLLs
-	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
-	rm -r "${PN/-/_}.egg-info" || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.15.1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.15.1.ebuild
index 260560a447aa..c923f27246e7 100644
--- a/dev-python/PyQt-builder/PyQt-builder-1.15.1.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.15.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/allpairspy/Manifest b/dev-python/allpairspy/Manifest
index 3fa369dcbd6d..986fda26c774 100644
--- a/dev-python/allpairspy/Manifest
+++ b/dev-python/allpairspy/Manifest
@@ -1 +1,2 @@
 DIST allpairspy-2.5.0.tar.gz 10729 BLAKE2B 40fd71135ce3919d1aec90ea2d2b0f3439c96a1890533f747f541f03fb47f6583de121dcca73ab3262b2d2ceb2df9d33da073868c44a77194f77c50905841384 SHA512 57ebcadec52fce7353fecc8d47d44f85e577594e3e7fa8670350817a848a6cdcd62908f1f371ca37d3ca7e8a49682888f38032b27c2abf734367076b08e2b4b0
+DIST allpairspy-2.5.1.tar.gz 14281 BLAKE2B f1a918e368e9d98e13e579a4d7bdd447ee243f56418ff990c4e8560730e96f8ec9b7230dc016d199676368b5b67928ac8e6ad922e766527d24a3a97b616c458f SHA512 062796329238837f2d9c9c56b3eefd8e462c4933578ef6f1f094a0e2f83bd44be6243ab202c976e0cbe13b8c0fb40d32c918a8bb6a1d29dcc0de942fc0b9339a
diff --git a/dev-python/allpairspy/allpairspy-2.5.1.ebuild b/dev-python/allpairspy/allpairspy-2.5.1.ebuild
new file mode 100644
index 000000000000..4b05c64c931c
--- /dev/null
+++ b/dev-python/allpairspy/allpairspy-2.5.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pairwise test combinations generator"
+HOMEPAGE="
+	https://github.com/thombashi/allpairspy/
+	https://pypi.org/project/allpairspy/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/arrow/arrow-1.2.3.ebuild b/dev-python/arrow/arrow-1.2.3.ebuild
index 3a2847561866..329569040dec 100644
--- a/dev-python/arrow/arrow-1.2.3.ebuild
+++ b/dev-python/arrow/arrow-1.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 0a3370bb4181..419b56991b4e 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1 +1,2 @@
 DIST astroid-2.15.5.gh.tar.gz 461755 BLAKE2B 4af28becb14d767c3fa162be93cd1d3f99e42a476a7b1ee57225a6d5603876cbfde7a58e17412d1142baa42288cbb2cfe3ecdbaafe5195c777f04a3ad9fe4427 SHA512 9862a2f4703b36284d14a3b09f80b4b0a1e0948e306b4906ec663fc133d07966e24a711a90067b369b166ce4d53859327e1da84406a023d1a911fff7bb0ed026
+DIST astroid-2.15.6.gh.tar.gz 462156 BLAKE2B f5df204a0b635d29165da1566afd9259ff26102fef3b56685ad9e10fe1cdae35aa90b1e1f81293e591c03122e980936dfd91b521dfe7a4c8cfacb8b40bcac9d6 SHA512 20c4d316176b84d61b5f44823026926e84c7de3c3a6febaa23cf9c8c5a9507ce65168804a61cb2db0ffcc7ec0ecb687282e6c794485135203cc25d30064e0047
diff --git a/dev-python/astroid/astroid-2.15.6.ebuild b/dev-python/astroid/astroid-2.15.6.ebuild
new file mode 100644
index 000000000000..d2feb47f4808
--- /dev/null
+++ b/dev-python/astroid/astroid-2.15.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/pylint-dev/astroid/
+	https://pypi.org/project/astroid/
+"
+SRC_URI="
+	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why they're broken
+		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
+		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
+		# some problem with warnings (our options?)
+		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
+		# requires six bundled in urllib3, sigh
+		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
+		# requires pip, and looks suspicious anyway
+		tests/test_manager.py::IsolatedAstroidManagerTest::test_no_user_warning
+		# pydantic-2?
+		tests/brain/test_dataclasses.py::test_pydantic_field
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/attrs/attrs-23.1.0.ebuild b/dev-python/attrs/attrs-23.1.0.ebuild
index 50b5fd2e8173..70717b7db77d 100644
--- a/dev-python/attrs/attrs-23.1.0.ebuild
+++ b/dev-python/attrs/attrs-23.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
diff --git a/dev-python/cffi/cffi-1.15.1-r2.ebuild b/dev-python/cffi/cffi-1.15.1-r2.ebuild
deleted file mode 100644
index 864133805d8c..000000000000
--- a/dev-python/cffi/cffi-1.15.1-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# no py3.12 yet because of:
-# 1. https://foss.heptapod.net/pypy/cffi/-/issues/562
-# 2. https://foss.heptapod.net/pypy/cffi/-/issues/563
-# 3. https://foss.heptapod.net/pypy/cffi/-/issues/564
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 toolchain-funcs pypi
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="
-	https://cffi.readthedocs.io/
-	https://pypi.org/project/cffi/
-"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-drop-deprecated-py.patch.xz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# Needs recent libffi for HPPA fixes
-DEPEND="
-	>=dev-libs/libffi-3.4.4-r1:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pycparser[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
-	"${FILESDIR}"/${P}-hppa.patch
-	"${FILESDIR}"/${P}-python3.11-tests.patch
-	"${WORKDIR}"/${P}-drop-deprecated-py.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		# Don't obsessively try to find libffi
-		sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these tests call pip
-		testing/cffi0/test_zintegration.py
-	)
-
-	"${EPYTHON}" -c "import _cffi_backend as backend" || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest c testing
-}
diff --git a/dev-python/cffi/cffi-1.15.1-r3.ebuild b/dev-python/cffi/cffi-1.15.1-r3.ebuild
index 73cc144731ad..63865aebb8a4 100644
--- a/dev-python/cffi/cffi-1.15.1-r3.ebuild
+++ b/dev-python/cffi/cffi-1.15.1-r3.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-drop-dep
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Needs recent libffi for HPPA fixes
 DEPEND="
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 9c7780ad660e..79a55f22030a 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,5 +1 @@
 DIST cfn-lint-0.77.10.tar.gz 3488571 BLAKE2B 6b828c760bf93f1d31fe7d24d76cea63c91ed3f73837382898c4f60aea30d667b28065e4004a6fe62bee04141baa1b3baf576f30af4c823f7980d48c97e2602b SHA512 e5ca37620d33d199295d43d81c7390e181281418681fedbaaedca01a1128b8680451fba5ce429875c2242fefad8cfd234bb919fe948bbf9cdc442bb064d84972
-DIST cfn-lint-0.77.6.tar.gz 3554363 BLAKE2B abd496cdb72e1032c92a6489da12a4ffb4f83bba994067f9e2d333e55a13ea22d07db880dd3acca208f9b8328c17fe98540cec2847dac32ad87b2662aa0047e4 SHA512 b36c781dbd3294d6f2cfe43f617832170e47c9c9502845a551e6a9263e28dc6de99c77abd998699a2fcb6f08535daff615b17072c3ad1fe9c10853890a71989f
-DIST cfn-lint-0.77.7.tar.gz 3554332 BLAKE2B b669b9f97523933eb5549f7b2d67a132aef2236301b24094a0b74e9198d49121d4ec173c99d74b554b77eee2765b4ceb97126f2ccfab121393bc68e34cfb8147 SHA512 124ab4b96963f4971a25535852290ee71b5eed82e85a4101b3aa0469213b1006bfe8ae3d384f1acf236a0fa9915a24999b00f31f0d6ddbedbdaba123bfbb823b
-DIST cfn-lint-0.77.8.tar.gz 3578363 BLAKE2B 33fbc0dd76a025425453bf39da0cd1c9ffc15b057735e2add0a54fe387377824839ab34fb37216db4fe0cc05f60878b4ac828aceecd888d510612d9c44d8473f SHA512 7fc71965d33df29557de996e2ba0e911e681b5d220e69346a26448c1e04f3cd40f7e17b933cde695ad5aa6170d46981834efa19103e50d6690b4d476d13f82ba
-DIST cfn-lint-0.77.9.tar.gz 3477918 BLAKE2B dd575c9610289b5fd256b7ddd11985a6b5790706d2d8d79409bea4b3c6600d680931893ce8f9b38724c14348fbb6023bd43dbd932c822547d923f5eaa43552bc SHA512 f861fb4b6e8c95e6ac9cda564b9f65c639696a1df16408500fab9a07c317e4663a1bbde87e245536b555a664f325441bd802a703ede7cd51f16be473afe34966
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.10.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.10.ebuild
index 6f296e7c5910..2807e680119f 100644
--- a/dev-python/cfn-lint/cfn-lint-0.77.10.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.77.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.6.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.6.ebuild
deleted file mode 100644
index 2807e680119f..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.77.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.7.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.7.ebuild
deleted file mode 100644
index 6f296e7c5910..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.77.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.8.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.8.ebuild
deleted file mode 100644
index 6f296e7c5910..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.77.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.9.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.9.ebuild
deleted file mode 100644
index 6f296e7c5910..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.77.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cryptography/cryptography-40.0.2-r1.ebuild b/dev-python/cryptography/cryptography-40.0.2-r1.ebuild
deleted file mode 100644
index 1547392d4b67..000000000000
--- a/dev-python/cryptography/cryptography-40.0.2-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	Inflector-0.11.4
-	aliasable-0.1.3
-	android_system_properties-0.1.5
-	asn1-0.13.0
-	asn1_derive-0.13.0
-	autocfg-1.1.0
-	base64-0.13.1
-	bitflags-1.3.2
-	bumpalo-3.10.0
-	cc-1.0.79
-	cfg-if-1.0.0
-	chrono-0.4.24
-	codespan-reporting-0.11.1
-	core-foundation-sys-0.8.3
-	cxx-1.0.86
-	cxx-build-1.0.86
-	cxxbridge-flags-1.0.86
-	cxxbridge-macro-1.0.86
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	iana-time-zone-0.1.54
-	iana-time-zone-haiku-0.1.1
-	indoc-1.0.4
-	instant-0.1.12
-	js-sys-0.3.61
-	libc-0.2.140
-	link-cplusplus-1.0.8
-	lock_api-0.4.9
-	log-0.4.17
-	memoffset-0.8.0
-	num-integer-0.1.45
-	num-traits-0.2.15
-	once_cell-1.14.0
-	openssl-0.10.50
-	openssl-macros-0.1.0
-	openssl-sys-0.9.85
-	ouroboros-0.15.6
-	ouroboros_macro-0.15.6
-	parking_lot-0.11.2
-	parking_lot_core-0.8.6
-	pem-1.1.1
-	pkg-config-0.3.26
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.53
-	pyo3-0.18.3
-	pyo3-build-config-0.18.3
-	pyo3-ffi-0.18.3
-	pyo3-macros-0.18.3
-	pyo3-macros-backend-0.18.3
-	quote-1.0.26
-	redox_syscall-0.2.16
-	scopeguard-1.1.0
-	scratch-1.0.5
-	smallvec-1.10.0
-	syn-1.0.109
-	target-lexicon-0.12.4
-	termcolor-1.2.0
-	unicode-ident-1.0.8
-	unicode-width-0.1.10
-	unindent-0.1.11
-	vcpkg-0.2.15
-	version_check-0.9.4
-	wasm-bindgen-0.2.84
-	wasm-bindgen-backend-0.2.84
-	wasm-bindgen-macro-0.2.84
-	wasm-bindgen-macro-support-0.2.84
-	wasm-bindgen-shared-0.2.84
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-0.46.0
-	windows-targets-0.42.2
-	windows_aarch64_gnullvm-0.42.2
-	windows_aarch64_msvc-0.42.2
-	windows_i686_gnu-0.42.2
-	windows_i686_msvc-0.42.2
-	windows_x86_64_gnu-0.42.2
-	windows_x86_64_gnullvm-0.42.2
-	windows_x86_64_msvc-0.42.2
-"
-
-inherit cargo distutils-r1 multiprocessing pypi
-
-VEC_P=cryptography_vectors-$(ver_cut 1-3)
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
-	https://github.com/pyca/cryptography/
-	https://pypi.org/project/cryptography/
-"
-SRC_URI+="
-	https://dev.gentoo.org/~mgorny/dist/${P}-pyo3-0.18.patch.bz2
-	$(cargo_crate_uris ${CRATES})
-	test? (
-		$(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)")
-	)
-"
-
-LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT
-	Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${P}-pyo3-0.18.patch"
-	)
-
-	default
-
-	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
-			darwinok=1
-		fi
-		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
-	local EPYTEST_IGNORE=(
-		tests/bench
-	)
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/cryptography/cryptography-40.0.2-r2.ebuild b/dev-python/cryptography/cryptography-40.0.2-r2.ebuild
new file mode 100644
index 000000000000..21b0958aabd1
--- /dev/null
+++ b/dev-python/cryptography/cryptography-40.0.2-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	Inflector-0.11.4
+	aliasable-0.1.3
+	android_system_properties-0.1.5
+	asn1-0.13.0
+	asn1_derive-0.13.0
+	autocfg-1.1.0
+	base64-0.13.1
+	bitflags-1.3.2
+	bumpalo-3.10.0
+	cc-1.0.79
+	cfg-if-1.0.0
+	chrono-0.4.24
+	codespan-reporting-0.11.1
+	core-foundation-sys-0.8.3
+	cxx-1.0.86
+	cxx-build-1.0.86
+	cxxbridge-flags-1.0.86
+	cxxbridge-macro-1.0.86
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	iana-time-zone-0.1.54
+	iana-time-zone-haiku-0.1.1
+	indoc-1.0.4
+	instant-0.1.12
+	js-sys-0.3.61
+	libc-0.2.140
+	link-cplusplus-1.0.8
+	lock_api-0.4.9
+	log-0.4.17
+	memoffset-0.8.0
+	num-integer-0.1.45
+	num-traits-0.2.15
+	once_cell-1.14.0
+	openssl-0.10.50
+	openssl-macros-0.1.0
+	openssl-sys-0.9.85
+	ouroboros-0.15.6
+	ouroboros_macro-0.15.6
+	parking_lot-0.11.2
+	parking_lot_core-0.8.6
+	pem-1.1.1
+	pkg-config-0.3.26
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.53
+	pyo3-0.18.3
+	pyo3-build-config-0.18.3
+	pyo3-ffi-0.18.3
+	pyo3-macros-0.18.3
+	pyo3-macros-backend-0.18.3
+	quote-1.0.26
+	redox_syscall-0.2.16
+	scopeguard-1.1.0
+	scratch-1.0.5
+	smallvec-1.10.0
+	syn-1.0.109
+	target-lexicon-0.12.4
+	termcolor-1.2.0
+	unicode-ident-1.0.8
+	unicode-width-0.1.10
+	unindent-0.1.11
+	vcpkg-0.2.15
+	version_check-0.9.4
+	wasm-bindgen-0.2.84
+	wasm-bindgen-backend-0.2.84
+	wasm-bindgen-macro-0.2.84
+	wasm-bindgen-macro-support-0.2.84
+	wasm-bindgen-shared-0.2.84
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-0.46.0
+	windows-targets-0.42.2
+	windows_aarch64_gnullvm-0.42.2
+	windows_aarch64_msvc-0.42.2
+	windows_i686_gnu-0.42.2
+	windows_i686_msvc-0.42.2
+	windows_x86_64_gnu-0.42.2
+	windows_x86_64_gnullvm-0.42.2
+	windows_x86_64_msvc-0.42.2
+"
+
+inherit cargo distutils-r1 flag-o-matic multiprocessing pypi
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI+="
+	https://dev.gentoo.org/~mgorny/dist/${P}-pyo3-0.18.patch.bz2
+	$(cargo_crate_uris ${CRATES})
+	test? (
+		$(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)")
+	)
+"
+
+LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2o-r6:0=
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${P}-pyo3-0.18.patch"
+	)
+
+	default
+
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_configure_all() {
+	filter-lto # bug #903908
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cryptography/cryptography-41.0.1-r1.ebuild b/dev-python/cryptography/cryptography-41.0.1-r1.ebuild
new file mode 100644
index 000000000000..ab9db0bad0a0
--- /dev/null
+++ b/dev-python/cryptography/cryptography-41.0.1-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	Inflector@0.11.4
+	aliasable@0.1.3
+	asn1@0.15.2
+	asn1_derive@0.15.2
+	autocfg@1.1.0
+	base64@0.13.1
+	bitflags@1.3.2
+	cc@1.0.79
+	cfg-if@1.0.0
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	indoc@1.0.9
+	libc@0.2.144
+	lock_api@0.4.9
+	memoffset@0.8.0
+	once_cell@1.17.2
+	openssl-macros@0.1.1
+	openssl-sys@0.9.88
+	openssl@0.10.54
+	ouroboros@0.15.6
+	ouroboros_macro@0.15.6
+	parking_lot@0.12.1
+	parking_lot_core@0.9.7
+	pem@1.1.1
+	pkg-config@0.3.27
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.59
+	pyo3-build-config@0.18.3
+	pyo3-ffi@0.18.3
+	pyo3-macros-backend@0.18.3
+	pyo3-macros@0.18.3
+	pyo3@0.18.3
+	quote@1.0.28
+	redox_syscall@0.2.16
+	scopeguard@1.1.0
+	smallvec@1.10.0
+	syn@1.0.109
+	syn@2.0.18
+	target-lexicon@0.12.7
+	unicode-ident@1.0.9
+	unindent@0.1.11
+	vcpkg@0.2.15
+	version_check@0.9.4
+	windows-sys@0.45.0
+	windows-targets@0.42.2
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_msvc@0.42.2
+	windows_i686_gnu@0.42.2
+	windows_i686_msvc@0.42.2
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_msvc@0.42.2
+"
+
+inherit cargo distutils-r1 flag-o-matic multiprocessing pypi
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+	test? (
+		$(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)")
+	)
+"
+
+LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2o-r6:0=
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_configure_all() {
+	filter-lto # bug #903908
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cryptography/cryptography-41.0.1.ebuild b/dev-python/cryptography/cryptography-41.0.1.ebuild
deleted file mode 100644
index 410b883f05d9..000000000000
--- a/dev-python/cryptography/cryptography-41.0.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	Inflector@0.11.4
-	aliasable@0.1.3
-	asn1@0.15.2
-	asn1_derive@0.15.2
-	autocfg@1.1.0
-	base64@0.13.1
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	indoc@1.0.9
-	libc@0.2.144
-	lock_api@0.4.9
-	memoffset@0.8.0
-	once_cell@1.17.2
-	openssl-macros@0.1.1
-	openssl-sys@0.9.88
-	openssl@0.10.54
-	ouroboros@0.15.6
-	ouroboros_macro@0.15.6
-	parking_lot@0.12.1
-	parking_lot_core@0.9.7
-	pem@1.1.1
-	pkg-config@0.3.27
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.59
-	pyo3-build-config@0.18.3
-	pyo3-ffi@0.18.3
-	pyo3-macros-backend@0.18.3
-	pyo3-macros@0.18.3
-	pyo3@0.18.3
-	quote@1.0.28
-	redox_syscall@0.2.16
-	scopeguard@1.1.0
-	smallvec@1.10.0
-	syn@1.0.109
-	syn@2.0.18
-	target-lexicon@0.12.7
-	unicode-ident@1.0.9
-	unindent@0.1.11
-	vcpkg@0.2.15
-	version_check@0.9.4
-	windows-sys@0.45.0
-	windows-targets@0.42.2
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_msvc@0.42.2
-	windows_i686_gnu@0.42.2
-	windows_i686_msvc@0.42.2
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_msvc@0.42.2
-"
-
-inherit cargo distutils-r1 multiprocessing pypi
-
-VEC_P=cryptography_vectors-$(ver_cut 1-3)
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
-	https://github.com/pyca/cryptography/
-	https://pypi.org/project/cryptography/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-	test? (
-		$(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)")
-	)
-"
-
-LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT
-	Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
-			darwinok=1
-		fi
-		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
-	local EPYTEST_IGNORE=(
-		tests/bench
-	)
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 00f163c19b22..a1fe91cfbb77 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1 +1,2 @@
 DIST denonavr-0.11.2.tar.gz 178495 BLAKE2B 7ee308a071f3e325849b67aa901d9999a31c566ce7fc7a0c5c71bb53d9bcd5effd4bf54dc0b4301f4403d01bca83af15ef603c0229b182ab1c1b2801ae934e61 SHA512 70ac865e20d6a71c51007e6b135b873492707bff1497616d44fbcf30ab8e3c172d93df08cfc23bebca929cb965d764d6d105d2ed4a0a5fc30d19732b66a88820
+DIST denonavr-0.11.3.tar.gz 179597 BLAKE2B 139cda38958e320d72f11ef25e94db67346b7e9f253cbbf60a0cc5f5e2e42846f070a57cfb1596cb648d1d70a62983d8f5fe6b91aec5b95501c049c1c65b7141 SHA512 a361ac3dd6385ad7c042f6cb7bd2092c39da75c167277347d199ab9de3a1ef9fad84e41428cfa02058c680c905965214e42780fa4d4fb1f4a1116102284fe571
diff --git a/dev-python/denonavr/denonavr-0.11.3.ebuild b/dev-python/denonavr/denonavr-0.11.3.ebuild
new file mode 100644
index 000000000000..5adf44a85b90
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.11.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="
+	https://github.com/ol-iver/denonavr/
+	https://pypi.org/project/denonavr/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/asyncstdlib-3.10.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-21.2.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.23.1[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.11.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/deprecation/deprecation-2.1.0-r1.ebuild b/dev-python/deprecation/deprecation-2.1.0-r1.ebuild
index 1c44aa5d42c6..6334a81745ca 100644
--- a/dev-python/deprecation/deprecation-2.1.0-r1.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
deleted file mode 100644
index 9d6b7eeb440e..000000000000
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="A library to handle automated deprecations"
-HOMEPAGE="https://deprecation.readthedocs.io/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -i -e 's:unittest2:unittest:' tests/test_deprecation.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/docker/Manifest b/dev-python/docker/Manifest
index 3ffe3016f685..84c5fd710377 100644
--- a/dev-python/docker/Manifest
+++ b/dev-python/docker/Manifest
@@ -1,2 +1 @@
-DIST docker-py-6.1.2.gh.tar.gz 253183 BLAKE2B 28435f5db00cbcd189cb06af77a4eac95a27944d324718c02b1d8f28c9954242c3a36ae376b0e0118ce1e03cb49f44925250b33b34b3ba5b459ef0df9ae9a6a4 SHA512 13c2711c44ae7b781187abaa7518ed86dd37192a44b6fff2c0090bfd8edb82555d15fb9d1681de9db47839f8dbcf17cc03fb88ed4e0e0052032dbcc9ed4c0078
 DIST docker-py-6.1.3.gh.tar.gz 253192 BLAKE2B b5a54d2bcbb4a89e4861bbf59a9b4565886f5541a518f66691ae205b7581f73af9fe6d491af299b0295f39b4a6e6248871b16e25ea5650fabbeafb7ced6cdaf7 SHA512 ba6ade2487afb8f68606b7d78c0f0dc83ffde622444a9598a5c647d0176695171040c5d1115fb8db6d97cb062a24d552d043274a56923b0eae0f64d98cb92c30
diff --git a/dev-python/docker/docker-6.1.2.ebuild b/dev-python/docker/docker-6.1.2.ebuild
deleted file mode 100644
index 2e969b8180d1..000000000000
--- a/dev-python/docker/docker-6.1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=docker-py-${PV}
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="
-	https://github.com/docker/docker-py/
-	https://pypi.org/project/docker/
-"
-SRC_URI="
-	https://github.com/docker/docker-py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/packaging-14.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/paramiko-2.4.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/myst-parser'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# localhost has a better chance of being in /etc/hosts
-	sed -e 's:socket[.]gethostname():"localhost":' \
-		-i tests/unit/api_test.py || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	epytest tests/unit
-}
diff --git a/dev-python/docker/docker-6.1.3.ebuild b/dev-python/docker/docker-6.1.3.ebuild
index a3fe24f9dc3d..2176517410ae 100644
--- a/dev-python/docker/docker-6.1.3.ebuild
+++ b/dev-python/docker/docker-6.1.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/packaging-14.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 6c0f78bed4d4..d2bf200b795b 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1 +1,2 @@
 DIST dogpile.cache-1.2.1.tar.gz 258589 BLAKE2B c271f823f1a57f26c07078edd9af5a899aa6c3793d979f3eb86cbad7814360d51dc26cdfe06f92f6bbc9a14620362332c22379a6024c9adab18f46c1ad3583fe SHA512 407a0b5842b9ae4a8a82da933b4c7a4fec4391b877dcddb4f454c7fdf78ed0d2f6db16650c89c8047e1ec2eb6348c23bdcae99a0998aa2de58cfc00d92e2fa5a
+DIST dogpile.cache-1.2.2.tar.gz 263102 BLAKE2B ccd64492e154f30b27a9b031086acd89002c9cae402105720022370688c6343c6c7a023fc643390764a40dfa9dde083e5adaf644aa79939c0bf6573c4c518366 SHA512 23b078b79e4b1f87c8d397d35b772f0b5fee66a0e452de06e7644ecb1ef577ae1629307a0e32fa62f49d536f95fb62fe70ededeb43647fa0c2e0baf896261931
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.2.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.2.2.ebuild
new file mode 100644
index 000000000000..24f2c8fe8b23
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
+HOMEPAGE="
+	https://github.com/sqlalchemy/dogpile.cache/
+	https://pypi.org/project/dogpile.cache/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index b38e271ef529..896552cb2232 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,6 +1,8 @@
 DIST elasticsearch-8.6.2-linux-x86_64.tar.gz 581745209 BLAKE2B c5d76e8fd2b7b28d50a0b81950c5d824f5000d3239efef9c3312e153829f09d98ba1394dceff2f147c29e2cd24be2ea4aaf0e0dc830e51989b87c8c7b48e3b3c SHA512 4c5ea98af53861d6c7f06f855f3bd4f4f52136d8149347e43f633a23ba56d3237f6ff7346bf849090f4e52b28fc21c98df8d9b0f0f845a330834367705cd366a
 DIST elasticsearch-8.7.0-linux-x86_64.tar.gz 596104472 BLAKE2B bf2d6d6f810abd6e586681882f7eb01728167c6fd56ff927b08388bc3f4f5d342f0d903db1306880d70efc27c1ed7c53ba25d9517c55f4fa228744fdb7e3695b SHA512 7ac6ee5e2e2ccee1ebb20a1c94992b90e879b8b37273d59ae1496b1e8ae5499ae1b6ddce8cea7dda3b63e7e45352735b2bd3328ad0fdd6d6aadb020de21eb894
 DIST elasticsearch-8.8.0-linux-x86_64.tar.gz 596757716 BLAKE2B 78867b59fddd8efdc63cbe914d968a500d5c1351bd97abb7fb868ca5af8945d7b8d4e2116f3b7daafa4ec1c675deec15dfad25cd4545efd694a6663d2590bccb SHA512 4af771a03371605ce82964300c78dd54d5f8ca3b1237c6480818f595a56deaceace842fdade433636ef53a0e55142477e82e9c1157e7e33ca3f46d86beca44e8
+DIST elasticsearch-8.8.2-linux-x86_64.tar.gz 597172402 BLAKE2B 65fa55de5282cefcb75d6dfc2af2f48ead1faa53674168c349451526f805417bc0744e6542fe5df0bb443a51b65ba48470e0fa0aa3704e95cb72ad90d324963b SHA512 4a63bb3c4cc69573be6a6ee6fae69adec2da5e33c048fa2aba8ee8842e2aef6ef82b6fd22cfb2145e307c46e6ddf40654a49e8bdab0f8672d88dac07a50e4743
 DIST elasticsearch-py-8.6.2.gh.tar.gz 517674 BLAKE2B c498f1e1efaea4c24f595f7e496f576372d6075da107b2f84a7d4a42c02de4e00d1459df6f965384f5880b4d8f910c4a7a49a773cb38361618ca7a74e5c4ec5a SHA512 53c03c9c8da4eb303e8f9cd5752bbef5a360d1e1a6fea4e98a8d576299f2ae4175c1da09429049cedf53a78bf86a4647fe4f4f9c7735a5a29977ada7db49e5fb
 DIST elasticsearch-py-8.7.0.gh.tar.gz 523141 BLAKE2B bbc6c59e921c5e8db3b7815a3086abe42690733d6719dcf3e167a521b1e7b38e68bf29ff2b1e0e48839be36c11feb9cb5bd9da507c35f508063ccfe9f3c24c59 SHA512 8f28d51cde600069692c8bef810e7949165a5f7a3ec440513a5f69e5c392ecb928dbd0317a9424d1845f523230a421e7d53db41a03b1bd3cc232c4b04ee0c894
 DIST elasticsearch-py-8.8.0.gh.tar.gz 526860 BLAKE2B 81d747c6ff3a552bcb279bc6ae4ede6a20c9516610f375dc11183eb38b759b4a8b4a9d0af9747300f483f3df403d918d938e50ae8bec91d09b67b7e81b11a114 SHA512 8bbbbfdcb658b648f2b3c7bd41c0d83cc66385eb8e5a118714c146c7ee8fb247f606098cc3ddacb679e009495dc8dbc0e3159fb0cae38ee49399e27c868940f1
+DIST elasticsearch-py-8.8.2.gh.tar.gz 527409 BLAKE2B e7768150e22995b4ae4a5b0898a252c46e90b224e8c4132a7035d726db9367facfe2cd006c0d319454c61c075d180776f567e45791d731bf1fc1d40a78d284a2 SHA512 5e5610425fe3727b817fbeafb411fa3e455a1f08c4992774c95c93c5b0d01880198d39febb18baee7a1da85bd126d9679fb6a2aac4602df8ec49cfff0b5bd3be
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-8.8.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-8.8.2.ebuild
new file mode 100644
index 000000000000..215cd5318a9b
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-8.8.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1
+
+DESCRIPTION="Official Elasticsearch client library for Python"
+HOMEPAGE="
+	https://ela.st/es-python
+	https://github.com/elastic/elasticsearch-py
+	https://pypi.org/project/elasticsearch/
+"
+# Use bundled jdk for the test elasticsearch as there is no convenient way to ensure system jdk17 is used
+SRC_URI="
+	https://github.com/elastic/elasticsearch-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? (
+		amd64? (
+			elibc_glibc? (
+				https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${PV}-linux-x86_64.tar.gz
+			)
+		)
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="
+	!amd64? ( test )
+	!elibc_glibc? ( test )
+	!test? ( test )
+"
+
+RDEPEND="
+	>=dev-python/aiohttp-3[${PYTHON_USEDEP}] <dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	>=dev-python/elastic-transport-8[${PYTHON_USEDEP}] <dev-python/elastic-transport-9[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4[${PYTHON_USEDEP}] <dev-python/requests-3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+		dev-python/unasync[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# REST api tests are a black hole for effort. It downloads the tests so its an ever moving target
+	# It also requires effort to blacklist tests for apis which are license restricted.
+	"test_elasticsearch/test_server/test_rest_api_spec.py"
+	# Counting deprecation warnings from python is bound to fail even if all are fixed in this package
+	# Not worth it
+	"test_elasticsearch/test_client/test_deprecated_options.py"
+)
+
+distutils_enable_sphinx docs/sphinx dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Replace added pytest options with setting asyncio_mode to auto.
+	# Test suite hasnt set asyncio parameters so its needed here.
+	sed -i '/[tool:pytest]/,/^$/ { s/addopts.*/asyncio_mode = auto/ }' setup.cfg || die
+
+	default
+}
+
+src_test() {
+	local es_port="25124"
+
+	export ES_DIR="${WORKDIR}/elasticsearch-${PV}"
+	export ES_INSTANCE="gentoo-es-py-test"
+	export ELASTIC_PASSWORD="changeme"
+	export ELASTICSEARCH_URL="https://elastic:${ELASTIC_PASSWORD}@localhost:${es_port}"
+
+	# Default behavior sets these depending on available memory.
+	# On my system its not reliable and leads to an instant OOM :D
+	# So lets add a reasonable limit
+	export ES_JAVA_OPTS="-Xmx4g"
+
+	cat > "${ES_DIR}/config/elasticsearch.yml" <<-EOF || die
+		# Run elasticsearch on custom port
+		http.port: ${es_port}
+		cluster.routing.allocation.disk.threshold_enabled: false
+		bootstrap.memory_lock: true
+		node.attr.testattr: test
+		repositories.url.allowed_urls: http://snapshot.test*
+		action.destructive_requires_name: false
+		ingest.geoip.downloader.enabled: false
+
+		xpack.license.self_generated.type: basic
+		xpack.security.enabled: true
+		xpack.security.http.ssl.enabled: false
+	EOF
+
+	# Set password in keystore
+	printf "y\n${ELASTIC_PASSWORD}\n" | ${ES_DIR}/bin/elasticsearch-keystore add "bootstrap.password" || die
+
+	local es_instance="gentoo-py-test"
+	local es_log="${ES_DIR}/logs/${es_instance}.log"
+	local es_temp="${T}/es_temp"
+	local pid="${ES_DIR}/elasticsearch.pid"
+
+	mkdir ${es_temp} || die
+
+	ebegin "Starting Elasticsearch for ${EPYTHON}"
+
+	# start local instance of elasticsearch
+	"${ES_DIR}"/bin/elasticsearch -d -p "${pid}" \
+			-Ecluster.name="${es_instance}" -Epath.repo="${es_temp}" || die
+
+	local i es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${es_log} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ ${es_started} -eq 0 ]] && die "Elasticsearch failed to start"
+
+	distutils-r1_src_test
+
+	pkill -F ${pid} || die
+}
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
index 1a503ccb9695..33f4eceeff9e 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,2 +1 @@
-DIST eradicate-2.2.0.gh.tar.gz 8808 BLAKE2B 34d1db824f6288d5da5cdc868045d899041b219e4918f5e838c066eb4e9903c2951c7cdded56c7c5455336940c212eb3e68ae61b9e090f497c3e6ef199f71e80 SHA512 80b7dd60004a5f4279a87c692b63de1b340c68d1379d975ef660130a649acbc03a5c5d6db935c782b84bbc7c2ab50b0ada2a172eafce1945113b3bccfb8055b5
 DIST eradicate-2.3.0.gh.tar.gz 8792 BLAKE2B 586989144ca69637ea769b90a72afa68eb4392e2b467d3a97f9adfc91d45d3f5be6ea6c8f00f0aa8307b52bca7243fd12e3eaad178ad3859918d137275d447c0 SHA512 b31f59b5785aa57fa55c329bfce430e8ade5de870bbe99585ff59e68fdd33bb312e49ecd72873780e47e09f713ebbaa929bd6981bf2800f858def80a9c03a8ec
diff --git a/dev-python/eradicate/eradicate-2.2.0.ebuild b/dev-python/eradicate/eradicate-2.2.0.ebuild
deleted file mode 100644
index 8f44d95d91c4..000000000000
--- a/dev-python/eradicate/eradicate-2.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Removes commented-out code from Python files"
-HOMEPAGE="
-	https://github.com/wemake-services/eradicate/
-	https://pypi.org/project/eradicate/
-"
-SRC_URI="
-	https://github.com/wemake-services/eradicate/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/eradicate/eradicate-2.3.0.ebuild b/dev-python/eradicate/eradicate-2.3.0.ebuild
index 0ee0a07f33fc..0379d6dc9fee 100644
--- a/dev-python/eradicate/eradicate-2.3.0.ebuild
+++ b/dev-python/eradicate/eradicate-2.3.0.ebuild
@@ -10,16 +10,16 @@ inherit distutils-r1
 
 DESCRIPTION="Removes commented-out code from Python files"
 HOMEPAGE="
-	https://github.com/wemake-services/eradicate/
+	https://github.com/PyCQA/eradicate/
 	https://pypi.org/project/eradicate/
 "
 SRC_URI="
-	https://github.com/wemake-services/eradicate/archive/${PV}.tar.gz
+	https://github.com/PyCQA/eradicate/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/eradicate/metadata.xml b/dev-python/eradicate/metadata.xml
index 8607e5367e1e..a504aadb5830 100644
--- a/dev-python/eradicate/metadata.xml
+++ b/dev-python/eradicate/metadata.xml
@@ -12,6 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">eradicate</remote-id>
-		<remote-id type="github">wemake-services/eradicate</remote-id>
+		<remote-id type="github">PyCQA/eradicate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 43b30944a0a1..f02a8f3133c8 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,3 +1,5 @@
 DIST execnet-1.9.0-pytest-7.2.patch 11177 BLAKE2B 6d6d0c76de606305ed0ca4f0f52d5ccc0cc3ab99d795ac2f4d39d3804cd5c0191f75704ee5eafcd135dc9854eef99a59dbd9cf57a8455b6b9cd45f2612fbcdba SHA512 ae16b3127545efe77a49392836a8940a053967e530a6288660a39edba9b35b448d0061ac7ac751c3be68de2cf5410655c2db55d344519f69db7c9ed4f7ca0003
 DIST execnet-1.9.0.tar.gz 173884 BLAKE2B 622a1f47365bdea97ba53aee908faf990ef847e3641ab0590073cdd6eac3413d1517f16e8e5b73b56884f02aebb3142691ecf6113e14f9c49c9b0fef3ee3247c SHA512 d425e7b6f3708efecb5dfa2c36a837cb55f2c32cf2ec0c1dc11cd1ca6ea614d119d04908b84dd5a3593c87db35e71fee202f843665c853ac3538479f60c83d60
 DIST execnet-2.0.0.gh.tar.gz 172932 BLAKE2B ad2ef83db08457e403bf568dbcd01975dbec6c20785b970860c04ba84887db3b83ca5d234341556aa33451052d082ebf9fe7a89ac6dfeab2868f9cb76a520969 SHA512 bde07713ed4f85b8de85e42c87d5bde062c0ac90defc87b9a3ec56cb210b445f06dce8e586c6ee764c45ab1f8947f330481e43921096cca9d987449d704c9988
+DIST execnet-2.0.1.tar.gz 160812 BLAKE2B 0e354b1630696faff7bc56f925a14797119f0480b5784f37154fed1bdf5e9541c6ccf73c805556d6b317d4d9c9b9b39714e187342c8a1a06a64b3efdc665f31e SHA512 422fdaa8173b3f41763738b64045583fd887d17fbacda921316d01c7a7082ed9447cdb85d3d42ee5ce8bff5917ee8d8a588c9e3caab8bd434606890effd284b2
+DIST execnet-2.0.2.tar.gz 161098 BLAKE2B 2a0a4d3071a0436d7c6ec450f1b502047e6a367985771aa58050e149ea060e8a573844bd2380c66be914dd00e3f9491b126e84089006787c61c043116f9e5981 SHA512 9e2e7ff4e04f50b12a3dd47d3326a3ea229f64926e8598bdce6ea25bd57afb41e96249e1c9f7333927a38a2793f67cac77965c922980055ed758dee361bf2ce4
diff --git a/dev-python/execnet/execnet-2.0.1.ebuild b/dev-python/execnet/execnet-2.0.1.ebuild
new file mode 100644
index 000000000000..ac5bcec67f3d
--- /dev/null
+++ b/dev-python/execnet/execnet-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Rapid multi-Python deployment"
+HOMEPAGE="
+	https://codespeak.net/execnet/
+	https://github.com/pytest-dev/execnet/
+	https://pypi.org/project/execnet/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	epytest testing
+}
diff --git a/dev-python/execnet/execnet-2.0.2.ebuild b/dev-python/execnet/execnet-2.0.2.ebuild
new file mode 100644
index 000000000000..ac5bcec67f3d
--- /dev/null
+++ b/dev-python/execnet/execnet-2.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Rapid multi-Python deployment"
+HOMEPAGE="
+	https://codespeak.net/execnet/
+	https://github.com/pytest-dev/execnet/
+	https://pypi.org/project/execnet/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	epytest testing
+}
diff --git a/dev-python/filelock/filelock-3.12.2.ebuild b/dev-python/filelock/filelock-3.12.2.ebuild
index 5395bafa0b35..3c3133872209 100644
--- a/dev-python/filelock/filelock-3.12.2.ebuild
+++ b/dev-python/filelock/filelock-3.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/fqdn/fqdn-1.5.1-r2.ebuild b/dev-python/fqdn/fqdn-1.5.1-r2.ebuild
index c4e524ec9f38..e0722ebec285 100644
--- a/dev-python/fqdn/fqdn-1.5.1-r2.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/fritzconnection/Manifest b/dev-python/fritzconnection/Manifest
index c7fdebe02360..ddd1824abbf5 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1 +1,2 @@
 DIST fritzconnection-1.12.0.gh.tar.gz 156938 BLAKE2B 731715514036a965fa8c9cf8bb808459f22a0c6b2df171c105f1d12f070eae8d6a36a0e77e9a35a024585f682b7c84f2a486006e670655a3b16b043695c57818 SHA512 b743810a24d39be34910e233faae0061974de540e746e88b2f63c1f3d5536e9de684862b02738f969e294ae2b6044d0994e1b9317e6a723b5acf9540d2995c12
+DIST fritzconnection-1.12.2.gh.tar.gz 157170 BLAKE2B 9d924ad3146361d9301f10154152cdf98987572880b79052bf9f2fa427fc8410bacae92e49219dd11372c2cce2d03fb0ffd4c732a45e210a05a0a561ba5fc155 SHA512 a9c62fdaa59f20e7661836888f49cadfc99d192c393f34d4cce59aa9b9a9eda162e25029933854e84de44e08190190f312bb3862d708e79d7cf1ee8496726eab
diff --git a/dev-python/fritzconnection/fritzconnection-1.12.2.ebuild b/dev-python/fritzconnection/fritzconnection-1.12.2.ebuild
new file mode 100644
index 000000000000..4f3353259b28
--- /dev/null
+++ b/dev-python/fritzconnection/fritzconnection-1.12.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
+HOMEPAGE="
+	https://github.com/kbr/fritzconnection/
+	https://pypi.org/project/fritzconnection/
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	>=dev-python/requests-2.22[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# flaky (relies on time.sleep(0.01) magically being sufficient)
+	fritzconnection/tests/test_fritzmonitor.py::test_terminate_thread_on_failed_reconnection
+)
diff --git a/dev-python/h5py/h5py-3.9.0.ebuild b/dev-python/h5py/h5py-3.9.0.ebuild
index 3a05f261d241..00828930298e 100644
--- a/dev-python/h5py/h5py-3.9.0.ebuild
+++ b/dev-python/h5py/h5py-3.9.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
index 3f024404d3b0..0b9007fcc258 100644
--- a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
+++ b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
diff --git a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
index b5ac8ea6c474..b79b4f409c3b 100644
--- a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
+++ b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/setuptools-scm-6.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
index 09c22ff73087..b66ae29a2500 100644
--- a/dev-python/hypercorn/Manifest
+++ b/dev-python/hypercorn/Manifest
@@ -1 +1,2 @@
 DIST hypercorn-0.14.3.gh.tar.gz 154930 BLAKE2B da827d586307ace6ef9ddb8ca4046ebc5c745df1d48152ed78b948751a7d472c73d5f8310e58266158af4739e14f2960a46c2e7fc7f12bf7629a3edb3821b58f SHA512 f0d69ab1883379058112907547e6f89a4a7114d7f4851b92f0c465d73def9cc15508e3981bda7e66ce3c00e896f7fb221b3dcd8bee6a51d8429572b678b7ade8
+DIST hypercorn-0.14.4.gh.tar.gz 156001 BLAKE2B 262cbaba3df674b07dd5f6c15418cac18b46c2303a8ff616c8d2e968ff233d15bf616f2d3d0dbacda03f819251453be1b00cee4b98fdfaaed49f40cdcfb43119 SHA512 461b6fab72586b3bdea25ded6c0439595a8f84d5fb0b1a264f976926d9d34cb21f52bd10c84b9180d08fb05942f9fdb842343d4c6c476dcd60a26399387a2373
diff --git a/dev-python/hypercorn/hypercorn-0.14.4.ebuild b/dev-python/hypercorn/hypercorn-0.14.4.ebuild
new file mode 100644
index 000000000000..cb1241731e13
--- /dev/null
+++ b/dev-python/hypercorn/hypercorn-0.14.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A ASGI Server based on Hyper libraries and inspired by Gunicorn"
+HOMEPAGE="
+	https://github.com/pgjones/hypercorn/
+	https://pypi.org/project/hypercorn/
+"
+SRC_URI="
+	https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/h11[${PYTHON_USEDEP}]
+	>=dev-python/h2-3.1.0[${PYTHON_USEDEP}]
+	dev-python/priority[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.1.0[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+	>=dev-python/wsproto-0.14.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--no-cov-on-fail::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/idna/idna-3.4.ebuild b/dev-python/idna/idna-3.4.ebuild
index 6e5c6da369f6..a6ed17f15814 100644
--- a/dev-python/idna/idna-3.4.ebuild
+++ b/dev-python/idna/idna-3.4.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 359681bb8684..73106565afb6 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1 @@
-DIST ipython-8.13.2.tar.gz 5467542 BLAKE2B dd924954c93eadc844e75cbfe95627f84120a120a7f69a2bd767c8506fe95ddac912ec9e55cad9ed1149369aec699e0e159f02b7a69ea4ec041e4af6677355ee SHA512 43bbc1669dffad690ee34c0455ca8ea66d30d6249d5c743c7cc100c0a218408761bce9cb798333bf7e7b0c03507009bcb8e1550bcd5be71680f30f822f9376bd
 DIST ipython-8.14.0.tar.gz 5470735 BLAKE2B 9789b49b771e69439f957ff85d81f40e6511f4440e2372cac881c708503a5ce1c22e9f1fac45828ee723d1bd9b9ee4684c475d08ed96ed98396faf1400b802af SHA512 94fe14fd914fa81fdb8e370cf0fe7bfb4286be1972b4499ed96e9bf7d018e89f586f3386269e1dafc4a2bc279df7980635bd748799639d6020f52c1cc8af6702
diff --git a/dev-python/ipython/ipython-8.13.2.ebuild b/dev-python/ipython/ipython-8.13.2.ebuild
deleted file mode 100644
index c399e508ae51..000000000000
--- a/dev-python/ipython/ipython-8.13.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature pypi virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.9)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version virtual/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.14.0.ebuild b/dev-python/ipython/ipython-8.14.0.ebuild
index 2c3e6178debf..25ecc219a8b9 100644
--- a/dev-python/ipython/ipython-8.14.0.ebuild
+++ b/dev-python/ipython/ipython-8.14.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index a7bed643d752..e981fb65c839 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,2 +1 @@
-DIST iso8601-1.1.0.tar.gz 12836 BLAKE2B 7860d52002008a76c1d28ae94abe5100c3ea434f8e19dcb677dfc84366e898d2d277d88e6591d663579281c4ee668e77db96fd586edbe8b027433844462071e9 SHA512 f3f9621863abcbcde467d38416391cd8c98f59b7b863845b670e11060f0f81bcf4979fadc51c19eb55a5fe44ee1af922976b11cc97bf7b2dc090a485ad9979ac
 DIST iso8601-2.0.0.tar.gz 6497 BLAKE2B 6c25a267e35afe1c0d879fd4be5f3c6e47750b4faf70f9238767e8ad901fb2da9b823dab9a3f3e26ccec843a4f993a331f6f7c616f98fd1520a5e4d16268060a SHA512 786bd2604cedeba8bfaa3ca0077057540fc898d9f942627958955406705f104c2109f20c84dfc79674178dfaf4bd0936b4e7759024c7f4b8ed130e40bbfc3c07
diff --git a/dev-python/iso8601/iso8601-1.1.0.ebuild b/dev-python/iso8601/iso8601-1.1.0.ebuild
deleted file mode 100644
index d6dcf0a800fe..000000000000
--- a/dev-python/iso8601/iso8601-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="
-	https://github.com/micktwomey/pyiso8601/
-	https://pypi.org/project/iso8601/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iso8601/iso8601-2.0.0.ebuild b/dev-python/iso8601/iso8601-2.0.0.ebuild
index 06e35ce294fe..d6dcf0a800fe 100644
--- a/dev-python/iso8601/iso8601-2.0.0.ebuild
+++ b/dev-python/iso8601/iso8601-2.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/isoduration/isoduration-20.11.0-r1.ebuild b/dev-python/isoduration/isoduration-20.11.0-r1.ebuild
index cc5fa3f62a0a..9f3939e12bef 100644
--- a/dev-python/isoduration/isoduration-20.11.0-r1.ebuild
+++ b/dev-python/isoduration/isoduration-20.11.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 40579d74960d..ed6162901425 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1 +1,2 @@
 DIST jaraco.classes-3.2.3.tar.gz 9416 BLAKE2B 00de6548b746d2e6136572d2bcbc8a9c3e6f6570a02ee27e679e6bab7b9f4b8a327acf2b8854045b5348df8760763a7bc52fedb0b3504629ceced3dd3b4588ad SHA512 73fe80de5c50b553efee6aa51fff98e30e72dcb4167b6056628d3cbbb897e29abde4fa9da79a2b413830d8440055a43ea97ace4daa62853d874419cb36c43fee
+DIST jaraco.classes-3.3.0.tar.gz 10729 BLAKE2B 05791a799e4d5bbce94b111e7acc922f46cf2eb409c6043f997482960ad3b4a29b0d2f9afc7f1fdc07363f0a0b6403077d685831baf909ecd93adac71611ac30 SHA512 8099c85c93ed0eff37b1f870e2577b20488dea7b10273c00a89b43c0ef759c17c9a835916eef0fd97b3944bc5cd50b32e1393ac7c80cf7c7bfd1ee0d639d16cf
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.3.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.3.0.ebuild
new file mode 100644
index 000000000000..8361111ba64e
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-3.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.classes/
+	https://pypi.org/project/jaraco.classes/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jsonpointer/jsonpointer-2.4.ebuild b/dev-python/jsonpointer/jsonpointer-2.4.ebuild
index dd47ece3db1d..ad0c491b31c5 100644
--- a/dev-python/jsonpointer/jsonpointer-2.4.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonschema-spec/Manifest b/dev-python/jsonschema-spec/Manifest
index 8114994cbf52..ab6e522adeda 100644
--- a/dev-python/jsonschema-spec/Manifest
+++ b/dev-python/jsonschema-spec/Manifest
@@ -1,6 +1,2 @@
-DIST jsonschema-spec-0.1.4.gh.tar.gz 30903 BLAKE2B eae7ba8b811dfd14d9b2e33d3355bf8c98e088b1a8fa3314300dcc7edae31727cc5a01d0a06af412b8c7d59eca69ba816f6eb2683e997719fd300a3445e96cfd SHA512 6b3d1710fdd8c43a0f38d0687c95e4e70c55df964dc597e4a00abad3459610829bd90190b21c512c70d46498d98b80ecc2422eb73d7822539841ff10bc7c2c4f
-DIST jsonschema-spec-0.1.5.gh.tar.gz 36035 BLAKE2B 4e6019fb1c7f5e85a03488e00ef080798bc6e3e06999d9c9c931072c640fd74b5125882e43dca26bad1acc3bdacb06a26f2c95dff25339e3f8b785d759085a49 SHA512 c76b15a3ead9498696c80cf7a378a675194837f04cd88d81be5213a38cde8177d5e8f7866d007648b7013db74d1057b700b027a79bcd893b0d493269abcd621d
 DIST jsonschema-spec-0.1.6.gh.tar.gz 36043 BLAKE2B e85cad336d6b5ed11d6a51c8fab2c28826f6a9836ad50d2423b23bef047c338307d3e9430f1d151dbaf7a92574c9899dbfd016c570456996250e8d7634373313 SHA512 78ea06a78fd25006d270e2c5033645133ee79b0f45cbfc54e250d4225a36beac59cf9aa92f15fd51bd101fac20fee990d693ab91d8343cd6a298d71735c80884
-DIST jsonschema-spec-0.2.0.gh.tar.gz 37210 BLAKE2B 44892638371f8ed9074c997e0590594a55a4a00bb0f88bbe535021726f1de6b961825a710c7f1ed63081c5ee7d252bc4f5bcc2cb462ded71ecb492625876c811 SHA512 6bc9f50f9132a72243df1a20d16d049ca1413904fba5403fb780663c0819ae3be8dfd51efada84118e34e157e95475e375df9c6ce1e1930c72c6d45dc71d4d04
-DIST jsonschema-spec-0.2.1.gh.tar.gz 37242 BLAKE2B 8e1b2c4e44052fba0e78cefdf0a60a1e14adbe9f0027464d87e635bac7bb2ce1aefe65c92a1224877128ee23505402f199aca119cd48769d9149d57b5f9ec7ea SHA512 1d1769e301f60c2b2a1e7b413e5d1081f3e069bf29ad12d5e3c4b0c91094c8e78f44b01642a9a58f229e5efe69db14276cf067d9dad37d53c8a35368bd62d6d6
-DIST jsonschema-spec-0.2.2.gh.tar.gz 37188 BLAKE2B 05f740f36bf93da99e88167b054883c39cea05cc5271722cd25ab345da5c6a63aa3dcea0af370686e227af3eabe39e01ec196ae90452c4d2814828d7acb35400 SHA512 25bd6cd2a7ab8f40e05a78ec4b69601cee7cb9c22c43eaeb66777b991249f4314eb27038ee6ec1f8b7e15c782385ef604e4454179ef6a2307c1a73731f72a021
+DIST jsonschema-spec-0.2.3.gh.tar.gz 37245 BLAKE2B e487b9e22d502dc1dbfa2957a28b8ea39b5809f7dcfc4d7f787d46727025528bf946d0576e0a1c530c56d8f80d09401c7bd565dee5af74838db5df0da3f9de11 SHA512 6de68cfa9aeda77cb68ad0d15cb87dd6298bf178424ea40e3009d78a9a5a5ee66443560a0d99521d02e2fbfcecbd081b24d1dd7dee216eaea1fffbd8f7a71e8a
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.1.4.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.1.4.ebuild
deleted file mode 100644
index 6daee2a6a03c..000000000000
--- a/dev-python/jsonschema-spec/jsonschema-spec-0.1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="JSONSchema Spec with object-oriented paths"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema-spec/
-	https://github.com/p1c2u/jsonschema-spec/
-"
-SRC_URI="
-	https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/pathable[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	dev-python/pathable[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.1.5.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.1.5.ebuild
deleted file mode 100644
index 11106a6a143e..000000000000
--- a/dev-python/jsonschema-spec/jsonschema-spec-0.1.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="JSONSchema Spec with object-oriented paths"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema-spec/
-	https://github.com/p1c2u/jsonschema-spec/
-"
-SRC_URI="
-	https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/pathable[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	dev-python/pathable[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	# remove impossible constraint
-	sed -i -e '/typing.extensions/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.1.6.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.1.6.ebuild
index 4c1b2bdda25c..38e3d84989ef 100644
--- a/dev-python/jsonschema-spec/jsonschema-spec-0.1.6.ebuild
+++ b/dev-python/jsonschema-spec/jsonschema-spec-0.1.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.2.0.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.2.0.ebuild
deleted file mode 100644
index 175114048014..000000000000
--- a/dev-python/jsonschema-spec/jsonschema-spec-0.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="JSONSchema Spec with object-oriented paths"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema-spec/
-	https://github.com/p1c2u/jsonschema-spec/
-"
-SRC_URI="
-	https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.24.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.3.4[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	# remove random pins due to caret operator
-	sed -i -e 's:\^:>=:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.2.1.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.2.1.ebuild
deleted file mode 100644
index b787a5095c32..000000000000
--- a/dev-python/jsonschema-spec/jsonschema-spec-0.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="JSONSchema Spec with object-oriented paths"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema-spec/
-	https://github.com/p1c2u/jsonschema-spec/
-"
-SRC_URI="
-	https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.1[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.3.4[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	# remove random pins due to caret operator
-	sed -i -e 's:\^:>=:' -e 's:,<[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.2.2.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.2.3.ebuild
similarity index 100%
rename from dev-python/jsonschema-spec/jsonschema-spec-0.2.2.ebuild
rename to dev-python/jsonschema-spec/jsonschema-spec-0.2.3.ebuild
diff --git a/dev-python/jsonschema-specifications/jsonschema-specifications-2023.6.1.ebuild b/dev-python/jsonschema-specifications/jsonschema-specifications-2023.6.1.ebuild
index a90660e4135f..4a8d6fc88665 100644
--- a/dev-python/jsonschema-specifications/jsonschema-specifications-2023.6.1.ebuild
+++ b/dev-python/jsonschema-specifications/jsonschema-specifications-2023.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/referencing-0.28.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/jsonschema-4.17.3.ebuild b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
index 8d64b4312be7..a28c42f8a56c 100644
--- a/dev-python/jsonschema/jsonschema-4.17.3.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/jsonschema-4.18.0.ebuild b/dev-python/jsonschema/jsonschema-4.18.0.ebuild
index b4ab8fb92591..daf147af3297 100644
--- a/dev-python/jsonschema/jsonschema-4.18.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.18.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kaptan/kaptan-0.5.12-r2.ebuild b/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
deleted file mode 100644
index 69f896f1ed81..000000000000
--- a/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Configuration manager in your pocket"
-HOMEPAGE="https://github.com/emre/kaptan"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND=">=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/kaptan/kaptan-0.5.12-r4.ebuild b/dev-python/kaptan/kaptan-0.5.12-r4.ebuild
index 3478ab2f6edb..0cf70651ff58 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r4.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
diff --git a/dev-python/lark/lark-1.1.5.ebuild b/dev-python/lark/lark-1.1.5.ebuild
index eb916b56c3f6..ebc8caa6fd91 100644
--- a/dev-python/lark/lark-1.1.5.ebuild
+++ b/dev-python/lark/lark-1.1.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/markdown-exec/markdown-exec-1.6.0.ebuild b/dev-python/markdown-exec/markdown-exec-1.6.0.ebuild
index dbc2b3efc408..dcd59b62a3f2 100644
--- a/dev-python/markdown-exec/markdown-exec-1.6.0.ebuild
+++ b/dev-python/markdown-exec/markdown-exec-1.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="ansi"
 
 RDEPEND="
diff --git a/dev-python/markdown-include/markdown-include-0.8.1.ebuild b/dev-python/markdown-include/markdown-include-0.8.1.ebuild
index 1983e613780b..49aca9e16365 100644
--- a/dev-python/markdown-include/markdown-include-0.8.1.ebuild
+++ b/dev-python/markdown-include/markdown-include-0.8.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND=">=dev-python/markdown-3.0[${PYTHON_USEDEP}]"
 BDEPEND=">=dev-python/setuptools-scm-6.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 296464c32ad0..9f00f05603fb 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,3 +1,4 @@
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670
 DIST matplotlib-3.7.1.tar.gz 38003777 BLAKE2B a387d23b58e09011cd3ae1f8c0ebf5dd8c04c8c15c1f6453c92cd22b2439fcabcf384f39ae8d2d2c6b7d2645817cd57a60856a4c05728e8f8aff9dd163af5083 SHA512 d7db4213d5b38eba779ba06ffaa8e67a435192e4a8cf62f8e1cd4b8079cd257b2e83cb79926df012b7084c785c0ce8b03275035f68cfcf0a36b0dda7322f2e67
+DIST matplotlib-3.7.2.tar.gz 38095843 BLAKE2B e26e78ce3a27604ff3d0f4d280798715b21a89104908e4fa66f96e32152d61f4f640e02e1eb2327563c71f3391c03716b5f6a1e769a07725d02c042b21973a4a SHA512 3ddb223c869c01cf71ab65a628a3c996eed1ff8b2375c02e3158a5750652a5d8277a55706e50890c15c14c7a104db01f01b01ca8964f85b6ffec104fc273872d
diff --git a/dev-python/matplotlib/matplotlib-3.7.2.ebuild b/dev-python/matplotlib/matplotlib-3.7.2.ebuild
new file mode 100644
index 000000000000..6bf2c0bcf481
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.7.2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic multiprocessing prefix pypi
+inherit toolchain-funcs virtualx
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="
+	https://matplotlib.org/
+	https://github.com/matplotlib/matplotlib/
+	https://pypi.org/project/matplotlib/
+"
+SRC_URI+="
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)
+"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+#
+# <pyparsing-3.1.0 for https://github.com/matplotlib/matplotlib/issues/26152
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
+	<dev-python/pyparsing-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	virtual/imagemagick-tools[jpeg,tiff]
+	$(python_gen_cond_dep '
+		dev-python/importlib-resources[${PYTHON_USEDEP}]
+	' 3.9)
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+distutils_enable_tests pytest
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+	# Affects installed _version.py, bug #854600
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+		"${FILESDIR}"/matplotlib-3.7.1-test.patch
+	)
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+	sed -i -e '/setuptools_scm/s:,<7::' setup.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+
+	unset DISPLAY # bug #278524
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = True
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	mkdir build || die
+	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by -Wdefault
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
+		tests/test_testing.py::test_warn_to_fail
+		# TODO?
+		tests/test_backend_qt.py::test_fig_sigint_override
+		# unhappy about xdist
+		tests/test_widgets.py::test_span_selector_animated_artists_callback
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/matplotlib/matplotlib/issues/23384
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
+	)
+
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+
+	esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	# speed tests up
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest --pyargs matplotlib -m "not network" \
+		-p xdist.plugin -n "$(makeopts_jobs)" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index b00cffcaf0ee..c41343c6b8c4 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,2 +1 @@
-DIST mdit-py-plugins-0.3.5.gh.tar.gz 59757 BLAKE2B bad78ec811d238bafd83c9d1bbd6e0bcac3b70cd87f52b215966e836d4c2a35715804fa1c7d3671de81713c4e169ad4bb6d9dcdf741f617544772d06f8e3ae56 SHA512 6cb153d8ccff8fa3f94731606ad5dd1c06954d95519ac77b6de477e04b878f84fb059052906bdea5d798be3de49733a909cb553107255a61cde6dd1c6c72d4d2
 DIST mdit-py-plugins-0.4.0.gh.tar.gz 62199 BLAKE2B d8e69022ecceed436cd28202406bd46e786d40d3527f1c2c9311c4c32c59a4806cde9dc386309976c185522dd6286aec2542dabd31e08b8d7322fd02ae07186d SHA512 cdcce7a3819120923b7725daae0bf7a833c4da4487c49ff1a067fecf7d5e8f7a7be2fae03f3b821c766d7d6ebed4a298755ad5edb00adf73300a76a5663d67d6
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
deleted file mode 100644
index 04d03fe831b1..000000000000
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of plugins for markdown-it-py"
-HOMEPAGE="
-	https://pypi.org/project/mdit-py-plugins/
-	https://github.com/executablebooks/mdit-py-plugins/
-"
-SRC_URI="
-	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.0.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.0.ebuild
index e3e5a9d87984..7db41515dbf8 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.0.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/markdown-it-py-4[${PYTHON_USEDEP}]
diff --git a/dev-python/mergedeep/Manifest b/dev-python/mergedeep/Manifest
index d0e48e169523..0c9f4a0278dc 100644
--- a/dev-python/mergedeep/Manifest
+++ b/dev-python/mergedeep/Manifest
@@ -1,2 +1 @@
 DIST mergedeep-1.3.4.gh.tar.gz 26627 BLAKE2B 334f5ec6948185e3f7758e079e65d92fb04dd3ae3bb208cb8fc67d2fd2d90ce16fecb28562d42eea75db978d9d323983efb85abbf7e5ff18e40c95fb066c47e7 SHA512 24cb1dbae9be715045b66b6d3a3c3deb98a41176ff2fae405f254baeebf5f45b69c948f7780b67762e613e20b5df3c5987e730c5cd91fe7dd1fbda6408906559
-DIST mergedeep-1.3.4.tar.gz 26627 BLAKE2B 334f5ec6948185e3f7758e079e65d92fb04dd3ae3bb208cb8fc67d2fd2d90ce16fecb28562d42eea75db978d9d323983efb85abbf7e5ff18e40c95fb066c47e7 SHA512 24cb1dbae9be715045b66b6d3a3c3deb98a41176ff2fae405f254baeebf5f45b69c948f7780b67762e613e20b5df3c5987e730c5cd91fe7dd1fbda6408906559
diff --git a/dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild b/dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild
index b25172f9aef1..b156286cf3b0 100644
--- a/dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild
+++ b/dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source \
diff --git a/dev-python/mergedeep/mergedeep-1.3.4.ebuild b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
deleted file mode 100644
index 8b479aa66472..000000000000
--- a/dev-python/mergedeep/mergedeep-1.3.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A deep merge tool for Python"
-HOMEPAGE="https://github.com/clarketm/mergedeep/"
-SRC_URI="https://github.com/clarketm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/alabaster dev-python/recommonmark
diff --git a/dev-python/mkdocs-gen-files/mkdocs-gen-files-0.5.0.ebuild b/dev-python/mkdocs-gen-files/mkdocs-gen-files-0.5.0.ebuild
index 3e74ddcb0c54..732770910ba6 100644
--- a/dev-python/mkdocs-gen-files/mkdocs-gen-files-0.5.0.ebuild
+++ b/dev-python/mkdocs-gen-files/mkdocs-gen-files-0.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND=">=dev-python/mkdocs-1.0.3[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/pytest-golden[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mkdocs-htmlproofer-plugin/mkdocs-htmlproofer-plugin-0.13.1.ebuild b/dev-python/mkdocs-htmlproofer-plugin/mkdocs-htmlproofer-plugin-0.13.1.ebuild
index 5bde85a5830f..57d2b7e4fa08 100644
--- a/dev-python/mkdocs-htmlproofer-plugin/mkdocs-htmlproofer-plugin-0.13.1.ebuild
+++ b/dev-python/mkdocs-htmlproofer-plugin/mkdocs-htmlproofer-plugin-0.13.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/manuzhang/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.ebuild b/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.ebuild
index e0e42827eeb2..578a81810428 100644
--- a/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.ebuild
+++ b/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.12.ebuild b/dev-python/moto/moto-4.1.12.ebuild
index 03ffd378c1bc..f4e8dab45b72 100644
--- a/dev-python/moto/moto-4.1.12.ebuild
+++ b/dev-python/moto/moto-4.1.12.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index c0a33b7f3079..cfde1ce9982a 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,3 +1,2 @@
-DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
 DIST munch-3.0.0.tar.gz 19276 BLAKE2B df7b8ee8ff807c2a1ca61974d70379623411db2229d176b890949aa3318f7b2ec1e108a340e55445751c46da24deb0f749d66fb69f9e10e92a04a01c766a73c6 SHA512 d08ac1b19badf0fb17f2dc81e53ab7492e49da225d8fa890fa9227df9d4e2bce395c7d7a8000f635529c1fb2a7eccd4eef10370b76e95b960955985b38003baf
 DIST munch-4.0.0.tar.gz 19089 BLAKE2B 17aba6f5ab3e2e532a9deb8623ef10aa569231e5457b96acacd7c11117db47afa82409f9bf8aa384a8207c23d4af1140dca6db27c73df05658b8ad3997ad071a SHA512 7beeee4d3fd084ac929e796cd62af097c2602a3ec06405f79b562bc6d14577350adbbe02848253c62f0938e706b9056799bfd5b9c2bdff6e559b3903b8cdca5c
diff --git a/dev-python/munch/munch-2.5.0-r2.ebuild b/dev-python/munch/munch-2.5.0-r2.ebuild
deleted file mode 100644
index 589c7c66c79d..000000000000
--- a/dev-python/munch/munch-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
-HOMEPAGE="
-	https://github.com/Infinidat/munch/
-	https://pypi.org/project/munch/
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-SLOT="0"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/munch/munch-3.0.0.ebuild b/dev-python/munch/munch-3.0.0.ebuild
index 8af92db348f0..6f40de5d58a0 100644
--- a/dev-python/munch/munch-3.0.0.ebuild
+++ b/dev-python/munch/munch-3.0.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index a25fec331cdd..342e016df60e 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,2 +1 @@
-DIST nbformat-5.8.0.tar.gz 140655 BLAKE2B e45b6fcc45fa01ceed49fba0b3a3fd749df6692e355156845cf69fd9d2e176332c61c89b5474ffa89d96da4d4453b668150e96ac266cddd254efdcb1a3b742a1 SHA512 f000db59701eec2fed8adba6c1b521bdfaf942bcd0dba2d8d6d79a7d28b078f4a29df05ca3f393c1651f3ddc6b3690f536928d6fff5937982cc52dd013bc6498
 DIST nbformat-5.9.0.tar.gz 140980 BLAKE2B e967ac0972dd2a5749694900002f9ada4171b5219249c3b6aa600fba97121aae0334516838c86b175064b0975a298fa9a1614dd2a458dd5d66ba832187731bd4 SHA512 c409feb3b6ae9b89b86d1c5e77a23a368776ccf9e62d606e2bb689927eca4d73c79a22e3f5e9e2beda78c201dc7485114e762872b305278c23c8129c7c65449b
diff --git a/dev-python/nbformat/nbformat-5.8.0.ebuild b/dev-python/nbformat/nbformat-5.8.0.ebuild
deleted file mode 100644
index 41d6dc238f8f..000000000000
--- a/dev-python/nbformat/nbformat-5.8.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbformat/
-	https://pypi.org/project/nbformat/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/fastjsonschema[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc \
-	dev-python/myst-parser \
-	dev-python/pydata-sphinx-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/nbformat-5.7.1-no-node.patch"
-)
-
-EPYTEST_IGNORE=(
-	# requires pep440 package, which is not really relevant for us
-	tests/test_api.py
-)
diff --git a/dev-python/nbformat/nbformat-5.9.0.ebuild b/dev-python/nbformat/nbformat-5.9.0.ebuild
index d4cb983ceb55..37335eb16943 100644
--- a/dev-python/nbformat/nbformat-5.9.0.ebuild
+++ b/dev-python/nbformat/nbformat-5.9.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/fastjsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 6f0a97691156..f10fe25c830c 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,2 +1 @@
-DIST nodeenv-1.7.0.gh.tar.gz 36209 BLAKE2B ff5853c04f9c442ffee883f7c981e574704c4ccbb37a8627257c4c7af3c86d70034a2e62b4bc6f4e7c6da32e0edb4f5b9216bf288f47991d9b42f21be454634f SHA512 1e3e4068591d51d8915de73ab0f82f04620ca628152ec5a454e7ad18001ff20b698f9818353c44b80200ab529d95fa3196a3dbc85f0c497ea49f60eaa5dc9ea7
 DIST nodeenv-1.8.0.gh.tar.gz 36750 BLAKE2B e75217bb0c468649cbc29688f29d62450008816fb07e4decf1b28dada8b820c2d6f70eb65444e06a8c64b8a816c0cc98f7d179e770eaefe93e87c0cda05e1f85 SHA512 96dce219e00d3837b2b0083af9fe6d94ed4e3cd029e3da564263ad8656dcb9c52440c2df6a6954095e5cacd03e44437f08695603dea82c28122713045183014f
diff --git a/dev-python/nodeenv/nodeenv-1.7.0.ebuild b/dev-python/nodeenv/nodeenv-1.7.0.ebuild
deleted file mode 100644
index 25fdbd3983a4..000000000000
--- a/dev-python/nodeenv/nodeenv-1.7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Node.js virtual environment builder"
-HOMEPAGE="https://github.com/ekalinin/nodeenv"
-SRC_URI="
-	https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
-
-# requires network access
-RESTRICT="test"
-PROPERTIES="test_network"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nodeenv/nodeenv-1.8.0.ebuild b/dev-python/nodeenv/nodeenv-1.8.0.ebuild
index 2df14840dbaf..42d7dcf80d02 100644
--- a/dev-python/nodeenv/nodeenv-1.8.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.8.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 5eb0b49cbb50..e13da7f134ae 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -3,3 +3,4 @@ DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B e48f65eab709f0c57ec378d813a7b65bcaca6d
 DIST numpy-1.24.3.tar.gz 10909904 BLAKE2B 3b14f8b6a7bd484de43c3b0e57f161388d6226e05ed9bc3d1edfaafc713b9597c7574b9b9c20b4e3a6bd291d32a607d95c72d6e25fa346ffdaf97c94767bc315 SHA512 d4b5841cbe68ee6653f99018e4e0182f2e5519a1cd69c14e0a95aa180f878e6a6786ccf0a7c78bf0d511c53e7535d7144fee428572dec7a4b60b25c8a1c0c9e1
 DIST numpy-1.24.4.tar.gz 10911229 BLAKE2B 2f054b4ede249653707c3df8ccf6df31b747c0625891ae6e01134f84b02d1300e1d7a88b5741e0e0f05218673d95374f263e5bfddbf17c9510aa93bac002eafc SHA512 89eb90548ad4f38cfe0a5077eef426058eed08ca17633024887e4d0ff5bdfe98736b1ad6850fe643bc0035d55ac4cd39b5971895eea9dcf247b5ff186654ed68
 DIST numpy-1.25.0.tar.gz 10426700 BLAKE2B 9a6c9b7e1172a21ec7cc3b2a0b292308ed7a859072ba73cac3c472cd60f45acd66032f24df19bddef8aa0aee7a243e21d3fa04b68f1383efc6af834cdc04b589 SHA512 e464d82bba0487f520ec7a820492343af5172e807e0f746688bbaff636a31947da62704ef0f35c74a46fb42332f4644f3c497d544789d22e5c01ca0823f82909
+DIST numpy-1.25.1.tar.gz 10428993 BLAKE2B ee3edaf5416ac858b995f0cb8df75962af01619969a2c70fa10b4e0d0a1c96a3b441ee470a463cdb7c60910d8823af1c41d37933f87bcaa0a724655d052ed20a SHA512 69cc5426f657a21a6a1fb3bb043b8acec90b87969f90177abb6d7294ca96d04f723ddf90fa40822704b16147a390abafbcda9702e40405ea6b6e22377aade71d
diff --git a/dev-python/numpy/numpy-1.24.4-r1.ebuild b/dev-python/numpy/numpy-1.24.4-r1.ebuild
index 2166e7e7a52d..1320287bdbe2 100644
--- a/dev-python/numpy/numpy-1.24.4-r1.ebuild
+++ b/dev-python/numpy/numpy-1.24.4-r1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 CPU_FLAGS_X86=( avx avx2 avx512dq avx512f avx512vl f16c fma4 popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3 xop )
 IUSE="lapack $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
diff --git a/dev-python/numpy/numpy-1.25.1.ebuild b/dev-python/numpy/numpy-1.25.1.ebuild
new file mode 100644
index 000000000000..2d4c86241ee9
--- /dev/null
+++ b/dev-python/numpy/numpy-1.25.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="lapack"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-util/meson-1.1.0
+	<dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.25.0_rc1-meson-pyproject.toml.patch
+	"${FILESDIR}"/${PN}-1.25.0-skip-python3.12-irrelevant-tests.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	append-flags -fno-strict-aliasing
+
+	distutils-r1_python_prepare_all
+
+	# TODO: Please drop once 1.25.0_rc1-meson-pyproject.toml.patch is gone
+	sed -i -e "s:version = \"2.0.0.dev0\":version = \"${PV}\":" pyproject.toml || die
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		-Dblas=$(usev lapack cblas)
+		-Dlapack=$(usev lapack lapack)
+	)
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very disk-and-memory-hungry
+		lib/tests/test_io.py::test_large_zip
+
+		# precision problems
+		core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# runs the whole test suite recursively, that's just crazy
+		core/tests/test_mem_policy.py::test_new_policy
+
+		typing/tests/test_typing.py
+	)
+
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		EPYTEST_DESELECT+=(
+			# TODO: crashed
+			lib/tests/test_histograms.py::TestHistogram::test_big_arrays
+		)
+	fi
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		EPYTEST_DESELECT+=(
+			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/numpy/numpy/issues/18388
+			core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
+			# https://github.com/numpy/numpy/issues/18387
+			random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
+			# more precision problems
+			core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+		)
+	fi
+
+	if [[ $(tc-endian) == "big" ]] ; then
+		# https://github.com/numpy/numpy/issues/11831 and bug #707116
+		EPYTEST_DESELECT+=(
+			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]'
+			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
+			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
+			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
+		)
+	fi
+
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
+			EPYTEST_DESELECT+=(
+				# too large for 32-bit platforms
+				core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
+				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
+				'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+				lib/tests/test_histograms.py::TestHistogram::test_big_arrays
+			)
+			;;
+		*)
+			;;
+	esac
+
+	rm -rf numpy || die
+	epytest -n "$(makeopts_jobs)" --pyargs numpy
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 6c856b3ba479..829635744809 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,2 +1,3 @@
 DIST openapi_schema_validator-0.4.4.tar.gz 11626 BLAKE2B e4247f07476d472761f46c98d9259383e960641b910334d967e61f55c63b855c752176e7217f8870016ec3767b0c1c45e8863ca600e354eb5aaa62bcacbe8d51 SHA512 273e3d7080c794ff277170e55e67e32d65211469642652437e59f985a002b20bd2cc8643d2b0214dc232980dd69c2f87ea748537552c66999a110b2e4be2125c
 DIST openapi_schema_validator-0.5.0.tar.gz 11996 BLAKE2B 91f4c51c1d44e363b5f4ca8c69c7836a6df3927d2db5f255b1cc81b97b2056b409becc6f5fb44c0fb82a11fb6a6de398ae49930fdcf77cdb1d88c998b75bf00f SHA512 4db13d63641f375d809501ca7f6efecbbdcc46e74fff1d06657e0c509e6e182c9b97a83031b7a9251e9897f5dd5620a29ddf932f7b8e191c3f78fd2adba5bc68
+DIST openapi_schema_validator-0.6.0.tar.gz 11849 BLAKE2B 34f3b0d0e301ff961d777c3a995906df396436da1b7c256c7bf4128ab2d48a05b38aaa362fa2b93b46e03fd176f43b6c585e1c4a3aab3e4baa81dc43cb6e8429 SHA512 ac90d424fcd8a416d395f8e74b3dfb51d2974ce74189e2d16ad4210ff0e7290b789c9e7268504c61aaad81f96c524e4fc3e595a856e26f7aee7df03f27e2fb2e
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.0.ebuild
new file mode 100644
index 000000000000..971c6180b461
--- /dev/null
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="OpenAPI schema validation for Python"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-schema-validator/
+	https://pypi.org/project/openapi-schema-validator/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-specifications-2023.5.2[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/oslo-utils/oslo-utils-6.2.0-r1.ebuild b/dev-python/oslo-utils/oslo-utils-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..f71d5c7f6d24
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-6.2.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.utils/
+	https://github.com/openstack/oslo.utils/
+	https://pypi.org/project/oslo.utils/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e '/tzdata/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}"/install -name '*eventletutils*' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/oslo-utils/oslo-utils-6.2.0.ebuild b/dev-python/oslo-utils/oslo-utils-6.2.0.ebuild
deleted file mode 100644
index c889c6445f5f..000000000000
--- a/dev-python/oslo-utils/oslo-utils-6.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.utils/
-	https://github.com/openstack/oslo.utils/
-	https://pypi.org/project/oslo.utils/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}"/install -name '*eventletutils*' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 1133f185f176..4fa85d2c6764 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,2 +1 @@
-DIST Pallets-Sphinx-Themes-2.1.0.tar.gz 21908 BLAKE2B 941aebe8b596b606ee02ee3d5e82019a09536175b7350484af5d072d5ce990271f93d1c9fcafbd33023145e23dacf2b844ccb117984b1262d073e2cff4b03f7d SHA512 3d2528cdc98a0da05410239875ff0295d4b68a15fce77890d6f1a6b4b59aee3f9c9b4c7e786b0945a8a7c549d24c1c206227ef751c1aa9fa90104509a912e167
 DIST Pallets-Sphinx-Themes-2.1.1.tar.gz 21776 BLAKE2B e43137bc6e545f0fc4977a4c724f739fdcfc234f0100b31f27c00f6abbc8cc7f7cc93b8beb9df0e576e6f4a65f52494685ecebf2db5362dc6ad7c9ad23552e11 SHA512 959e63970a3787ae58dc8418813ae490f3979cad4945d897594bcdca3bf15abde6d17364916a3a4d7f9803720d2b5dfee5adaad1d918f520b9954ccc5da136ec
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.0.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.0.ebuild
deleted file mode 100644
index cb930d8acd4c..000000000000
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=Pallets-Sphinx-Themes
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx themes for Pallets and related projects"
-HOMEPAGE="
-	https://github.com/pallets/pallets-sphinx-themes/
-	https://pypi.org/project/Pallets-Sphinx-Themes/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.1.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.1.ebuild
index cc5af10a9b71..9e9cac8fde83 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.1.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 814398b1d552..970ea4c8e21d 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,4 +1 @@
-DIST python-phonenumbers-8.13.11.gh.tar.gz 4910723 BLAKE2B 270ded8f0c009feb0ffe70bdcec089f400d1ea18ae24e3837b8f3a659657b82fb5912577eba22cb7c28a297dcbb55d402213c576857c514eb08c241af8bc1e4e SHA512 688b5440538cd6d636b645474dff51e4ba9a080708e4d3a9bdd5560701a9effbb26b9a669c632917101ea2e27a6f2ebe1f468fc0a881625ef33a4e30885ae30b
-DIST python-phonenumbers-8.13.13.gh.tar.gz 4912623 BLAKE2B 7b030b15861150564dbc640d3ee40f8db360b79427d5ca6ebd33ff350cde2505c592455722463e94a609b4487a6908b9a5359059b83a3a4fe4212483bbf9f2fe SHA512 fe2e2aae730b5df6f1b150d45b6e3cb5225327b653243fece186d22b1f4685d796f91c3dc462d3c2239d976b249d4756590f72c8ff4d007826e46b86f0acc36e
-DIST python-phonenumbers-8.13.14.gh.tar.gz 4912846 BLAKE2B 0d4bc37280e863a97a4b235db6c8ab2681bf4aac1ec18a7c6f4505ddf0143fd97685772c554e8270f6243e5a80548b0b0005ef27073f7d16f88a56442c0862aa SHA512 c6e07538f6a5c61f2d8d2bbbf26722af3548eff5aadd0b35898ad7eee62be010bca0386494b77cfcdcff414bafdb382d52944996d2b4a539c0ff3a572bf8d675
 DIST python-phonenumbers-8.13.15.gh.tar.gz 4912960 BLAKE2B aef5c2524f2ae122bc0b3846fed94c5d8fad219eab72ba1838baca7ce3e839510b2601b967cfdd1c26e5200f05821ef7892f7445074a09c3dde150f5ab4a8c08 SHA512 688425ee6a62b132b865580bd7615235357963c51a49333bf400d01877728374173ff674c82535f67c86c0abb39acbb4373b4760116c3161b5bb633efc6a9f32
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.11.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.11.ebuild
deleted file mode 100644
index f02dfcaeb112..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.13.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.13.ebuild
deleted file mode 100644
index 61f15b7f6118..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.14.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.14.ebuild
deleted file mode 100644
index 61f15b7f6118..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.15.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.15.ebuild
index 61f15b7f6118..de1b2859f7ea 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.15.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.15.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
index 560aa1783a6f..4d7adf7c4968 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	virtual/pkgconfig
diff --git a/dev-python/poetry-core/poetry-core-1.6.1.ebuild b/dev-python/poetry-core/poetry-core-1.6.1.ebuild
index b0e0141470ca..7930932b3f97 100644
--- a/dev-python/poetry-core/poetry-core-1.6.1.ebuild
+++ b/dev-python/poetry-core/poetry-core-1.6.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 # check inside src/poetry/core/_vendor/vendor.txt
 # (note that some are indirect deps)
diff --git a/dev-python/pygments-ansi-color/pygments-ansi-color-0.3.0.ebuild b/dev-python/pygments-ansi-color/pygments-ansi-color-0.3.0.ebuild
index da000ad8c707..0e77095c7cfb 100644
--- a/dev-python/pygments-ansi-color/pygments-ansi-color-0.3.0.ebuild
+++ b/dev-python/pygments-ansi-color/pygments-ansi-color-0.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/chriskuehl/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pygraphviz/pygraphviz-1.11.ebuild b/dev-python/pygraphviz/pygraphviz-1.11.ebuild
index 9e703e4cfba4..1c96e9caab70 100644
--- a/dev-python/pygraphviz/pygraphviz-1.11.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.11.ebuild
@@ -19,7 +19,7 @@ SRC_URI="$(pypi_sdist_url "${PN}" "${PV}" .zip)"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 DEPEND="
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 58c1c5ba4fa2..d87f4abd85e2 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1 @@
-DIST pylast-5.1.0.gh.tar.gz 40178 BLAKE2B f290afa72d71cb2f88793aaa31aa059a603375e91b310c3ca9180ed5626c589f3d91ae1961db15e256b01bd019b8e59dd48be45ff96683707c05ee9170dfed84 SHA512 64c71f5365638f3bdb435ac2d7405bd1e7a3ebe95fee97469c64bee63ad9850d45781756ebd59942c70780830fbb0519874908d2894e227acadedb5120c3b9ab
 DIST pylast-5.2.0.tar.gz 41137 BLAKE2B a7742bd2a23e281ab1a12d0198c74f1b5d8302700cb58490a5b3bff693098c8c3bf548ed52ca7f8cefecbcc10972c57da9ca04fe1d791141aacbb84ead9592ed SHA512 1ae76ff4ec6f009388abfcf8525f1c19e47cbabaace1f5e8c518819d0856168d855b789e3c08a9699dd7ab88ebfc7c3ab81c2d74a0fa1fd210450741b99da8c6
diff --git a/dev-python/pylast/pylast-5.1.0.ebuild b/dev-python/pylast/pylast-5.1.0.ebuild
deleted file mode 100644
index 0ca52750d20d..000000000000
--- a/dev-python/pylast/pylast-5.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="
-	https://pypi.org/project/pylast/
-	https://github.com/pylast/pylast/
-"
-SRC_URI="
-	https://github.com/pylast/pylast/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/httpx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pylast/pylast-5.2.0.ebuild b/dev-python/pylast/pylast-5.2.0.ebuild
index 51e6b2a6ab46..21d670a38c97 100644
--- a/dev-python/pylast/pylast-5.2.0.ebuild
+++ b/dev-python/pylast/pylast-5.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopenssl/pyopenssl-23.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-23.2.0.ebuild
index 80d9faec3657..cb1199a23c08 100644
--- a/dev-python/pyopenssl/pyopenssl-23.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-23.2.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	<dev-python/cryptography-42[${PYTHON_USEDEP}]
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index b86c93da8eb6..28509227a6f6 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -2,5 +2,6 @@ DIST pypdf-3.10.0.gh.tar.gz 7558639 BLAKE2B 4c3bc668ae750e1ff78837459704fa24fbc8
 DIST pypdf-3.11.0.gh.tar.gz 7560736 BLAKE2B 171c242e819cb417004aaba6341a38e8b89eec1346d6bdf899320da220f6368e38fee268ae2a90e308fd142c33411acf89a82bf00aa1220c9c697c052255e7a1 SHA512 f2f8d6e1035a8b2d14d6750c64e46e14b119324e08a3f808e5cacb7144c5c3ce3db65248010d13d520bc57915ea0f5f9a4b78db72ae430b46f614b2c0d5f7359
 DIST pypdf-3.11.1.gh.tar.gz 7560136 BLAKE2B fa6b415b2b98a5e4a8d67bfdf38a81922ddf724fdbb17581c035294565e7c953e9e9ad190dcdc4172ba78b6e8e7c7a4df008e6ca30f88337aad5ee04523e2b81 SHA512 061265b4263396c3a204a8741cd8200408ca0c00520b022d54acb10a2902ed61a54a7990d47c91a9b292653ef98005c00084f0d61f7e79b5e8f617896dbaa7bb
 DIST pypdf-3.12.0.gh.tar.gz 7560403 BLAKE2B 1595020104ee6d93027ad9ff3f58bbdec33c8f4a407a29ca110a01b506a5aaf0808d75d727099930abd98406a5cc7e66f3529974b5920a1ca4382ed02367dc51 SHA512 fa196aac50c24f3459725c77ca346b1ac2a7aa343ae1f2277a42401b5335dd4c7f827dafcd8aa8b099c72fe332107c091cc5fe476f593fdc9ea146aaa204cdcd
+DIST pypdf-3.12.1.gh.tar.gz 7561799 BLAKE2B 9f2ed1fe6767f5f7eace9ec05fda4dfee616628aed70becc9e748c65c686634153d42766169d02fc9c663835938d730e0d1b7f764dbffa42942cea2b40cfd921 SHA512 2262ed21547bf32db92491fbde57b10964a0267b369203c9f965974de01bd1017d9e7948076b728644fd16ef0fa36c628005812ed08cc69847704a42c40ace77
 DIST pypdf-sample-files-2cf1e75af7bcb9c097deae6fb112c715d4721744.gh.tar.gz 10226061 BLAKE2B a9b32d6cd3d22bbc0aee54ca3e914c4d2eb2a9a44a1a508e54e0a8fbcb5fad9ab05e72cf66553a1b5595131104ff22dea115d2804d2970200c4cf5f808532174 SHA512 f064f0468b07bf705a1d0f3a0fc6fe535c234a39408dca268f223e7c3548e66f599a4e67156e7848b70e9a3bd1bc2756395dd93b0c828ee08fe2bb8833f2b196
 DIST pypdf-sample-files-69b31cff6b183a42f9081709ef9bee4047976f56.gh.tar.gz 9044391 BLAKE2B 9a9bcfbacabf3c80073a440f54736728cba4ea92d1a817ce98bcaf9375340d95e453f45207f53ac878ef5c13bc4ca7d0d4488b79f205f396e960ed042680ca01 SHA512 32b4572d60a0aadba02485f11c84712c1f5f0a75f7acd6fb27f1df00cb2a8ae338a1001e6519f66c248efbd129aba1a2ad568e930ce90bd542c8dc58f383386a
diff --git a/dev-python/pypdf/pypdf-3.12.1.ebuild b/dev-python/pypdf/pypdf-3.12.1.ebuild
new file mode 100644
index 000000000000..daa02ffcff0c
--- /dev/null
+++ b/dev-python/pypdf/pypdf-3.12.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=2cf1e75af7bcb9c097deae6fb112c715d4721744
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/pypdf/
+	https://github.com/py-pdf/pypdf/
+"
+SRC_URI="
+	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[jpeg,jpeg2k,tiff,${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# rely on -Werror
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_orientations
+	# TODO: requires fpdf
+	tests/test_page.py::test_compression
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
+	fi
+}
+
+python_test() {
+	epytest -o addopts= -m "not enable_socket"
+}
diff --git a/dev-python/pyproject-api/metadata.xml b/dev-python/pyproject-api/metadata.xml
index 0441a08b409f..e625dc565153 100644
--- a/dev-python/pyproject-api/metadata.xml
+++ b/dev-python/pyproject-api/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">tox-dev/pyproject-api</remote-id>
 		<remote-id type="pypi">pyproject-api</remote-id>
diff --git a/dev-python/pyproject-api/pyproject-api-1.5.3.ebuild b/dev-python/pyproject-api/pyproject-api-1.5.3.ebuild
index 3bc4973c1714..9ba8d7e19cbd 100644
--- a/dev-python/pyproject-api/pyproject-api-1.5.3.ebuild
+++ b/dev-python/pyproject-api/pyproject-api-1.5.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index be6ec455e669..2ebcc8515143 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,2 +1 @@
-DIST pyroute2-0.7.8.tar.gz 418102 BLAKE2B 67485b52e579a4d73877ff62c772a2145896900ae86effea54b0a93c42eaef782548a9b74eb777f885be227a880afc6f7664464e71fd45e0862f317aea2c908e SHA512 0d4824dd21dda5efe19bc953265e75f07f8813a45e703e90fa0bae0765fd88205255b219b4ec1e0e4f399ce2a055e351fd98ae8c7ca14bda7312c3cfdef724e2
 DIST pyroute2-0.7.9.tar.gz 418877 BLAKE2B 0585af297a58d53ba8698f706e50860eba39ab3334e5d2de9b94d15485399f4429da234e0bc22695097fb90782d482283da304af9bd471749039741cde294734 SHA512 23fea1206a1b6345d05e338449414f3757021ec5cc739aed16cc390e48c62f42f6246838942dc1e3015462aba2ac8051936aad4ce6e76d57ff956046396ecd91
diff --git a/dev-python/pyroute2/pyroute2-0.7.8.ebuild b/dev-python/pyroute2/pyroute2-0.7.8.ebuild
deleted file mode 100644
index 2e7b56ef6b06..000000000000
--- a/dev-python/pyroute2/pyroute2-0.7.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library"
-HOMEPAGE="
-	https://github.com/svinota/pyroute2
-	https://pypi.org/project/pyroute2/
-"
-
-LICENSE="|| ( GPL-2+ Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-# tests need root access
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pyroute2/pyroute2-0.7.9.ebuild b/dev-python/pyroute2/pyroute2-0.7.9.ebuild
index 08784a0ce549..2e7b56ef6b06 100644
--- a/dev-python/pyroute2/pyroute2-0.7.9.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.7.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( GPL-2+ Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 # tests need root access
 RESTRICT="test"
 
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
index 9bf40ca401cc..c66dc498ff7f 100644
--- a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 7c7037110490..a8074906530d 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,2 +1 @@
-DIST pytest-check-2.1.4.tar.gz 24770 BLAKE2B 72973951e900276e771c083ad8869afbff5305c922c4cbc3fa02b302c6c72f24616ec89f25c2cbc7a2fbe333a4a8c00e2436a2f55345cc8b9791a1e5c2e64125 SHA512 8bf110f7c8e7d76c394ece5b6ba83cdf4ebc459d3a79541c5077237a1caecd0ecc82a74ebc796de9cbc921f48d1c739d1c40dcbd9c2efa3b1ab01f0234238bed
 DIST pytest_check-2.1.5.tar.gz 24990 BLAKE2B d7b09fe1f4b2932b4d9cfc12e0cc3a2c8082a97727cc6bec01f0db32b67af5860c8677749bf48068e496896fdf5a6beab57eb1fb39facddfb8defa995ff1ccfd SHA512 b3886f96db1ca20e4d337ea527e38e67faa1d79ace3c2cde2760ff66bc7fb5a77eeca2d3833a0abcf16e6f1f6922a82a8fddf7949ddf78e5238c9018761f2829
diff --git a/dev-python/pytest-check/pytest-check-2.1.4.ebuild b/dev-python/pytest-check/pytest-check-2.1.4.ebuild
deleted file mode 100644
index 417168c0b477..000000000000
--- a/dev-python/pytest-check/pytest-check-2.1.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-2.1.5.ebuild b/dev-python/pytest-check/pytest-check-2.1.5.ebuild
index 2b390b088d17..5a6eb521467d 100644
--- a/dev-python/pytest-check/pytest-check-2.1.5.ebuild
+++ b/dev-python/pytest-check/pytest-check-2.1.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-golden/pytest-golden-0.2.2.ebuild b/dev-python/pytest-golden/pytest-golden-0.2.2.ebuild
index 3ad9c0b434be..3087ff87091d 100644
--- a/dev-python/pytest-golden/pytest-golden-0.2.2.ebuild
+++ b/dev-python/pytest-golden/pytest-golden-0.2.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/oprypin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/atomicwrites-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 10602264b9d9..fc86437af047 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,2 +1 @@
-DIST pytest-mock-3.10.0.tar.gz 28384 BLAKE2B 2f51f8be34094054b8f7864eb083dde00800adb73af668444d21c95d8f159594bed0f68694e7ffb0e24da402a4865f37c07d85622ad00f130ccdb4e3d189bf9a SHA512 2ad6866d581a2999899e399ef5516d478a6172f52923f03703e3e3708229fb3b1178c91225b5cc90734c96abcb48fea517b11e0fc193da6fb592295395c14cd3
 DIST pytest-mock-3.11.1.tar.gz 31251 BLAKE2B 26655487947d614483f082f17c9f3a9fc2688c016d07c6d4c4e34c369f87f3d914cf82d966a655e1eee501088d27d711f1b65f0c777678254dcfffa5c8c7585f SHA512 f52147498657d35f4616ea788b500a68ffcf1c2c066047fb973308b54e11bd7fe5a3961115bab99ae6858000ebb68b35cc489e81221a0bd26afae8426092ff6b
diff --git a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
deleted file mode 100644
index a72e71fb4369..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_TESTED=( python3_{10..12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-mock/
-	https://pypi.org/project/pytest-mock/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# obsolete, upst. e2016928db1147a2a46de6ee9fa878ca0e9d8fc8
-	sed -i -e '/import py\.code/d' tests/test_pytest_mock.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
-	local EPYTEST_DESELECT=()
-
-	if has_version dev-python/mock; then
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_mock.py::test_standalone_mock
-		)
-	fi
-
-	epytest --assert=plain
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild
index fffc7a4e5350..21e83bfc0670 100644
--- a/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-6[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0-r1.ebuild b/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..8ec81faef350
--- /dev/null
+++ b/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="More descriptive parametrized-test IDs for py.test"
+HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-verbose-parametrize/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# The test suite is borked, some of the tests are extremely sensitive to Python
+# verbosity level whereas others act differently depending on whether the package
+# has previously been installed or not.
+RESTRICT="test"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0_collections-abc.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
index dfd7e0c4cbfe..76c14100eeb1 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0-r1.ebuild b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..b34374ec9df3
--- /dev/null
+++ b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="JSON RPC 2.0 server library"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-jsonrpc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND=">=dev-python/ujson-3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/${P}-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-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
deleted file mode 100644
index 17c068963632..000000000000
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Basic functions for handling mime-types in python"
-HOMEPAGE="https://github.com/dbtsai/python-mimeparse"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-python_test() {
-	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r4.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r4.ebuild
index 361b7cc7d68a..72a6b947fe2d 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r4.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index c7fb200a08f8..e75b49b7473e 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,4 +1 @@
-DIST python-utils-3.5.2.tar.gz 26883 BLAKE2B 9532d8fecd8d57a9a9f50e2e7e67386e4c5922f4ec316851544147f6da82586bb01796bb3e3fc95c894a790c57711c983d8da9abc5edc5a722089a0d86d7fb61 SHA512 2e36bbb2e43591744c63ea972b7f361138694eb32510643ea88e8d757882379e3aec247c2fc4d5c67876939b71d564570a975700728c79f9db0cc4fcbc1605e7
-DIST python-utils-3.6.0.tar.gz 28488 BLAKE2B 0426943a631ad68afafdbe603d14a32e179e58f8c45ac98248096de40bb67243196ca4498e1b908a25e213301e26d42f3f2c175cfa282c18b1db8f15b14385e6 SHA512 2d26e9c37f42d525640b9573cd794acb93e44a01d817e4c9ccf2d07261581dd16a04f38d245f97efb01952476fbc312e1831b5b617659787cbaac38692853bdd
-DIST python-utils-3.6.1.tar.gz 28460 BLAKE2B c4e4f640c6e402b3c308b6a7b3ac4cfd0f4ff8c6fe7553a87d263f697ced0da0b63aa6d8d7ff6a02af1974e32c644e214ddefa6bd0a5f272f37d65017d4fb009 SHA512 f7c6b3c5951c2902e94f3c17791178813695bcc15828ed52db6e071f9e08528a8202be1cff29bab2ce534e822f358cf41b8082fbf40db16e657b0b1c1dfa71a8
 DIST python-utils-3.7.0.tar.gz 29654 BLAKE2B ff306a2ee3e84585081f504ad50f117294698c75dd4d5015db6cf9326796d69aaf63365ac5bbedb3af4d41e4f18b7a05437860bf41cdb870e43f1ba75e92628c SHA512 df3b33dbf213c7099a5a17166ac1e01e9044bf6bb364de96a4b182831ff3216fe37edb7f94cb66f8d2fcab42cea404a9c4f27142890ae0e7510363815f47ad41
diff --git a/dev-python/python-utils/python-utils-3.5.2.ebuild b/dev-python/python-utils/python-utils-3.5.2.ebuild
deleted file mode 100644
index 0d1e8a55eba0..000000000000
--- a/dev-python/python-utils/python-utils-3.5.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.6.0.ebuild b/dev-python/python-utils/python-utils-3.6.0.ebuild
deleted file mode 100644
index 79f64316b1e5..000000000000
--- a/dev-python/python-utils/python-utils-3.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.6.1.ebuild b/dev-python/python-utils/python-utils-3.6.1.ebuild
deleted file mode 100644
index 79f64316b1e5..000000000000
--- a/dev-python/python-utils/python-utils-3.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.7.0.ebuild b/dev-python/python-utils/python-utils-3.7.0.ebuild
index 79f64316b1e5..e721347e8ccd 100644
--- a/dev-python/python-utils/python-utils-3.7.0.ebuild
+++ b/dev-python/python-utils/python-utils-3.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index 3ff009be94ea..dc4b12ac1b63 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -4,3 +4,4 @@ DIST pyupgrade-3.4.0.gh.tar.gz 62408 BLAKE2B a816cea1e2b17790312d4e17ec972a1e09a
 DIST pyupgrade-3.6.0.gh.tar.gz 62595 BLAKE2B a6622985e4b26bfb55cdeebd2323bd912289399bffa167b7d4ac1d16c11072b9b58793193febed31838d72691f3c6882914cd7005391f477a2ca6c78b808a33d SHA512 15b3ea59e0afbd5da0c2e7d60ed938d418107eb99cae7d2a5059fcea3f3ea69f451fed962cbdbb40655c39911c92f21bb9ace55f9b1bc65be2f8870b5b48acb8
 DIST pyupgrade-3.7.0.gh.tar.gz 62560 BLAKE2B 65715106db02e83f801b47aad5e48ba6e84cc42121298a210de8893752392ecbf99953fb6e0b7a2629b76e454523520794b7107226587d7dcfb46eecaad82439 SHA512 cd6b0a1516e91e1e8823333aaa314ca265387ea8dfb5739e428703f2dd798755126dc6269a5d253d6eaa3118d096945e9492f7f122ae306f6d5835b8aa9fa30f
 DIST pyupgrade-3.8.0.gh.tar.gz 62529 BLAKE2B d82a8670bd14294f3320f57643173e8e2963898133f38158902d6c6df01bd6859204a40b8f83ff533ca16ff583f3a739cbbba2a9c3a9205ffd796ba81f6cfbb6 SHA512 af04d68560fb520361ce42be449b26d3c590337ba3b54adfaf610e9477c3e913d3f38f742d055f6e435a3dc7695ae18b22d011b3cfec02b6c41c7b64a6e83b3b
+DIST pyupgrade-3.9.0.gh.tar.gz 63231 BLAKE2B 5b8bcba1d5f20379a2fe12df3f515222ccf05a67c6666c9de9caddc2f667010eec296f5c64354dbd56170a94f3cba00e0556f34c5f0cc2ffcc4e3a289790d24f SHA512 572f5b30ce18d86ed2e0cae102cc05940e58be325e0dffb4d5c23e7ed377e497d74c01f44d2bf32a18d04eaed282df5007f5f9eea5633fc46f196c63a6fcc134
diff --git a/dev-python/pyupgrade/pyupgrade-3.9.0.ebuild b/dev-python/pyupgrade/pyupgrade-3.9.0.ebuild
new file mode 100644
index 000000000000..8d3990592700
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-3.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
+HOMEPAGE="
+	https://github.com/asottile/pyupgrade/
+	https://pypi.org/project/pyupgrade/
+"
+# no tests in sdist, as of 3.3.2
+SRC_URI="
+	https://github.com/asottile/pyupgrade/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/tokenize-rt[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 27a3062757c3..d451846291ee 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1 @@
-DIST readthedocs-sphinx-ext-2.2.0.tar.gz 12721 BLAKE2B 3ac02a96a059e6d6b94af4318a5e816f8664e1164edb315d7540d1bfcce3b0edbbe9d567b0dc2931179cb309714175c64a3684b9d568551cc240ccbefc77a10a SHA512 8f7009a0716751de2fe2fed726aa08bb382d15ef6c4fb66e6c29537f985a92ab7cc137f81a4f6200e794cb7f495ebf561356194f57c694509b67e7686bef52c5
-DIST readthedocs-sphinx-ext-2.2.1.tar.gz 12644 BLAKE2B eb7b5f8d91dcf9f413cabe790537ed9179790c48e5778f026f07d442f4b446c6968b86c7e7eef4d548307ebd85ece8ff5a1fb3877ac4e3187ee8c53be86fc7dc SHA512 d2933228678549b7ab53bf7b8720eb23a5fcc05983dea56ab762906fc8a1445b2b94e0c12d647e18e6156fa1460a31ec0e7a7d7e4e8f5c46c5e39a9f35c382b9
 DIST readthedocs-sphinx-ext-2.2.2.tar.gz 12106 BLAKE2B 4b9785c6b36ea66a7910d544b3acde9accc676e18b6c1e37b9285f6e095371bd7baf19b912b604596e92c89ad935c37263b2c977c66265e7697f18d399fd3006 SHA512 333e2068a92287821991e4e96b397e0d2b62f5080b65aff8f31b8828a7e930b038fb5ee176e20622e1a78c966c5d4cf84dfead832f4cbe1e68f2b0a0260009f7
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
deleted file mode 100644
index a8aa2efef40d..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code specific for Read the Docs and Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/readthedocs-sphinx-ext/
-	https://pypi.org/project/readthedocs-sphinx-ext/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-# unittest should be sufficient but tests are very verbose, so pytest's
-# output capture is most welcome
-distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.1.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.1.ebuild
deleted file mode 100644
index 00dffbb4b59c..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code specific for Read the Docs and Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/readthedocs-sphinx-ext/
-	https://pypi.org/project/readthedocs-sphinx-ext/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-# unittest should be sufficient but tests are very verbose, so pytest's
-# output capture is most welcome
-distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.2.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.2.ebuild
index 00dffbb4b59c..a8aa2efef40d 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.2.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/referencing/referencing-0.29.1.ebuild b/dev-python/referencing/referencing-0.29.1.ebuild
index 7d750e925a11..94561728ff63 100644
--- a/dev-python/referencing/referencing-0.29.1.ebuild
+++ b/dev-python/referencing/referencing-0.29.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/regex-2023.6.3.ebuild b/dev-python/regex/regex-2023.6.3.ebuild
index a5bd236e1efd..2e3d25809863 100644
--- a/dev-python/regex/regex-2023.6.3.ebuild
+++ b/dev-python/regex/regex-2023.6.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 52b7c33a8684..e8bda4a814bd 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,2 +1 @@
-DIST requests-mock-1.10.0.tar.gz 72627 BLAKE2B 4ce1838f03b732de4007c2e9b700876dcf8dba0f5eafef1292e0e40ae75e08f9b3bf74c3620d2d762944ccf9af248304929f57a337122b1a69d13355dc3f290e SHA512 873c9b219e2a2360872fac22c83371ce40f4dee45e6a0d40365f4f551271c2168a662dced6e8baad890b1dadfc03d21d4ce013f149d25a42d998af4f4fca2a79
 DIST requests-mock-1.11.0.tar.gz 74377 BLAKE2B f871bbd18b42668d9eb693b807a67a33c9fb7c4316966ad2c16800bf562be982c737e1c1a803e3c5b6d3cde8c3d789671b5fce7d54df308dc55b2ef73a641ff4 SHA512 8d161cb0f6183994053d4dd06b801c2614b7ac937798addcdc52ee8e3973a7ef874ca615ca1946ea4bc0e05ce36c5c813460f7a41b3254671095059536fd2961
diff --git a/dev-python/requests-mock/requests-mock-1.10.0-r1.ebuild b/dev-python/requests-mock/requests-mock-1.10.0-r1.ebuild
deleted file mode 100644
index c6dc0ea5ab0e..000000000000
--- a/dev-python/requests-mock/requests-mock-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="
-	https://github.com/jamielennox/requests-mock/
-	https://pypi.org/project/requests-mock/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# urllib3 causes regressions that aren't caught by tests:
-# https://github.com/jamielennox/requests-mock/issues/228
-RDEPEND="
-	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests-futures[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable reno which only works inside a git repository
-	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
-	# Remove the release notes section which requires reno
-	rm doc/source/release-notes.rst || die
-	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
-	# Disable a test which requires purl (not in the tree)
-	sed -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
-		-i tests/test_adapter.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/requests-mock/requests-mock-1.11.0.ebuild b/dev-python/requests-mock/requests-mock-1.11.0.ebuild
index bdcf3889474d..c3f4605ece49 100644
--- a/dev-python/requests-mock/requests-mock-1.11.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.11.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild
index a7e0b02b9dcc..c61a88c3cf9b 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
index 27895deb9b42..cced400b50cc 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/rfc3987[${PYTHON_USEDEP}]
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild
index ad7770c9cb99..59f2ba52b4ff 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/regex[${PYTHON_USEDEP}]
diff --git a/dev-python/rpds-py/Manifest b/dev-python/rpds-py/Manifest
index 93bb9abad752..713489108e76 100644
--- a/dev-python/rpds-py/Manifest
+++ b/dev-python/rpds-py/Manifest
@@ -25,6 +25,7 @@ DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST rpds-0.13.0.crate 67994 BLAKE2B 91b4aec7a25b81566288c5fefe5f89a0f8b9eae83caf05cf7a9796394df70ae79b721b64804f72c582bfc41ff59647a9bc0980ba7dc9438412f6445e4a916b5b SHA512 6567eabae407fb2c5eea49395d6901c540dc0b4dbd585d5f93fed1b4a71885a784fb8652f46cca5148acd35957040c4a61ce1d95e871cf494b41db846fd38698
 DIST rpds_py-0.7.1.tar.gz 15355 BLAKE2B 801cdd11b09a49d6769ffeac2340d203351d4b6f85cac1fa06b306e50021d4956601c3e6ca645091157dac70a2619cc00bdd277e57cf7bc3762bff04781a3c76 SHA512 60245d4ef4a1d1b49fdca93c530f5f66ccc7b601bd29ddd04de05a2030914bc55157262f2cda2d4dfe5e735f6f29d99a7edf74e6058eab96668e88540ad0b84c
+DIST rpds_py-0.8.10.tar.gz 16400 BLAKE2B 821f88119bf13819bbc30dc7ed7c5bd5fefc6f8931c1df14ac6249f0e707464818e4b89745ec93ea78251ecc440a0f2f178a43945a55edfb75681e24e4cc2657 SHA512 4bec55c6cd4025d6af1b78bc5b4187631d33470648c5ccf16be6296fd62c14493fbaa08f37b66963eb46f379915bfb55639222ee3bee4ecdd0f1dc2d237982aa
 DIST rpds_py-0.8.8.tar.gz 16383 BLAKE2B dd45d7ce214266ce533f4aed8d4eaf33da08c9414bd7a1783c2e909ee63079f5687ac8497a940f027b2bda7adf4ef5bd8612ebf3706a4c3b3bcb129e6721a903 SHA512 68cda5ba4b72fc419a0c59fa2cc0655734cff9b452b11da26bb38acf221c2b4f503d3b7742032e467ee91f9fdd3de94b3aa43e5df1bf353ede07761ca759c86b
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
diff --git a/dev-python/rpds-py/rpds-py-0.8.10.ebuild b/dev-python/rpds-py/rpds-py-0.8.10.ebuild
new file mode 100644
index 000000000000..5aa215f1d27a
--- /dev/null
+++ b/dev-python/rpds-py/rpds-py-0.8.10.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+CRATES="
+	archery@0.5.0
+	autocfg@1.1.0
+	bitflags@1.3.2
+	cfg-if@1.0.0
+	indoc@1.0.9
+	libc@0.2.139
+	lock_api@0.4.9
+	memoffset@0.9.0
+	once_cell@1.17.1
+	parking_lot@0.12.1
+	parking_lot_core@0.9.7
+	proc-macro2@1.0.51
+	pyo3-build-config@0.19.1
+	pyo3-ffi@0.19.1
+	pyo3-macros-backend@0.19.1
+	pyo3-macros@0.19.1
+	pyo3@0.19.1
+	quote@1.0.23
+	redox_syscall@0.2.16
+	rpds@0.13.0
+	scopeguard@1.1.0
+	smallvec@1.10.0
+	static_assertions@1.1.0
+	syn@1.0.109
+	target-lexicon@0.12.6
+	unicode-ident@1.0.6
+	unindent@0.1.11
+	windows-sys@0.45.0
+	windows-targets@0.42.1
+	windows_aarch64_gnullvm@0.42.1
+	windows_aarch64_msvc@0.42.1
+	windows_i686_gnu@0.42.1
+	windows_i686_msvc@0.42.1
+	windows_x86_64_gnu@0.42.1
+	windows_x86_64_gnullvm@0.42.1
+	windows_x86_64_msvc@0.42.1
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
+HOMEPAGE="
+	https://github.com/crate-py/rpds/
+	https://pypi.org/project/rpds-py/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
+
+distutils_enable_tests pytest
diff --git a/dev-python/selenium/selenium-4.10.0.ebuild b/dev-python/selenium/selenium-4.10.0.ebuild
index 4a7efe79264e..0d80e2f414f6 100644
--- a/dev-python/selenium/selenium-4.10.0.ebuild
+++ b/dev-python/selenium/selenium-4.10.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	)
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index d0edfa560abd..9299d51c0212 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,5 +1,2 @@
-DIST sentry-python-1.24.0.gh.tar.gz 360564 BLAKE2B 032c929b75e29ebb0e95f8dddcc567d7367399b0945f918821c5331898b0aa90eac4af531f4f49c52949d00b655508cd57a88915ab054f2a44f72e3dc81cc9a9 SHA512 9dee3f14082331232f743c7bd38a7a46273d4c467bdd4f8672f7597fa0d3baaecd34423d07669f14f0265be2c947bdbddc983aaa8cab66a139aeb036fde1b708
-DIST sentry-python-1.25.1.gh.tar.gz 362026 BLAKE2B f392d766305a119d8d24472d21efade8a0f058d18e8d0e7b15fbcc2c368171e89a79394534aa85a7f9c4013fc1ba2566ee3de6d4708e1c5d7f3e3dd2aae56d4d SHA512 eb22213d99989711fc1449f3910dbd81eafe6d8903181955cb307066ba90a6e0cf587e875c806a013ca2b9465dc070e622c4ec6a656bdec51668455d353ad91a
 DIST sentry-python-1.26.0.gh.tar.gz 371531 BLAKE2B cdc44a8c4067405242b7aaec28999902df8ac7938d933ec8f5c050b6659bf5f920d7422dbe712813de995308fd49ce6173ca59e346d5a8912f6c3452f6063fb2 SHA512 de1d1c4af1d629c7689691d99ebd0acd3c023fc07fcfc6e706e7738b536601186ce33672b85ba08123f430923bb0c67cdbe0e56c9642d2219df55c8f1d14f07d
-DIST sentry-python-1.27.0.gh.tar.gz 375579 BLAKE2B ad6de41078c76a1fe99c415d4eaf3a7ad11283f4a95ecdc543918de6f931b3ffc0d840345478834dbf97fe2f48490533a14de294b852ec5ac03f24d57cfef935 SHA512 45317295fc71f2a2965ba65552cd6b0fd5f48ae95e1ed06a288d61cfab96cd05d5316cef08f7a90599c1ba57d24022a610fe1bfb9c98ff2a0853f2fc8921c8e7
 DIST sentry-python-1.27.1.gh.tar.gz 376598 BLAKE2B 4ad5986af5e252cf501523fcafdaa7ada4870aae0252227907d86ce3e886b58f7154f4407cb6ae22473044589c9c2639c7de8ca92dea1a7a7835c51c28b44bb6 SHA512 1408c06b3b8a8ef0c888f26a4591d45b63fda51853e52f2ea8921e4983d0a7b05b053c6bf17d55fc59667e5b4b4ca953419303774101fa58ef6f37428d600c90
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.24.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.24.0.ebuild
deleted file mode 100644
index b1efc57d0d9f..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.24.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_11 )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	tests/integrations/socket/test_socket.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.25.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.25.1.ebuild
deleted file mode 100644
index 67abd0d3c7e8..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.25.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_11 )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	tests/integrations/socket/test_socket.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.26.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.26.0.ebuild
index 1335788113ac..c84bd07acef0 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.26.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.26.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.27.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.27.0.ebuild
deleted file mode 100644
index 1335788113ac..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.27.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_11 )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	tests/integrations/socket/test_socket.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/simplebayes/simplebayes-1.5.8-r1.ebuild b/dev-python/simplebayes/simplebayes-1.5.8-r1.ebuild
new file mode 100644
index 000000000000..92d03eb3ba62
--- /dev/null
+++ b/dev-python/simplebayes/simplebayes-1.5.8-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="memory-based, optional-persistence naive bayesian text classifier"
+HOMEPAGE="https://github.com/hickeroar/simplebayes"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/simplebayes/simplebayes-1.5.8.ebuild b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
deleted file mode 100644
index 84a12fa2b2f6..000000000000
--- a/dev-python/simplebayes/simplebayes-1.5.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="memory-based, optional-persistence naive bayesian text classifier"
-HOMEPAGE="https://github.com/hickeroar/simplebayes"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/six/six-1.16.0-r1.ebuild b/dev-python/six/six-1.16.0-r1.ebuild
index 3f3d34b72432..df1788703008 100644
--- a/dev-python/six/six-1.16.0-r1.ebuild
+++ b/dev-python/six/six-1.16.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/smmap/smmap-5.0.0-r1.ebuild b/dev-python/smmap/smmap-5.0.0-r1.ebuild
index b2ac0818d228..64544cd9db1e 100644
--- a/dev-python/smmap/smmap-5.0.0-r1.ebuild
+++ b/dev-python/smmap/smmap-5.0.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://github.com/gitpython-developers/smmap/"
 
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/smmap/smmap-5.0.0.ebuild b/dev-python/smmap/smmap-5.0.0.ebuild
deleted file mode 100644
index d79a3512c07a..000000000000
--- a/dev-python/smmap/smmap-5.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pure Python implementation of a sliding window memory map manager"
-HOMEPAGE="
-	https://pypi.org/project/smmap/
-	https://github.com/gitpython-developers/smmap/"
-
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-distutils_enable_tests unittest
diff --git a/dev-python/sphinx-basic-ng/Manifest b/dev-python/sphinx-basic-ng/Manifest
index 7d938d0ac6b1..1d754faa7beb 100644
--- a/dev-python/sphinx-basic-ng/Manifest
+++ b/dev-python/sphinx-basic-ng/Manifest
@@ -1 +1,2 @@
 DIST sphinx-basic-ng-1.0.0.beta1.gh.tar.gz 24059 BLAKE2B 319f27b7326acf0ad1457fcb4d9b6257fb420eaf2bf7d4ebd6e9333f992bc5d0a5fdb518f196edc342c023f3a1c9d1258de2bac5f263d35226ac3ed62d747f23 SHA512 177da348fdb2af88bbe3a269f0d468f4d8cd5710a3102ea0fdd943505bc5251a73783a12e5397750fd7bec2df7ecce6601e82a95e777cbd40540a7833982c998
+DIST sphinx-basic-ng-1.0.0.beta2.gh.tar.gz 24076 BLAKE2B ce2d8e20d22e4d4e62b4db2eed41c72329a076bbacbf4cd247b657404e8b7f714c37b9625d77363edf7d4e53d9cef45568c53cbad8275bd7b519c0f7b1657c1f SHA512 e8c342251d0b0a085a1cd3a8fe8bede90cde3c5a404daf7afc24b601e6bdcef1c37161fadd21d34306633f1978bc96438bad3d9aa4511913dd92d69f4e299926
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild
new file mode 100644
index 000000000000..86839c93bdc0
--- /dev/null
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P=${P/_/.}
+DESCRIPTION="A modern skeleton for Sphinx themes"
+HOMEPAGE="
+	https://github.com/pradyunsg/sphinx-basic-ng/
+	https://pypi.org/project/sphinx-basic-ng/
+"
+SRC_URI="
+	https://github.com/pradyunsg/sphinx-basic-ng/archive/${PV/_/.}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/sphinx-4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	local HTML_DOCS=()
+	build_sphinx tests/barebones
+	rm -r tests/barebones/_build || die
+}
diff --git a/dev-python/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index 09d063091ece..9d996d229f0f 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1 +1,2 @@
+DIST sphinx-multiversion-0.2.4.gh.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
 DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
diff --git a/dev-python/sphinx-multiversion/metadata.xml b/dev-python/sphinx-multiversion/metadata.xml
index 64aa484646ed..61610788aab5 100644
--- a/dev-python/sphinx-multiversion/metadata.xml
+++ b/dev-python/sphinx-multiversion/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinx-multiversion</remote-id>
+		<remote-id type="github">Holzhaus/sphinx-multiversion</remote-id>
 	</upstream>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4-r1.ebuild b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..434de8f770d1
--- /dev/null
+++ b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Add support for multiple versions to sphinx"
+HOMEPAGE="https://github.com/Holzhaus/sphinx-multiversion"
+SRC_URI="https://github.com/Holzhaus/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 42606f8a782d..d86ffd4897fc 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1 +1,2 @@
+DIST sphinx-panels-0.6.0.gh.tar.gz 400548 BLAKE2B 685b241ffe839face392950ccaa5c00d5613ee4076a4f8d62fdff32158f2d02c444375b7f656a89d4712f8bf895b937ff9fe650cab98670f03b0c4d75e545f97 SHA512 74064538ff8cd1c7c44b5daeda272217618ed33394694883046972b4262d503e1426e7573d8b49040d4b426651377b89fd4ad2a085f1e62827e7ef51e6912e5f
 DIST sphinx-panels-0.6.0.tar.gz 400548 BLAKE2B 685b241ffe839face392950ccaa5c00d5613ee4076a4f8d62fdff32158f2d02c444375b7f656a89d4712f8bf895b937ff9fe650cab98670f03b0c4d75e545f97 SHA512 74064538ff8cd1c7c44b5daeda272217618ed33394694883046972b4262d503e1426e7573d8b49040d4b426651377b89fd4ad2a085f1e62827e7ef51e6912e5f
diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
index 737d697e677b..75a31066e3b2 100644
--- a/dev-python/sphinx-panels/metadata.xml
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinx-panels</remote-id>
+		<remote-id type="github">executablebooks/sphinx-panels</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..20998bfad1ce
--- /dev/null
+++ b/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for creating panels in a grid layout"
+HOMEPAGE="https://github.com/executablebooks/sphinx-panels"
+SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/pytest-regressions[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/dev-python/sphinx-pytest/Manifest b/dev-python/sphinx-pytest/Manifest
index 8a19fe48250e..c4353293bdc7 100644
--- a/dev-python/sphinx-pytest/Manifest
+++ b/dev-python/sphinx-pytest/Manifest
@@ -1,2 +1 @@
-DIST sphinx-pytest-0.0.5.gh.tar.gz 6228 BLAKE2B bb619ce79411a611fecf778ac095da0e7557bc419b7395efbc4dc2163699425898005fabadc083b74ac2cab8f207dcf8969f5c551c975d6354063962141c907b SHA512 e1af518cc5535ecacae612f11c7fb1200965a1999d9eb2643ba14b222fc4e93c257ef6600b37b9de4075bf3e5e703db60e7350cd5159fcf4ba21abec28bceb66
 DIST sphinx-pytest-0.1.1.gh.tar.gz 6744 BLAKE2B f196a9fff7a63d1b7664f334c01f38fc44f5611be012092dad077f27bb2ddf03f2ebb7ebcbf7132a9b8c8b17166673945e9b92e88f285c4c95c4c2a696285cbc SHA512 f3210f8b2413171cc37a38fc66b8be0cd32db1a0aebb979dc9057a861711481fde6b86b7c9548166f906d9483762b864759fb4f7ba5069cda4d9fc12c1e2975c
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.0.5.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.0.5.ebuild
deleted file mode 100644
index 9fee05c1455e..000000000000
--- a/dev-python/sphinx-pytest/sphinx-pytest-0.0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpful pytest fixtures for Sphinx extensions"
-HOMEPAGE="
-	https://github.com/chrisjsewell/sphinx-pytest/
-	https://pypi.org/project/sphinx_pytest/
-"
-SRC_URI="
-	https://github.com/chrisjsewell/sphinx-pytest/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.1.1.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.1.1.ebuild
index 5cf11f8e357d..13af7d2d51d2 100644
--- a/dev-python/sphinx-pytest/sphinx-pytest-0.1.1.ebuild
+++ b/dev-python/sphinx-pytest/sphinx-pytest-0.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-rtd-theme/Manifest b/dev-python/sphinx-rtd-theme/Manifest
index 97e537a4b87e..1890a72ba2dc 100644
--- a/dev-python/sphinx-rtd-theme/Manifest
+++ b/dev-python/sphinx-rtd-theme/Manifest
@@ -1,3 +1 @@
-DIST sphinx_rtd_theme-1.2.0.tar.gz 2784826 BLAKE2B 62d0af56a29d66831447009991a5e0fb0a483ca91ac2ef7e7ce0b19510281308b49219efd0c6e1bd8fc95c2acae233133ce2f89b7507c2b20f0f322e59ab06e0 SHA512 dd407c648c5512a79e31a106825c6f9ec4696b14d950830ab36faf912ea804b48b3a5d09c6a144e9cead773e4c057cbc809d7582deea1b253ce71b756f7f6b10
-DIST sphinx_rtd_theme-1.2.1.tar.gz 2784128 BLAKE2B c5aed3beb6ade90a27690a8c33c8e18d05f53fb5514987828823f3a8d4bbfecb2212593733ce03323b8e9402730bd8fadce6c5dfc0d425cd4b335f6eef81f948 SHA512 0c1e0f0015f9df23f992023e137cc5976e76ad45e46e2f51186cf572289afae5e37d29013e0440a9059808d9b40af850d29393c2d2bc0a3cd845b0fbfa392294
 DIST sphinx_rtd_theme-1.2.2.tar.gz 2784122 BLAKE2B af738c99a2406daa0372171a34c78ee14e955fee589ba49811ea50fd2cdeeee431367fde4d6a34d9e4f532d1ed6d079b1cebf4bb390b573fb5fe9cfc8f02b838 SHA512 44272272ce14387c1252ec40325ff8f9b40da6e37206333a8e0831cdce76c45efe58cf28f08132188d2799527a40e4ead881e8577776a123921b1cd908dd17fe
diff --git a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild
deleted file mode 100644
index 8a9a2f30e284..000000000000
--- a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/sphinx_rtd_theme/
-	https://pypi.org/project/sphinx-rtd-theme/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/sphinx-7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-jquery-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin docutils
-	sed -i -e '/docutils/s:<0[.]19::' setup.cfg || die
-	sed -i -e '/jquery/s:,!=3[.]0[.]0::' setup.cfg || die
-	distutils-r1_src_prepare
-
-	# CI=1 disables rebuilding webpack that requires npm use
-	# yes, that surely makes sense
-	export CI=1
-}
diff --git a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.1.ebuild b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.1.ebuild
deleted file mode 100644
index aac7b0e2e7a8..000000000000
--- a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/sphinx_rtd_theme/
-	https://pypi.org/project/sphinx-rtd-theme/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/sphinx-7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-jquery-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin docutils
-	sed -i -e '/docutils/s:<0[.]19::' setup.cfg || die
-	sed -i -e '/jquery/s:,!=3[.]0[.]0::' setup.cfg || die
-	distutils-r1_src_prepare
-
-	# CI=1 disables rebuilding webpack that requires npm use
-	# yes, that surely makes sense
-	export CI=1
-}
diff --git a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.2-r1.ebuild b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.2-r1.ebuild
index 247f5a56e50d..ef0aa53cebdb 100644
--- a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.2-r1.ebuild
+++ b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
deleted file mode 100644
index 084aaa30a4c9..000000000000
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-jsmath/
-	https://pypi.org/project/sphinxcontrib-jsmath/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild
index a153b591a758..3e48e836982a 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
deleted file mode 100644
index 089c5961d346..000000000000
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which outputs QtHelp documents"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-qthelp/
-	https://pypi.org/project/sphinxcontrib-qthelp/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r2.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r2.ebuild
index ae6e7514abb1..f25bc1f16bf6 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r2.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..c6ed42088b64
--- /dev/null
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Make Sphinx better at documenting Python functions and methods"
+HOMEPAGE="
+	https://github.com/python-trio/sphinxcontrib-trio
+	https://pypi.org/project/sphinxcontrib-trio/
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+)"
+
+# AttributeError: 'Sphinx' object has no attribute 'add_stylesheet'
+#distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/python-trio/sphinxcontrib-trio/issues/260
+	local -x PYTHONPATH="${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages"
+	epytest --deselect tests/test_sphinxcontrib_trio.py::test_end_to_end
+}
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index b8de93031c98..3c40a286ffb1 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,2 +1 @@
-DIST starlette-0.27.0.gh.tar.gz 2838346 BLAKE2B 25f30e83edc12fa6607ef31b2711ee2b3c205aa62cc362d4a7389d61e48fc4410610841caca2e99dd3527eb0f47fe2740c5908ab5c72158e57a384563b53328d SHA512 dd7ce57b78a5ab42e62699e6feed735c66aa64dce2004304a139957c75192cc0b3a475e80bb9ecee16093940d45f142f83e61af6fad0f320a8f586fea752049f
 DIST starlette-0.28.0.gh.tar.gz 2843094 BLAKE2B a3cb35cf465b4540457cffafe4a3bb32081f542b8a5c730bc7fcc0bbf9f7a6c2c21bcc4297c8f3c5281f6ca787aa03c3ee4f90032155d1aa1887440dc289e5c1 SHA512 344c0581e6d6e64abd51347757cba4eb9bfba6f66bf62a2a5491cd3bb1c332895d6827bc478c00d9dfe3043152e814b6870894577a4e9547ac116c66f75a49b1
diff --git a/dev-python/starlette/starlette-0.27.0.ebuild b/dev-python/starlette/starlette-0.27.0.ebuild
deleted file mode 100644
index bffc3ba47039..000000000000
--- a/dev-python/starlette/starlette-0.27.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.28.0.ebuild b/dev-python/starlette/starlette-0.28.0.ebuild
index 11703340a66f..bffc3ba47039 100644
--- a/dev-python/starlette/starlette-0.28.0.ebuild
+++ b/dev-python/starlette/starlette-0.28.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
index 938131f9cd59..b918f04bf9d9 100644
--- a/dev-python/stdio-mgr/Manifest
+++ b/dev-python/stdio-mgr/Manifest
@@ -1,2 +1 @@
 DIST stdio-mgr-1.0.1.gh.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
-DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1-r1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1-r1.ebuild
index b6ac9b7058fc..8480e72b7844 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1-r1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
deleted file mode 100644
index b5546da434ca..000000000000
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Context manager for mocking/wrapping stdin/stdout/stderr"
-HOMEPAGE="
-	https://github.com/bskinn/stdio-mgr/
-	https://pypi.org/project/stdio-mgr/
-"
-SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-# doc directory is not included in the release tarball for some reason
-#distutils_enable_sphinx doc \
-#				dev-python/sphinxcontrib-programoutput \
-#				dev-python/sphinx-rtd-theme
-
-python_test() {
-	# skip the doctests
-	epytest tests
-}
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 0f6a05e1f527..def9f3dde355 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,2 +1 @@
-DIST stevedore-5.0.0.tar.gz 513970 BLAKE2B e1135a281c88633daed4ec41a5bb66c3bf2ed2275a3502fbc90b6ba09ac55693e5c98a0af49d948adf141812e195dfdb6a293021405abdba962c05ff506a1879 SHA512 4041172deba14b8e33cb48d8b629810e66a52e1676a989417c1b896930e980e0057efbf8f9b6b9c4c82ffce02b132b8e6c5f7a5b02e49d7c7c242ab4a20bac02
 DIST stevedore-5.1.0.tar.gz 514100 BLAKE2B f12e0eaa0c3d4bfa334a89ced740277bd2979e7ff48c7bc36bd85d801d0d2dd92f2f8cf7ef29b8fb61a5361a655c6a5303ad6f6aa2666fb57ebcee209ac0c344 SHA512 d7ad920961c9f4055cb145c84578f09f0af93eadf82f60bd7903dfc909cc2cdb64159d9b9b1469eb04569705f4208b667ded5aab17e97bba5dd7310263f449de
diff --git a/dev-python/stevedore/stevedore-5.0.0.ebuild b/dev-python/stevedore/stevedore-5.0.0.ebuild
deleted file mode 100644
index fb7343a6080f..000000000000
--- a/dev-python/stevedore/stevedore-5.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="
-	https://opendev.org/openstack/stevedore/
-	https://github.com/openstack/stevedore/
-	https://pypi.org/project/stevedore/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-
-	# Also known problem, inside venv
-	sed -i -e 's:test_disable_caching_file:_&:' \
-		stevedore/tests/test_cache.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-5.1.0.ebuild b/dev-python/stevedore/stevedore-5.1.0.ebuild
index cf7aa7d0468a..5a9f2ab218e3 100644
--- a/dev-python/stevedore/stevedore-5.1.0.ebuild
+++ b/dev-python/stevedore/stevedore-5.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
index fefdd4276f8d..dc4b7da3736f 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
@@ -22,6 +22,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index 6dd44f415e31..fa8e5ab2f767 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,3 +1 @@
-DIST tavern-2.0.7.gh.tar.gz 207577 BLAKE2B 1583bfdb0ef013f65ed437bb613e87ad0d0e9375cceb3ed295dfe96afcdc11607b77b9e91cfe3db2f5b53a33be56db558f2f489ba60cda15c270ab9ec07118a2 SHA512 9e69d4dc3a3a06855cbbb567e9b73e62fe65832e022e3d0eb471d2eee9035950207abbba2fca5e0aeda091987bebafce78ba96814a41bf785dab5a48afdc5302
-DIST tavern-2.1.0.gh.tar.gz 209527 BLAKE2B 86023c19b5293a16f00f7f7e72e44e6ddfc51979cc10d8ba85265bdbddbdf6a2dab89d3f0588a3429eabba1871ebc97c5979d728e25fc5f27aea7dda58dc594f SHA512 a689ff8fa57bce5b11d7b3a34c89f1096fe45c2e5a5314196f67db43b5811580248ed70f5eb6bb69d619ce458248513205c7b3df876e4033dd96169d6680bbe9
 DIST tavern-2.2.0.gh.tar.gz 213603 BLAKE2B 3a192424817d641da7428e27d49c553f9554fb740c9b0cde0d8e693fc204deb15d6f08f8bb60d961278f26b9f7c17bffb68cc7136cc9cc496eb74dd845ec5158 SHA512 731e479f3fe69cdaa28e391512207edde1084f3844da9c77ee7c917096422a009a4beeed9c135b773550c181f698d41ac83b013b111535e527f90569e16a00b4
diff --git a/dev-python/tavern/tavern-2.0.7.ebuild b/dev-python/tavern/tavern-2.0.7.ebuild
deleted file mode 100644
index e3e1c0ae466a..000000000000
--- a/dev-python/tavern/tavern-2.0.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs"
-HOMEPAGE="
-	https://github.com/taverntesting/tavern/
-	https://pypi.org/project/tavern/
-"
-SRC_URI="
-	https://github.com/taverntesting/tavern/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/paho-mqtt[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pykwalify[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/python-box[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/Faker[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip unnecessary pins, upstream doesn't update them a lot
-	sed -i -E -e 's:,?<=?[0-9.]+::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -p tavern
-}
diff --git a/dev-python/tavern/tavern-2.1.0.ebuild b/dev-python/tavern/tavern-2.1.0.ebuild
deleted file mode 100644
index 6d527aada725..000000000000
--- a/dev-python/tavern/tavern-2.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs"
-HOMEPAGE="
-	https://github.com/taverntesting/tavern/
-	https://pypi.org/project/tavern/
-"
-SRC_URI="
-	https://github.com/taverntesting/tavern/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/paho-mqtt[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pykwalify[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/python-box[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/Faker[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip unnecessary pins, upstream doesn't update them a lot
-	sed -i -E -e 's:,?<=?[0-9.]+::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -p tavern
-}
diff --git a/dev-python/tavern/tavern-2.2.0.ebuild b/dev-python/tavern/tavern-2.2.0.ebuild
index 6d527aada725..8188f7424e37 100644
--- a/dev-python/tavern/tavern-2.2.0.ebuild
+++ b/dev-python/tavern/tavern-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-python/jmespath[${PYTHON_USEDEP}]
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 55eda873b4b5..a74318f86623 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,2 +1 @@
-DIST tempest-34.2.0.tar.gz 1141098 BLAKE2B 60d09fc0de49e63213bf23cc223cec92b53f887ff5677fd80cefac441166ef777bc8b96682847697702af26d8481192a2fe19ddbe42cd3b991cc0f16ed09176d SHA512 22cf6e5b6d60398a7a1698ad0bad02d8d16ffd815f573fb526becb9d1be64151bc6b33fb6b8b03f9c52f18565ca06cad1bf9725f2cff2c6116c88f85439b5d7e
 DIST tempest-35.0.0.tar.gz 1144022 BLAKE2B dd333ac1271ef51171ff7d06931138a6de5872a86e2ed49c4d94b37431f6f94092069eef6700e453ab6e5fc04f004f5bd040af64ea98531bf56eba5edc9394b3 SHA512 c8986e13c821c8861f0b9c1b37c71a1017cd6de480a5efdcc646b51d1c7032a236f98735d0f77240fc9ec9eb711638a12f7a4a8d67e99c76bc1f6b561c39c61d
diff --git a/dev-python/tempest/tempest-34.2.0.ebuild b/dev-python/tempest/tempest-34.2.0.ebuild
deleted file mode 100644
index f7d3f5d8ad3e..000000000000
--- a/dev-python/tempest/tempest-34.2.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="
-	https://pypi.org/project/tempest/
-	https://docs.openstack.org/tempest/latest/
-	https://launchpad.net/tempest/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	mv "${BUILD_DIR}"/install/{usr/,}etc || die
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
-	local -x OS_TEST_TIMEOUT=300
-	eunittest -b -s tempest/tests -t .
-}
diff --git a/dev-python/tempest/tempest-35.0.0.ebuild b/dev-python/tempest/tempest-35.0.0.ebuild
index 93fcb0ff084e..ddfbd6ac4877 100644
--- a/dev-python/tempest/tempest-35.0.0.ebuild
+++ b/dev-python/tempest/tempest-35.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/testresources/testresources-2.0.1-r2.ebuild b/dev-python/testresources/testresources-2.0.1-r2.ebuild
deleted file mode 100644
index 68b526d7eee5..000000000000
--- a/dev-python/testresources/testresources-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pyunit extension for managing expensive test resources"
-HOMEPAGE="
-	https://launchpad.net/testresources/
-	https://github.com/testing-cabal/testresources/
-	https://pypi.org/project/testresources/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-#	sed \
-#		-e 's:testBasicSortTests:_&:g' \
-#		-i testresources/tests/test_optimising_test_suite.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/testresources/testresources-2.0.1-r3.ebuild b/dev-python/testresources/testresources-2.0.1-r3.ebuild
index 30c055507529..9d28740da7fd 100644
--- a/dev-python/testresources/testresources-2.0.1-r3.ebuild
+++ b/dev-python/testresources/testresources-2.0.1-r3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/testtools/testtools-2.6.0-r1.ebuild b/dev-python/testtools/testtools-2.6.0-r1.ebuild
index 6af5a459caa1..e67dc2887647 100644
--- a/dev-python/testtools/testtools-2.6.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.6.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/testtools-2.6.0.ebuild b/dev-python/testtools/testtools-2.6.0.ebuild
deleted file mode 100644
index a0d427b32bfe..000000000000
--- a/dev-python/testtools/testtools-2.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="
-	https://github.com/testing-cabal/testtools/
-	https://pypi.org/project/testtools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc
-
-src_prepare() {
-	# very fragile to formatting changes (broken on py3.10 & pypy3)
-	sed -i -e 's:test_syntax_error(:_&:' \
-		testtools/tests/test_testresult.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite ||
-		die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 8e6d20b4332f..d615ccde7c58 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,2 +1 @@
-DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
 DIST three-merge-0.1.1.gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
index 56d7c893d3d4..3933999a807c 100644
--- a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/diff-match-patch[${PYTHON_USEDEP}]
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
deleted file mode 100644
index 21f79fc691f7..000000000000
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python library to perform a 3-way merge between strings"
-HOMEPAGE="https://github.com/spyder-ide/three-merge
-	https://pypi.org/project/three-merge/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
-
-BDEPEND="test? (
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/pytest-timeout[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/time-machine/time-machine-2.10.0.ebuild b/dev-python/time-machine/time-machine-2.10.0.ebuild
index d6f96f71fc73..e009b9349c16 100644
--- a/dev-python/time-machine/time-machine-2.10.0.ebuild
+++ b/dev-python/time-machine/time-machine-2.10.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/tiny-proxy/Manifest b/dev-python/tiny-proxy/Manifest
index 3d5ac361927d..f0cb38f143f3 100644
--- a/dev-python/tiny-proxy/Manifest
+++ b/dev-python/tiny-proxy/Manifest
@@ -1,2 +1 @@
-DIST tiny-proxy-0.1.1.gh.tar.gz 14940 BLAKE2B eba17082bf832127c36468db37d9214e45d236c9c1fa7e357e05269df8671f4a06992e03224147642221220aeb89d91479332038e09bf1aa22ce1f0c0316ff20 SHA512 aaf677d18058e6c7c1133398e03d7b0d8b9b4e500fc89174bb3dda1145eb0382492b227f892f672d7a558a30f1d4b92b20eef62922e0e6983f93fcd17850d825
 DIST tiny-proxy-0.2.0.gh.tar.gz 15017 BLAKE2B 46c98d7d4fff2af85464a7c280d212b9be4eb263b8ca643013166b6a81d8783b3078d1551fba0d40417a0cbab795564dbd457bfc037e6c2d40612eabb45fef01 SHA512 748de443ab337f159b1bce852de7f3f10ca32a5580f99bf1e3448c86f49cba26a6ed2855d06b91da7457b3185f99755efd65714a4db3804309cc931e16bdd8b5
diff --git a/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild b/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
deleted file mode 100644
index 39420f9407a0..000000000000
--- a/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple proxy server (SOCKS4(a), SOCKS5(h), HTTP tunnel)"
-HOMEPAGE="
-	https://github.com/romis2012/tiny-proxy/
-	https://pypi.org/project/tiny-proxy/
-"
-SRC_URI="
-	https://github.com/romis2012/tiny-proxy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.6.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
-		>=dev-python/httpx-socks-0.7.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tiny-proxy/tiny-proxy-0.2.0.ebuild b/dev-python/tiny-proxy/tiny-proxy-0.2.0.ebuild
index 54ef1a1ee3ec..4637e69a2314 100644
--- a/dev-python/tiny-proxy/tiny-proxy-0.2.0.ebuild
+++ b/dev-python/tiny-proxy/tiny-proxy-0.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tornado/tornado-6.3.2-r1.ebuild b/dev-python/tornado/tornado-6.3.2-r1.ebuild
index c44ab2b97f92..3d88aa8ad2aa 100644
--- a/dev-python/tornado/tornado-6.3.2-r1.ebuild
+++ b/dev-python/tornado/tornado-6.3.2-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index e5d9f008d5de..64a838d073d6 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,2 +1 @@
-DIST towncrier-22.12.0.gh.tar.gz 54670 BLAKE2B b6baf6970cc8a5f798f378ae7c0637184a869c3c72907205c6493786353f1a5f26e1bca0faa7f4685236e3a1fc9d4b2cfe6632f01d36926ae9e74cb188460674 SHA512 6fad515b2368f2c1ee27673080607460949d6651d3c9b9ab106b8e7f0298d0748a4ec1424f73bb7bf8a81eef5b0fa74de6a0b7295f02f02f354f20a99eb30814
 DIST towncrier-23.6.0.gh.tar.gz 59311 BLAKE2B d778154288923aa26c8d4d99b5f4c999ce50687164c4477d093b1254394ed7cbc5d708f1a1b7e6f25ebca95217a049692f7c9ee822661f44d02f79db32240229 SHA512 44142130b6a3e4428a085f1c6e793ccf631de77f8f2eafb8d1145f45d8d26faa6d27c30f09b8db95e63b4c3de927ac975ed95d1ed6b76dac3d9ba5eef54989c0
diff --git a/dev-python/towncrier/towncrier-22.12.0.ebuild b/dev-python/towncrier/towncrier-22.12.0.ebuild
deleted file mode 100644
index 30a541d1ca58..000000000000
--- a/dev-python/towncrier/towncrier-22.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Building newsfiles for your project"
-HOMEPAGE="
-	https://github.com/twisted/towncrier/
-	https://pypi.org/project/towncrier/
-"
-SRC_URI="
-	https://github.com/twisted/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-default-group[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/incremental[${PYTHON_USEDEP}]
-	test? (
-		dev-vcs/git
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial towncrier ||
-		die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/towncrier/towncrier-23.6.0.ebuild b/dev-python/towncrier/towncrier-23.6.0.ebuild
index c2ceb8e19d71..476c1deedafb 100644
--- a/dev-python/towncrier/towncrier-23.6.0.ebuild
+++ b/dev-python/towncrier/towncrier-23.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/trio-websocket/Manifest b/dev-python/trio-websocket/Manifest
index 119224c7865c..c9354e19506c 100644
--- a/dev-python/trio-websocket/Manifest
+++ b/dev-python/trio-websocket/Manifest
@@ -1,2 +1 @@
-DIST trio-websocket-0.10.2.gh.tar.gz 45025 BLAKE2B cc80f7b8e06bb88bef69c6326dd899a27523ea70e0ea10c8b02a26498102638c569ffe21e2b4e355f9c635d60ae8ae34664d311bf5fe286456e43e0f9c2ba481 SHA512 ad8d4facb153b59597ca7dac14dabe60ac8ca4331aa72df8120e01ec726e1f392a8167d070f72534eb735b5dbf4afe46e385c0e3a2dd250afa2280c6a5a0c863
 DIST trio-websocket-0.10.3.gh.tar.gz 45109 BLAKE2B 7adad8bd59b2350d7b8e50e88710c8b9844e8b34c712615e058a6045d575671043c527ac4330941431502affc7c307d61c1f9c1b328c579a622ff11ea79fbeb6 SHA512 8ff50030c9616ea8baa9627f229304fbb72528fcc97d1e5ead90acc3c7d683751c0d98e9c4f779d4d65fc765b00b6ec93b6d3384070a76fe18d3318af7afa975
diff --git a/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild b/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
deleted file mode 100644
index d64a773f38c1..000000000000
--- a/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client and server implementation for Python Trio"
-HOMEPAGE="
-	https://github.com/HyperionGray/trio-websocket/
-	https://pypi.org/project/trio-websocket/
-"
-SRC_URI="
-	https://github.com/HyperionGray/trio-websocket/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	>=dev-python/trio-0.11[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-trio-0.5.0[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p trio
-}
diff --git a/dev-python/trio-websocket/trio-websocket-0.10.3.ebuild b/dev-python/trio-websocket/trio-websocket-0.10.3.ebuild
index 8e735c733d60..815f0b97c34b 100644
--- a/dev-python/trio-websocket/trio-websocket-0.10.3.ebuild
+++ b/dev-python/trio-websocket/trio-websocket-0.10.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/exceptiongroup[${PYTHON_USEDEP}]
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index d4f6545d23b0..83bd2f42075a 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,3 +1,2 @@
-DIST trio-0.22.0.gh.tar.gz 517482 BLAKE2B ab1fcb22d8f0ed9c8de831a9384b55ab433811863974cb767cb0ea4eb3a0df7372b5ea2c2d4c2af3ca1d3c8c3144d5546ad8cc68276b17ecb3d20ea1858ba9e0 SHA512 45b813d6cc65f8d49f70cb0ea7f33593fed0cc5989c60ba449f0b38c4759604aa7360cd016758fd364438b92516be549edf1efd583c7f5ee2de8813334f182bc
 DIST trio-0.22.1.gh.tar.gz 536365 BLAKE2B a2b8b672de5ffed99cb2d93888414526749a836dcb4a5101f6de9358c2e231fec56bd7fd80ff2300489931f8b516265ff0881bbde8721c09eed6f48eabcf2f8c SHA512 28f3248627dcfa06333ec41f17b7419f1192dd0f041ae56f78582a2a781875805e55981a62a1dc2dba191460a67d03e89f0497bb98ef265a37842aae93488be1
 DIST trio-93c1d96a535cca565e1b1ba552cb9c4798b3f852.gh.tar.gz 528405 BLAKE2B b6db1413259c7aa4aa9055eb8d0d810ca7866e312ed81395c7bd2d69cad56dec9cd1422513ee4018077eca0a3b55b4fe74178d4af3599e8ba8b7ad124d820066 SHA512 e5bdc6f918cac8d8eed5d459cfed368336eec301890bd6b579bdf3b2bca7d78246b5b06fb6259fadba0fef45b782e8b03c85884b96d8a961056f7720cd28b944
diff --git a/dev-python/trio/trio-0.22.0-r1.ebuild b/dev-python/trio/trio-0.22.0-r1.ebuild
deleted file mode 100644
index 9b69e958854e..000000000000
--- a/dev-python/trio/trio-0.22.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for async concurrency and I/O"
-HOMEPAGE="
-	https://github.com/python-trio/trio/
-	https://pypi.org/project/trio/
-"
-SRC_URI="
-	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/exceptiongroup-1.0.0_rc9[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/outcome[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/astor-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/immutables-0.6[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/immutables \
-	dev-python/sphinxcontrib-trio \
-	dev-python/sphinx-rtd-theme \
-	dev-python/towncrier
-
-src_prepare() {
-	# fix incorrect version
-	# https://github.com/python-trio/trio/issues/2485
-	sed -i -e "s:0.21.0+dev:${PV}:" trio/_version.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these tests require internet access
-		trio/tests/test_ssl.py
-		trio/tests/test_highlevel_ssl_helpers.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# Times out on slower arches (ia64 in this case)
-		# https://github.com/python-trio/trio/issues/1753
-		trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
-
-		# incompatible ipython version?
-		trio/_core/tests/test_multierror.py::test_ipython_exc_handler
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not redistributors_should_skip"
-}
diff --git a/dev-python/trio/trio-0.22.0_p20230530-r1.ebuild b/dev-python/trio/trio-0.22.0_p20230530-r1.ebuild
index 83733f7b9ec0..273cf4413165 100644
--- a/dev-python/trio/trio-0.22.0_p20230530-r1.ebuild
+++ b/dev-python/trio/trio-0.22.0_p20230530-r1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/uri_template/uri_template-1.3.0.ebuild b/dev-python/uri_template/uri_template-1.3.0.ebuild
index 2e521ba306ab..8f52867d84a2 100644
--- a/dev-python/uri_template/uri_template-1.3.0.ebuild
+++ b/dev-python/uri_template/uri_template-1.3.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 7ff3e3a49985..5f658e0bc236 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,4 +1 @@
-DIST virtualenv-20.21.0.tar.gz 12070063 BLAKE2B f69d5934191ccd8e9420c37e51b53df7876961d6f13d0f75845530893fd91df29a512e64eaa27135535816250a3149087029e6fe1b15317b8079af9cee2832ea SHA512 77aae5ebc5007093953c30da1eed996e851a65c7dd1f7a3a85961a1bb251b3d7970936eea1efe8babb216d2024072bdbf1c1a97ba8760a04a0abf6e7c3a27d09
-DIST virtualenv-20.22.0.tar.gz 6612036 BLAKE2B aeebf0a80dd96eb78dc4a2ca258e1089a9ce1a4e0bb66b1e8b5093353e298e22dbcc57acea7f5094dee29e4e855c51ce235901fd39d29fbfbc3dd96dcef8b15f SHA512 83d15b03abebd856b1636d0f00443f77882de9fdeb9dff67b72dc839d55f4e7e0668914ef3ac79cdf1d8cf147e29ba97feb720a5ebfcf24dc6cd27ec2e04384d
-DIST virtualenv-20.23.0.tar.gz 6617594 BLAKE2B 370cabd8b8fe24dc7bcaee9c9976d43ca36768824e5fa8c4167f701edba0498fc9faf7af12e8964b57246d2390d995562327067cb30d577ef70adcd9439b3a49 SHA512 90b5aae687984b982dd60d573f9b2cf9a525c135f93d51a9087940d2265a1dd0c59670dcfff9b3aa459a081b0b13d1183360022825f486c9cf2fc86bfc5b8bc3
 DIST virtualenv-20.23.1.tar.gz 6619074 BLAKE2B 0b35a1439b7e2a9eba9c676457a39d22c4318dd4925723bdfcd5ec36cdae236b5bd6aee44a7e4cea5f1febfac7dbf58a7b0e21bb150529f9b851eb065fbddede SHA512 9a19b8f4aff021f5419c10b5954118adb668294cdeffba7a43ed12f76fc6fc8aed8e53df68277a959deb7a4e81f81ed9b4797c17574c347610c8de8d85826af8
diff --git a/dev-python/virtualenv/virtualenv-20.21.0.ebuild b/dev-python/virtualenv/virtualenv-20.21.0.ebuild
deleted file mode 100644
index 6d67e05abece..000000000000
--- a/dev-python/virtualenv/virtualenv-20.21.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx-rtd-theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-
-	epytest
-}
diff --git a/dev-python/virtualenv/virtualenv-20.22.0.ebuild b/dev-python/virtualenv/virtualenv-20.22.0.ebuild
deleted file mode 100644
index ded73646ae95..000000000000
--- a/dev-python/virtualenv/virtualenv-20.22.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.11[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.2[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-# https://github.com/pypa/virtualenv/issues/2554
-BDEPEND+="
-	test? (
-		$(python_gen_cond_dep '
-			!!<dev-python/virtualenv-20.22[${PYTHON_USEDEP}]
-		' 3.9)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p flaky -p freezegun -p pytest_mock
-}
diff --git a/dev-python/virtualenv/virtualenv-20.23.0.ebuild b/dev-python/virtualenv/virtualenv-20.23.0.ebuild
deleted file mode 100644
index b191729360ac..000000000000
--- a/dev-python/virtualenv/virtualenv-20.23.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.11[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.2[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.7.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-# https://github.com/pypa/virtualenv/issues/2554
-BDEPEND+="
-	test? (
-		$(python_gen_cond_dep '
-			!!<dev-python/virtualenv-20.22[${PYTHON_USEDEP}]
-		' 3.9)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.23.1.ebuild b/dev-python/virtualenv/virtualenv-20.23.1.ebuild
index 959d901aeb8a..ed08b28c6102 100644
--- a/dev-python/virtualenv/virtualenv-20.23.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.23.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/webcolors/webcolors-1.13.ebuild b/dev-python/webcolors/webcolors-1.13.ebuild
index 14285b8dceef..91aca93b3c1d 100644
--- a/dev-python/webcolors/webcolors-1.13.ebuild
+++ b/dev-python/webcolors/webcolors-1.13.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 98e2059fbe6d..4d97073a759b 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1 @@
-DIST websocket-client-1.5.1.tar.gz 49942 BLAKE2B 7996798a5ff8c2eb1322fc7a9fa61d5cff99c71413293ce5b05f9af3581cff472350e79813ce3b393ce4fa4b7d19de956f0ad9ff6232c426be3c8adb8c91fb40 SHA512 9fce0c8de64e051b151c40a295a7f722ed7f95d19bd92ffd5cd9c64962821024e79b70d18ca7e30ca8b8707ba86be041134f13d7e2cf7bc4a4539eb22ba60895
-DIST websocket-client-1.5.2.tar.gz 50761 BLAKE2B 5b97ce1125a8ae2f95ea103a2436d8c3471bd88c9b6f631ed9cbc1e55bff3eb13e93f662f6892c65b0f035dca66f2b2a43230f228b4f174c56c0203f5e044b07 SHA512 0837dae6ea1096421482dc1882e522d9e9041d9777ef31517116592f7b537735d1d8e319e910481be4abaceda8f79855397e4dfce2c9e622d7e7b6e6577e404e
-DIST websocket-client-1.5.3.tar.gz 50887 BLAKE2B 3268b133c32be46a08208b61fc038b18a142b2e8ee87b1cfc61cd4ea814b9a389f7d72a08ab7dcb8da3a0aa144c1617b5825ce466b81f1f3c066605ad1b47d08 SHA512 6980b88166475f50d5f572bfcaa23f1203ecd1f2c06901ddd6df78d1bfff1ae54ef0a85348d6f28b580fcf405e496bdd67e898c6e4760098ba620bb69c52f39b
-DIST websocket-client-1.6.0.tar.gz 51163 BLAKE2B 2ff1c29f7f2f1e5e3f4708e6d28d1f834e9fe8a5638ab5c04f78a1597e69f387b023a4b8760c98b8fc803a0a5047318753aada1e3161ea63ada782b94a190a24 SHA512 a0c2f51c213a95d94a82a13b6f1b75a865f2686b867ed01503ccd9417bc495fed2f178174c392d4f12adb1ffcb97cfd9762afcc4d8b877572daffa74fd3de90e
 DIST websocket-client-1.6.1.tar.gz 51324 BLAKE2B 7619f6a1dfe7c9df19e645f396b17695ba6e1cda8d06f99be2451c7b3f7d5fc745402abcab2f6b5ce260aab94ecba17439a1f7ff2612acc66dbd88e973f2f512 SHA512 eb784dffb2ad26b63e5890685ed46ccadee40687f4433a1b28392d468fdc1099192095899b56129f72b28e88960744bb5d4991d826476d77ec98bbf18df3f608
diff --git a/dev-python/websocket-client/websocket-client-1.5.1.ebuild b/dev-python/websocket-client/websocket-client-1.5.1.ebuild
deleted file mode 100644
index 3d46ebd70e83..000000000000
--- a/dev-python/websocket-client/websocket-client-1.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="
-	https://github.com/websocket-client/websocket-client/
-	https://pypi.org/project/websocket-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.5.2.ebuild b/dev-python/websocket-client/websocket-client-1.5.2.ebuild
deleted file mode 100644
index e70ca56c7688..000000000000
--- a/dev-python/websocket-client/websocket-client-1.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="
-	https://github.com/websocket-client/websocket-client/
-	https://pypi.org/project/websocket-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.5.3.ebuild b/dev-python/websocket-client/websocket-client-1.5.3.ebuild
deleted file mode 100644
index e70ca56c7688..000000000000
--- a/dev-python/websocket-client/websocket-client-1.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="
-	https://github.com/websocket-client/websocket-client/
-	https://pypi.org/project/websocket-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.6.0.ebuild b/dev-python/websocket-client/websocket-client-1.6.0.ebuild
deleted file mode 100644
index e70ca56c7688..000000000000
--- a/dev-python/websocket-client/websocket-client-1.6.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="
-	https://github.com/websocket-client/websocket-client/
-	https://pypi.org/project/websocket-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.6.1.ebuild b/dev-python/websocket-client/websocket-client-1.6.1.ebuild
index e70ca56c7688..596f7a2a7b64 100644
--- a/dev-python/websocket-client/websocket-client-1.6.1.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/werkzeug/werkzeug-2.3.6.ebuild b/dev-python/werkzeug/werkzeug-2.3.6.ebuild
index 510a6ca0d800..95b34d71e684 100644
--- a/dev-python/werkzeug/werkzeug-2.3.6.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.3.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 20cb0dec6502..c3ec2380a8e0 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,8 +1,3 @@
-DIST zeroconf-0.62.0.tar.gz 141269 BLAKE2B 17efd98394155e415cc9b9b6ff7b2ec6d702613a38e4af8d8e168155a2ecef20f16d4864dc2c62833c9d186d937eca9a5b25846efdc0c21d7bf29f1d911228ca SHA512 d923f23af59dfa09977ec45507c8a02d68a49077652a3fe7d8f23a62e45c525bb431ee5a82c51012d8ba77a7285eaae963a84f0727110780392b0fb7c9966038
-DIST zeroconf-0.63.0.tar.gz 141580 BLAKE2B 22267e2be9118c91b5d7638843e89de0a2838eb1ebca2c233038fc202b8648256193fd8d61523960e1fce110ef7e3c3c06190f5369f700c02cbd047a036a362e SHA512 b899838ddae288b0f0483ca6950871d88ee387769507fe803a68df1cd5657bf9eee2aeecfc2e7685ded5327e70e04cfe445b564f16e3e9191112ddaae7deda18
-DIST zeroconf-0.64.0.tar.gz 142520 BLAKE2B b26c728519b7962c9620f857654e9bd347b1dcd98642a2305f4102ce8fe76cf2f24a934a7a65c355e1dbeaf2152c31f43b529f922b2c3fceec09dbc3f106c6ff SHA512 b85fab86150e88ab4aec8c5f5d338c962ad071140f5ee472b7f3ba8f196a96976e4dc9c1c99b2bd8040d486d0f79c966d45ee2ba58f7724cdbc3345811b9ebc9
-DIST zeroconf-0.64.1.tar.gz 142617 BLAKE2B 100243491aa85b9be8a7664ad9de6f1b202d02fbc2fd3be6116cf1c00c8885ad9fa00c784a036b27338ddb09f6a29b59a056fc610bcf9283cb9fce79110fa07b SHA512 9fa217811bea4b8597bfa4cdca40afd9fdd6920a6499d5b7f61fe78ff09106662f3cbc2381dfbfb541a330ecfa21a751e4bf455f19ba7433b0ebf43da1f21cce
-DIST zeroconf-0.66.0.tar.gz 142962 BLAKE2B 7cc625ea71e00a4e1f47589de1e8168c6299396f1f50d5ba6b530040a0d97ce40b1e858bb76eaaa3e8796c5cc793d819f0b31d693340f2ba5f26cf17d8db3f28 SHA512 544bccaf1acf2a3861c3e0131836f4ccd5d5aadc7222cf34f02ccae61abf32cf7430925698f13d14cf16a62ea9875df6e37fc5e93abfb02dbed79cb1e2e47fe3
-DIST zeroconf-0.68.0.tar.gz 143138 BLAKE2B fc0bdd42245339abf4a283a4f3dba9b820c02074fb78066d9867bf7cdd06c17f2cc5452fdfe3dab93bd3427d800b4901a6cb398593c5beb2495d89b240f3df13 SHA512 6f72391e9486debdb588c3f4e262530b584be967bcb524758e025035aec53ed49fbcee8f9e2c0caaf9a94f2fc5b9c19e5d88e83f1ca909be8d2049f8e2b4e43b
 DIST zeroconf-0.69.0.tar.gz 143434 BLAKE2B 1c80eff0395167879b0d782d1b0fc5f6102a95271682212de11983bd523565622b52ec13591445b4e4015fffa6a94d6b023d7addb6f05b4c1dfd65ce4181d9f5 SHA512 6f9799fe7810cf5357e378435308d87eeef1279768581f1704201f2aa7683a324b4bae697099259b3a85012a8de412bf892aa264322349b2f98d676b392482c2
 DIST zeroconf-0.70.0.tar.gz 143727 BLAKE2B dc7d44e69ebfad71519acfe32ea91dc165b9813c0d16feb4f663845fe532f0b696a2d384a2b5a7091c3b759d484b6d80275a8e70dfa0b9605909bf2758599a1d SHA512 37dc1fde285b09fa2654de685a1dbbbcf35834147ff2f7115ccf569e404d92ff116a5b437a53ef6f40252641ad810cfd862e2d5db6cd76ed2120fb658b50c001
+DIST zeroconf-0.71.0.tar.gz 143961 BLAKE2B 5a51242c148b095c83ef36abf2ba70d4a860e412cd4fdd75293505969397be29577e69e37fff2696ece6300e3b2638d8c2e95db3c7a5aadf78695ddc2adf17ab SHA512 b417a030984bbd9931612b09b44e8be32322d9da01f7e1e8248f4c8054a15a2245db485d71b7a2e57a71a9ec78dd63cc866b4d4f970a9de7b5407936da75773e
diff --git a/dev-python/zeroconf/zeroconf-0.62.0.ebuild b/dev-python/zeroconf/zeroconf-0.62.0.ebuild
deleted file mode 100644
index efb69cd446e8..000000000000
--- a/dev-python/zeroconf/zeroconf-0.62.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.63.0.ebuild b/dev-python/zeroconf/zeroconf-0.63.0.ebuild
deleted file mode 100644
index 18e95e45e5c2..000000000000
--- a/dev-python/zeroconf/zeroconf-0.63.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.64.0.ebuild b/dev-python/zeroconf/zeroconf-0.64.0.ebuild
deleted file mode 100644
index 417165c9efb4..000000000000
--- a/dev-python/zeroconf/zeroconf-0.64.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x SKIP_IPV6=1
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.64.1.ebuild b/dev-python/zeroconf/zeroconf-0.64.1.ebuild
deleted file mode 100644
index 50486a2e065a..000000000000
--- a/dev-python/zeroconf/zeroconf-0.64.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-# Cython-3: https://github.com/python-zeroconf/python-zeroconf/issues/1183
-BDEPEND="
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export REQUIRE_CYTHON=1
-
-python_test() {
-	local -x SKIP_IPV6=1
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.66.0.ebuild b/dev-python/zeroconf/zeroconf-0.66.0.ebuild
deleted file mode 100644
index 50486a2e065a..000000000000
--- a/dev-python/zeroconf/zeroconf-0.66.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-# Cython-3: https://github.com/python-zeroconf/python-zeroconf/issues/1183
-BDEPEND="
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export REQUIRE_CYTHON=1
-
-python_test() {
-	local -x SKIP_IPV6=1
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.68.0.ebuild b/dev-python/zeroconf/zeroconf-0.68.0.ebuild
deleted file mode 100644
index 50486a2e065a..000000000000
--- a/dev-python/zeroconf/zeroconf-0.68.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-# Cython-3: https://github.com/python-zeroconf/python-zeroconf/issues/1183
-BDEPEND="
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export REQUIRE_CYTHON=1
-
-python_test() {
-	local -x SKIP_IPV6=1
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.69.0.ebuild b/dev-python/zeroconf/zeroconf-0.69.0.ebuild
index 547370f5f4c2..901de773de6e 100644
--- a/dev-python/zeroconf/zeroconf-0.69.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.69.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/zeroconf-0.71.0.ebuild b/dev-python/zeroconf/zeroconf-0.71.0.ebuild
new file mode 100644
index 000000000000..547370f5f4c2
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.71.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index d13a7166da2f..97ac779616c7 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1 +1,2 @@
 DIST zipp-3.15.0.tar.gz 18454 BLAKE2B 759c9be6cdf6297874ed8d7cc98e8fc7c360bb765b72b345b264034f43a63831b92daa31a4d40736cc83a12b5f853d17da7fae290cb62a87ac6552edfcaca913 SHA512 74a512428fa29e284c515a7e6c45030e4d840727e12e376bca480a90b7fd1e111462deafa372ca9aebd9f53c24bc37111570e7a4a6a873c0b7dee9a0277c100d
+DIST zipp-3.16.0.tar.gz 18432 BLAKE2B b9f9f016f6f6bc87610fa4338dcbd237b09623cb5da20761e5a6f4e06bc694b6e5fd219681e12468b76b2ebf590f3ea1adfa066dfdf49caf4aecee30f73a4c19 SHA512 f83eb32a28a1f3acf49ade075e8390f89912d1a058cf514432c06efc1963d2a40d78051a6f7963fcdaee3dcf38e327a48a4eef15e5f3ac0db4a9590d6061ccdf
diff --git a/dev-python/zipp/zipp-3.16.0.ebuild b/dev-python/zipp/zipp-3.16.0.ebuild
new file mode 100644
index 000000000000..b9d1c493d482
--- /dev/null
+++ b/dev-python/zipp/zipp-3.16.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="
+	https://github.com/jaraco/zipp/
+	https://pypi.org/project/zipp/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# big_o is only used in test_complexity, that we ignore
+BDEPEND="
+	test? (
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# performance tests are flaky by design
+	tests/test_complexity.py
+)
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "zipp"
+		version = "${PV}"
+		description = "Backport of pathlib-compatible object wrapper for zip files"
+	EOF
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 390df8d42396..6e0e1460d151 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/assistant/assistant-5.15.10.ebuild b/dev-qt/assistant/assistant-5.15.10.ebuild
index 12f38d51e08a..95a6f017be24 100644
--- a/dev-qt/assistant/assistant-5.15.10.ebuild
+++ b/dev-qt/assistant/assistant-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/designer/designer-5.15.10.ebuild b/dev-qt/designer/designer-5.15.10.ebuild
index e3babb8e34b9..131c9c9917df 100644
--- a/dev-qt/designer/designer-5.15.10.ebuild
+++ b/dev-qt/designer/designer-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.10.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.10.ebuild
index 4fc0122600f2..0df86fac0890 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.10.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/linguist/linguist-5.15.10.ebuild b/dev-qt/linguist/linguist-5.15.10.ebuild
index 0f41358c9ef3..5b6769e3789d 100644
--- a/dev-qt/linguist/linguist-5.15.10.ebuild
+++ b/dev-qt/linguist/linguist-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/pixeltool/pixeltool-5.15.10.ebuild b/dev-qt/pixeltool/pixeltool-5.15.10.ebuild
index 65b095c2b500..4bc1920a8dfa 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.10.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qdbus/qdbus-5.15.10.ebuild b/dev-qt/qdbus/qdbus-5.15.10.ebuild
index f2ec589eaf0c..31cf292518cd 100644
--- a/dev-qt/qdbus/qdbus-5.15.10.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.10.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.10.ebuild
index 833686fe5996..ae8c8cd2f2ce 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.10.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qdoc/qdoc-5.15.10.ebuild b/dev-qt/qdoc/qdoc-5.15.10.ebuild
index 7358ed9e1f7d..c642056b0917 100644
--- a/dev-qt/qdoc/qdoc-5.15.10.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 QT5_MODULE="qttools"
@@ -32,3 +32,9 @@ src_prepare() {
 
 	qt5-build_src_prepare
 }
+
+src_configure() {
+	# qt5_tools_configure() not enough here, needs another fix, bug 676948
+	qt5_configure_oos_quirk qtqdoc-config.pri src/qdoc
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qt3d/qt3d-5.15.10.ebuild b/dev-qt/qt3d/qt3d-5.15.10.ebuild
index aa9ae23b4d9d..58a2fa81561b 100644
--- a/dev-qt/qt3d/qt3d-5.15.10.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 inherit qt5-build
 
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.10.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.10.ebuild
index e7c437157c60..c30d48ec750d 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.10.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 QT5_MODULE="qtconnectivity"
diff --git a/dev-qt/qtcharts/qtcharts-5.15.10.ebuild b/dev-qt/qtcharts/qtcharts-5.15.10.ebuild
index 8ff19dca1761..c2c69cd83a7a 100644
--- a/dev-qt/qtcharts/qtcharts-5.15.10.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.15.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Chart component library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.10.ebuild
index 714939f2cd3f..b9d0a5dadd5e 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.10.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtcore/qtcore-5.15.10.ebuild b/dev-qt/qtcore/qtcore-5.15.10.ebuild
index bb160e75674e..615e873d6597 100644
--- a/dev-qt/qtcore/qtcore-5.15.10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.10.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.10.ebuild
index 69e53cbb220f..036712baa689 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.10.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtdbus/qtdbus-5.15.10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.10.ebuild
index b3f0daa28abb..846447157120 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.10.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild
index 1fb7272a0e85..e70e3fb354c2 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=3
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..11} )
diff --git a/dev-qt/qtdiag/qtdiag-5.15.10.ebuild b/dev-qt/qtdiag/qtdiag-5.15.10.ebuild
index ce2f5c0aafc3..482264542e59 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.10.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.10.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.10.ebuild
index acfeaccfaf54..19ce4e27aba2 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.15.10.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt module to support gamepad hardware"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 IUSE="evdev qml sdl"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.10.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.10.ebuild
index daf940d84d66..8cd951d38535 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.10.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/qtgui-5.15.10.ebuild b/dev-qt/qtgui/qtgui-5.15.10.ebuild
index 1788d8cd16e3..f385500d97f0 100644
--- a/dev-qt/qtgui/qtgui-5.15.10.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qthelp/qthelp-5.15.10.ebuild b/dev-qt/qthelp/qthelp-5.15.10.ebuild
index 7b9619c5b3c8..613bf49456f8 100644
--- a/dev-qt/qthelp/qthelp-5.15.10.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.10.ebuild
index 1fc71ebd4a6d..c546fdded876 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.10.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtlocation/qtlocation-5.15.10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.10.ebuild
index b668a16694a3..474141507617 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.10.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.10.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
 	MAPBOXGL_COMMIT=5a07e1967dcc925d9def47accadae991436b9686
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 fi
 
 inherit qt5-build
@@ -49,3 +49,10 @@ src_prepare() {
 	qt5-build_src_prepare
 }
 fi
+
+src_configure() {
+	# src/plugins/geoservices requires files that are only generated when
+	# qmake is run in the root directory. Bug 633776.
+	qt5_configure_oos_quirk qtlocation-config.pri src/location
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.10.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.10.ebuild
index 54a0996459c5..c837a53ca3a7 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.10.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild
index 39ee0ea09f21..e1e33de9cf1b 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.10.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.10.ebuild
index 8ca55634ef0e..52dd082d9b3f 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.10.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtopengl/qtopengl-5.15.10.ebuild b/dev-qt/qtopengl/qtopengl-5.15.10.ebuild
index ba5740e2ba20..3516cea56564 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.10.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtpaths/qtpaths-5.15.10.ebuild b/dev-qt/qtpaths/qtpaths-5.15.10.ebuild
index 4f1248d19ada..65089e8b773b 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.10.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.10.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.10.ebuild
index 6718de2a8736..7f5436a812c0 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.10.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.10.ebuild
index a336232f46a1..0c1244042243 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.10.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.10.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.10.ebuild
index 4f9605ba7339..16757afb354b 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.10.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.10.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.10.ebuild
index 516ef9f53ce3..83656eb57b51 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.10.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtscript/qtscript-5.15.10.ebuild b/dev-qt/qtscript/qtscript-5.15.10.ebuild
index 84c08b2bb93c..734b49795797 100644
--- a/dev-qt/qtscript/qtscript-5.15.10.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/qtscxml-5.15.10.ebuild b/dev-qt/qtscxml/qtscxml-5.15.10.ebuild
index df03cf101cc7..9a76f3de8862 100644
--- a/dev-qt/qtscxml/qtscxml-5.15.10.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsensors/qtsensors-5.15.10.ebuild b/dev-qt/qtsensors/qtsensors-5.15.10.ebuild
index c17bac84a9e9..5c2d6be713cb 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.10.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/qtserialport-5.15.10.ebuild b/dev-qt/qtserialport/qtserialport-5.15.10.ebuild
index 33c11cea1984..d0b37cdc6a71 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.10.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/qtspeech-5.15.10.ebuild b/dev-qt/qtspeech/qtspeech-5.15.10.ebuild
index 19d976af0d2c..5b5ba96d6c1f 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.10.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtsql/qtsql-5.15.10.ebuild b/dev-qt/qtsql/qtsql-5.15.10.ebuild
index cda68ae7f0bc..e212a4f5e857 100644
--- a/dev-qt/qtsql/qtsql-5.15.10.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtsvg/qtsvg-5.15.10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.10.ebuild
index 65a771cc81cf..0b7b1dcc16f5 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.10.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qttest/qttest-5.15.10.ebuild b/dev-qt/qttest/qttest-5.15.10.ebuild
index 0fe023018987..0be181f76485 100644
--- a/dev-qt/qttest/qttest-5.15.10.ebuild
+++ b/dev-qt/qttest/qttest-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qttranslations/qttranslations-5.15.10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.10.ebuild
index a93c56dbcd09..ba35fb50c2be 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.10.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.10.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.10.ebuild
index 5ac114d3dae2..403cfababc93 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.10.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10.ebuild
index f1bed530d4bb..1d468758af62 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.10.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.10.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.10.ebuild
index 80ffa670d6b4..196facafa07b 100644
--- a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.10.ebuild
+++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.10.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.10.ebuild
index e357da75e2aa..b01a3537b949 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.10.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild
index af47654684b8..ce07a4c85372 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
 HOMEPAGE="https://www.qt.io/"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 	if [[ ${PV} == ${QT5_PV}_p* ]]; then
 		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/${P}"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.10.ebuild
index 2a8b5a147209..b612cbb9be1e 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.10.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwebview/qtwebview-5.15.10.ebuild b/dev-qt/qtwebview/qtwebview-5.15.10.ebuild
index ca158199c5b2..2d70ca8c6095 100644
--- a/dev-qt/qtwebview/qtwebview-5.15.10.ebuild
+++ b/dev-qt/qtwebview/qtwebview-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild
index a4f8b71aa72a..6a45eb742a9d 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.10.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.10.ebuild
index 756a955c471d..3fc2e14046b4 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.10.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.15.10.ebuild b/dev-qt/qtxml/qtxml-5.15.10.ebuild
index dfbc2bf9b84f..5da15908c96b 100644
--- a/dev-qt/qtxml/qtxml-5.15.10.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.10.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.10.ebuild
index 19a738140a60..37ab65d896c3 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.10.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.10.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 424f810514c5..3619b4a013a3 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actiontext/actiontext-6.1.7.4-r1.ebuild b/dev-ruby/actiontext/actiontext-6.1.7.4-r1.ebuild
new file mode 100644
index 000000000000..454fdb684f2c
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.1.7.4-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	~dev-ruby/activerecord-${PV}[sqlite]
+	dev-ruby/bundler
+	=dev-ruby/minitest-5.15*:*
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/io-console/io-console-0.6.0-r1.ebuild b/dev-ruby/io-console/io-console-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..54a0ae2fb86d
--- /dev/null
+++ b/dev-ruby/io-console/io-console-0.6.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/io/console/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/io"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="io-console.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="add console capabilities to IO instances"
+HOMEPAGE="https://github.com/ruby/io-console"
+SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/task :test/ s:^:#:' -i Rakefile || die
+
+	# Avoid test that require a proper TTY
+	sed -e '/test_\(bad_keyword\|failed_path\)/aomit "requires TTY"' \
+		-i test/io/console/test_io_console.rb || die
+
+	# Remove ruby and ffi files in accordance with the gemspec. These
+	# are only used when using a different ruby engine like jruby.
+	rm -fr lib/io/console.rb lib/io/console/ffi || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/io-console/io-console-0.6.0.ebuild b/dev-ruby/io-console/io-console-0.6.0.ebuild
deleted file mode 100644
index 6c1240d7498a..000000000000
--- a/dev-ruby/io-console/io-console-0.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/io/console/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/io"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="io-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="add console capabilities to IO instances"
-HOMEPAGE="https://github.com/ruby/io-console"
-SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/task :test/ s:^:#:' -i Rakefile || die
-
-	# Avoid test that require a proper TTY
-	sed -e '/test_\(bad_keyword\|failed_path\)/aomit "requires TTY"' \
-		-i test/io/console/test_io_console.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rake/rake-13.0.6-r2.ebuild b/dev-ruby/rake/rake-13.0.6-r2.ebuild
index 0cd3a7152daf..dccfcd88769a 100644
--- a/dev-ruby/rake/rake-13.0.6-r2.ebuild
+++ b/dev-ruby/rake/rake-13.0.6-r2.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
-DEPEND+=" app-arch/gzip"
+BDEPEND+=" app-alternatives/gzip"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
 	doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/reline/Manifest b/dev-ruby/reline/Manifest
index a1eb387b3050..2d0c88cfcd0e 100644
--- a/dev-ruby/reline/Manifest
+++ b/dev-ruby/reline/Manifest
@@ -1 +1,2 @@
 DIST reline-0.3.5.tar.gz 86159 BLAKE2B 344db9ea247e3acc5b2f346cec657b3702c385b165b0d99e25239d099cbf293705458bc00cbf1646581abc37e0b661962aa2ae6be56879e9a1b8b7b31b2f1ff6 SHA512 5aa6f01cc92d4036f7edb6d10bb1d03300cf79667b87fe7bd4d53bd9cc018b1ac56de7f1ccbaac8ee76d9301196130fcbc6913e482a2c8d78526664f2076677c
+DIST reline-0.3.6.tar.gz 87142 BLAKE2B 7e52e4a1e1cc62f58a5ae45f452b269233b2b681a0146f1ccab5343491053bd514d6fa93610c17bddc4ec3dfc14fa06e6f67559c8d4e254a0d0f857271ee5a31 SHA512 b8a46aaaa5de0658378b5eb52d9ca78d82bb54c392e0cad512bfbba4d82834ea5834582b7055b12ccfae8785ce4d13f232aa9d4e7f8b48da0dd2aeb982cd2705
diff --git a/dev-ruby/reline/reline-0.3.6.ebuild b/dev-ruby/reline/reline-0.3.6.ebuild
new file mode 100644
index 000000000000..e402f399fa66
--- /dev/null
+++ b/dev-ruby/reline/reline-0.3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="reline.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Alternative readline implementation in pure Ruby"
+HOMEPAGE="https://github.com/ruby/reline"
+SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ':'./:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test/reline -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/stringio/Manifest b/dev-ruby/stringio/Manifest
index ebd8cb62cb00..000f22fed0ed 100644
--- a/dev-ruby/stringio/Manifest
+++ b/dev-ruby/stringio/Manifest
@@ -1,4 +1,3 @@
-DIST stringio-3.0.4.tar.gz 43654 BLAKE2B 08f0d41577cae1acba36acc3823218649342c45fde58fd4a2455a40e3f80859e405db541f1f3a55b222083b2e30efb8d6a2396edb208b1cfd802b5b85c196a4c SHA512 835fa9861e2446512715315ecd44ea192f6209ab5a12f10d91f11ad156ba896737531a5074e7f10f6cd5d3500fd07036de7a9d0bcbce4c2ffe75822fbb28a2f8
 DIST stringio-3.0.5.tar.gz 43822 BLAKE2B 5b79def3cb154f4bb1f4a50b8eeb95e0841279d8500b0ad0cdae1f3029c2b53e8e3f46583ed0b5e289afe6636bb4610bc27a25e24acba5c7c1e679c5e4283f3b SHA512 d881dea34738e46fffaceb9a5e88fa3148979eff3571a6693d1d80bd01fbe236c0eb65bd8b2003abc0241bceff93d87fd3acd27b038b3a7bf6da65d492047153
 DIST stringio-3.0.6.tar.gz 44971 BLAKE2B a143fc01e7b9434db3b444f6049b002549a4149b9573ceeab4bf8955555290b1f41ef6ff012c7f58d1bc0559ca864e83aeb34f0cb75c3133ea91ac51f55008ff SHA512 118e7672fb347b111f90f4380e49ad01aac617fdf6afc9317f2242e942e68fa55ef5d71782c15156ed7b4c91d1eff75ac68d870885650ac4505d6a17b368afab
 DIST stringio-3.0.7.tar.gz 44797 BLAKE2B 2772028015b6eb5e5a45e9c86551e62e91e24a627b7280530a10b1d343f08eb19b53d4fbeaf791ed23a239e0609775e8eb4c0550dadc282f690ecc9abef7930b SHA512 fcea0a32bb70c6f1d8a3b237e8a8dbb2677b00c077f0d6ddfa72e1e382c832277ee592dd2e17abdc12003b0494665853eab18fa90bf6f34f51efa0f62f7ea1b9
diff --git a/dev-ruby/stringio/stringio-3.0.4.ebuild b/dev-ruby/stringio/stringio-3.0.4.ebuild
deleted file mode 100644
index bcb84c33aab9..000000000000
--- a/dev-ruby/stringio/stringio-3.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTENSIONS=(ext/stringio/extconf.rb)
-RUBY_FAKEGEM_GEMSPEC="stringio.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pseudo IO class from/to String."
-HOMEPAGE="https://github.com/ruby/stringio"
-SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -e "/s.version =/ s/source_version/'${PV}'/" \
-		-e 's/__dir__/"."/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
index 122733e79907..663ba02a0573 100644
--- a/dev-ruby/sus/Manifest
+++ b/dev-ruby/sus/Manifest
@@ -1,6 +1,3 @@
-DIST sus-0.15.2.tar.gz 25676 BLAKE2B 3cc99d849674b87c8ac919dc176d48cfc184de9ed302f33a40a3f171430e9cc0ad9624c29f95053e7a8bd0ab7b2741bd6a09c7a77707a9ef83a265b09a095b4d SHA512 0f2e0f3640cce798564c53ffb2cc93996eda28af3b49d4f0d89327be960ef68e8aee5b0e906cfbadca0582bf5b363633314fd7d2eabf7ebf4782fe2aed095394
-DIST sus-0.16.0.tar.gz 26123 BLAKE2B 829e2ec74e60eb41809d85e9f74e1c8697d7803c6f26dd5da18f705fb0b35f85d8efb976eb858e07647db2137a1e864181346b69d2dd054d81289a6bd43cca2c SHA512 cd787e63b202df8b501c5d71198b9cfa23085b7e6ad7d9d9a4d023e4fab3a6c103d89390293f9940d14c023ea224b33b5ec728b67988aee8279cf248e20547cf
-DIST sus-0.18.0.tar.gz 27299 BLAKE2B 235ee4b9229d27966eabddd9400b734bd98c9f175eb639830b45269977b75770c72357be7cc631076df90f35cec38cfa6137277394dc1af0053cf81de59a84bf SHA512 3aea3aeac304efeafd0dd27f523196965731521cebb123d781cbb3a59bbaf79a5db460f2bf8461d750865616ec1dd4cf4acc0c29d3be0a0d7f33e21c43e0844c
 DIST sus-0.20.3.tar.gz 28845 BLAKE2B d10b142dd9d7ef44a453746f859a7d4a66eacd09ea157aef1887a95b01a88e7f749f9ca881518500eef48917b5cb1e67ac008327af0ae9df0200875bbe1de3b1 SHA512 1158f6ae53c5aae22454a15eaf7e613a00b1af730bf07af6662bd7e9d7f30365cea9dbebcddb5b6234931cf9414b8c3af0889d73194632cbaad439872cc89059
 DIST sus-0.21.0.tar.gz 29581 BLAKE2B c39102c006b1fdfec6f40ef7eaa973a0cd5039b73402c8c5ff9234a0c06131c24550070fd04d59dd8706edbd08d46604e943f9b69e071dd29eefda103a1a6d1f SHA512 1fdbcbe814411a0ff3b9ebc72143f64fc76dbe11faea915e9d46bda786da9837e62a5a3070ceb6f28ac6bfe2c4fc8646de865efbc679abe80ee2a7abe327c007
 DIST sus-0.21.1.tar.gz 29580 BLAKE2B 9a30950b4ad9da13af48c50a96951ba9f9cace97fac3a603de5acfe489dc8c8d4581b064f2452c9bf5da96da4db8f488df42f89a2113dd924c8ba8fcf8fd9230 SHA512 73db74f791f47a898840db65cf9c2f98b92f3d2a5319828f26dc55c8aef8e0932060c1075f5010b3c2b887891c1467a3828728f78a84297725d851966093ce9e
diff --git a/dev-ruby/sus/sus-0.15.2.ebuild b/dev-ruby/sus/sus-0.15.2.ebuild
deleted file mode 100644
index 439f98b70da2..000000000000
--- a/dev-ruby/sus/sus-0.15.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and scalable test runner"
-HOMEPAGE="https://github.com/ioquatix/sus"
-SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Remove the sus configuration which enabled coverage checks.
-	# Its dependency is not packaged.
-	rm -f config/sus.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} bin/sus-parallel || die
-}
diff --git a/dev-ruby/sus/sus-0.16.0.ebuild b/dev-ruby/sus/sus-0.16.0.ebuild
deleted file mode 100644
index 46c6a8c0fd05..000000000000
--- a/dev-ruby/sus/sus-0.16.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and scalable test runner"
-HOMEPAGE="https://github.com/ioquatix/sus"
-SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Remove the sus configuration which enabled coverage checks.
-	# Its dependency is not packaged.
-	rm -f config/sus.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} bin/sus-parallel || die
-}
diff --git a/dev-ruby/sus/sus-0.18.0.ebuild b/dev-ruby/sus/sus-0.18.0.ebuild
deleted file mode 100644
index 46c6a8c0fd05..000000000000
--- a/dev-ruby/sus/sus-0.18.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and scalable test runner"
-HOMEPAGE="https://github.com/ioquatix/sus"
-SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Remove the sus configuration which enabled coverage checks.
-	# Its dependency is not packaged.
-	rm -f config/sus.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} bin/sus-parallel || die
-}
diff --git a/dev-ruby/syslogger/syslogger-1.6.6-r2.ebuild b/dev-ruby/syslogger/syslogger-1.6.6-r2.ebuild
index 60ace531122d..511cd0a413d3 100644
--- a/dev-ruby/syslogger/syslogger-1.6.6-r2.ebuild
+++ b/dev-ruby/syslogger/syslogger-1.6.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index de1252e52aab..884fdc107027 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,3 +1,2 @@
 DIST temple-0.10.0.gem 40960 BLAKE2B c3d272bc5f9263f5727fc81803f1c265f39ba10a3336bccbe17ce9aa4a6a13304c73a8d323bc45fe59c5d8230a569ad3af3de9225c8e21eccda291e89e482d75 SHA512 b207ff1f29b810c943577da1ce72c7eaa2bd672758929b39d6f92c5061c85c720fd49fbb666d5d8f9d1a8c1fbbef28f85cadb6635c12a3ceec29f8b0305833cc
 DIST temple-0.10.2.gem 40960 BLAKE2B 690d4a891d30d453c303aa47c07f341334cdbf4605f3936422d939bd148cb0df412d00c2718db2e6e9b9ab7a1c2ba7f538cdc96fec17958215b95a1b60093955 SHA512 54cc549056924958ce36c52d2b795cc3303ddd689f5fbe50b01c1e806582b97d37e438d917eaf6c05519b4aad9b05fff5e305d8d614c1e8f714f1e1a88d8db23
-DIST temple-0.9.1.gem 40960 BLAKE2B f9c87bc713b934980cebaf79737eea89c82d845027cabcd67f3420da621f6797bd99481b1bb624a8894d71f4843ee3ac612f1da661991b8adcc002e2a12f32a9 SHA512 2d7c0c64fb51356599ecbd9119314f954341acf66d5ad729b7e19058628118509e14ef116d4ed549996d7119cf9a1f38de5818b46ef5a9a19473b0d007131e6a
diff --git a/dev-ruby/temple/temple-0.9.1.ebuild b/dev-ruby/temple/temple-0.9.1.ebuild
deleted file mode 100644
index 4162034e7ada..000000000000
--- a/dev-ruby/temple/temple-0.9.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
-HOMEPAGE="https://github.com/judofyr/temple"
-
-LICENSE="MIT"
-SLOT="0.7"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/erubi
-	>=dev-ruby/tilt-2.0.1 )"
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index f31a652a34a5..121a3ff5e552 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,2 +1,3 @@
 DIST tilt-2.0.11.tar.gz 53041 BLAKE2B 2509cc3efe5e6302c8943c00108eeda6ee4b23a18952ad23049e11ea28b397b80a21d34c4d241119f45cedf2a978a2673d857a6cc32d7e26a2016caa510458f9 SHA512 e28e31ab92aa42eada34e0f6c05dab6a54945d07b649588356b1635ba8a36700f6e537e8702613883693501442d21690d8b3690b06f7b9f331192134511b78b7
 DIST tilt-2.1.0.tar.gz 54542 BLAKE2B b2d7729654efb51d9f61afe75476d6620edd7c104c045dc68c6a5e983cea8dec612d2e5013c51ee7736c87d770acdf8e6f186ff156d177f3281e0fb58d0e8422 SHA512 a450bdc51d782169cda2c43b550fad1425d4ee1a8f3c2da0bb1112051eb9ccfd95e903984ed6d3c76b0f322a243021587c6614f6452c385450ff1a985cfbcaa5
+DIST tilt-2.2.0.tar.gz 57826 BLAKE2B 10729ac9cb2e2d0b2292a6fdacc0d705179d719d7f4bbdb11075e0eeaeb82933daec22063d3448ea2ada6e50f37b2b66303854707f50162efd11a6151ded45df SHA512 135a32402512fda71952dc2534b02a291d749dbdcb9e17f52c7fa6ecfe3bd7e894f28f3d3d4a595daa63ffbe90cca106347aa916541292558a26d8122fcd7c90
diff --git a/dev-ruby/tilt/tilt-2.2.0.ebuild b/dev-ruby/tilt/tilt-2.2.0.ebuild
new file mode 100644
index 000000000000..200a882f0d0c
--- /dev/null
+++ b/dev-ruby/tilt/tilt-2.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
+
+RUBY_FAKEGEM_GEMSPEC="tilt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
+HOMEPAGE="https://github.com/jeremyevans/tilt"
+SRC_URI="https://github.com/jeremyevans/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Block on some of the potential test dependencies. These dependencies
+# are optional for the test suite, and we don't want to depend on all of
+# them to facilitate keywording and stabling.
+ruby_add_bdepend "test? (
+	dev-ruby/erubi
+	dev-ruby/nokogiri
+)"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
+	sed -e '7irequire "uri"' -i test/test_helper.rb || die
+
+	# Avoid tests with minor syntax differences since this happens all
+	# the time when details in the dependencies change.
+	rm -f test/tilt_sasstemplate_test.rb || die
+
+	# Skip tests for unpackaged asciidoctor converter
+	sed -i -e '/docbook 4.5/askip' test/tilt_asciidoctor_test.rb || die
+}
diff --git a/dev-ruby/twitter/Manifest b/dev-ruby/twitter/Manifest
index 2f7612a48213..9cce530b6162 100644
--- a/dev-ruby/twitter/Manifest
+++ b/dev-ruby/twitter/Manifest
@@ -1 +1,2 @@
 DIST twitter-7.0.0.tar.gz 831181 BLAKE2B aeb888bf1551116916cc10a4c0278dcee541e953c6e1be09bd95f348b8a2a08075d44c4b8beb736b13564d550b5797184c725141c5c3866f5423afddfdfbea19 SHA512 4b0f831ddb1f54fc5894a15010d17b54c62f6caa3eadd6a1f0e0ef37235f29f53f6315c49213244d79ab3708d5a7b1e1b9735d1f35fa291a66d439db916d3ec7
+DIST twitter-8.0.0.tar.gz 830698 BLAKE2B 187c37adb2971845730ba8ef15f7350083130c1c2f1704f3dc909aee28e8b7742e1a45b3bac8d198eb45f4e415dd15ebfe0099d9e52b7c5a5ec40ca2a6cdaa2e SHA512 b67e97385cb53cb4d75381fb16a6395d0ea72dc2fa0a900ff072ef0ef87947364967da9070e5a2449f5a938740ac0910a342d8ff3bd62095ecfb468b173a754e
diff --git a/dev-ruby/twitter/twitter-8.0.0.ebuild b/dev-ruby/twitter/twitter-8.0.0.ebuild
new file mode 100644
index 000000000000..cb4d2622eb59
--- /dev/null
+++ b/dev-ruby/twitter/twitter-8.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="twitter.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper around the Twitter API"
+HOMEPAGE="https://github.com/sferik/twitter/"
+SRC_URI="https://github.com/sferik/twitter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.3
+	=dev-ruby/buftok-0.3.0*
+	>=dev-ruby/equalizer-0.0.11
+	=dev-ruby/equalizer-0.0*
+	>=dev-ruby/http-5.1:5
+	>=dev-ruby/http-form_data-2.3:2
+	=dev-ruby/llhttp-ffi-0.4*
+	=dev-ruby/memoizable-0.4*
+	=dev-ruby/multipart-post-2*
+	>=dev-ruby/naught-1.1
+	=dev-ruby/simple_oauth-0.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/webmock:3
+	>=dev-ruby/timecop-0.6.1
+	)
+	doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+#	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die "Unable to remove bundler code."
+
+	sed -i -e '/simplecov/,/^end/ s:^:#:' \
+		-e '1igem "webmock", "~>3.0"' spec/helper.rb || die
+
+	# Avoid a spec that fails due to changes in dependencies.
+	sed -i -e '/#reverse_token/,/^  end/ s:^:#:' \
+		spec/twitter/rest/oauth_spec.rb
+}
+
+each_ruby_test() {
+	CI=true RSPEC_VERSION=3 ruby-ng_rspec || die
+}
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index 368d91ad63a2..cf54faee90d6 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -1,2 +1 @@
-DIST typeprof-0.21.3.tar.gz 1073355 BLAKE2B e8fa905b69f30b8f9884bae6b9600f802d0f0055f61f4a619768bf37547049fba97b8670cad9cdaeec9aa44519ae28bb13b8b0f533ff4d89e892e1726b56f7ff SHA512 ac9f0be4025181b994568e946591ddca4d0e4bb1949ba84d1920d765ba4549212e3fc4c10904ed691ecdbb153cd1b494f51065fcfddc4cb3c72ff5b393aa7c62
 DIST typeprof-0.21.7.tar.gz 1036834 BLAKE2B c0a8a1ed3a0592f72489eb342cbaf132e647d11ef5f3eef003b4208e512f581aacd586cac137c9b405d59f71e1b9e2cbc9903a9c1b4791db0ad0a64485247eea SHA512 0dd149da7873ec4422a03fa31a828a8efafa5faff0c23dffde74650b71e14d472f1bb0c36d28a48e0538a761538504937ad4e0f8a711a9f5c2b52ac4128a8f37
diff --git a/dev-ruby/typeprof/typeprof-0.21.3.ebuild b/dev-ruby/typeprof/typeprof-0.21.3.ebuild
deleted file mode 100644
index 1c11643810de..000000000000
--- a/dev-ruby/typeprof/typeprof-0.21.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
-HOMEPAGE="https://github.com/ruby/typeprof"
-SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
-
-all_ruby_prepare() {
-	# Avoid tests that download live code using git
-	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
-
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/version_gem/Manifest b/dev-ruby/version_gem/Manifest
index c325e1c1c900..66cec4983c80 100644
--- a/dev-ruby/version_gem/Manifest
+++ b/dev-ruby/version_gem/Manifest
@@ -1,2 +1 @@
-DIST version_gem-1.1.2.tar.bz2 22084 BLAKE2B 865b4b193c62ccf40d3f4bb086d9b5c297426d6d260617d9619a0f83a1e6d00a47231439a8851c22648572a768eb83ab9822c44a3d8a0c7a023be1491bb05a48 SHA512 e0fb5c31ef4c36889ac7f90e173e4c45f30ecad3439d2ec99aeec1d63e27ee1697a02271b62cc0565cbd3491c3384d925aa7d1d9d7a879549cb2ef9f326f8127
 DIST version_gem-1.1.3.tar.bz2 24554 BLAKE2B 419851cb5fcc5391449b28785aecc1c4e145bed4eafb443cdcd284d3b19d0911307afd226e43a829f34784a2fe7ece5e7e00502bfa5a9b0bb7eb49d0b6dcebf4 SHA512 77e90c6c2a52495ad9096fb83a10492f5b9bda35160287e15898351204ead174677021bde58f5dc7cd8f02f1d599736b3c3b7aba291f73e44edece10c61646e4
diff --git a/dev-ruby/version_gem/version_gem-1.1.2.ebuild b/dev-ruby/version_gem/version_gem-1.1.2.ebuild
deleted file mode 100644
index c92817188a50..000000000000
--- a/dev-ruby/version_gem/version_gem-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="version_gem.gemspec"
-
-#RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Enhance that VERSION! Sugar for boring Version modules"
-HOMEPAGE="https://gitlab.com/oauth-xx/version_gem"
-SRC_URI="https://gitlab.com/oauth-xx/version_gem/-/archive/v${PV}/version_gem-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-RUBY_S="version_gem-v${PV}"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/if RUN_COVERAGE/if false/' spec/spec_helper.rb || die
-
-	# Avoid broken implementation already fixed upstream
-	sed -i -e "s/'when actual' do/'when actual', pending: 'broken spec' do/" spec/version_gem/ruby_spec.rb || die
-}
diff --git a/dev-ruby/web-console/web-console-4.2.0.ebuild b/dev-ruby/web-console/web-console-4.2.0.ebuild
index 4948c90f97ac..d8c735f6df97 100644
--- a/dev-ruby/web-console/web-console-4.2.0.ebuild
+++ b/dev-ruby/web-console/web-console-4.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
 
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.7.5.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.7.5.ebuild
deleted file mode 100644
index 2ff9a692bd08..000000000000
--- a/dev-ruby/websocket-driver/websocket-driver-0.7.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/websocket-driver/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A complete implementation of the WebSocket protocols"
-HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
-SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby31)
-			# Avoid specs broken by a cosmetic change in port number handling.
-			# https://github.com/faye/websocket-driver-ruby/pull/88
-			rm -f spec/websocket/driver/client_spec.rb || die
-			;;
-	esac
-}
diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index 7658f048a4d9..886ada85f58d 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1 +1,2 @@
 DIST will_paginate-3.3.1.gem 34816 BLAKE2B c8506fd9c529764e539ba799b3ef12f47e8d17a8579f2337163ab316cb6d9fe40c3d41c94e9616f55b9f3766989b11e5fb0579f0a69d2ee52c3f5c6104f32b7b SHA512 6b17ba13aeb3733811d6ab10f8c873b9f3687c88a86971f2aa820df7d294b304eaf74c699f34aca2242a0be6033db03d07f67d76fc183b2685ee1be53c9c1c64
+DIST will_paginate-4.0.0.tar.gz 36062 BLAKE2B 9d2c61bc7e223be1b94b67807ef80c0d0094c062b06415dd688af8a5e8f62b9eb1a81c84c9fc15ada328cb9df28d354b98cdbbcaa5056cfa3b48a2c6d0ce1be3 SHA512 b6268ef9ec45a03cd21928578ad7df14c80de905b386978cc2dd50b42ea919c9e139ee820362cdd64ed0258bb3f38b3a1c39f4207828891cb1691d16f7699bc0
diff --git a/dev-ruby/will_paginate/will_paginate-4.0.0.ebuild b/dev-ruby/will_paginate/will_paginate-4.0.0.ebuild
new file mode 100644
index 000000000000..c9a6d92dedaf
--- /dev/null
+++ b/dev-ruby/will_paginate/will_paginate-4.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="will_paginate.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Most awesome pagination solution for Ruby"
+HOMEPAGE="https://github.com/mislav/will_paginate/"
+SRC_URI="https://github.com/mislav/will_paginate/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	# Remove tests for unpackaged ORMs
+	rm -f spec/finders/{sequel,mongoid,data_mapper}* || die
+}
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rails
+		dev-ruby/activerecord[sqlite]
+		dev-ruby/mocha
+	)"
diff --git a/dev-ruby/xdr/metadata.xml b/dev-ruby/xdr/metadata.xml
index 89d964794753..b7c3a5eef44f 100644
--- a/dev-ruby/xdr/metadata.xml
+++ b/dev-ruby/xdr/metadata.xml
@@ -10,6 +10,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">stellar/ruby-xdr</remote-id>
+    <remote-id type="github">astroband/ruby-xdr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/xdr/xdr-3.0.3.ebuild b/dev-ruby/xdr/xdr-3.0.3.ebuild
index 37e6a1690f1c..3d7b44c8008b 100644
--- a/dev-ruby/xdr/xdr-3.0.3.ebuild
+++ b/dev-ruby/xdr/xdr-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 09dfc44eda8f..f7f81d4666b8 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/bigloo/bigloo-4.4c_p4-r5.ebuild b/dev-scheme/bigloo/bigloo-4.4c_p4-r5.ebuild
index c1d2c93aafbb..4cfa3c8cc3ba 100644
--- a/dev-scheme/bigloo/bigloo-4.4c_p4-r5.ebuild
+++ b/dev-scheme/bigloo/bigloo-4.4c_p4-r5.ebuild
@@ -142,11 +142,11 @@ src_configure() {
 }
 
 src_compile() {
-	default
+	emake -j1
 
-	emake -C bdl
-	emake -C bdb
-	emake -C cigloo
+	emake -C bdl -j1
+	emake -C bdb -j1
+	emake -C cigloo -j1
 
 	use emacs && emake -C bmacs
 }
diff --git a/dev-scheme/fibers/Manifest b/dev-scheme/fibers/Manifest
index 12710e3d869d..92ff7d3ebc3a 100644
--- a/dev-scheme/fibers/Manifest
+++ b/dev-scheme/fibers/Manifest
@@ -1,2 +1 @@
-DIST fibers-1.2.0.tar.gz 104975 BLAKE2B d43175eeb03bf8ed1100e948423e0e7abb5ae1d859f3d4dd82f775b7b0ff477d99d1d2fffd9ccf0a1c19ab398f33eb1d7cefad30ba1991a63a63755ae38e6f07 SHA512 3113e287ab2b09c54c14a5c4d2b0330fcfc96281ec6f234655acadfb5a3c0a2872b602089e4fa025f42ba52749e71121062057029097f0957d71e97c0e4e9c71
 DIST fibers-1.2.0_p20230522.tar.gz 108368 BLAKE2B 4d7b773d29b235c94a86b55e17d8cbf1544024e803a00681f46221483f9112da954befb612ba2ceaa185ec6992b049a9fb144f32331ab7699436d8e107de8b10 SHA512 1ea2a6a56bbae88244a3f606cef24087949b18aa931af4d98ee1212665a93cb107cc9f8a1d250b45954f76979002656eac002105e6b3b82c0422ddb9006602d9
diff --git a/dev-scheme/fibers/fibers-1.2.0.ebuild b/dev-scheme/fibers/fibers-1.2.0.ebuild
deleted file mode 100644
index 5bedc28e5196..000000000000
--- a/dev-scheme/fibers/fibers-1.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Lightweight concurrency facility for Guile Scheme"
-HOMEPAGE="https://github.com/wingo/fibers/
-	https://github.com/wingo/fibers/wiki/Manual/"
-SRC_URI="https://github.com/wingo/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-scheme/guile-2.1.7:="
-DEPEND="${RDEPEND}"
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-Werror
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2dcac64bd5be..9ae431a0a721 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/clazy/clazy-1.11-r2.ebuild b/dev-util/clazy/clazy-1.11-r2.ebuild
deleted file mode 100644
index caf68b299f37..000000000000
--- a/dev-util/clazy/clazy-1.11-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=15
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm python-any-r1
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://apps.kde.org/clazy"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-regex-detect.patch"
-	"${FILESDIR}/${P}-fix-llvm-15.patch"
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}" && has_version "sys-devel/llvm:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	export LLVM_ROOT="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Run tests against built copy, not installed
-	# bug #811723
-	PATH="${BUILD_DIR}/bin:${PATH}" LD_LIBRARY_PATH="${BUILD_DIR}/lib" cmake_src_test
-}
diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
index f94951e9f8f9..7544fb8e3fa0 100644
--- a/dev-util/fq/Manifest
+++ b/dev-util/fq/Manifest
@@ -2,3 +2,5 @@ DIST fq-0.5.0-deps.tar.xz 23548612 BLAKE2B 2ad41a19b4f600df4ef1ad4e900d037d5df2b
 DIST fq-0.5.0.tar.gz 14043325 BLAKE2B a69d2f8602c8a1def0aff3c291e6ace23509e53a96c3b0e11e0353bc8a35cdd7ca6a8c8d1d72557e1c6895154d5e62070a7cd35ac76224c676c7e708e512d349 SHA512 21d0d23c21d12188bff10845b1c31cc8535f31ccef54d2b3e5b9b9770d6d0c830a9d83db3fb7f6559e940227bdcd8fdb3df45eccc2ab4cfe2e36214585e21343
 DIST fq-0.6.0-deps.tar.xz 23555196 BLAKE2B 9cdaefa577a4f795cdae1ad548a973439e3f9bc00570cee15009fbcc09002598e58888c00ed2179425c124cc00b213476717755e07c580e4e6664649448d5938 SHA512 075f51047f3c8884dd220d14fb72a1b35f2988cc4f5ff103349f4727361be1d0ed404526eaebf8481ab215e8cbca1f20c74981710403b74110311b0e50231fab
 DIST fq-0.6.0.tar.gz 14669090 BLAKE2B 6ad6be12df84e8c21f01679a1dcb94b9095735570843258fe302c5b1ac0d45305fdb4ad15fff287077ecdd20bc51af56f9036127e7dcfc23b69160dc4ee04d75 SHA512 625bef47f03115d52a960ce1afb5f850f8cd8a5414a12df3213fd3af6e6d9b7c0022dc62ee2d424d6dcbee828c9c8f233050e9d0afb880aac2864c2b24737f40
+DIST fq-0.7.0-deps.tar.xz 30504100 BLAKE2B c5882e883ee63b6e342a1f492a7455fd51712ea4eba294f3f360293fc5acb9a561d92d1a1f5aadc81aba8cb8f9528b4f55cd17e0789d10770f2b130f16ddcadd SHA512 08cd7904056c571553621c9baf66b35a82dc4ef6ea608e5c3692155769293743ade964682e565d46ace2e26ab769b1dcb3b23933acda9fb82e6725cee682f761
+DIST fq-0.7.0.tar.gz 14694306 BLAKE2B 5eb70ffd97b17d9c8b457939c05df2fe9c852766483914e877a72b07a03516d6c23220e08ad1209e0211ad27123f4782947004da7e67179a17460790b5e6d659 SHA512 6f04b705f466009c53e6626411f84346486a688bbc6ddb596e0b2f6dbae46b12734e0345fd4641883fda209fe0fee5c04cf65398bb9a4215b297d9ebc74c1372
diff --git a/dev-util/fq/fq-0.7.0.ebuild b/dev-util/fq/fq-0.7.0.ebuild
new file mode 100644
index 000000000000..5df96c3f076c
--- /dev/null
+++ b/dev-util/fq/fq-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
+HOMEPAGE="https://github.com/wader/fq"
+SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-tcltk/expect )"
+
+src_prepare() {
+	default
+
+	# Don't unconditionally (and therefore twice) build tests
+	# TODO: upstream
+	sed -i -e 's/all: test fq/all: fq/' Makefile || die
+}
+
+src_compile() {
+	# Avoid -s being set in Makefile (stripping)
+	export GO_BUILD_LDFLAGS="-w"
+
+	default
+}
+
+src_install() {
+	einstalldocs
+
+	dobin fq
+}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.confd b/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
index 6bb38f3e6ce3..208dd2850408 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r1.confd
@@ -39,10 +39,8 @@ JENKINS_ARGS=""
 #
 JENKINS_USER=jenkins
 
-
-
 #
-# Pid File 
+# Pid File
 #
 JENKINS_PIDFILE="/var/run/jenkins.pid"
 
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r3.init b/dev-util/jenkins-bin/files/jenkins-bin-r3.init
index 96ddbc1fd421..b5c02a0ea2b5 100644
--- a/dev-util/jenkins-bin/files/jenkins-bin-r3.init
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r3.init
@@ -28,7 +28,6 @@ start() {
     PARAMS="--logfile=/var/log/jenkins/jenkins.log"
     [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
     [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
-    [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
     [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
 
     if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.401.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.401.2.ebuild
index a6cffe5d8277..b87af37db7c2 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.401.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.401.2.ebuild
@@ -5,10 +5,10 @@ EAPI=8
 
 inherit systemd
 
-DESCRIPTION="Extensible continuous integration server"
+DESCRIPTION="The leading ope source automation server"
 HOMEPAGE="https://jenkins.io/"
 LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
 SLOT="lts"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE=""
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.410.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.410.ebuild
index 45f6ff742f49..fa5a1d259805 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.410.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.410.ebuild
@@ -5,10 +5,10 @@ EAPI=8
 
 inherit systemd
 
-DESCRIPTION="Extensible continuous integration server"
+DESCRIPTION="The leading open source automation server"
 HOMEPAGE="https://jenkins.io/"
 LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SRC_URI="https://get.jenkins.io/war/${PV}/${PN/-bin/}.war -> ${P}.war"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE=""
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index fdf6f914fa65..df5f83f8b352 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,3 +1,4 @@
 DIST ostree-2023.1.tar.xz 2079904 BLAKE2B 993570624cb43684d81fff9f3789a9cee3b998f945a78bc6eb99330eed45739d1e6fb66589cefba10eea608c5cd389cc121a890c27efa773a405a5d8b1f117d9 SHA512 a6a6e47d6cb9ec6826d48a50a2abac69e4a040f2b5830d39e8a006c738a163fb15fde8630bf271d92cec9470601281669cd4bf942e4b7c4d42441bd5d1730572
 DIST ostree-2023.2.tar.xz 2081320 BLAKE2B f773bf979b4bc97b9b8f96dc4385745bc386c29952a36c07cdd33a7db7802876ce154b5ac1f3669605ab3949a539aa8e2b3a3d94608557eb65249b5188f9d012 SHA512 549a2bdf8cef93d421aaf990e2d1c534063f0314b5933db7ce123bdd138229e24cc171d541296e45a7546a91d35149c1c8f29ea90949876200c574e7ec297b98
 DIST ostree-2023.3.tar.xz 2075168 BLAKE2B 6e699420a89b36520e60a5682a421fd8f10eb20702abe6af97be9ee78a04be98e8d164157d29726de9e63b869051f7e60f199776ea3d959d4f0ad4165ff780c6 SHA512 af3b80d55e15b515e860ab0ee5f061f1a4d649b21441d5cde66e71ff4349ef480565cb795838ebce2f42784d53e349c2443159d9ee452277001d930ba814fe40
+DIST ostree-2023.5.tar.xz 2115184 BLAKE2B ac1fa6764e1b7e5cd6656f2977b2605e3d2c612e6ee426fc8dbd7c84d6aebe72159943d7c2e53a2898aee6c085814228df772edc35b93daa23cb14bbb5642a6f SHA512 0bb19f199344d8db7299cf710f2ba0b2657cdcb5b1fc6d85446cef9538b069e470b47fc0c2c1029e12b8b9adb978f32a6f44f48949ff5c97a01051a425a9f2d5
diff --git a/dev-util/ostree/ostree-2023.5.ebuild b/dev-util/ostree/ostree-2023.5.ebuild
new file mode 100644
index 000000000000..680a258f04e4
--- /dev/null
+++ b/dev-util/ostree/ostree-2023.5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostreedev.github.io/ostree/"
+SRC_URI="
+	https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz
+		-> ${P}.tar.xz
+"
+S="${WORKDIR}/lib${P}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
+RESTRICT="test"
+REQUIRED_USE="
+	dracut? ( systemd )
+	http2? ( curl )
+	httpd? ( || ( curl soup ) )
+"
+
+RDEPEND="
+	app-arch/xz-utils
+	dev-libs/glib:2
+	sys-fs/fuse:3
+	sys-libs/zlib
+	archive? ( app-arch/libarchive:= )
+	curl? ( net-misc/curl )
+	dracut? ( sys-kernel/dracut )
+	gpg? (
+		app-crypt/gpgme:=
+		dev-libs/libgpg-error
+	)
+	grub? ( sys-boot/grub:2= )
+	introspection? ( dev-libs/gobject-introspection )
+	libmount? ( sys-apps/util-linux )
+	selinux? ( sys-libs/libselinux )
+	sodium? ( >=dev-libs/libsodium-1.0.14:= )
+	soup? ( net-libs/libsoup:3.0 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/glib-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/ostree-2023.3-dont-force-clang-introspection.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Needs Bison (bug #884289)
+	unset YACC
+
+	local econfargs=(
+		--enable-man
+		--enable-shared
+		--with-grub2-mkconfig-path=grub-mkconfig
+		--with-modern-grub
+		$(use_with archive libarchive)
+		$(use_with curl)
+		$(use_with dracut dracut yesbutnoconf) #816867
+		$(use_enable doc gtk-doc)
+		$(usex introspection --enable-introspection={,} yes no)
+		$(use_with gpg gpgme)
+		$(use_enable http2)
+		$(use_enable httpd trivial-httpd-cmdline)
+		$(use_with selinux )
+		$(use_with soup soup3)
+		--without-soup # libsoup:2.4
+		$(use_with libmount)
+		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
+		$(use_with sodium ed25519-libsodium)
+		$(use_with systemd libsystemd)
+		$(use_with zeroconf avahi)
+	)
+
+	if use systemd; then
+		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+	fi
+
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process ostree-tmpfiles.conf
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index cf4059906562..f29ce0668bdc 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 847c436651af..5e23d793915a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -326,6 +326,28 @@ qt5-build_pkg_postrm() {
 
 ######  Public helpers  ######
 
+# @FUNCTION: qt5_configure_oos_quirk
+# @USAGE: <file> or <file> <path>
+# @DESCRIPTION:
+# Quirk for out-of-source builds. Runs qmake in root directory, copies
+# generated pri <file> from source <path> to build dir <path>.
+# If no <path> is given, <file> is copied to ${QT5_BUILD_DIR}.
+qt5_configure_oos_quirk() {
+	if [[ "$#" == 2 ]]; then
+		local source="${2}/${1}"
+		local dest="${QT5_BUILD_DIR}/${2}"
+	elif [[ "$#" == 1 ]]; then
+		local source="${1}"
+		local dest="${QT5_BUILD_DIR}"
+	else
+		die "${FUNCNAME[0]} must be passed either one or two arguments"
+	fi
+
+	mkdir -p "${dest}" || die
+	qt5_qmake "${QT5_BUILD_DIR}"
+	cp "${source}" "${dest}" || die
+}
+
 # @FUNCTION: qt5_syncqt_version
 # @DESCRIPTION:
 # Wrapper for Qt5 syncqt.pl to sync header files for ${PV} (required to run if
@@ -739,44 +761,7 @@ qt5_tools_configure() {
 	# allow the ebuild to override what we set here
 	myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" )
 
-	# out-of-source build quirks
-	case ${PN} in
-		qdoc)
-			# bug 676948
-			qt5_tools_oos_quirk qtqdoc-config.pri src/qdoc
-			;;
-		qtlocation)
-			# src/plugins/geoservices requires files that are only generated
-			# when qmake is run in the root directory. bug 633776
-			qt5_tools_oos_quirk qtlocation-config.pri src/location
-			;;
-		*) ;;
-	esac
-
-	qt5_tools_oos_quirk qttools-config.pri
-}
-
-# @FUNCTION: qt5_tools_oos_quirk
-# @INTERNAL
-# @USAGE: <file> or <file> <path>
-# @DESCRIPTION:
-# Quirk for out-of-source builds. Runs qmake in root directory, copies
-# generated pri <file> from source <path> to build dir <path>.
-# If no <path> is given, <file> is copied to ${QT5_BUILD_DIR}.
-qt5_tools_oos_quirk() {
-	if [[ "$#" == 2 ]]; then
-		local source="${2}/${1}"
-		local dest="${QT5_BUILD_DIR}/${2}"
-	elif [[ "$#" == 1 ]]; then
-		local source="${1}"
-		local dest="${QT5_BUILD_DIR}"
-	else
-		die "${FUNCNAME[0]} must be passed either one or two arguments"
-	fi
-
-	mkdir -p "${dest}" || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${source}" "${dest}" || die
+	qt5_configure_oos_quirk qttools-config.pri
 }
 
 # @FUNCTION: qt5_qmake_args
diff --git a/eclass/user-info.eclass b/eclass/user-info.eclass
index b18f280c1022..1cc7b8250309 100644
--- a/eclass/user-info.eclass
+++ b/eclass/user-info.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: user-info.eclass
@@ -64,7 +64,7 @@ egetent() {
 			getent "${db}" "${key}"
 		else
 			if [[ ${key} =~ ^[[:digit:]]+$ ]]; then
-				grep -E "^([^:]*:){2}${key}" "${ROOT}/etc/${db}"
+				grep -E "^([^:]*:){2}${key}:" "${ROOT}/etc/${db}"
 			else
 				grep "^${key}:" "${ROOT}/etc/${db}"
 			fi
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 8f28b52bafa3..f0d2b09f0b70 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch b/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch
new file mode 100644
index 000000000000..d4a803b97aec
--- /dev/null
+++ b/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch
@@ -0,0 +1,138 @@
+https://bugs.gentoo.org/910081
+https://github.com/shlomif/PySolFC/commit/75a3000ca1301e15d5fdbc6bae6df8dbf1cac066
+
+From 75a3000ca1301e15d5fdbc6bae6df8dbf1cac066 Mon Sep 17 00:00:00 2001
+From: Joe R <joeraz5@verizon.net>
+Date: Sun, 2 Jul 2023 11:07:24 -0400
+Subject: [PATCH] New logic for getting resampling method, for compatibility
+ with newer Pillow versions.
+
+--- a/pysollib/mfxutil.py
++++ b/pysollib/mfxutil.py
+@@ -106,6 +106,17 @@ def format_time(t):
+     return "%d:%02d:%02d" % (t // 3600, (t % 3600) // 60, t % 60)
+ 
+ 
++def get_default_resampling():
++    if not USE_PIL:
++        return 0
++    elif hasattr(Image, "ANTIALIAS"):
++        return Image.ANTIALIAS
++    elif hasattr(Image, "LANCZOS"):
++        return Image.LANCZOS
++    else:
++        return Image.NEAREST
++
++
+ def print_err(s, level=1):
+     if level == 0:
+         ss = PACKAGE+': ERROR:'
+--- a/pysollib/options.py
++++ b/pysollib/options.py
+@@ -28,7 +28,8 @@
+ import configobj
+ 
+ import pysollib.settings
+-from pysollib.mfxutil import Image, USE_PIL, print_err
++from pysollib.mfxutil import USE_PIL,\
++    get_default_resampling, print_err
+ from pysollib.mygettext import _
+ from pysollib.mygettext import myGettext
+ from pysollib.pysoltk import STATUSBAR_ITEMS, TOOLBAR_BUTTONS, TOOLKIT
+@@ -474,7 +475,8 @@ def __init__(self):
+         self.tabletile_scale_method = 0
+         self.resampling = 0
+         if USE_PIL:
+-            self.resampling = int(Image.ANTIALIAS)
++            self.resampling = int(get_default_resampling())
++
+         # solver
+         self.solver_presets = [
+             'none',
+--- a/pysollib/ui/tktile/menubar.py
++++ b/pysollib/ui/tktile/menubar.py
+@@ -94,32 +94,32 @@ def createResamplingMenu(menubar, menu):
+                             variable=menubar.tkopt.resampling,
+                             value=int(Image.NEAREST),
+                             command=menubar.mOptResampling)
+-    if Image.BILINEAR:
++    if hasattr(Image, "BILINEAR"):
+         submenu.add_radiobutton(label=n_("&Bilinear"),
+                                 variable=menubar.tkopt.resampling,
+                                 value=int(Image.BILINEAR),
+                                 command=menubar.mOptResampling)
+-    if Image.BICUBIC:
++    if hasattr(Image, "BICUBIC"):
+         submenu.add_radiobutton(label=n_("B&icubic"),
+                                 variable=menubar.tkopt.resampling,
+                                 value=int(Image.BICUBIC),
+                                 command=menubar.mOptResampling)
+-    if Image.LANCZOS:
++    if hasattr(Image, "LANCZOS"):
+         submenu.add_radiobutton(label=n_("&Lanczos"),
+                                 variable=menubar.tkopt.resampling,
+                                 value=int(Image.LANCZOS),
+                                 command=menubar.mOptResampling)
+-    elif Image.ANTIALIAS:
++    elif hasattr(Image, "ANTIALIAS"):
+         submenu.add_radiobutton(label=n_("&Antialiasing"),
+                                 variable=menubar.tkopt.resampling,
+                                 value=int(Image.ANTIALIAS),
+                                 command=menubar.mOptResampling)
+-    if Image.BOX:
++    if hasattr(Image, "BOX"):
+         submenu.add_radiobutton(label=n_("B&ox"),
+                                 variable=menubar.tkopt.resampling,
+                                 value=int(Image.BOX),
+                                 command=menubar.mOptResampling)
+-    if Image.HAMMING:
++    if hasattr(Image, "HAMMING"):
+         submenu.add_radiobutton(label=n_("&Hamming"),
+                                 variable=menubar.tkopt.resampling,
+                                 value=int(Image.HAMMING),
+--- a/pysollib/ui/tktile/tkutil.py
++++ b/pysollib/ui/tktile/tkutil.py
+@@ -24,7 +24,8 @@
+ import os
+ import re
+ 
+-from pysollib.mfxutil import Image, ImageDraw, ImageOps, ImageTk
++from pysollib.mfxutil import Image, ImageDraw, ImageOps, ImageTk, \
++    get_default_resampling
+ from pysollib.settings import TITLE, WIN_SYSTEM
+ 
+ from six.moves import tkinter
+@@ -288,7 +289,10 @@ def subsample(self, r):
+             im = PIL_Image(image=im)
+             return im
+ 
+-        def resize(self, xf, yf, resample=Image.ANTIALIAS):
++        def resize(self, xf, yf, resample=-1):
++
++            if resample == -1:
++                resample = get_default_resampling()
+ 
+             w, h = self._pil_image_orig.size
+             w0, h0 = int(w*xf), int(h*yf)
+@@ -456,7 +460,10 @@ def _createBottomImage(image, color='white', backfile=None):
+     size = (w-th*2, h-th*2)
+     tmp = Image.new('RGBA', size, color)
+     tmp.putalpha(60)
+-    mask = out.resize(size, Image.ANTIALIAS)
++
++    resampling = get_default_resampling()
++
++    mask = out.resize(size, resampling)
+     out.paste(tmp, (th, th), mask)
+     if backfile:
+         back = Image.open(backfile).convert('RGBA')
+@@ -465,7 +472,7 @@ def _createBottomImage(image, color='white', backfile=None):
+         a = min(float(w1)/w0, float(h1)/h0)
+         a = a*0.9
+         w0, h0 = int(w0*a), int(h0*a)
+-        back = back.resize((w0, h0), Image.ANTIALIAS)
++        back = back.resize((w0, h0), resampling)
+         x, y = (w1 - w0) // 2, (h1 - h0) // 2
+         out.paste(back, (x, y), back)
+     return out
+
diff --git a/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild b/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild
new file mode 100644
index 000000000000..e4a685a7a5c3
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="tk"
+inherit distutils-r1 xdg
+
+MY_PN="PySolFC"
+MY_P="${MY_PN}-${PV}"
+PS_CARD_P="${MY_PN}-Cardsets-2.2"
+PS_CARD_MIN_P="${MY_PN}-Cardsets--Minimal-2.2.0"
+
+DESCRIPTION="Exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="https://pysolfc.sourceforge.io/"
+SRC_URI="mirror://sourceforge/pysolfc/${MY_P}.tar.xz
+	extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_P}.tar.bz2 )
+	!extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/pysol_cards[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+		!minimal? ( dev-python/pillow[jpeg,tk,${PYTHON_USEDEP}] )')
+	!minimal? ( dev-tcltk/tktable )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pillow-10.patch
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# make pip check happier, pycotap is not needed
+	sed -i "/'pycotap'/d" setup.py || die
+
+	if use extra-cardsets; then
+		find ../${PS_CARD_P} -type d -name .thumbnails -exec rm -r {} + || die
+	fi
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.md NEWS.asciidoc README.md )
+	distutils-r1_python_install_all
+
+	doman docs/pysol{,fc}.6
+
+	insinto /usr/share/${MY_PN}
+	doins -r ../$(usex extra-cardsets ${PS_CARD_P} ${PS_CARD_MIN_P})/.
+
+	# html files are used at runtime, keep at default location
+	dosym -r /usr/share/{${MY_PN},doc/${PF}}/html
+
+	# russian translation is not currently displaying right
+	# https://forums.gentoo.org/viewtopic-t-1142910.html
+	rm "${ED}"/usr/share/locale/ru/LC_MESSAGES/pysol.mo || die
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 30ac76682f31..b4637ce3b746 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 45abd5ca7154..cb558f5b4b39 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,66 +1,66 @@
-DIST thunderbird-102.12.0-af.xpi 556869 BLAKE2B bf49ad640d28261190e0a36c12c3a889bed4b0f2ae721c0c3bd9cfe1aca0affc4db4313e6917f591d7b27b57c64673f61c78d38b9f5c1dc089969c8f6731bca2 SHA512 0d3ec14b80d936bf3d8c676ff3350e64148899ec0c1f675ce9afb4c1b4db190b7aff896b1b6021710ee6bef5e187c7dec2e5186ec7d7cbd4db5147bae5525274
-DIST thunderbird-102.12.0-ar.xpi 666808 BLAKE2B d85de24769323489354f1e01a3f314c89353cb65aaae1c34e1081ae677a1242a6e2e014af6492379f36405785c6844ba338c7411e38002b23ad36a9f5d47d756 SHA512 234f9f8cb953367427acf4f66d78b09b17b42a5b68e7e88d6d05a553480b97d0ba6795c6397d47c2ec56128f9617eb12fde62ae5da561a4f46265f4848a3958b
-DIST thunderbird-102.12.0-ast.xpi 572287 BLAKE2B b6b978805d004ed0af315ca5a933e6718a2fb418bb57225179b2592de4e1cc02829d86d293b84c1efa4156ec91ca989295511f0cca2fb54c34ec2843e4ad0d45 SHA512 36bfd1a60fba2e68f9f70acdf16baf70bb98cf9d29b9445e1bb12049cf0a35e31690bf1a08921bbfb231f028f37229166ea003a441ccfa4d9f92037611c987a3
-DIST thunderbird-102.12.0-be.xpi 701912 BLAKE2B 9fb23f99301745b0ccd7133e3ad2a27f1411cbedf6a05a5e67e0283d659c089f7f8c13c04069a06a6ea7d9417158f799fddbb2f638814af6a491972c7dd12d0e SHA512 53289e594064486b4de310bf63f31bb49953522eebea135c86d4ea2c88516e870449cde96dfb7016460b92927c6ab60f11a8f7a23097544963eb26094b529e17
-DIST thunderbird-102.12.0-bg.xpi 693374 BLAKE2B 4e0aaa5df44d143a64bafde233ef52ceda5f9145deb72d590a43dfe419292bedd3472012dce0ebe75ff0f627484044faad00289b20c7fa767ca8a6483f3b9986 SHA512 7a4c9f79bd4e3c91c73b310f499f3fba53d394a03ffe389646bd5aad0b7721d2128927c30264a4d7fc84d633901568eed7ad265420b1e6e10f06c9cca08b7873
-DIST thunderbird-102.12.0-br.xpi 626471 BLAKE2B b271977f2d58f620be16df68615573c8453cb74e661d7ecc86cedef2bf7523cd789965f316147e6a3b7c800acb1aff997d336ec82788e15cd9379194ae7a98f2 SHA512 0bce25a993e8f5b46247197a98c279563ec0be9fae9c867f4a18a9a97bc740ff517c42ffc9f283e180a7cbd6e83f57172e3d1555204fba4c2ab16e753c9eaf3a
-DIST thunderbird-102.12.0-ca.xpi 651366 BLAKE2B 291b7acc40fb147c91a9ca0354bdade746aca3bfa1a3a5ae77ec8934ec7324ce11ed557f1b9b8a9bc8d425cbb0f8b731d2e315110c5f6c19f74cd1c68fda79c6 SHA512 851d756c599bf6ed164b73bf1de839f428741bbee2dcdaa61a4a04fa5b75cdc9c407201dc0e1e1ab4f97ef0fbcc46065c90eee2d29126bd1025bc80bfe91664e
-DIST thunderbird-102.12.0-cak.xpi 651778 BLAKE2B f0a9d413e3d493f85afce06a3ef53792c0a75034f3e6db09f36a6e233db3837472e12d15052d0cc23a37d8a765b9977215130cc992bfc6f809d3d7c361c5fde5 SHA512 2c4b350de4c2e9519ef3c2f08520e8b38e06bb8d5143b747a6cb4eeb6f2a6cd1b1127634f6b2ac61583eaeb3799ee0549f8509edfa118de91422293bc9e204ea
-DIST thunderbird-102.12.0-cs.xpi 728624 BLAKE2B 7e8fa63f2f74f7bf779b7c0b0923466bb6948228d9e6cd4bc7cccdf2bd9f52aa0767fc3bef9d2152dad2ee40b7c9601c56177c24497366af9edd675b5f238e0e SHA512 c31e9aa24759b3e611e06615130f1ae9639af47770c7f22a198f9f188ab80aa9fcdd73c0f5c5580dbedf0f11c55a9d6979fdc658dd072642ce32729a779d97d1
-DIST thunderbird-102.12.0-cy.xpi 705575 BLAKE2B 365fdd721204d00b80d6eb81b46c086add45f88d31bbda0f69e686585b8a5835e54632215fe6cfecfa1df24802a32123b8f2a775771ff184ad41eac2ad5ef05b SHA512 ae4b457d5f8fbd3380923315a1cb0b3970e25e32affa0e7aed6053cc56f11fee0a12b202d9a3cef9e3066247a417e2d2e2db33bf9a729759725cf27a9180637e
-DIST thunderbird-102.12.0-da.xpi 685254 BLAKE2B ed17511e6e3d91ca20f885d5e966157992275a6f1180249d6ef52cce93754884ea75892651b1af2b96c012621ee87807ecc09128c58ae76735db28b8354a78ee SHA512 f16f6bd0ebc7602ed6ca21217070fa9cdb2006d324c91124bcf1fa9a0afc6fa59e0f634e9d18922fabd78bd6cefe9e9f6a5bcfb7a28f396368ab698589938876
-DIST thunderbird-102.12.0-de.xpi 717943 BLAKE2B 4694fc24436a2f1a8029f2aef2b76c4e409279871eebf5474a5a11a07a5372bae67599eac589fb40c3cf13133f9a7fde706e5ca86ac2e45c944b7e2415fb9e68 SHA512 331072b54d61003f75b34a99570292f84453a0e635f864c528ce48c94fba23e0150313354d882245feb2d1228a2e9d9c195a412c08be4e788571aa0979359231
-DIST thunderbird-102.12.0-dsb.xpi 737081 BLAKE2B 605cadee6750c6f892410b162f4f256c0e912960e2a6c0b2b3cf22647a746275f71a845ebc1eac21948dfbf544f6e6f28db07a329193b4d0d16bc4687a065f4a SHA512 783e51e6befe3a35ea382db2c385351a08bea7189646178fd1ec576ef207bdda644261e0c56cf37183caaacb3316a64636559ef7b6b80d03596af7255bed29ff
-DIST thunderbird-102.12.0-el.xpi 840812 BLAKE2B 04577e28a08def57ef677a2577e8c5597be1bf08a7dd0e14a90399c9d9064913b88916a15c73d5565a5a4f714314e18f52353eb613469531ca65a8f1a33b8b50 SHA512 c9cc17de9186a3f6d966902acecb4e930559ad58f035c0820638fa1881cf7766f9b658dacebd84d654dbf533303e1732686f2b6d34aaf50a35472bab18f9d713
-DIST thunderbird-102.12.0-en-CA.xpi 659093 BLAKE2B 425b558846218ec37a3f12ae9cb1455b06d95c1726f2e873947916e8a490bf7acb58b60b984c32a4cfea7b1a5099937355efc934bcd4180f9f9c16d59725d44d SHA512 39b40724d1258c25f5cc331cdd281e209cd18e92ace4e2b612e76cf0baace654cb3d27c475baccef399d27b192c0a1bed4efa864ad650f1524c41ea2ae98fac8
-DIST thunderbird-102.12.0-en-GB.xpi 665007 BLAKE2B acf4486fb6c1a44b176e9bf80c6f12f864b11ea09c7002934640205fab9b42c29a86f3d6bd62910886c3149ffd5a7d268b1a46403b1d67306785ab1ff7995bc3 SHA512 0b156b3b2edfbe851e88366fcd949492e77172918888ff92ac851f51bf6fc28cfece130bb46f5fddd3efae9d92a5970433e28dc76b3fa42076de572af0076595
-DIST thunderbird-102.12.0-es-AR.xpi 717275 BLAKE2B 5c0cc6e34b34c33a8e36c5841dfdb13bbbc226dd284f2cdf0f6eacf3f9550fb6ccac6dfada8953abf16613ffe6a903901303cffc3a2c6da015cb13e2b018671d SHA512 5d264ac7c7cfc3bac8dcf07e81862fe5443e97008196184871efe94ace36ae839dac53ad4aefbb0632f5e4ded9e55c5ef3aa0d8eb75bd28cb047fbab1f70580f
-DIST thunderbird-102.12.0-es-ES.xpi 677481 BLAKE2B 0ec36c38b306ae4b38f706691dab5254892a36bcfbdf55f03390ac9be1d5eb2a48a4d8fa3474ba4cbdfada80ade1b885aa3b370a4ff8c4a6093842e8990490b4 SHA512 d078785c664ad134775804590652803be5e7ebfbe60a7d361640ce8045b73c265824b623bc0ac7394ba38bf265d1b63130f335d63649dde3817750cda36a4b6d
-DIST thunderbird-102.12.0-es-MX.xpi 719708 BLAKE2B 8a5084179527949c8d43a86cabc47d7c4c2e865493f72323d11753e5a79ad871b758260dfb3369491ffde8baf6f097b2d4fe3cf8ca1feebd1ddee52c57bb480e SHA512 c5f472d29de6014606ca73c7d333c81b186c4fa00a99f1044e77b8836b126924c90b40453171d8920461fda81dd0552b5532eda24e48391920cd38a65b1bbf10
-DIST thunderbird-102.12.0-et.xpi 676673 BLAKE2B 75dd1cc286260137c9541cc86de2395fca6d4a722fb8e620a8d44cbccc66f66953bb6209e8884728609541ff769b24998189ee0c646b3b01cd657146154365c9 SHA512 f3d6702738c55c7f4daf18d1a9183d34c1dfbb9074621363369a3132c64ef1975f4651fc9659cb1450c8d4cd610810eaf6e90f30dcc1fe1afbfc74402af3b4ec
-DIST thunderbird-102.12.0-eu.xpi 701827 BLAKE2B 8a88ca039e2b028e59a72298964c590e77c2b8b9d7a3106360853b7153019e1d7442654c5238cdbd47220149a98f91d5522b6a9a81c051dd7c5efbd2d356769e SHA512 ad84aa83c1b2dc87e09babeef1d01737e3e3ab7edd4f816532d860cb61294380cea35ebc80566ad3eb531af77da05e10a0a0447f99ccc0bf386ae6344407a873
-DIST thunderbird-102.12.0-fi.xpi 693484 BLAKE2B a500f26430813db9075870821c2c4d2d7b0d85e191e546c08a246ce4142d4e54b7ea320062dffd5a79ffc4e29609ecb346109c47984be0b484ee1f004086ea55 SHA512 e82318909b0650aecf14b74fd7e724a376f18d86414090d9e5227eeffd1fdcf2b0540cfb8a6ec5608ef0bebb2ecc203508cd3c80777c331757abd00fea4b643f
-DIST thunderbird-102.12.0-fr.xpi 730314 BLAKE2B 7314a7f3850e04342db25c7b4790d5845d232d9b43ba1c5da11f40adc5e74ccee325f44cedd1c0bd38ba3b2cad773607e641cf3feb4528b3c0ef82de536f759f SHA512 97bbfe9e21c88b69de7ff940365504d3cf12d5d28fbb5bdd591a02a2549c821227a90d3c577c1c2af04675bf66bf2c8d8126aa7697b620edf052da974724a5b1
-DIST thunderbird-102.12.0-fy-NL.xpi 711989 BLAKE2B ca495fcf43ed529f73e738b7d48c02fa0e7157d2448133a8aa0dbf746b9832962aa46049c223381fb0909c32985c15b076d0cab2e578560d427291bd4b303a57 SHA512 57d4b3f74bb3bec813ca5227ef753c6ee3b4b06603abaec92f5955dc6e404ee65ffb95d7d746a0dc1f0f9290f2630dc6ac054ca2118e24b197d3da3043de17a0
-DIST thunderbird-102.12.0-ga-IE.xpi 614535 BLAKE2B 086753da4594d5319b35ecfe0d4475f4c7abfa533536adbb35db803731b2d5429792f63e9476e7738fdf844d97958292e588db83cb118fc755a1009b03d250da SHA512 cebd6a55ffe2d0a9a3ee031f473765170110c3e7ed8a3d1858d778fea82278f9ee926a6c0e3f95bf839020176d858d4b9068ef2e64324370d2f7f2cb8456380b
-DIST thunderbird-102.12.0-gd.xpi 643573 BLAKE2B e93f26c4c7d1e96e9ec66d20137b2d5c0fae41de05f13f4cb84eec0f9c5251cdd38993f19c55b9c139bf603e8f9d93b0dd68fa0b12a387a68d05376c7151eea0 SHA512 e119d6522b862885a51619850a69b410b1f858626e85abdadd8869849e7d1618c346a412a0daf598640b19a63e43084bacc9d9f4e8334243c5c32fbbb4676be7
-DIST thunderbird-102.12.0-gl.xpi 673001 BLAKE2B f61dd06d4c7c525361472aec72f07b0720bf07a0a78aa2ab6320435efd5774bae774cfbd5a6e9fa3a8d9c62670ec31b2e651e60bf6b698e3e74eaf3b8b6f83b9 SHA512 a228c41464538e9da97f47073d8f91784ad43c97f4ed05af42a918eb0a1e2cc96b44fe78ca6ac40a530c841c6b70a331d03eaa0d9cd0ac40bf0c3e70529eb5af
-DIST thunderbird-102.12.0-he.xpi 676369 BLAKE2B c9f09ea3c22bd249a945e788fab3458e3ff6ad8f87e80e102bbfe11ef3e636a78e100934bfb66b74671868ebd2cb160e825d72ff4fdef2838664e3d542e64f6f SHA512 21fe33cf3b6b9458355df136ec506a95b038f89cb6362450591f6fa32e88b161107a4798e411227602d9ac86e719ef56dbd47824065069e60fc4c9b92eae6484
-DIST thunderbird-102.12.0-hr.xpi 677718 BLAKE2B 5240fb800c81b2a2ff36d7e2175dc9e530c52e02c36e7117d5aabe0b9c7320f8e1025a657bee57efd481c6e59205fa9eb42333fbdcffecb74d3670fea70124c0 SHA512 8df2e4a2bcdfd0ff230e33bdf39a2cf512a507ed0cb96a586925a56124e07bd4b8f3819c1ef0e850845bcc15f7859014c1ff635f80e0b952c8f538f6b6c4e054
-DIST thunderbird-102.12.0-hsb.xpi 736537 BLAKE2B 563f059cebcb9303b497f68cadcf55a5adacd50c7704c3d5c71535f0b97fcc50923e4c98065d67916d89ff22a40e97ded98d74b720ef159b121ed7fea5e3556d SHA512 e778ccc08bcefa6bdad70bd88728577ca2bf9fd240b61bc2bd7d526d9fa6ab0d954fb8c421f3e948e80cf63a343062cd34f15c7f682bd75e9d36a185dd132aa9
-DIST thunderbird-102.12.0-hu.xpi 741200 BLAKE2B 4bc9208a9092819137e00a4dc0731ddc86b46f05d90f59cc3710ccfdbe942e9a276b8074d2b6300582ade8b4b839f64d28fbeaf96a2abf1ce8edcaebe3a23db4 SHA512 dc5e5e47781ac3d497337ee7ce8d0dc8861621a696b7acebbf0c2da72e5b11d96462adab8729288f3c1b60462d52e0c0092995d4f3bcebadd3cf0891d1a11553
-DIST thunderbird-102.12.0-id.xpi 653191 BLAKE2B 29e0d8e40688b3f3193066a752ec4bb8198d1dfc92b8bef2b4a30a275fe3245367444b62dc2a59e42b398a03797c9c12b53f406b1fef93f0107047939cea9efb SHA512 6a8e35e3dc35107407b76f2ebc871c1778d7862d89b0359d112bc94af9e44b001399bfb9326ddd181f8d67c9647c84ee3338851052a33dd6aa5e91e234068f40
-DIST thunderbird-102.12.0-is.xpi 706391 BLAKE2B b319853bedb5cf54c7e0e690b6ed44af196010927e23e852fb781710f7c3540a2f6814bee35edabfffd42320f9953f06035996fc6a9a839055f00afaf065f3c3 SHA512 04411e9638cd659a3229b003921538c7c30fb3aba2f81281748f5f840c179df3ceb2b6a08001ff4bb759c92d9c0f811cb539414ad99d29a479998b6a07bd127c
-DIST thunderbird-102.12.0-it.xpi 639985 BLAKE2B 36068fc1f1c6de4cdc47165bfac299818733b254d06a741c7ad024a6f3b59b44dd4cff0af8fa6139bf748d611e318251b44b79819bf73dd707c8b948314ea14d SHA512 9ebe2f5216605e026a3cb4fb0a61a22e9ec4042cf3a7985c4e02336995c83b92afa6b845a4c198b1d610bf3a2f9bff9f7d68929099491a190676767ad33ef39d
-DIST thunderbird-102.12.0-ja.xpi 781906 BLAKE2B 6b7c516a92e8c290933f38473465bb29a47839edb9520fc9f5fff60033e852192e6700d7dc4047738e8ea202b922455b20c777b7bbdb66931c13de6572ca59bf SHA512 02e9a60645bd07aaf6893e6486669b7e64922f8a1e0ecee692101f940d6a9dea948a361ffa2660efd34d18a4b48b45810d2d00773497869ff7ce2568247a8def
-DIST thunderbird-102.12.0-ka.xpi 769801 BLAKE2B b9776d3743dfc502b0f76a105c360b941eae9d7ccf8af82f637e7a202503de84265a26049d3bed6b7e7e1dc60cf922fa9892185eaeb91066e32452c17656a7c0 SHA512 e02118ef8f18ca606c33fed58e5f8be43dd0f7064751253194c14840787c10c56f27746667495978ad2dcc077f8bd5c3c10c17bebb91437534ce1ac18ead4d70
-DIST thunderbird-102.12.0-kab.xpi 702701 BLAKE2B f6296bd4aa59cd4cc64f4a0a9b38447e16b5f3b2115bc6365bc21866baf1b118809e7720fcb4963d1a2efed11d24dc9aa5fdc03e6dd2846251c3b1963dd178b4 SHA512 4a66118c6e6264ee282b83f0e9130b51f3840752590520d7c73024719993d9748254c15f66dc5cf4c9f99c80d1baa283748860e95d2c2a7564aa1def7d57752a
-DIST thunderbird-102.12.0-kk.xpi 810966 BLAKE2B 229886d734a69bb75143a05fa31e7928c438f23cde5cb15656d2d7e6a191f85775b1bc89721167adf51ea195e4d95cbd1789c8c567d5c0744d23dbb25233dfed SHA512 46e79c514903cc3281acb0979cf8a97a31156595d25e3b087602f73bccb14df3d9d9f6e31d2fccba0073b732c31af4727ec9dae17cb7d3ea52faa34e0dbff576
-DIST thunderbird-102.12.0-ko.xpi 716819 BLAKE2B 3f10fb7a76c56ed21e1419ec1330ec6d8b8990d0ee00301616446e6cebba3001c3b84e0990c119a989c9680e76ca7f78739889bb618bc07d30bf5f5845270fdb SHA512 33ab8f47c0e9880ecfab67181387e934b43e46bf92ad1544d8f3475d3ab360cab46dd091f4b2f2f944fb9b0ae4048c93227bbd7fe8793a1b60ae39c7b42c43e7
-DIST thunderbird-102.12.0-lt.xpi 690854 BLAKE2B 8a43c147e46e21f59d6cb751ddfc98cd5ce27ef82a56a48182ddf53315c60090875273c6f18cc2a01fe52f99a775852c8310451eedbb92ef1c93e9de904b5502 SHA512 4c2c0ae55698a24fe3b138cddd014b09274030aa153b9e84afcad9076eab92fae8dfe2791cb3e30c97481a55c70567c6ef4b9c6b82c840ec44d82b12f70d87e2
-DIST thunderbird-102.12.0-lv.xpi 617766 BLAKE2B 8ada00bba0d5dd6d959d589d75c96a7b9ab5b4570fb391c18fa226ecaf6ba5ba9f5f676d6df51645f527ee5b6507c1abc0bf62401abdef3d8e9fefcef02b0230 SHA512 402c23db838af9ea4ab9e20533b92027c8b7fe03b7ee434746dac6db447ddcbfc1ce76afd9563485d68e414bbbaf03629552632a7090b0b83d19b1dd10e22cec
-DIST thunderbird-102.12.0-ms.xpi 577757 BLAKE2B 9c32d28e6b5d371bc52d1d8dd4c6ff5ffb93b19cbd01b3f413f8e345736b78652064042042298f7b41a7ce72452d1acbdf7811ce239c515c300323e5ef59a281 SHA512 f3caa0be15061497d574ae31a5b14a843d1c7172a3ee9b71339e956a09d7ab4760975591272570a9522bcd578bd1934ec17f0bcb8aed4edd1b043b1a0e528a7b
-DIST thunderbird-102.12.0-nb-NO.xpi 662682 BLAKE2B ebadeef91a7e8af71b797d744295625816095e2e4ca845c7a508ad7ddfa7beb715990031823021a177dc28867658ee5a4026dcbf594fa690e636cd094d4e21d2 SHA512 36107365ca9924194fb0c26f3e4f035c957926977dcd498bff3b19bdc3fc903c50ee42d3c706b54a0bc0620d4ef1f5ae0ae82c1a67c8ace2a022b4587efe3a60
-DIST thunderbird-102.12.0-nl.xpi 703274 BLAKE2B 81646192f230055e4f6f27b1801c6f1d567118a5e372d6bb83c99ceeb82a2b9accead0c85f24dd2c764e185c4e02a77c47a9e6eb7be81e6c4293291817ed0078 SHA512 c24c45ac61ea454ed53be9f3d91beb6599a2693985b78da53164731a2ec0437f8da2c5518f5f9dd00cf8fb3270347dc1a4bb65866ccbe336e454735c675db1a5
-DIST thunderbird-102.12.0-nn-NO.xpi 672831 BLAKE2B 639445762e2b12eac1ede597ae240fbcde8a60d1e295b42321f166f5d12744a02546b149eba71df1ce328e939d2e1b9c235aba54a8661e4fd8677d96a8a008ac SHA512 69d7e52e17ae5c66046dfd04b8eade756062d8fb96b1cd8b549b2af3ea1727d522add6c89e17046eab6720af0e287dee54c191f92e01c48a536b223d69c6db83
-DIST thunderbird-102.12.0-pa-IN.xpi 668030 BLAKE2B 3865fc2ee9618dcd8353b405fbbb762c0dbef28d2f1d7d7bd42c3aed95dcf993632fe88b3277e9e80937d0b3eebd4b6b375ce0353e9ab245c53563535e925b56 SHA512 b1ef2038b4b0a7bd64593002704f5b5904c9fd15c3c51f6c695dd671bff3fc8d8fbce1d379dbaa0a7a90ceb42a89adb61dfc9e36bcced2130761fb32c1301187
-DIST thunderbird-102.12.0-pl.xpi 716229 BLAKE2B aa02b54b89b851e4b9c1cd72d69075c61bfc8cbfff478dc377728b502af50b82f87be949baa587c2cb34cdf56cddb32d7603274ed3e4da0c3bb13ed9b3ad4290 SHA512 2e83af2e03534b255a95f34804a5be9ef86f2fc276b7f8f32fb66cd1193df70022536404f198aefee1cc347ece87cfdd17ff9ff7b99d7b3bdefeccfa6c70bd19
-DIST thunderbird-102.12.0-pt-BR.xpi 711150 BLAKE2B 42454ca6c3ce72096f8d14e74687077e6528734d10613532d30f97b23548383be4106d8d7f1916835b9e976912f878502724c33789694ee16add2936bad2e21b SHA512 273ba7d25954433d1ad1a3f46c0fe2a8c967a6274816d66f3eebf05fe8ac8685150df2141eacdfe78db13051c92f370c4ae5b157febc20092151a0748fb38623
-DIST thunderbird-102.12.0-pt-PT.xpi 686909 BLAKE2B 11ecb9881c408ab3297fa04e29d1b58cc75bc7ca7ff4d18e2bc878dc156fe371030d0dea49496b5135a7d8304effe312aea83ddfe3b6736189ba7fc03a6f0cdc SHA512 fbacb25c83ea7c78f0c1e471579638ba67c84a3588d319047ce9e2e54729dbe83a95fca0e9f9f94b3a274bf4906aff8b0457b5a1896ac6754f40de13db0e184c
-DIST thunderbird-102.12.0-rm.xpi 701681 BLAKE2B a8b9838974778d1d30489f9b43429ed2a7de4173824e4c318ff77915ac89d5db5f0dc4bdc595f52a9d54027253e49a24b5a9f3a39bbf3e1bb59e3b62cd564c49 SHA512 1ec6c62d90e1ffeb9bc3aea34ac68cdecf272e8a9a6240ed7d53e3328797c98960a9f907583d7a08e237e0042037c8717d408966a3f1197ad97dd5fe97547607
-DIST thunderbird-102.12.0-ro.xpi 661278 BLAKE2B 37c9e7e66d2e0e9ab7d92bfaf8f62afb40844aa508d85d2e8b531c869f667fa9822bc6f9eb63185958caad3d561a0f7bb8d4058b9f191ddf86523ae6042fddd5 SHA512 c67e6ffaf8b442dc5f519554010e04f52dec69de554942af1890c31045545643a9e1818e7207ac040662f2a62573ae92db13190dd0808f54a00967c9c28cc292
-DIST thunderbird-102.12.0-ru.xpi 827220 BLAKE2B 411417eb3ad089e892d9bd5b492bc5171af0c6d65e41e2aa1f9d71c6ae9a002d07bb0fda91ad15a376a8102819eee3b8e92ecef34b7e51bef26b9f15402bcc6e SHA512 ca0c2a3a4c1e25f4ceb02061376004b2e82c76e17fefe1deb8971db070ab25e3f72170e4cbfacbb9fe74b0a47e7b82aff0a9a6eae124087eac4718a04b186acf
-DIST thunderbird-102.12.0-sk.xpi 740981 BLAKE2B 1594e65ca143e76b3b100c5d70fdf20c8c36340e7f18625aba4bea1d3cda58d429d7c41dc964e95aa40568430c9fd5ea6e1d6298b6a8dfc4139defc2e11e4769 SHA512 d3a967b7b6e2383aefcf63158d8aba856854b832d75a7c978c75dfad07793f1863996c7e5312272651b8f7479e07892bf0871df82ed4e2cb0becf0cf45524019
-DIST thunderbird-102.12.0-sl.xpi 704057 BLAKE2B 1158ca3c8f648c072fe551880236de212dd044e01b83438c75504fbf3aea9a9a9f2f087491c59de75ebe132f09100f4e72a40c5908f8bd2217d31418f7fa187c SHA512 feac5432e2c0082238eb510d20ce47eea812b4513383c301a656672b1401f46a2e9e9efe3f31963636b909ec673282941681cefb5d0ffe9b073473ddd54900a2
-DIST thunderbird-102.12.0-sq.xpi 726034 BLAKE2B 0d9e9fc94a830078bf9330c9d957a810b25d6e91138f770d15f9e3e7ef6ac34b563435f94c70caaef8eb5d022adcd1a1a978314cc3db84f5b411f00e2ffeb588 SHA512 f1b21c88e2270d86aca20e09062fb593767d6f38308e9dc72378ec8be5d4abfd90103bb68692ecd5c8847362c63e9706c31fc273471227a22edc2eb7850bdd48
-DIST thunderbird-102.12.0-sr.xpi 720554 BLAKE2B 5f57f24cd24ea923b611bd6dabb78c5a97e2aeea676b96b671cf16e89e129634791bdb86d7e3568f7f08b03fb106311c1eb78e98a08f3d5e5019c77b5750830f SHA512 82c95e95963f5d4cdee39b45c60d8c706a051333c8e40bab01a90cbb7af180a1f741d46fd01411ce40da8eb0d2acfb1132dd1730bd804726627b1cfefd041181
-DIST thunderbird-102.12.0-sv-SE.xpi 706951 BLAKE2B 09fdb936e6f723cd438a8d5c28207c0e7592b2867c044091fb1053d55469141470687b84307b2f3de5e442e263342ddca6b364e3f44b4e4d41c82b297533850b SHA512 72e93022ef447a63eddc6f55717dbcd661c2b9ab7ce0f0249d88abca9eb1c124f28cd1c792dc3bf2fa39c6a33d4b2edf0fb999c130c8d10c704bedc3777a48e4
-DIST thunderbird-102.12.0-th.xpi 758235 BLAKE2B fdf8c2f8bb2f6b7cb14612d8709b8713395c71162e5a9770549c5d8739ba32c58ab9f1bc8aceb2bf8e078e3974ed7336a899f46fcc1072bad20c9e6034d78b24 SHA512 abf3696fcee1e4038ded1006822f4dbf29a6d39d8ec2b785fab81da6aeb23db4156e3bbb615f3e9df6684b31b0b60893d9d8f1542ae24f1ad22c0228c8cf5a46
-DIST thunderbird-102.12.0-tr.xpi 720174 BLAKE2B d6d5b53370162e86a21d8f14ade244ef365bf3873f124b5877a3e7c33afe2aa8d8f27bd844205dcc007676d98b06006c8888d34d0a1c4cb4675fb64bb69a6b71 SHA512 668c5bfd2314eb8c363bcef0575969c8e628cae286009561e4b8922c9b486b3d01c7ef86221f6442def63e489cb116f87eda92164b2b338988fe77109d464d94
-DIST thunderbird-102.12.0-uk.xpi 818662 BLAKE2B 5fbdcdc300a54123a5411732158212c2b2bb8aa8e9a3cb8aa423220e852360265e0f10e463c5a094763c564214640213a99ff7c77edd7e4c974f63bc0b665f55 SHA512 80158d3b4762385ecb7322ce2af20535ec907943137e467858cc6e37f0cf47e9a430921d78d55fa3e3bc6fdecbd045d365047781530c67c30235acdf266fd96f
-DIST thunderbird-102.12.0-uz.xpi 593012 BLAKE2B 283eaa6c6bf986e17c0e659e165ca809a17af5a6a4c7e58fcb5bdb6488cf527786bb08fc196aa28fa5ac7256fd746090c80eb3a7c030437e718ff7d4f648c0c1 SHA512 080ce00445c8d61d559a90141add9da9892cc584c50cbc2e0dad65c1fb30df4cecfd331433dea898763569f2b1e268eacf9867f333b2cf9b0dac17a7aca0bbd5
-DIST thunderbird-102.12.0-vi.xpi 745662 BLAKE2B 7c3022da529e8badd780b7563e4672f110e0e00221f7292c6f1b4cc9d470b103c2f01161d9982ae89ff227e8234e7afb6085222f02c814e32b543a7b9115da79 SHA512 b4aed65f63be3082104446703f5c65405934bc454afe9d643c8c1053d0e28befa08634545a37539d9b8a16069723dd175743d835d673d509d1dd0c3ba5687243
-DIST thunderbird-102.12.0-zh-CN.xpi 739886 BLAKE2B 3df5581c666cd0d11682fae5ce02ce447915b2c81b9a1c60ea95d7da227dd8532ff487485b06cfba4b6ae884d0f59da1a6cf3c04fa5b38f9576bc2270399d005 SHA512 e3d901fe873badd85f104316ec331010df4390960d45830c9acd859e0a4849d1b9089d7ceb2adf4d8366d1b4b95e68be3423ce358e1b1e9651eaec1538f319cf
-DIST thunderbird-102.12.0-zh-TW.xpi 748346 BLAKE2B 2950a7cf86aaad8aeeab276b82529f8aa5c003cc3b0170237745c3526fadb218dd616333b3899f3eff4e69ec2f4994dfc2fe7ecc8e03902dd6dbbb0423ef098e SHA512 34f903a976e2cf9e942202d5153ae7385612df68cb429dcc9bd75f6e2fd96c173a01742a15a49f8ff7c29b618f55198cec096a1be22fd32c5d971692efd27c89
-DIST thunderbird-bin_i686-102.12.0.tar.bz2 78319158 BLAKE2B ae4db571f9dbf1a49fd6d3c07c96ffd49a63bfb9c8d57e78035e645398bc5f71cc206fa44b5fa4795fde4e34a4e10ad426108267110ddc245c592a8bc2a24ab3 SHA512 5511c592584df5949eae53990538363976803ab4e1b09de6f62f5a33e51a82ebc797bf53c50e5df012fc5dfc0e43fc0c2161a380e3cc89f5e235b62c4976debd
-DIST thunderbird-bin_x86_64-102.12.0.tar.bz2 75283834 BLAKE2B c2843a97f24148cca2ed187bcac745dfc2fd0438e38c9aec3fa078ae6bc75c896f07616d227bcb8f5efbcd9820cb35f25bb3b51c99d60e6aceaea583c8326ed9 SHA512 2643e94b75780e37d9b1641a4798f19b63ca2d46eeb8f0a25bad25d61379694b223459ad5592cba825f0a87c02f33d48b5a3da42fdc0cfefa062d8d72cb98dd8
+DIST thunderbird-102.13.0-af.xpi 556871 BLAKE2B 35f1ee32781f79d722255e22b9cd1a7670bfc4e7655d944ca11406caca058cb178a74aa0731e2b1417ac736320096ba2a460ce0185257e8e75122ea9cffef10f SHA512 fb6891e6cff7ec6a85d4ec50b4341990bdbde7da8b32527d9849984a09bf3260b5cdff0900ed396295d5e3d1a120046e61f545b1fb1a024a3b459da18983210d
+DIST thunderbird-102.13.0-ar.xpi 666810 BLAKE2B dbc9981c7729684310be6c7423ff1dba2fc672128d9b970f63a5a8bc1b3f4cfb29efccc4b7a9f9c2f6b7ac09ab54a11d7b4d570ee038a614589add31691892f3 SHA512 7d51c10e2b5965f25081b08e58283d379ecf4ff9bae01ccf2b0f80d6b0457ee80e1f9588cce2d0524d776e44766d3f7f449a0d883f3871dd2c9bbce8cfcdb994
+DIST thunderbird-102.13.0-ast.xpi 572288 BLAKE2B 001b8888b08f91d7f4c6bc246db288d297b506fe8e441ab19a846eb451c6d3b116996a1107f0c1074fd1e033c4b5f87ddaf5a09dbd3476ebc469c91552bc4b7a SHA512 d1b2e675380c8511c587229a3b8bce1cc19e24b5fcbbd8d778e537d8e5c5614dc3b8b810e781cd5ef03314bc275c3ee76b6ea83df907283781c79c4e85a58a9e
+DIST thunderbird-102.13.0-be.xpi 701914 BLAKE2B 1cc71a641ee1a771c602396e3d81638621c4485f8d74b439e4d74e159a65407e51f9502606b5dc6d15100a735f7c3a8554d032a411914d334e7f2cf967f0d6de SHA512 2fe8ba257afe65b253a7e2b994ac3094cd8feb258985b0e35ed78d7d323fb907b7c9c42ba58cb1f4fac41e7a3086f64bfdd27df19bff1e564678b52c390881df
+DIST thunderbird-102.13.0-bg.xpi 693377 BLAKE2B d301d5c321c717d128bcca6f67437d022a16c460820f1ab97b95c1ce8f36063ee133b25ffe4d5b157fcaf4f0a8192a834fbc43d63bc3837beb4a9a5e9ca774d6 SHA512 62b8d62d92d3371f33c7182f5d0a7ebef4fa492469156ca0a5a11dc050b0f3f75c7d836f251c1a34a33067e11a2baab5b7fcb386dc0cde7690a7f9aca851329f
+DIST thunderbird-102.13.0-br.xpi 626472 BLAKE2B 23c6ec7ca24e7f8b0b6ab4da6f9f13d35480298120c276559057a1161f09f4a92bd2e9e6e6cfbba0f0834647524e86025abed503ad2ffe2335798aee6f82b3ae SHA512 87d3243fc693d1fc70c67a47b5f33bd3ce0526a1ced3adb907947dc8fb12c2e2880f3e240880f7d0c8a894c91e302d652b74f8920c26725415c64555b83768b6
+DIST thunderbird-102.13.0-ca.xpi 651367 BLAKE2B 7a3f3dd801776645c56fc5020a4eef2e4c00de10cf44f459f64bbf2c687072894943c61af4bea97eb1de1a060c6bd61f5eafb2467cb2da4bf4f0cd63a1c05d19 SHA512 cc235e482d03de1ec06f70aaff816afd7211776e3c0e84c284648ecccae25c20530f7dc98198d5ead6f12c8ecf85b895c4b8b23c463822b977ab3bc1619e6286
+DIST thunderbird-102.13.0-cak.xpi 651779 BLAKE2B 74787f6e8882279277cbcfe5e9fd6ef485f2bfff2db1b232a3a29dcebc87b3fc71eabba398c3d48b8bf8eaad5909bef496ad67810c4433d62719bbf45561b490 SHA512 a4e012834f6d616f60cf5c15ff5667a5c5a7ada0a8dd45bce048a5c7ae52ecfd4491cf24bd3bda723f144b67ad55abffb6c7eb0fdd75abaa977ba32704a85891
+DIST thunderbird-102.13.0-cs.xpi 728624 BLAKE2B 363f113f74f786ec1bed9ba77d51d0df0fccc0a0baa8eb56e4925a80386f62b8c6ee0ce59be0aa6b0e098254da37949c7b3bcaa53928f146412dbb7481545779 SHA512 5410e5ea859ba542804d8946603f69e5eb5814373d5bdbfe598a4c2067be9a6b21c4065d78b987e6bf41c26466b0a7ab0dec4114916c8ab7b80a268d4b9bb75b
+DIST thunderbird-102.13.0-cy.xpi 705577 BLAKE2B 3175c4ac83a6d88bc4b62f0bb2dd7122e2aa27344f5fed404fa5c5d7c3c5c0f9cb27f4f29ff4384efb9ac7d984cfa3ea5451dbdb515a2f59f6144f64c46fb379 SHA512 0b7e832dc82ea5c29d2845035eb0ce3fd3a96e6e9340ffd9460972c6da30325437e932ef19065d15d51e269283f5d486a6e87a44f52ad14a7e83d075687a8646
+DIST thunderbird-102.13.0-da.xpi 685255 BLAKE2B b95a31839cb7c81dfb66c3fd7654b1800183965fcfd127e09517f69452b883727391b9c2941df9e9d6832b4e1759d7190b3a5617a8321b08d373812b7d0e5677 SHA512 37dcdf4dba2691c4fb15108e7bb96c94188754ab0b3ffedaaf1544885097cca51e94e9da27f878c15d48819ea756bba743a64844769f63a8aa51138c8e5169f1
+DIST thunderbird-102.13.0-de.xpi 717945 BLAKE2B c4c0fe10336d1ae0aad1153242caba81664e3e86d483fcdba5593d260d53182cbe02055dbb4317715e3fa9fee20894c530cb312bd0cbf5ec9efe56db1f6428d4 SHA512 51359e6e5fd0bb2e96b32a0b14a4e1ea2debbbc9001b147e49bbc6bc9ca7b4caa4605f981b382b53658187252c263865590fabf7cd94274f77bc46abd00544ee
+DIST thunderbird-102.13.0-dsb.xpi 737085 BLAKE2B 1649f3e879ce49f31e44743d7ffe7323b009ffc56ec3a1e09fdacfbae9722893ded3a74659ca1bebf4af1babc2e676a793ae6c3f861e307e95b591e2d9c4a450 SHA512 b69e50e3bc0031778f2c866bd628998eb2f2303c5cd0a1450e694bab72a253473b5e48377de62ba8fb3d4b2cbd5948b1746e5b0863ff922381a7beb0da3bbbf3
+DIST thunderbird-102.13.0-el.xpi 840813 BLAKE2B 341ff0ed0da15960427e1fa77011490cd8bfd4245d15ecad27f08294bc203783255e30a75a3179a7f266f2e3139d0460268ffab25139f86a65de34475faf8bbc SHA512 499eb38edcc37a0c5eb5da0b0bdb157cc70e9e900d880d0206d4836e8b07f0ab2cd917604d5e45338df0143c612b23a1263c51fdde3310fe99b785f1ae62940c
+DIST thunderbird-102.13.0-en-CA.xpi 659093 BLAKE2B 277adc49ab3e875c329956e48791083bbeed212d24c94224d2f582c58e8f8c092fcc2310f5b9e6e9a6435bec50feff2df8b68416fe235b8453d6fbffe79aa1cf SHA512 b7a744a4a443ac61eb4afb038c19cfa49e866cfe661bd98276f17e6b1719d00f236d594f9b50370af43c27dfaa70284d8d19526aec86f22f4c7fb9d3d03f3306
+DIST thunderbird-102.13.0-en-GB.xpi 665007 BLAKE2B 7421c7184a1ebaf50aa5a6a1c1b3399ca33c431243a2d1d7277cfe037ec9f923f0f92250a53073c611110b5b0298e9ff7b91d2d3ba4655f4d9dd583ee23da520 SHA512 7f5f94fffcf8fdb69cab63d28c7dbdac72b08434f441289abb508f9502cddc81f76140ee52ddf0e4be4d6c3bbf432ae2a5380172bf0b7b669810b0026aaf7a65
+DIST thunderbird-102.13.0-es-AR.xpi 717276 BLAKE2B ff2915d4ffd1229e4e953929d14d56ce0bb59e7ff208e20667fd438240bcb1f2197dcdd98636a7438d00a2e72ef78b5d1801d5bc5439ddf9feeeb3f2a9610da3 SHA512 c032a8e514c66d6139a7b9b6704aced41b6a5f4062fcaf82a0f341db34bde7bdb8225adb7947ae892cf168dbaf93204f3cb61d697f537bc47592f942910a6c03
+DIST thunderbird-102.13.0-es-ES.xpi 677480 BLAKE2B 65d64c347402469df5bd9108076e14344df3f42d13f5b633b261a49d45a4d451d368a4cf9a5be40c1c43bb3cab370c742de6eea6e6d2e32b8ec8efff660a9bff SHA512 7c1ead6ce92b0b36375dae3d214aed7c32376b9ad3c7a2f73b708ff3ca717cc240c1ff53eaf40c5220c834bb56689bf27619e8776f5464d28047ea54c180d481
+DIST thunderbird-102.13.0-es-MX.xpi 719709 BLAKE2B ac783cec119eb4d31179f655e2f05cc03b99ee2f603328f7b972dde4da7babf8ab817514cd9586f094badb47c74806b519a7c2532d06589989374eb408db6d9c SHA512 8b92c0f155811c2fbd0f621f88145ef533d1525853a14f4e412b18fa3146a4bdc82cc759f58b732122479888100ad868061384c50a59fc53bca5a1d1850095ad
+DIST thunderbird-102.13.0-et.xpi 676675 BLAKE2B c8a828a78f88b6aa132305f255096ac24abbc1f395ec3dc18a8a7ea7dc903a4086b2588b69a83f9af0174de427ff751e5af38ac9b7b6b8b469a6455634775db7 SHA512 26981cd751a02e9a27061d385960e50bd373c059227197c6a23641e71a2a0a9a3d05cda931fc2754b2c8bb265d816ff82bd8ee43546dced921a352b35ee5cef6
+DIST thunderbird-102.13.0-eu.xpi 701828 BLAKE2B d2ec049b5ebd59f85fa50ac7f8d73ea84bf92eda7a0b35cdce80d9262ca288994e211c0e33114e8e92ad6efdda227035832a10245ff0d40db78746e1e0f2a72c SHA512 375ffe098455743d79a9d5d2d74f6bdfdb189715ddf35d53be876770ecda4fd06563cdb6341aafd5b735a8eeb06a7cbf1cbdf9034a355f740d433c336c928e91
+DIST thunderbird-102.13.0-fi.xpi 693486 BLAKE2B 735f88dbe8421c2045222e7e45ab82c2c2ead6d77901ff98141607a4350e550e1d4069f762363828cc8ba034977468cab38f4f9fa8d63cd98d609db93c0dc76b SHA512 42d057032d683da16ae0745d4817e55e78ab119b758778b2ab3711560eb1831899448b9f22af0cbdda3636f60e0a5340855c9abf4eb513d5f36fd339471d2c94
+DIST thunderbird-102.13.0-fr.xpi 730316 BLAKE2B c40256d94aaf14d0c4483d90a7654258a1672ffc76fc41abbb0529551082c6d26b4df52a472ede5e152aeb3639d14cb702011f30a346a6db077104768d6e4b09 SHA512 fa189bf073a12ba543fdb9159a389724b0301e117e5035163c2c2f577958048760e9e1b665dd17a56c06ca2dddc62704d9708bb579bb32de1ca32b98dbfa6990
+DIST thunderbird-102.13.0-fy-NL.xpi 711991 BLAKE2B 2f36f81c4f91d54a160092f512a5676db722c1a0d06b43938e58e7a21c9bc7a5ac33091a4b255d6e4fef953dbb30c038052a9ba7b79c473c775c061068cb05d8 SHA512 3e1277b754364c024ccf66e70871cb3b7a73e93346bd0b2180e38b513c273893c22f1f56f4778907defed25331c7a75aeb976153278cdbc962fe775b7a5e5159
+DIST thunderbird-102.13.0-ga-IE.xpi 614537 BLAKE2B 940fcec8b0e5a1a5a826608a094b18a1bccd11695b87d9b30ae69b26f2274c4eb480d617c97771735ca113eb18b021ac559df7f6d19187b6463817c07f45336d SHA512 219a6667ea1c6a98852fce6d663a831e1ee7b7e0ee5f4c4ccfe8e45e6214188715291da1eddc5709c34cb4e52843bfae5889a32555c67ce2066ab1d728cab249
+DIST thunderbird-102.13.0-gd.xpi 643576 BLAKE2B 4d9c81c23838f84aa07dcb5ff4cd18573f164953d1f204a43cad2a4bdc4f9016ba089f830b118b602287f2833b22f6d02cae8569b8c9c3d908045af61e25f0a6 SHA512 4459a226538fc54e02eb0fa57234533f219f3c5148961e77e054e93ebf2bfda6c41c0d4e874de3ca73a7f3f6c253acb94cb89a95b193f42daf40b9f8e3117ca2
+DIST thunderbird-102.13.0-gl.xpi 673002 BLAKE2B 86d1c1cf97854a4661f2516950c0491519453b9fa6100c8f4b68d80eb556b5cdba52a19d0ff852adf535914002757e122394d2f9e7a394b769abb46df3f62ede SHA512 17187d0eb3414ecd98909f9f7fd49de9efbfeeedbf1980d9426d29e19379afde66e2eb9b21a79b45ec6748e43d552c63bebd111192407eb9474d9efd5cc4e5c9
+DIST thunderbird-102.13.0-he.xpi 676369 BLAKE2B af732acdf919078b61206b7816e29ba989dafa462699ad6d4df467b3caa93c6a3ccccdba35ad57bf7d7042842524297cd3233f34de2da53666c0981af5a01733 SHA512 8a4dff3c908586d0c3ab13a73ecd085c68bd678fcfd4264ea097c9d6173ade6d4a1514efa2045b9d75263b0dd5b1b313bd85a41b42f45f577c272d5760273af0
+DIST thunderbird-102.13.0-hr.xpi 677719 BLAKE2B a1b2f145388ec5b036febb401033fea5292bdd6a89593e408605bbfe071c9f4ac1a69a0881b01cc4d4b85da14df0afa76a1493a7bfd8066278430a38cd4226d9 SHA512 951dc3982dc2f0007dc66ea6f8f53a83c3dd380f84124f28522deab88ad7f558c26b4e54169ee67e0e6a91fd8e3b8f14ed4dcacbda24a811b265a9e5fdc282dc
+DIST thunderbird-102.13.0-hsb.xpi 736540 BLAKE2B 0d5992a45d18a51d7fff47e124969496770c6c4f58eccc847975007578d54815d5f6d2b2d898b2fa9d854068c07ae23b5ffe80d9ed6f803b274dd5c98b52ab70 SHA512 43db7766b309ec6a17ac49c6f964464a00058aa3009bc9dac3bd3843bb93e992cc77fc86e1a8372f981d4143ebef6b295709618e27afe89fd054c4f08d68c56c
+DIST thunderbird-102.13.0-hu.xpi 741200 BLAKE2B f5781ba11ee11ce40ded24ed987f56a63b2522321ce3a0a70be15e971d675b06c57a3f5c1e1aadd96bb5b7d09582453da4fe19d74b069ddb2979bb56e4b25b9c SHA512 04bbed6e46777f5e6518c77f092193b0a5be65eda0ebc7cf7dfedf284d3769c24786b187255a3d0c8f9a7b8ddebf6d996af5cc888031b377008d14dc4933ffa9
+DIST thunderbird-102.13.0-id.xpi 653192 BLAKE2B 414f3c185403818ac9c91f5ed8a1a3bf2acfcd24e4012a50af175c16b8c0a3f9f02707c8dace185d71b4a768ba97f8ac30ee6dc55ea383fa410c4c37a0cdc81d SHA512 7ca1ac0dc6e31cb87ac55bfe9af3e1a43316d78cae02bc0d4db16ce7459f5f9f10e2cc406881ae70438d886b717aecfb4a9c2c992beb1507fc3e4cd0ba7ee4f5
+DIST thunderbird-102.13.0-is.xpi 706393 BLAKE2B 727927a182dd214ea32328d4a149fbe77a1d4826f4d2f16d6339b3ecd458b1793f8f5d8a6d608b0e2c9fb437f6a639af99dc977c5c46728ec91e4e95da692111 SHA512 008f18b029f68030665c80573e93ed7bf9a3c802c4aff3ad917f488927788e19f15066c2a7c65b5d4e2f172c65380b0d38860ec1c4ba7e2e8ce16cde2fa7a260
+DIST thunderbird-102.13.0-it.xpi 639984 BLAKE2B 9b4ba2a58b783822c6babd6cd51273edb58f6b98dd5e44aebf9105cff36890bdc697e4c0535ac523b667c2e62bf9b73c69552a124cf8039f4f0c2a38975aa79e SHA512 d923bac519e54633671d18998ba1345a1d281a8d89ac70b7c0381082f5b9d46a14cff13a443d4546ebce65fd05dfa15c7e2032eb8abff564941213ac0d9817e4
+DIST thunderbird-102.13.0-ja.xpi 781907 BLAKE2B 6128ec4e3cd4697ab1459992a1af22d283cb3cd2e9eb5ad2c64157f58eb8f0563a5d7e217f99538ba6ffdeac02ccd32ef7609d7a4b4cd9d6c78ad3e3f1e9ebd8 SHA512 b4d8cb9e435c0a91c13751961b06a1165971ba781208b044c9b1a41e6387ad4618cc17d6f64ccc14cc7f584aacf7813e54c5570404cca1938e03a2d17975e679
+DIST thunderbird-102.13.0-ka.xpi 769803 BLAKE2B 2c020e54893cb76db78791593d2bd877d509171cda98d40e0b74812ae34cc829ed6e4fe1575c1295df0d40a0e7b4a51dc838cd8806f8c4c344ca834f2c58fe45 SHA512 98a9c89ce34e896565c5a6a1cb10247b941f60ebe58f0f64c3ec32f7307cd2eff0ced578f0004a0780a16b243192cec18fda6c9b7811bab42db88b0c68ec1ac2
+DIST thunderbird-102.13.0-kab.xpi 702703 BLAKE2B 326a5c3c0349195e6c69a377da1b7ff2aa172b640cef284dad81cf7fa0001327158d23dd2b22188916dd5876210fe2ea03298ccdbed2f5efe4a52ce71e8b79d9 SHA512 9b2409c8b0b843fd1e2d9246f8a42b51b1e022ca9ab1901af4d8dfe30537145fa1e2a301fe1dfb381e4cec6ff52336b4a7e7bee07f25064898d37fec30d92329
+DIST thunderbird-102.13.0-kk.xpi 810967 BLAKE2B 5ae4d22e45885b55f85e1db9f5a5dfdc6ad8893b073083b5d40ab1f33c30655fa49835f8ccc13b6196c6e2ff8013b096fa7cd5d04538917638878c9645780cf2 SHA512 404e7ebea18d51b1295e17770eb2540f4c073b807e3112cc61dbbd562be911aa9356655fe71265861c12d7da7b05bbbeea7479eeae4fbaf3a1970daefe44109e
+DIST thunderbird-102.13.0-ko.xpi 716819 BLAKE2B d468d847e328a999bd2921e6268ba6524129f4bdb495c0dc17590c094964b7376bdd263aa85440dd9eef2a730e56fa1d826027d154f14635198fdf25026c97b3 SHA512 af7d9843b01e890527391d2f3273457b39423a51af3644656d859b44d52488f1d17bc89a9aea1e7b585a5fa41708ef6c7ee9746cd2db914afe9bd3f0d2cfcd11
+DIST thunderbird-102.13.0-lt.xpi 690855 BLAKE2B 02558b70060acbdc77c5862217a5869982024128585ce7fa2257437e2f3f46192e8089ef82220c1481626987836aebbe3353cdd17899c689d9924b751454683f SHA512 3f2dc3bddfe66e29585528c78690f378c84e042d2a4602b763e3c0af99f2a164764ebc1c3839c7bfacfcd835d54cfbba11beb76975b509696bb7d5c052cdd135
+DIST thunderbird-102.13.0-lv.xpi 617767 BLAKE2B b19bb8d06b0e8247f0de242f2f8f32fb29b2f4c4f62415d79eddb256ee66731f425dc3ffc234f4bcebbca8138e6370064f8352cfdcfc326a54fa84a920cf825a SHA512 4094c5576baafa86886efa43c81983bfcbb99c96b0d89c530a7bbc584332a2f38c503ebd619a4df3963a052ed10a8019675e20a064042a4c8950fcb28eb5482f
+DIST thunderbird-102.13.0-ms.xpi 577759 BLAKE2B 0e607dbb00af42715033b24d3ccd13c42e64a5f454169c4557aadc6a767cb4b9568f59679db8adea22cf3b7d0cbff8bbf23a901f6cb7ab6fc2a521bfc23f9dd9 SHA512 1d0a3f0a9bf64d1fbf257a4f67c6a3980cc967dbc00fc7acf263ce6f04f4706a6a9343e6502c33d9de0d6907759820647d7f0787f50784e3004296c1fe83647c
+DIST thunderbird-102.13.0-nb-NO.xpi 662681 BLAKE2B b40f276c753f916b83a2b3b7f6c8cd5f01b3ecf0dc59a32eafff09024472249ac254d983741149a997ef02cf2039fd76b5af3080c990f525574b55ba45a3117b SHA512 33b8683a6f6979f6593c6bb1c96a52da3bd4a7d0f15e6c8ddd323d5ca2b63702aaf7fad95ca098a9599d7ab3a24c94c5d087ea4afe89fc21ecbaa6448d76da13
+DIST thunderbird-102.13.0-nl.xpi 703275 BLAKE2B b0fa922e2af1afa75e3a4dd2640a55f84be3e41718c3ef19b20deb22331dbbd2c9948f0f1d855cadca308323d9135ab34505090b7970c475cc0213d139cf3fda SHA512 2f2841db49ce6a1a6abccfa94511deac0192870dd833284d69c09b43a1370d03a87ab065123e4dba5b2f386b92cd1e408cc579839de7406204354468d63ca069
+DIST thunderbird-102.13.0-nn-NO.xpi 672832 BLAKE2B 27bd8d1877b7c2e6670405e1495b86e9ee5967496a5d856d20696abacb4d5bac9a58c0ce413390a6a04e4e88bcd7fc42ae0f48f0c4c9e1da6ceae908dcf72dfc SHA512 296591157e4b09788a5db6ccc26610e44e5112463b2e7671d704e927eaa5f8be514ce82367000f6f2cf5f53d4d8e4b55a4a944c386fdf50f505b645b687a6609
+DIST thunderbird-102.13.0-pa-IN.xpi 668032 BLAKE2B 78054fab20e60c4646277c7ed6d78c0e7fdcffb9b064905b31c1e9c2e4fba6c75d092bad2123229013f6738c6b2b96df5afec0127869d4d53112dba1806c8f8b SHA512 7a4aaf3f1986f02c3f772fc3886ab960f4009dda3e0549f27e215e7a8d2ab7cc73229781a0f38727092a5cb62c0ba05d9fa4edd8a88c05134ba258f6368085f9
+DIST thunderbird-102.13.0-pl.xpi 716229 BLAKE2B dd48851f066fe3371c326d84a6be484b7e3a3167361a7f50e6f6b30688d40969ab1d90ef3dccf1d470fb4d7ea76f9abefe9eb06708b1dd0ce834dc0e7dffbd64 SHA512 fdfb78d0c5798ecefa408d226bc18c94b1c62dbe85e80c763ab99da84449708b1c3d1db3ebb9c4f74a39e24a0659b70172226db4172f9cb33a33c68bd29d0963
+DIST thunderbird-102.13.0-pt-BR.xpi 711150 BLAKE2B 642beba31b79f847072a250a50672cfb2227a7ff252caae8e2ae9840bfee486dc60908f3f7bd70117980597c95cd5ed8cf8c860a18aeaf7ef6002952e1f6cdb5 SHA512 0d817b74868a46c1405eabef5df3faec1bb9d37ae3c0e09f01a67b23bc1121f8adc8e901ed18e03d2e67bb159881a7a14e5da2650201327276d7063b60f765fb
+DIST thunderbird-102.13.0-pt-PT.xpi 686910 BLAKE2B ecbaf9738859669b03bf632c09317399505a2c6cfbfa0c5dabebb51df53bc52b69729cdd2118de639e1811c342db043980dc71ceaec800ea0e711d6ef187ec3c SHA512 a95881f6c9cc903818c241aa59a0d4463d0c5df85f19020a466a49ee3496eb59c139fb4b48deac72c77305cccead4289d0752bedf0e8180bf5309b9c556c80fa
+DIST thunderbird-102.13.0-rm.xpi 701681 BLAKE2B 03bd15deff66306ac75f0a6cc4030d7ffa188fc7018eabe0ebd347189280926e5904c66bf2ffd2308b202adc49f18b245aaa8f235750336f0c136e4c9b77982a SHA512 8ea83e013a8197c11bab38fc7cc1521b695c39e0a409d180e4db46986e9f5b526b7dd5d66ece8ae13130516ca41c5bc784ff046c636f4c9458a94d9f63a8fc1c
+DIST thunderbird-102.13.0-ro.xpi 661281 BLAKE2B 08354c44434e79d18960ad69ce5eb51713de504ae5be33b9e153005653ad0d6e8af890d9b8eaa382d2e619a3c663d844a362f88409cf8458d3a9a3803599343d SHA512 7bb5c403c7381dc9cc5084d08129e678543caebcd5c650c06a827c1e032f7f3c7e088a5ce7c24cf121397949d6896aa3740ee7459bd55f860197c8cc9b341fe7
+DIST thunderbird-102.13.0-ru.xpi 827221 BLAKE2B b85820539559982ac9a9bc1da493390a70612a10307753e0a47c7e79815ba6a45bd2eb9f6c0a213c57d6782146a996d0d5ad88f55d9a27cc5d55a717b28b2822 SHA512 875898dd3f9a379c51c2353df200a62f99deb42fe0c54940e27d4259e979a026483a799230af10c27c9af4695c3bcabdabeb076408059c42dda2e63a700a599a
+DIST thunderbird-102.13.0-sk.xpi 740981 BLAKE2B 3687b2f0c9d4769f0b846e231d0a2e8ddd20d6a6273b822509d4c721218f711391ff16281fa78be6d11a824648bfd2add03a546e333b6f0d426d4e50df1f812b SHA512 b666461ee94182101f986159f1a11fa53bdb59d504e594c2486d07659e921d17c71492fd83f468b6fbae7421a0dcb90a977eefe8ed6438371e21cd51a98144fa
+DIST thunderbird-102.13.0-sl.xpi 704057 BLAKE2B eafc137066f3e19022e36ce9431c2c629cbfd59edb60de7e633413eea074b64e69bb08b94a2a539410afdd87da11bc2ac2d6939ab54579a81afe881a55c71677 SHA512 694631fdf0018ee45b601d3788f5a61b258925cdb93700a159b355a8fabf088a196d7d30bb10174ae57f82e57e5f198f8aeae9634f9e844e74aad6455eadeda2
+DIST thunderbird-102.13.0-sq.xpi 726036 BLAKE2B d1ded399b05530f000498363d6b2d353ba57ff8601cfdce0323f83f3b2087da0cb7f008eaf8c5ee8554e4d1049ad4571ebcbc66724c6ba416864615bb343e931 SHA512 737107ae7b84825e9979eddccb85b13ec263c38724890e74fc5b95a18f9edb66d65b9be70e0c6c44504c84e18f1d1d2101f4ad7f40cb8bc987552e5da3c52284
+DIST thunderbird-102.13.0-sr.xpi 720557 BLAKE2B 99ed0a16d551a67f2211caf31561639cc7ceb7ec4c654489a078bed4c52901c94007e89925c0865ee55699c9cd944983f0a12ffe948f6e46a2d553763cc3ec6b SHA512 edad7259529251a99514b86b25993209a7dcebde4c0436be5a1f6a4f330f4c61e7b0e719ff1325d217880d495f5d54a8be2b960ad4d337d76dbe82dee2b61deb
+DIST thunderbird-102.13.0-sv-SE.xpi 706954 BLAKE2B 644ff766ccf9dbec9c4f850000fa10ab292e8c761411cb9b82805bd7fec31f8f3d3055d6c7c9752c6cfd5f1f21ebc1547a479f2aef83aec0ec44332cb0fa8f62 SHA512 3154155d6e3a3f2dbe98f27c557452368b13a33a31a41a7e38e55b8ce5e827c3066290cfedc391f7037a715901147c5ce6d699cfbff8a28af0480cc5a94a2587
+DIST thunderbird-102.13.0-th.xpi 758235 BLAKE2B 91be214e96c65e60f488122a82703586996e2528aa54db8f34511af358b5103126acfb3f0ff3892512836467524602b20a0cecf1acf437301d9b6460e4fe23d9 SHA512 d0824cfe6993a503071a68768670f3514c0de7151d43c0d5e6c3d66842bc817186030fd7816739534718ae4b569e86dca3da6606132805fcee1f536719775627
+DIST thunderbird-102.13.0-tr.xpi 720175 BLAKE2B adb1974a7f463ce858591989f799a9cc5e7727ced9deaca319afe8125cc2ab3926e5d63984f8c9ff4838a5c930b26365c333e037957a4b4219d6cef20baf5492 SHA512 4610215cbf9a1e650e76d6edfc2e14e698201c3c0ef51fb48e59bac74fbf6ec8f660bf65ff14d046489819c2b95bd60088bf7d0746ab2195829719fadecf6944
+DIST thunderbird-102.13.0-uk.xpi 818663 BLAKE2B 7bb55727bd50ac2570279a37e8f449c0af7341eff15609a50f31693b4c7af8d31ff9773011833406a1be44b6cc25c59bc7448853d251d2375f2b5c41608712e2 SHA512 8f0a47e4d6fbe6cbc9e33610ca2db97df4b750b769de40e6f02536894a97e463cd4f5ec49b0c563bc57fa9ddff75b2835c47950dd1bf85ee3e893b1839899071
+DIST thunderbird-102.13.0-uz.xpi 593012 BLAKE2B 7c0f62b7338dfab37d6df2de55ab0f306a940a42918360e92f7fbeca3fadb28320e8e6852c3766baeda14810c15e34ea8c0caa1fcd4e78556e02c8901fbcc51a SHA512 3ccce30ce66af4db0e61f598208983aed718a0f2bfed326bd5c13e4b640d8e27b2cccb90a38ca349fa625ae4c6d1abdf1982408ff1d21e4e48c874820127c3c6
+DIST thunderbird-102.13.0-vi.xpi 745663 BLAKE2B ada366e22a8ada1fe584c1f087cb3b55e00fc68de64f0b4302e91385779850fe5622678e92f5c5a4e4cc128506ca9df01e29b3c83f8b9afa9ba4c432f140ddef SHA512 767b32fc8604f667d2ddf1f0205f636f3dba2fa9482199febb6330b5dd07be0e57b092b67ce5031d21930168d946a45ab1f98f954279448c1a9f92d69541b893
+DIST thunderbird-102.13.0-zh-CN.xpi 739887 BLAKE2B 7f4564d89192cafeccd99893bb44f74ffc316bd106b28b580c1f8f8967cbdcc9247528dd59cd9fa62a49d1ca8907766ddee5bfa7c08d8a35940da135edf2dc90 SHA512 4bf08f0c26474da4592a21438fad776562763a6207fbd8c4a13ce8c8353f85f5fdcab7878210665547972d27ad27b396678425ec19d623351af6b7b3e0f53a20
+DIST thunderbird-102.13.0-zh-TW.xpi 748347 BLAKE2B f3d419e179b2840c56079204708f9fe3b0db1d0e606b6c87c17ff987d2c3ab0459dfd7a8d0e10d1718b944b7f30174c8dce76f8f03f84e3c18220845fa5cea3f SHA512 d682ccb94b7a8cc39668e3f7c09cf62c6e2fd8ed54609f2d8ba96aa79972f250c04012e7ccdce65e6df8375f89bdc8434892513ac1fe4cc2390f632e03dedecf
+DIST thunderbird-bin_i686-102.13.0.tar.bz2 78357327 BLAKE2B 58c641424fe2150ba2cd4e62d5014d89e32a1fd85cf555579f718bad83eb96738da434ba402c429c606e61393a4ea361b2f212be0fc624b95863014f290d12be SHA512 7537b278f59b49e961a42369c0f1bee7ca66c4ed6e6a4e454d64669b9d9a23b9ccda4b46994def7deac1469a4259a5dfa5398351b614bb9a0257a61230bafe5e
+DIST thunderbird-bin_x86_64-102.13.0.tar.bz2 75340268 BLAKE2B 1759fa30eb5be88e40fd75dbabdd555917ebcf34cfb7393fd8c395653f63ac216a3af3c5c2b17db9df1b4b37b24f91bf0ab7c0dba284dbb1c6be4bd40f450c4d SHA512 624a7ad940088bf704df421f203363b6ca6a1af950daf02477e4ba9e2a1e520634cefafa168b0bdd8f3cdbdd20d5f83ec897e4774a3862cc0296982199968077
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-102.12.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-102.13.0.ebuild
similarity index 100%
rename from mail-client/thunderbird-bin/thunderbird-bin-102.12.0.ebuild
rename to mail-client/thunderbird-bin/thunderbird-bin-102.13.0.ebuild
diff --git a/mail-client/thunderbird/thunderbird-102.13.0.ebuild b/mail-client/thunderbird/thunderbird-102.13.0.ebuild
index f74cebc0aacb..ec0955e5f93e 100644
--- a/mail-client/thunderbird/thunderbird-102.13.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.13.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.thunderbird.net/"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 724fbfd1d88b..76c72f14b4ca 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 34d3ea5287f8..e0180344c1a2 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1 +1,2 @@
 DIST graphviz-8.0.5.tar.xz 21426200 BLAKE2B 0b84dd788c2e8ee54941c9093ad8b9208d30bb42f1b6c62afd136ddc4616c2a851ce78b62631ec8023b39bdb861c3aa3ecc89b1804dbd77f56530a1ab8217a5d SHA512 1bcde81cd8bb370e6b843b02eecc96459d7567ff982a2fc4a97b50b43dad45ac2d4d5fb5f5f629562585600256878dd81c7b4c51ab1691cb3b6f4dcc054c7443
+DIST graphviz-8.1.0.tar.xz 21429292 BLAKE2B ed70eb6edf9394409edea252eae3c882d69cac3dba6464f9dfcc33fffbffd7dfdea931efb5e25aab65f027022065757c5cf1bf805f794fd7368da1005dfcfde1 SHA512 56ce357999b7e7c623ec410eb772a98a23be2d7e871c5e6f500ea000d217714b8f6114d35844dac576e2dcb059f74037833e7728b85fc2c8fa67589e716a39e1
diff --git a/media-gfx/graphviz/graphviz-8.1.0.ebuild b/media-gfx/graphviz/graphviz-8.1.0.ebuild
new file mode 100644
index 000000000000..9d1aaab6a8f5
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-8.1.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit python-single-r1
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+# Unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk2 !postscript !lasi )
+	pdf? ( cairo )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpng-1.2:=
+	sys-libs/zlib
+	virtual/libiconv
+	cairo? (
+		>=x11-libs/cairo-1.1.10[svg(+)]
+		>=x11-libs/pango-1.12
+	)
+	devil? ( media-libs/devil[png,jpeg] )
+	gtk2? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	gts? ( sci-libs/gts )
+	guile? ( dev-scheme/guile )
+	lasi? ( media-libs/lasi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	ruby? ( dev-lang/ruby:* )
+	svg? ( gnome-base/librsvg )
+	tcl? ( >=dev-lang/tcl-8.3:= )
+	webp? ( media-libs/libwebp:= )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+
+# Dependency description / Maintainer info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Directly depends on gtk-2 and gdk-pixbuf.
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - go (disabled)
+# - io (disabled)
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, gvedit, gvpr, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - gvedit (via 'qt5'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf=(
+		# Speeds up the libltdl configure
+		--cache-file="${S}"/config.cache
+		--enable-ltdl
+		$(use_enable doc man-pdfs)
+		$(use_with cairo pangocairo)
+		$(use_with examples demos '$(docdir)/examples')
+		$(use_with devil)
+		$(use_with gtk2 gdk)
+		$(use_with gtk2 gdk-pixbuf)
+		$(use_with gtk2)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(use_with svg rsvg)
+		$(use_with webp)
+		$(use_with X x)
+		--with-digcola
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-ming
+		# New/experimental features, to be tested, disable for now
+		--without-ipsepcola
+		--without-smyrna
+		# Bindings
+		$(use_enable guile)
+		$(use_enable perl)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--disable-lua
+		--disable-java
+		--disable-ocaml
+		--disable-php
+		--disable-python
+		--disable-r
+		--disable-sharp
+		# libtool file collision, bug #276609
+		--without-included-ltdl
+		--disable-ltdl-install
+		QMAKE=$(usev qt5 qmake5)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use python && python_optimize \
+		"${D}"$(python_get_sitedir) \
+		"${ED}"/usr/$(get_libdir)/graphviz/python3
+}
+
+pkg_postinst() {
+	# We need to register all plugins before they become usable
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 95117e70d0a5..3ce393f64935 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/dav1d/dav1d-1.2.1.ebuild b/media-libs/dav1d/dav1d-1.2.1.ebuild
index 5992d0bbc4d6..b0e02dd3e01a 100644
--- a/media-libs/dav1d/dav1d-1.2.1.ebuild
+++ b/media-libs/dav1d/dav1d-1.2.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/dav1d/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 inherit meson-multilib
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f9d25fc7bcf9..c2727e233cd0 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1 +1,2 @@
 DIST harfbuzz-7.3.0.tar.xz 18867940 BLAKE2B 7b1f6fb0c4c7483ff7a7c27f613b8579af30a304432e1a4e157aec4344449aed93e68443df1f2bc741be6780a6b2214d54804e2df9a20d83c8256b5f98c7fcda SHA512 e1fb484e4117cedc72bd473ee91b2f6143533fb467ec9a64361f0c7ffd8b5a44ad2ea42daa948a2d5d85297ace4b640fcd24a8291b0d75a1d4ee468c629febe9
+DIST harfbuzz-8.0.0.tar.xz 18793316 BLAKE2B b37ef67734af2b0e0f4587fc5e43b3046d669d4fac50c0f2bf9710a9e84384b9a22141999299476d715ce148b33236a42aa0f5d250114f0aef3074f6c401170b SHA512 8f4b72ec5f4fca56162e6d6fd6c60aa68958861ca5683e34a9ed96dd09d203253d5dbbfb2987b161fabda9b3abf61120e928a4dd6e9e9e6b6842294cfdf08402
diff --git a/media-libs/harfbuzz/harfbuzz-8.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.0.0.ebuild
new file mode 100644
index 000000000000..c114ab1668f9
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-8.0.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+# 6.0.0 changed libharfbuzz-subset.so ABI
+SLOT="0/6.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# bug #726120
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die
+
+	# bug #790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+
+	# bug #762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext=disabled
+		-Dchafa=disabled
+		-Dwasm=disabled
+
+		$(meson_feature cairo)
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+		# Breaks building tests..
+		#$(meson_native_use_feature utilities)
+
+		$(meson_use experimental experimental_api)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	# harfbuzz:src / check-static-inits times out on hppa
+	meson_src_test --timeout-multiplier 5
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 1528b814b2d3..c114ab1668f9 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -3,19 +3,19 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 
-if [[ ${PV} = 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
@@ -74,8 +74,9 @@ src_prepare() {
 multilib_src_configure() {
 	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
+		-Dcoretext=disabled
+		-Dchafa=disabled
+		-Dwasm=disabled
 
 		$(meson_feature cairo)
 		$(meson_feature glib)
diff --git a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch
new file mode 100644
index 000000000000..43448a01c473
--- /dev/null
+++ b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/908939
+https://github.com/libjxl/libjxl/issues/2433
+https://github.com/libjxl/libjxl/pull/2596
+
+From 6a5cd1ff847e7b18ba8b87fcc11ada17dccb0692 Mon Sep 17 00:00:00 2001
+From: Sami Boukortt <sboukortt@google.com>
+Date: Thu, 22 Jun 2023 12:26:25 +0200
+Subject: [PATCH] Make sure to read the rendering intent before the CICP tag
+
+The code that reads the CICP tag exits the function if it succeeds, but
+it should not skip reading the rendering intent, so make sure to have
+already done it by that point.
+---
+ lib/jxl/enc_color_management.cc | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/lib/jxl/enc_color_management.cc b/lib/jxl/enc_color_management.cc
+index 752e3e02c0..2b519d152e 100644
+--- a/lib/jxl/enc_color_management.cc
++++ b/lib/jxl/enc_color_management.cc
+@@ -982,6 +982,14 @@ Status ColorEncoding::SetFieldsFromICC() {
+   Profile profile;
+   JXL_RETURN_IF_ERROR(DecodeProfile(context, icc_, &profile));
+ 
++  const cmsUInt32Number rendering_intent32 =
++      cmsGetHeaderRenderingIntent(profile.get());
++  if (rendering_intent32 > 3) {
++    return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
++  }
++  // ICC and RenderingIntent have the same values (0..3).
++  rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
++
+   static constexpr size_t kCICPSize = 12;
+   static constexpr auto kCICPSignature =
+       static_cast<cmsTagSignature>(0x63696370);
+@@ -993,14 +1001,6 @@ Status ColorEncoding::SetFieldsFromICC() {
+     return true;
+   }
+ 
+-  const cmsUInt32Number rendering_intent32 =
+-      cmsGetHeaderRenderingIntent(profile.get());
+-  if (rendering_intent32 > 3) {
+-    return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
+-  }
+-  // ICC and RenderingIntent have the same values (0..3).
+-  rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
+-
+   SetColorSpace(ColorSpaceFromProfile(profile));
+   if (cmsGetColorSpace(profile.get()) == cmsSigCmykData) {
+     cmyk_ = true;
diff --git a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch
new file mode 100644
index 000000000000..af9345867473
--- /dev/null
+++ b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/908939
+https://github.com/libjxl/libjxl/issues/2433
+https://github.com/libjxl/libjxl/pull/2617
+
+From d9637bd803bf9fadc00aa01cea7becfff1e00e1f Mon Sep 17 00:00:00 2001
+From: Sami Boukortt <sboukortt@google.com>
+Date: Mon, 26 Jun 2023 15:06:17 +0200
+Subject: [PATCH] Fix decode_test with lcms2
+
+Co-authored-by: Zoltan Szabadka <szabadka@google.com>
+Co-authored-by: Luca Versari <veluca@google.com>
+---
+ lib/jxl/decode_test.cc | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/lib/jxl/decode_test.cc b/lib/jxl/decode_test.cc
+index 44ead99ec6..bbb7bda39c 100644
+--- a/lib/jxl/decode_test.cc
++++ b/lib/jxl/decode_test.cc
+@@ -3734,13 +3734,18 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
+       jxl::Span<const uint8_t>(codestream.data(), codestream.size()));
+   ASSERT_EQ(br.ReadFixedBits<16>(), 0x0AFF);
+   jxl::CodecMetadata metadata;
+-  EXPECT_TRUE(ReadSizeHeader(&br, &metadata.size));
+-  EXPECT_TRUE(ReadImageMetadata(&br, &metadata.m));
++  ASSERT_TRUE(ReadSizeHeader(&br, &metadata.size));
++  ASSERT_TRUE(ReadImageMetadata(&br, &metadata.m));
+   streampos->basic_info =
+       add_offset(br.TotalBitsConsumed() / jxl::kBitsPerByte);
+   metadata.transform_data.nonserialized_xyb_encoded = metadata.m.xyb_encoded;
+-  EXPECT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
+-  EXPECT_TRUE(br.JumpToByteBoundary());
++  ASSERT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
++  if (metadata.m.color_encoding.WantICC()) {
++    jxl::PaddedBytes icc;
++    ASSERT_TRUE(jxl::ReadICC(&br, &icc));
++    ASSERT_TRUE(metadata.m.color_encoding.SetICCRaw(std::move(icc)));
++  }
++  ASSERT_TRUE(br.JumpToByteBoundary());
+   bool has_preview = metadata.m.have_preview;
+   while (br.TotalBitsConsumed() < br.TotalBytes() * jxl::kBitsPerByte) {
+     FramePositions p;
+@@ -3750,7 +3755,7 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
+       frame_header.nonserialized_is_preview = true;
+       has_preview = false;
+     }
+-    EXPECT_TRUE(ReadFrameHeader(&br, &frame_header));
++    ASSERT_TRUE(ReadFrameHeader(&br, &frame_header));
+     p.header_end =
+         add_offset(jxl::DivCeil(br.TotalBitsConsumed(), jxl::kBitsPerByte));
+     jxl::FrameDimensions frame_dim = frame_header.ToFrameDimensions();
+@@ -3760,7 +3765,7 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
+         frame_header.passes.num_passes, /*has_ac_global=*/true);
+     std::vector<uint64_t> section_offsets;
+     std::vector<uint32_t> section_sizes;
+-    EXPECT_TRUE(ReadGroupOffsets(toc_entries, &br, &section_offsets,
++    ASSERT_TRUE(ReadGroupOffsets(toc_entries, &br, &section_offsets,
+                                  &section_sizes, &groups_total_size));
+     EXPECT_EQ(br.TotalBitsConsumed() % jxl::kBitsPerByte, 0);
+     size_t sections_start = br.TotalBitsConsumed() / jxl::kBitsPerByte;
diff --git a/media-libs/libjxl/libjxl-0.8.2-r1.ebuild b/media-libs/libjxl/libjxl-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..06d0fd0c3225
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.8.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+# This changes frequently.  Please check the testdata submodule when bumping.
+TESTDATA_COMMIT="d6168ffb9e1cc24007e64b65dd84d822ad1fc759"
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl"
+SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
+		-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="openexr test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
+	media-libs/giflib:=[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=[${MULTILIB_USEDEP}]
+	>=x11-misc/shared-mime-info-2.2
+	openexr? ( media-libs/openexr:= )
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.2-backport-pr2596.patch"
+	"${FILESDIR}/${PN}-0.8.2-backport-pr2617.patch"
+)
+
+multilib_src_configure() {
+	filter-lto
+
+	local mycmakeargs=(
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_ENABLE_PLUGINS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DBUILD_TESTING=$(usex test ON OFF)
+		)
+		use test &&
+			mycmakeargs+=( -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" )
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DBUILD_TESTING=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch b/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch
new file mode 100644
index 000000000000..38bb96c5e048
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.3.2-fix-test-file-collisions.patch
@@ -0,0 +1,89 @@
+Fixes test file collisions with high concurrency builds
+Fix by Ninpo <ninpo@qap.la>
+https://bugs.gentoo.org/909759, https://github.com/OpenShot/libopenshot/issues/933
+
+--- a/tests/FFmpegWriter.cpp
++++ b/tests/FFmpegWriter.cpp
+@@ -34,7 +34,7 @@ TEST_CASE( "Webm", "[libopenshot][ffmpegwriter]" )
+ 	r.Open();
+ 
+ 	/* WRITER ---------------- */
+-	FFmpegWriter w("output1.webm");
++	FFmpegWriter w("Webm-output1.webm");
+ 
+ 	// Set options
+ 	w.SetAudioOptions(true, "libvorbis", 44100, 2, LAYOUT_STEREO, 188000);
+@@ -50,7 +50,7 @@ TEST_CASE( "Webm", "[libopenshot][ffmpegwriter]" )
+ 	w.Close();
+ 	r.Close();
+ 
+-	FFmpegReader r1("output1.webm");
++	FFmpegReader r1("Webm-output1.webm");
+ 	r1.Open();
+ 
+ 	// Verify various settings on new MP4
+@@ -81,7 +81,7 @@ TEST_CASE( "Options_Overloads", "[libopenshot][ffmpegwriter]" )
+ 	r.Open();
+ 
+ 	/* WRITER ---------------- */
+-	FFmpegWriter w("output1.mp4");
++	FFmpegWriter w("Options_Overloads-output1.mp4");
+ 
+ 	// Set options
+ 	w.SetAudioOptions("aac", 48000, 192000);
+@@ -97,7 +97,7 @@ TEST_CASE( "Options_Overloads", "[libopenshot][ffmpegwriter]" )
+ 	w.Close();
+ 	r.Close();
+ 
+-	FFmpegReader r1("output1.mp4");
++	FFmpegReader r1("Options_Overloads-output1.mp4");
+ 	r1.Open();
+ 
+ 	// Verify implied settings
+@@ -123,7 +123,7 @@ TEST_CASE( "DisplayInfo", "[libopenshot][ffmpegwriter]" )
+ 	r.Open();
+ 
+ 	/* WRITER ---------------- */
+-	FFmpegWriter w("output1.webm");
++	FFmpegWriter w("DisplayInfo-output1.webm");
+ 
+ 	// Set options
+ 	w.SetAudioOptions(true, "libvorbis", 44100, 2, LAYOUT_STEREO, 188000);
+@@ -203,7 +203,7 @@ TEST_CASE( "Gif", "[libopenshot][ffmpegwriter]" )
+     t.Open();
+ 
+     /* WRITER ---------------- */
+-    FFmpegWriter w("output1.gif");
++    FFmpegWriter w("Gif-output1.gif");
+ 
+     // Set options (no audio options are set)
+     w.SetVideoOptions(true, "gif", Fraction(24,1), 1280, 720, Fraction(1,1), false, false, 15000000);
+@@ -221,7 +221,7 @@ TEST_CASE( "Gif", "[libopenshot][ffmpegwriter]" )
+     w.Close();
+     t.Close();
+ 
+-    FFmpegReader r1("output1.gif");
++    FFmpegReader r1("Gif-output1.gif");
+     r1.Open();
+ 
+     // Verify various settings on new Gif
+--- a/tests/ImageWriter.cpp
++++ b/tests/ImageWriter.cpp
+@@ -64,7 +64,7 @@ TEST_CASE( "Gif", "[libopenshot][imagewriter]" )
+ 	r.Open();
+ 
+ 	/* WRITER ---------------- */
+-	ImageWriter w("output1.gif");
++	ImageWriter w("ImageWriter-Gif-output1.gif");
+ 
+ 	CHECK_FALSE(w.IsOpen());
+ 
+@@ -87,7 +87,7 @@ TEST_CASE( "Gif", "[libopenshot][imagewriter]" )
+ 	r.Close();
+ 
+ 	// Open up the 5th frame from the newly created GIF
+-	ImageReader r1("output1.gif[4]");
++	ImageReader r1("ImageWriter-Gif-output1.gif[4]");
+ 
+ 	// Basic Reader state queries
+ 	CHECK(r1.Name() == "ImageReader");
diff --git a/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild b/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild
index f15646eaddd7..392a75b44969 100644
--- a/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.3.2-r1.ebuild
@@ -41,6 +41,10 @@ BDEPEND="doc? ( app-doc/doxygen )
 		dev-libs/unittest++
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/libopenshot-0.3.2-fix-test-file-collisions.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 }
@@ -86,7 +90,7 @@ src_compile() {
 
 src_test() {
 	# https://github.com/OpenShot/libopenshot/issues/922 exclude broken test
-	virtx cmake_src_test -E '(Caption:caption effect)' || die
+	virtx cmake_src_test -E '(Caption:caption effect|Timeline:Multi-threaded Timeline GetFrame)' || die
 }
 
 src_install() {
diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index 4f4977a28229..c6e5fc462052 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -1 +1,2 @@
 DIST libshumate-1.0.3.tar.xz 110868 BLAKE2B 56d2304208dd41e1c6dc14b76bd6c5cadfb3359576c1c74405851e63be06deaa92bce4fae7bb91855fee53f561dfa84ccbb7ff61eed2f3195d6a93f76e3e2668 SHA512 dc72955bdbe6eee3d4d82dd884c5e74341fa5de25af388d3cc41a368170e4d8f5edf32acdf320e7dde9bc6ace94694e166eafb864887f66a60fb4053d12e1462
+DIST libshumate-1.0.4.tar.xz 111960 BLAKE2B 889ddcf2231091f72bcadb94a12db545218c8c145c2c803b6febd75481087177cc92c5406d08ed450940f17bb5f094bcb4124cdd5bfa7d3d3ac69b225cf449e9 SHA512 6befa699f11c2bf60ff8d109f24f8015b44084816e66d365d3e7249897901b1d2117f038289287df450296132c6ebe267411caa6bfb2bcf306f907d10a3d1be7
diff --git a/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch b/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch
new file mode 100644
index 000000000000..fa3a0ea30abc
--- /dev/null
+++ b/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch
@@ -0,0 +1,98 @@
+https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/158/
+
+From f4f806207cc59c21331d1542f6629e85a59ea1db Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 1 Dec 2022 20:48:57 -0500
+Subject: [PATCH] tests: Add test setup for valgrind
+
+valgrind is great, but it often does not support the latest instruction
+sets used by core libraries (e.g. AVX instructions used in glibc). That
+leads to failures that are unrelated to libshumate. For example:
+
+  6/7 viewport            FAIL            0.16s   killed by signal 4 SIGILL
+  [...]
+  vex amd64->IR: unhandled instruction bytes: 0xC4 0xE1 0xF9 0x90 0xD 0xDE 0xE8 0x1 0x0 0x41
+  vex amd64->IR:   REX=0 REX.W=1 REX.R=0 REX.X=0 REX.B=0
+  vex amd64->IR:   VEX=1 VEX.L=0 VEX.nVVVV=0x0 ESC=0F
+  vex amd64->IR:   PFX.66=1 PFX.F2=0 PFX.F3=0
+
+Categorizing these tests under a 'valgrind' setup allows distributions
+to easily disable them.
+---
+ tests/meson.build | 38 +++++++++++++++++---------------------
+ 1 file changed, 17 insertions(+), 21 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index eadf54f..362e87d 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -6,21 +6,18 @@ test_env = [
+   'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+ ]
+
+-valgrind_tests = [
+-  'coordinate',
+-  'memory-cache',
+-  'viewport',
+-]
+-
+ tests = [
++  'coordinate',
+   'file-cache',
+-  'marker',
+   'map',
++  'marker',
+   'marker-layer',
++  'memory-cache',
++  'viewport',
+ ]
+
+ if get_option('vector_renderer')
+-  valgrind_tests += [
++  tests += [
+     'vector-expression',
+     'vector-style',
+     'vector-value',
+@@ -29,21 +26,20 @@ endif
+
+ subdir('data')
+
++# Allow the tests to be easily run under valgrind using --setup=valgrind
+ valgrind = find_program('valgrind', required: false)
+
+ if valgrind.found()
+-  foreach test : valgrind_tests
+-    executable = executable(
+-      test,
+-      test_resources,
+-      '@0@.c'.format(test),
+-      dependencies: [libshumate_dep],
+-    )
+-
+-    test(test, valgrind, args: ['--leak-check=full', '--error-exitcode=1', executable], env: test_env)
+-  endforeach
+-else
+-  tests += valgrind_tests
++  add_test_setup('valgrind',
++    exclude_suites: [ 'no-valgrind', 'flaky' ],
++    exe_wrapper: [
++      valgrind,
++      '--leak-check=full',
++      '--error-exitcode=1',
++    ],
++    env: test_env,
++    timeout_multiplier: 20,
++  )
+ endif
+
+ foreach test : tests
+@@ -55,4 +51,4 @@ foreach test : tests
+   )
+
+   test(test, executable, env: test_env)
+-endforeach
+\ No newline at end of file
++endforeach
+--
+2.39.3
+
diff --git a/media-libs/libshumate/libshumate-1.0.4.ebuild b/media-libs/libshumate/libshumate-1.0.4.ebuild
new file mode 100644
index 000000000000..835ca224551f
--- /dev/null
+++ b/media-libs/libshumate/libshumate-1.0.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala virtualx
+
+DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps"
+HOMEPAGE="https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate"
+
+SLOT="1.0/1"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+IUSE="gtk-doc +introspection vala" # vector-renderer is still experimental, maybe put in at a later release
+
+RDEPEND="
+	>=dev-libs/glib-2.68.0:2
+	>=x11-libs/cairo-1.4
+	>=dev-db/sqlite-1.12:3
+	>=gui-libs/gtk-4:4
+	>=net-libs/libsoup-3.0:3.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+"
+# vector-renderer? (
+#	>=dev-libs/json-glib-1.6.0[introspection?]
+#	dev-libs/protobuf-c
+# )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-tests-Add-test-setup-for-valgrind.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		-Ddemos=false # only built, not installed
+		# $(meson_use vector-renderer vector_renderer)
+		-Dvector_renderer=false
+		-Dlibsoup3=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html || die
+		mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/html/libshumate-1.0 || die
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 32f63c3a08c9..9f38481f9356 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
index 7c8d77bf0da0..ed7c08f21b45 100644
--- a/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
diff --git a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
index 29c69eb8ffa3..35f24b5dfacb 100644
--- a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6d37c80ac5d5..d17c9822f910 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/devedeng/devedeng-4.17.0-r1.ebuild b/media-video/devedeng/devedeng-4.17.0-r1.ebuild
deleted file mode 100644
index 36b0979743be..000000000000
--- a/media-video/devedeng/devedeng-4.17.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
-HOMEPAGE="https://www.rastersoft.com/programas/devede.html"
-SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-cdr/cdrtools
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3
-	|| ( media-video/vlc media-video/mpv media-video/mplayer )
-	media-video/ffmpeg
-	media-video/dvdauthor
-	media-video/vcdimager
-	|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
-
-DEPEND="${PYTHON_DEPS}"
-
-# src/unitests only works against system installed devedeng
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch )
-
-src_prepare() {
-	default
-
-	# Documentation path
-	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${PF}#" \
-		-i src/devedeng/configuration_data.py || die
-	sed -e "/'doc'/s/devedeng/${PF}/" -i setup.py || die
-
-	# Desktop icon
-	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
-}
diff --git a/media-video/devedeng/devedeng-4.17.0-r2.ebuild b/media-video/devedeng/devedeng-4.17.0-r2.ebuild
new file mode 100644
index 000000000000..451ce0cb30ea
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.17.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="https://www.rastersoft.com/programas/devede.html"
+SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-cdr/cdrtools
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	|| ( media-video/vlc media-video/mpv media-video/mplayer )
+	media-video/ffmpeg
+	media-video/dvdauthor
+	media-video/vcdimager
+	|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
+
+DEPEND="${PYTHON_DEPS}"
+
+# src/unitests only works against system installed devedeng
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch
+	"${FILESDIR}"/${P}-locale_install.patch
+)
+
+src_prepare() {
+	default
+
+	# Documentation path
+	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${PF}#" \
+		-i src/devedeng/configuration_data.py || die
+	sed -e "/'doc'/s/devedeng/${PF}/" -i setup.py || die
+
+	# Desktop icon
+	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
+}
diff --git a/media-video/devedeng/devedeng-4.17.0.ebuild b/media-video/devedeng/devedeng-4.17.0.ebuild
deleted file mode 100644
index 765cb590e3ee..000000000000
--- a/media-video/devedeng/devedeng-4.17.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
-HOMEPAGE="https://www.rastersoft.com/programas/devede.html"
-SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-cdr/cdrtools
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3
-	|| ( media-video/vlc media-video/mpv media-video/mplayer )
-	media-video/ffmpeg
-	media-video/dvdauthor
-	media-video/vcdimager
-	|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
-
-DEPEND="${PYTHON_DEPS}"
-
-# src/unitests only works against system installed devedeng
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch )
-
-src_prepare() {
-	default
-
-	# Documentation path
-	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${P}#" \
-		-i src/devedeng/configuration_data.py || die
-	sed -e "/'doc'/s/devedeng/${P}/" -i setup.py || die
-
-	# Desktop icon
-	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
-}
diff --git a/media-video/devedeng/files/devedeng-4.17.0-locale_install.patch b/media-video/devedeng/files/devedeng-4.17.0-locale_install.patch
new file mode 100644
index 000000000000..c8cfefad093b
--- /dev/null
+++ b/media-video/devedeng/files/devedeng-4.17.0-locale_install.patch
@@ -0,0 +1,15 @@
+diff -Naur devedeng-4.17.0.orig/setup.py devedeng-4.17.0/setup.py
+--- devedeng-4.17.0.orig/setup.py	2022-03-02 16:03:24.000000000 +0100
++++ devedeng-4.17.0/setup.py	2023-07-09 11:07:43.855950815 +0200
+@@ -33,10 +33,7 @@
+     for lang_name in [f for f in os.listdir('locale')]:
+         mofile = os.path.join('locale', lang_name,
+                               'LC_MESSAGES', 'devedeng.mo')
+-        # translations must be always in /usr/share because Gtk.builder only
+-        # search there. If someone knows how to fix this...
+-        # share/locale/fr/LC_MESSAGES/
+-        target = os.path.join('/usr', 'share', 'locale',
++        target = os.path.join('share', 'locale',
+                               lang_name, 'LC_MESSAGES')
+         data_files.append((target, [mofile]))
+ 
diff --git a/media-video/devedeng/metadata.xml b/media-video/devedeng/metadata.xml
index 6fd493ed47c4..45d3c80bfe20 100644
--- a/media-video/devedeng/metadata.xml
+++ b/media-video/devedeng/metadata.xml
@@ -11,6 +11,6 @@ DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD), suitables
 The suffix NG is because it is a rewrite from scratch of the old Devede, to work with Python3 and Gtk3, and with a new internal architecture that allows to expand it and easily add new features.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">rastersoft/devedeng</remote-id>
+		<remote-id type="gitlab">rastersoft/devedeng</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/vlc/vlc-3.0.18-r3.ebuild b/media-video/vlc/vlc-3.0.18-r3.ebuild
index 8090dd85c579..b7dea2946af7 100644
--- a/media-video/vlc/vlc-3.0.18-r3.ebuild
+++ b/media-video/vlc/vlc-3.0.18-r3.ebuild
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv -sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86"
 fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 6279ea5d55f2..0d462718060a 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 c57b25be6522..455f4bb674b5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Jul 2023 19:39:39 +0000
+Mon, 10 Jul 2023 05:39:41 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c57b25be6522..455f4bb674b5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Jul 2023 19:39:39 +0000
+Mon, 10 Jul 2023 05:39:41 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f6c2a1bffa5d..4365398ccfdc 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 8a7a84a71e8a..864c3dc7bccc 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/_cron-failure-0 b/metadata/md5-cache/acct-group/_cron-failure-0
deleted file mode 100644
index e3b665ad1f64..000000000000
--- a/metadata/md5-cache/acct-group/_cron-failure-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-process/systemd-cron failure emails
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2767d2515fef2f5d97604bccf559a943
diff --git a/metadata/md5-cache/acct-group/_cron-failure-0-r1 b/metadata/md5-cache/acct-group/_cron-failure-0-r1
new file mode 100644
index 000000000000..fac7d18fd4cf
--- /dev/null
+++ b/metadata/md5-cache/acct-group/_cron-failure-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/systemd-cron failure emails
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9afd57413fd5681377f8d62f3721190d
diff --git a/metadata/md5-cache/acct-group/adm-0-r1 b/metadata/md5-cache/acct-group/adm-0-r1
deleted file mode 100644
index 7978eb0d28e0..000000000000
--- a/metadata/md5-cache/acct-group/adm-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: adm
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1d6571af81b68752be9743e541e43e5d
diff --git a/metadata/md5-cache/acct-group/adm-0-r2 b/metadata/md5-cache/acct-group/adm-0-r2
new file mode 100644
index 000000000000..6bd458bf60b1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/adm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: adm
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cd98d2657ed4806e240de9edd8d70698
diff --git a/metadata/md5-cache/acct-group/aerospike-amc-0 b/metadata/md5-cache/acct-group/aerospike-amc-0
deleted file mode 100644
index 3b82f6945fe3..000000000000
--- a/metadata/md5-cache/acct-group/aerospike-amc-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-admin/aerospike-amc-community
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ddaca2db35f773d03feff25bc5d4afef
diff --git a/metadata/md5-cache/acct-group/aerospike-amc-0-r1 b/metadata/md5-cache/acct-group/aerospike-amc-0-r1
new file mode 100644
index 000000000000..f3dcc443661f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/aerospike-amc-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/aerospike-amc-community
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=32ef9508cce8abba3aa04dd80096c681
diff --git a/metadata/md5-cache/acct-group/airdcppd-0-r1 b/metadata/md5-cache/acct-group/airdcppd-0-r1
deleted file mode 100644
index 0990601c32a3..000000000000
--- a/metadata/md5-cache/acct-group/airdcppd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-p2p/airdcpp-webclient
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f924bc0a91f26abf3b6d5b80e33e5e3e
diff --git a/metadata/md5-cache/acct-group/airdcppd-0-r2 b/metadata/md5-cache/acct-group/airdcppd-0-r2
new file mode 100644
index 000000000000..1b61b9dc6577
--- /dev/null
+++ b/metadata/md5-cache/acct-group/airdcppd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-p2p/airdcpp-webclient
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ee7b7a1ed6298c6bc9dbee719c92af83
diff --git a/metadata/md5-cache/acct-group/alertmanager-0 b/metadata/md5-cache/acct-group/alertmanager-0
deleted file mode 100644
index 723f19489a9b..000000000000
--- a/metadata/md5-cache/acct-group/alertmanager-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: alertmanager
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6f57e83ae26cb862b182b16b00779484
diff --git a/metadata/md5-cache/acct-group/alertmanager-0-r1 b/metadata/md5-cache/acct-group/alertmanager-0-r1
new file mode 100644
index 000000000000..a6cc7029c2e0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/alertmanager-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: alertmanager
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b3eef80aae6b1f74a86b394ac9bb4f36
diff --git a/metadata/md5-cache/acct-group/amanda-0 b/metadata/md5-cache/acct-group/amanda-0
deleted file mode 100644
index 1c5bf3fd37dc..000000000000
--- a/metadata/md5-cache/acct-group/amanda-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: amanda
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0635855ebd8437206eac277d3df1ab0b
diff --git a/metadata/md5-cache/acct-group/amanda-0-r1 b/metadata/md5-cache/acct-group/amanda-0-r1
new file mode 100644
index 000000000000..80f2d034c120
--- /dev/null
+++ b/metadata/md5-cache/acct-group/amanda-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: amanda
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ddf9e9b411f9a048d244dc1d3f0d120c
diff --git a/metadata/md5-cache/acct-group/amavis-0-r1 b/metadata/md5-cache/acct-group/amavis-0-r1
deleted file mode 100644
index 5c1b00279dbd..000000000000
--- a/metadata/md5-cache/acct-group/amavis-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for mail-filter/amavisd-new
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5f7c0aa5d8e477f0d186563309904523
diff --git a/metadata/md5-cache/acct-group/amavis-0-r2 b/metadata/md5-cache/acct-group/amavis-0-r2
new file mode 100644
index 000000000000..94fea31954f8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/amavis-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-filter/amavisd-new
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cc1c528a96ffd6f75425daea5eab2a59
diff --git a/metadata/md5-cache/acct-group/amule-0-r1 b/metadata/md5-cache/acct-group/amule-0-r1
deleted file mode 100644
index ec304f0ddd99..000000000000
--- a/metadata/md5-cache/acct-group/amule-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-p2p/amule
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c29b2069aed0cdb0ec1e5020f1b24f83
diff --git a/metadata/md5-cache/acct-group/amule-0-r2 b/metadata/md5-cache/acct-group/amule-0-r2
new file mode 100644
index 000000000000..ea60c720d10b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/amule-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-p2p/amule
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dd5cf69dc9eb82500990099687aadf62
diff --git a/metadata/md5-cache/acct-group/android-0 b/metadata/md5-cache/acct-group/android-0
deleted file mode 100644
index ba4cb846e160..000000000000
--- a/metadata/md5-cache/acct-group/android-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for dev-util/android-{ndk,sdk-update-manager}
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3a9dcc8bc3b31fa8b57136a7c38cebef
diff --git a/metadata/md5-cache/acct-group/android-0-r1 b/metadata/md5-cache/acct-group/android-0-r1
new file mode 100644
index 000000000000..f4773c6e3bdf
--- /dev/null
+++ b/metadata/md5-cache/acct-group/android-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for dev-util/android-{ndk,sdk-update-manager}
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e174d764294fd2e68ff637e4be575f9d
diff --git a/metadata/md5-cache/acct-group/anope-0-r1 b/metadata/md5-cache/acct-group/anope-0-r1
deleted file mode 100644
index 022d876b500a..000000000000
--- a/metadata/md5-cache/acct-group/anope-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for Anope IRC services
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=585a94bcfbd4a948c1d00460302de69a
diff --git a/metadata/md5-cache/acct-group/anope-0-r2 b/metadata/md5-cache/acct-group/anope-0-r2
new file mode 100644
index 000000000000..1c4195f21f33
--- /dev/null
+++ b/metadata/md5-cache/acct-group/anope-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Anope IRC services
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=95fd71b8552cbb39a487eb91c859de47
diff --git a/metadata/md5-cache/acct-group/apache-0-r2 b/metadata/md5-cache/acct-group/apache-0-r2
deleted file mode 100644
index 588a4f0a55bb..000000000000
--- a/metadata/md5-cache/acct-group/apache-0-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: apache
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2038b87875f983dedf4dc101d91a590b
diff --git a/metadata/md5-cache/acct-group/apache-0-r3 b/metadata/md5-cache/acct-group/apache-0-r3
new file mode 100644
index 000000000000..2f44e412b777
--- /dev/null
+++ b/metadata/md5-cache/acct-group/apache-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: apache
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c62373ca3f9e90d5ad4783c1e504a7af
diff --git a/metadata/md5-cache/acct-group/apt-cacher-ng-0 b/metadata/md5-cache/acct-group/apt-cacher-ng-0
deleted file mode 100644
index 869795495ca4..000000000000
--- a/metadata/md5-cache/acct-group/apt-cacher-ng-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: apt-cacher-ng
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9606ab0a5d5490f43e18855edb1f8a0c
diff --git a/metadata/md5-cache/acct-group/apt-cacher-ng-0-r1 b/metadata/md5-cache/acct-group/apt-cacher-ng-0-r1
new file mode 100644
index 000000000000..2886554cc53b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/apt-cacher-ng-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: apt-cacher-ng
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cad7a2c85f293e8fef55d1d6b680ddb9
diff --git a/metadata/md5-cache/acct-group/argus-0 b/metadata/md5-cache/acct-group/argus-0
deleted file mode 100644
index ad0d3813a3c9..000000000000
--- a/metadata/md5-cache/acct-group/argus-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=gid for net-analyzer/argus
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ab3bdf1449731973c570a00ced92ae41
diff --git a/metadata/md5-cache/acct-group/argus-0-r1 b/metadata/md5-cache/acct-group/argus-0-r1
new file mode 100644
index 000000000000..4d5a42927526
--- /dev/null
+++ b/metadata/md5-cache/acct-group/argus-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-analyzer/argus
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f0ab5812001018bfc6dcf8a4db3f4249
diff --git a/metadata/md5-cache/acct-group/arpwatch-0 b/metadata/md5-cache/acct-group/arpwatch-0
deleted file mode 100644
index 68510dab609f..000000000000
--- a/metadata/md5-cache/acct-group/arpwatch-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-analyzer/arpwatch
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=18abf91633100aa1afeb6e5bd1b27928
diff --git a/metadata/md5-cache/acct-group/arpwatch-0-r1 b/metadata/md5-cache/acct-group/arpwatch-0-r1
new file mode 100644
index 000000000000..3190085ec549
--- /dev/null
+++ b/metadata/md5-cache/acct-group/arpwatch-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/arpwatch
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9a01e2def74080db4cf786e6905841ca
diff --git a/metadata/md5-cache/acct-group/artifactory-0 b/metadata/md5-cache/acct-group/artifactory-0
deleted file mode 100644
index a1995216d745..000000000000
--- a/metadata/md5-cache/acct-group/artifactory-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for dev-util/artifactory-bin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8528369a43ab0510ce7d2fc1cd77d832
diff --git a/metadata/md5-cache/acct-group/artifactory-0-r1 b/metadata/md5-cache/acct-group/artifactory-0-r1
new file mode 100644
index 000000000000..7e20b8e8a7a9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/artifactory-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for dev-util/artifactory-bin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=23e6bf9b3e006ce492fbcaecc5656921
diff --git a/metadata/md5-cache/acct-group/aspnet-0 b/metadata/md5-cache/acct-group/aspnet-0
deleted file mode 100644
index 711b8d5fe3e1..000000000000
--- a/metadata/md5-cache/acct-group/aspnet-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: aspnet
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=14616aad6d367a0192546bc8be927fc8
diff --git a/metadata/md5-cache/acct-group/aspnet-0-r1 b/metadata/md5-cache/acct-group/aspnet-0-r1
new file mode 100644
index 000000000000..2a69e0a2e0b5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/aspnet-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: aspnet
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0b55e2f0eb7330d0f262a019ffd25444
diff --git a/metadata/md5-cache/acct-group/asterisk-0-r1 b/metadata/md5-cache/acct-group/asterisk-0-r1
deleted file mode 100644
index 4278e20e4325..000000000000
--- a/metadata/md5-cache/acct-group/asterisk-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for asterisk
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e954f273914a4ec40261f625add6d226
diff --git a/metadata/md5-cache/acct-group/asterisk-0-r2 b/metadata/md5-cache/acct-group/asterisk-0-r2
new file mode 100644
index 000000000000..555a10580166
--- /dev/null
+++ b/metadata/md5-cache/acct-group/asterisk-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for asterisk
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8e88e4352ae93af8385e2efadfc4b02b
diff --git a/metadata/md5-cache/acct-group/at-0 b/metadata/md5-cache/acct-group/at-0
deleted file mode 100644
index d0c53574c8e7..000000000000
--- a/metadata/md5-cache/acct-group/at-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: at
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6c23587cea818c9c29fa00aca3ffa7cc
diff --git a/metadata/md5-cache/acct-group/at-0-r1 b/metadata/md5-cache/acct-group/at-0-r1
new file mode 100644
index 000000000000..8411cde2f053
--- /dev/null
+++ b/metadata/md5-cache/acct-group/at-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: at
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9ccb16390467649566664a5c4909d7b9
diff --git a/metadata/md5-cache/acct-group/atheme-services-0-r1 b/metadata/md5-cache/acct-group/atheme-services-0-r1
deleted file mode 100644
index ea88f569d3b1..000000000000
--- a/metadata/md5-cache/acct-group/atheme-services-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for Atheme IRC services
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8a1c3b6be0ce737ea538fa9b67308069
diff --git a/metadata/md5-cache/acct-group/atheme-services-0-r2 b/metadata/md5-cache/acct-group/atheme-services-0-r2
new file mode 100644
index 000000000000..e507e5c66015
--- /dev/null
+++ b/metadata/md5-cache/acct-group/atheme-services-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Atheme IRC services
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8313c9fa36cb4c202676cf78339eef80
diff --git a/metadata/md5-cache/acct-group/audio-0-r1 b/metadata/md5-cache/acct-group/audio-0-r1
deleted file mode 100644
index 93d4ac32c9e9..000000000000
--- a/metadata/md5-cache/acct-group/audio-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: audio
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3e8495e7dda7e82fb24d3085b5d5b043
diff --git a/metadata/md5-cache/acct-group/audio-0-r2 b/metadata/md5-cache/acct-group/audio-0-r2
new file mode 100644
index 000000000000..cc601a019b52
--- /dev/null
+++ b/metadata/md5-cache/acct-group/audio-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: audio
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c8f92c870a2f2a92e45e441e43b172c1
diff --git a/metadata/md5-cache/acct-group/automatic-0 b/metadata/md5-cache/acct-group/automatic-0
deleted file mode 100644
index fc7f43417217..000000000000
--- a/metadata/md5-cache/acct-group/automatic-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: automatic
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0d901dcf07bf1d30026c2725cda223dd
diff --git a/metadata/md5-cache/acct-group/automatic-0-r1 b/metadata/md5-cache/acct-group/automatic-0-r1
new file mode 100644
index 000000000000..44cfc295600c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/automatic-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: automatic
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dd01a2a872be8542d76ac1882f0465cc
diff --git a/metadata/md5-cache/acct-group/automx2-0-r1 b/metadata/md5-cache/acct-group/automx2-0-r1
deleted file mode 100644
index 8960acac9bb5..000000000000
--- a/metadata/md5-cache/acct-group/automx2-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-mail/automx2
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5a803addb55ed971114916d64f9fcda0
diff --git a/metadata/md5-cache/acct-group/automx2-0-r2 b/metadata/md5-cache/acct-group/automx2-0-r2
new file mode 100644
index 000000000000..6f80889c97a8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/automx2-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/automx2
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=149252e1846ffcb63196b1743f99c8fe
diff --git a/metadata/md5-cache/acct-group/avahi-0-r1 b/metadata/md5-cache/acct-group/avahi-0-r1
deleted file mode 100644
index a9444cec1860..000000000000
--- a/metadata/md5-cache/acct-group/avahi-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for avahi
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9d663044ca758ad7cdeb5e5f81cb0656
diff --git a/metadata/md5-cache/acct-group/avahi-0-r2 b/metadata/md5-cache/acct-group/avahi-0-r2
new file mode 100644
index 000000000000..6d8443d5ac2f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/avahi-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for avahi
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3f14a0352604a9e41919ff976fd6d707
diff --git a/metadata/md5-cache/acct-group/avahi-autoipd-0-r1 b/metadata/md5-cache/acct-group/avahi-autoipd-0-r1
deleted file mode 100644
index 90235a3d8da2..000000000000
--- a/metadata/md5-cache/acct-group/avahi-autoipd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for avahi-autoipd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=78d96081c13dac159d4fa4d0cebd5c31
diff --git a/metadata/md5-cache/acct-group/avahi-autoipd-0-r2 b/metadata/md5-cache/acct-group/avahi-autoipd-0-r2
new file mode 100644
index 000000000000..fbb5b28cd4d6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/avahi-autoipd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for avahi-autoipd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=66d5202b0f772dbb53626c899ad3b557
diff --git a/metadata/md5-cache/acct-group/axtls-0 b/metadata/md5-cache/acct-group/axtls-0
deleted file mode 100644
index 1e6d62436da3..000000000000
--- a/metadata/md5-cache/acct-group/axtls-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-libs/axtls
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dc367e60f51dd7e43359750bec5c5d04
diff --git a/metadata/md5-cache/acct-group/axtls-0-r1 b/metadata/md5-cache/acct-group/axtls-0-r1
new file mode 100644
index 000000000000..b79b8b7bf666
--- /dev/null
+++ b/metadata/md5-cache/acct-group/axtls-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-libs/axtls
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=df27d0d23d834ef66357827f5089aca9
diff --git a/metadata/md5-cache/acct-group/backuppc-0 b/metadata/md5-cache/acct-group/backuppc-0
deleted file mode 100644
index ab222cedc9db..000000000000
--- a/metadata/md5-cache/acct-group/backuppc-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-backup/backuppc
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1b420974b69da3f560d9900dec5b049a
diff --git a/metadata/md5-cache/acct-group/backuppc-0-r1 b/metadata/md5-cache/acct-group/backuppc-0-r1
new file mode 100644
index 000000000000..8aa6f5bff0f0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/backuppc-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-backup/backuppc
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0c77367045efcd1c67cb0c446c7f1e69
diff --git a/metadata/md5-cache/acct-group/bacula-0-r1 b/metadata/md5-cache/acct-group/bacula-0-r1
deleted file mode 100644
index fef58af98043..000000000000
--- a/metadata/md5-cache/acct-group/bacula-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the bacula backup system
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=26d34f08d4cf0aaea79e4148f729aea9
diff --git a/metadata/md5-cache/acct-group/bacula-0-r2 b/metadata/md5-cache/acct-group/bacula-0-r2
new file mode 100644
index 000000000000..f4d334b9dc9d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bacula-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the bacula backup system
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1ccef992be769fba15fcfdcaeee5b905
diff --git a/metadata/md5-cache/acct-group/bareos-0-r1 b/metadata/md5-cache/acct-group/bareos-0-r1
deleted file mode 100644
index 374e3f0c672b..000000000000
--- a/metadata/md5-cache/acct-group/bareos-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the bareos network backup suite
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=36f81d9e21dbde16f4ac0c2e79d4f3f1
diff --git a/metadata/md5-cache/acct-group/bareos-0-r2 b/metadata/md5-cache/acct-group/bareos-0-r2
new file mode 100644
index 000000000000..bf84e4f6cb59
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bareos-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the bareos network backup suite
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=36886fa6e4baf96ee5d47e6c0b5cef96
diff --git a/metadata/md5-cache/acct-group/beanstalk-0 b/metadata/md5-cache/acct-group/beanstalk-0
deleted file mode 100644
index 907badd73cd5..000000000000
--- a/metadata/md5-cache/acct-group/beanstalk-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-misc/beanstalkd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=20575dd90ceb0ec27c5a4b641c2c144c
diff --git a/metadata/md5-cache/acct-group/beanstalk-0-r1 b/metadata/md5-cache/acct-group/beanstalk-0-r1
new file mode 100644
index 000000000000..c7d44b127257
--- /dev/null
+++ b/metadata/md5-cache/acct-group/beanstalk-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/beanstalkd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=12d3b357b4bdc9bd49f9cac16f344df7
diff --git a/metadata/md5-cache/acct-group/bedrock-0-r1 b/metadata/md5-cache/acct-group/bedrock-0-r1
deleted file mode 100644
index ce2dc4f91ccb..000000000000
--- a/metadata/md5-cache/acct-group/bedrock-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the Minecraft Bedrock server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7e32735adcfc57d4793a8b22854d83fd
diff --git a/metadata/md5-cache/acct-group/bedrock-0-r2 b/metadata/md5-cache/acct-group/bedrock-0-r2
new file mode 100644
index 000000000000..192780053136
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bedrock-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Minecraft Bedrock server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b5b164e74cf17618414f0e385a8573ed
diff --git a/metadata/md5-cache/acct-group/biboumi-0 b/metadata/md5-cache/acct-group/biboumi-0
deleted file mode 100644
index f99bfa7b1596..000000000000
--- a/metadata/md5-cache/acct-group/biboumi-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: biboumi
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=381735805a05e15fa0b0f9f97c78f40a
diff --git a/metadata/md5-cache/acct-group/biboumi-0-r1 b/metadata/md5-cache/acct-group/biboumi-0-r1
new file mode 100644
index 000000000000..b50a2386bfed
--- /dev/null
+++ b/metadata/md5-cache/acct-group/biboumi-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: biboumi
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=09de9bcb892cf80413d3203315d4a69a
diff --git a/metadata/md5-cache/acct-group/bind_exporter-0-r1 b/metadata/md5-cache/acct-group/bind_exporter-0-r1
deleted file mode 100644
index 5252f15fada8..000000000000
--- a/metadata/md5-cache/acct-group/bind_exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: bind_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0e4b6cc2baa05f53ef217049c873677c
diff --git a/metadata/md5-cache/acct-group/bind_exporter-0-r2 b/metadata/md5-cache/acct-group/bind_exporter-0-r2
new file mode 100644
index 000000000000..e98c3e1ff904
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bind_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: bind_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9910f0625a0c60dcac1440308ccf11d6
diff --git a/metadata/md5-cache/acct-group/bird-0 b/metadata/md5-cache/acct-group/bird-0
deleted file mode 100644
index dfa145af278d..000000000000
--- a/metadata/md5-cache/acct-group/bird-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: bird
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5a7485a97cb891ab36b8e76172d866db
diff --git a/metadata/md5-cache/acct-group/bird-0-r1 b/metadata/md5-cache/acct-group/bird-0-r1
new file mode 100644
index 000000000000..a209cec6294f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bird-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: bird
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0bea27fb7ebb84eb41d5a00708ceca1c
diff --git a/metadata/md5-cache/acct-group/bitcoin-0-r1 b/metadata/md5-cache/acct-group/bitcoin-0-r1
deleted file mode 100644
index 2bb9627c44d0..000000000000
--- a/metadata/md5-cache/acct-group/bitcoin-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for users with access to system-wide Bitcoin services
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=88eb29593f02d3f148cb9595415b4861
diff --git a/metadata/md5-cache/acct-group/bitcoin-0-r2 b/metadata/md5-cache/acct-group/bitcoin-0-r2
new file mode 100644
index 000000000000..eecd6333b66f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bitcoin-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for users with access to system-wide Bitcoin services
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=573570ef0c80ed706fe2ca03dba88340
diff --git a/metadata/md5-cache/acct-group/bitflu-0 b/metadata/md5-cache/acct-group/bitflu-0
deleted file mode 100644
index 7d7f1596d266..000000000000
--- a/metadata/md5-cache/acct-group/bitflu-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-p2p/bitflu
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8cf2ae9469d7240140821a3bc9b55726
diff --git a/metadata/md5-cache/acct-group/bitflu-0-r1 b/metadata/md5-cache/acct-group/bitflu-0-r1
new file mode 100644
index 000000000000..ad8c3b98778a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bitflu-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-p2p/bitflu
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=767e454d5a51ed2e44068efe8e29f93b
diff --git a/metadata/md5-cache/acct-group/bitlbee-0-r1 b/metadata/md5-cache/acct-group/bitlbee-0-r1
deleted file mode 100644
index 285f403f8ad3..000000000000
--- a/metadata/md5-cache/acct-group/bitlbee-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: bitlbee
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=73f06d421342719fef4843bc1e48bc8d
diff --git a/metadata/md5-cache/acct-group/bitlbee-0-r2 b/metadata/md5-cache/acct-group/bitlbee-0-r2
new file mode 100644
index 000000000000..18754be0cad3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bitlbee-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: bitlbee
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bcd4111914e10bb450a012a675ad1676
diff --git a/metadata/md5-cache/acct-group/blackbox_exporter-0 b/metadata/md5-cache/acct-group/blackbox_exporter-0
deleted file mode 100644
index 40dfcad8b77a..000000000000
--- a/metadata/md5-cache/acct-group/blackbox_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: blackbox_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=05b6b3e7c88e76ceb1044e6e80da2c24
diff --git a/metadata/md5-cache/acct-group/blackbox_exporter-0-r1 b/metadata/md5-cache/acct-group/blackbox_exporter-0-r1
new file mode 100644
index 000000000000..9db6cef7a6b4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/blackbox_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: blackbox_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=25cb65e056591212af2269321ebfc5f0
diff --git a/metadata/md5-cache/acct-group/boinc-0 b/metadata/md5-cache/acct-group/boinc-0
deleted file mode 100644
index 2ca86e42912e..000000000000
--- a/metadata/md5-cache/acct-group/boinc-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for sci-misc/boinc
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cabe626fd2ba8bff5d1b81d2bdd0a196
diff --git a/metadata/md5-cache/acct-group/boinc-0-r1 b/metadata/md5-cache/acct-group/boinc-0-r1
new file mode 100644
index 000000000000..e2e9fb6cccea
--- /dev/null
+++ b/metadata/md5-cache/acct-group/boinc-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sci-misc/boinc
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5f35b3f1386e961c149ff39b10af3d80
diff --git a/metadata/md5-cache/acct-group/brlapi-0 b/metadata/md5-cache/acct-group/brlapi-0
deleted file mode 100644
index 68fc08739e1a..000000000000
--- a/metadata/md5-cache/acct-group/brlapi-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: brlapi
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=67c9bf699565b8da9c9cc4a417ae3e77
diff --git a/metadata/md5-cache/acct-group/brlapi-0-r1 b/metadata/md5-cache/acct-group/brlapi-0-r1
new file mode 100644
index 000000000000..f0917dab6f23
--- /dev/null
+++ b/metadata/md5-cache/acct-group/brlapi-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: brlapi
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ef8f5cfa2b8e31390d76ba7c6057858a
diff --git a/metadata/md5-cache/acct-group/brltty-0 b/metadata/md5-cache/acct-group/brltty-0
deleted file mode 100644
index 443295b281f6..000000000000
--- a/metadata/md5-cache/acct-group/brltty-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: brltty
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5865cbfb98fe3ec124c67c930538c13b
diff --git a/metadata/md5-cache/acct-group/brltty-0-r1 b/metadata/md5-cache/acct-group/brltty-0-r1
new file mode 100644
index 000000000000..25184c1ba242
--- /dev/null
+++ b/metadata/md5-cache/acct-group/brltty-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: brltty
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b72194110f0f64e2d48eec5e61d5476d
diff --git a/metadata/md5-cache/acct-group/buildbot-0-r1 b/metadata/md5-cache/acct-group/buildbot-0-r1
deleted file mode 100644
index 6f6cee7253b0..000000000000
--- a/metadata/md5-cache/acct-group/buildbot-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Buildbot program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=89a1f7b2c007a52657e285e313072c3a
diff --git a/metadata/md5-cache/acct-group/buildbot-0-r2 b/metadata/md5-cache/acct-group/buildbot-0-r2
new file mode 100644
index 000000000000..13a7d7856738
--- /dev/null
+++ b/metadata/md5-cache/acct-group/buildbot-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Buildbot program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ba73e9cac029d167d9f90e5fc2c80333
diff --git a/metadata/md5-cache/acct-group/bumblebee-0 b/metadata/md5-cache/acct-group/bumblebee-0
deleted file mode 100644
index d6321f8a1aee..000000000000
--- a/metadata/md5-cache/acct-group/bumblebee-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: bumblebee
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6c376a27237d79604a3d8b4ced56a869
diff --git a/metadata/md5-cache/acct-group/bumblebee-0-r1 b/metadata/md5-cache/acct-group/bumblebee-0-r1
new file mode 100644
index 000000000000..adf6ea01a33c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/bumblebee-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: bumblebee
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=666b833b0756072928e11a9f9fbfb660
diff --git a/metadata/md5-cache/acct-group/burp-0-r1 b/metadata/md5-cache/acct-group/burp-0-r1
deleted file mode 100644
index 558e501e3904..000000000000
--- a/metadata/md5-cache/acct-group/burp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the app-backup/burp server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b3d665979d05f87af43921c0c12bb0a0
diff --git a/metadata/md5-cache/acct-group/burp-0-r2 b/metadata/md5-cache/acct-group/burp-0-r2
new file mode 100644
index 000000000000..481e5c4df77f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/burp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the app-backup/burp server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3b3813d4b833ad5336bc1f2cc5350c3f
diff --git a/metadata/md5-cache/acct-group/burrow_exporter-0-r1 b/metadata/md5-cache/acct-group/burrow_exporter-0-r1
deleted file mode 100644
index a363a1ebbb1d..000000000000
--- a/metadata/md5-cache/acct-group/burrow_exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-metrics/burrow_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9f38e73b043d16c0855a5660ea1c72ee
diff --git a/metadata/md5-cache/acct-group/burrow_exporter-0-r2 b/metadata/md5-cache/acct-group/burrow_exporter-0-r2
new file mode 100644
index 000000000000..a92dff5975d1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/burrow_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/burrow_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=222ffc753a7c2d85656fdb52644abf51
diff --git a/metadata/md5-cache/acct-group/cadvisor-0-r1 b/metadata/md5-cache/acct-group/cadvisor-0-r1
deleted file mode 100644
index 8dfad65a00a5..000000000000
--- a/metadata/md5-cache/acct-group/cadvisor-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: cadvisor
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=750f0ef60b2b2f507bc44e1a81a663ac
diff --git a/metadata/md5-cache/acct-group/cadvisor-0-r2 b/metadata/md5-cache/acct-group/cadvisor-0-r2
new file mode 100644
index 000000000000..430203eb11f1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cadvisor-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: cadvisor
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bb7bf280f4e6c9b5cec200b955a470d0
diff --git a/metadata/md5-cache/acct-group/cancd-0 b/metadata/md5-cache/acct-group/cancd-0
deleted file mode 100644
index 02b60a41179b..000000000000
--- a/metadata/md5-cache/acct-group/cancd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the CA NetConsole Daemon
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9869990ea0c90548cbd1f635c0031c55
diff --git a/metadata/md5-cache/acct-group/cancd-0-r1 b/metadata/md5-cache/acct-group/cancd-0-r1
new file mode 100644
index 000000000000..750b1776c8de
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cancd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the CA NetConsole Daemon
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0f9dff926c9be807dcaa9c065eb47978
diff --git a/metadata/md5-cache/acct-group/carbon-0-r1 b/metadata/md5-cache/acct-group/carbon-0-r1
deleted file mode 100644
index 2eb224bdd91f..000000000000
--- a/metadata/md5-cache/acct-group/carbon-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: carbon
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=349e522ff3a3f29496a3170475df3bdf
diff --git a/metadata/md5-cache/acct-group/carbon-0-r2 b/metadata/md5-cache/acct-group/carbon-0-r2
new file mode 100644
index 000000000000..aa61b0e0ecb5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/carbon-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: carbon
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aa828275bb92176e2b4d72df7b462d1a
diff --git a/metadata/md5-cache/acct-group/cdrom-0-r1 b/metadata/md5-cache/acct-group/cdrom-0-r1
deleted file mode 100644
index 5900a39479a0..000000000000
--- a/metadata/md5-cache/acct-group/cdrom-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: cdrom
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6220758de6cdd6054db6004a785f19aa
diff --git a/metadata/md5-cache/acct-group/cdrom-0-r2 b/metadata/md5-cache/acct-group/cdrom-0-r2
new file mode 100644
index 000000000000..4234ce7b6891
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cdrom-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: cdrom
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aeda8fce0959a35b3cac51281f04ec44
diff --git a/metadata/md5-cache/acct-group/ceph-0-r1 b/metadata/md5-cache/acct-group/ceph-0-r1
deleted file mode 100644
index b3d4e34a0c8a..000000000000
--- a/metadata/md5-cache/acct-group/ceph-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: ceph
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=890b80077af994c9b8619d237b07e449
diff --git a/metadata/md5-cache/acct-group/ceph-0-r2 b/metadata/md5-cache/acct-group/ceph-0-r2
new file mode 100644
index 000000000000..9fc032904e02
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ceph-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ceph
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=32dfe27b92ceae5f5dba3276271341f4
diff --git a/metadata/md5-cache/acct-group/cgit-0 b/metadata/md5-cache/acct-group/cgit-0
deleted file mode 100644
index b33dd6ba8d40..000000000000
--- a/metadata/md5-cache/acct-group/cgit-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: cgit
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d88ca4ae79125394ef44fdee07423a37
diff --git a/metadata/md5-cache/acct-group/cgit-0-r1 b/metadata/md5-cache/acct-group/cgit-0-r1
new file mode 100644
index 000000000000..1f6fc63566c1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cgit-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: cgit
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8c9df8d7add2d960a4e824cc5a88662f
diff --git a/metadata/md5-cache/acct-group/chronograf-0-r1 b/metadata/md5-cache/acct-group/chronograf-0-r1
deleted file mode 100644
index 10c54fc8627a..000000000000
--- a/metadata/md5-cache/acct-group/chronograf-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: chronograf
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d345b47bed52dbfd657e31ec0b813dd3
diff --git a/metadata/md5-cache/acct-group/chronograf-0-r2 b/metadata/md5-cache/acct-group/chronograf-0-r2
new file mode 100644
index 000000000000..231dc27afb1e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/chronograf-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: chronograf
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=418a890fad31ad8addba5acdb7bd088b
diff --git a/metadata/md5-cache/acct-group/cinder-0-r1 b/metadata/md5-cache/acct-group/cinder-0-r1
deleted file mode 100644
index 93c1e3b7bc2f..000000000000
--- a/metadata/md5-cache/acct-group/cinder-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: cinder
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2338b3f3fc4f4d39a2d711be9d060968
diff --git a/metadata/md5-cache/acct-group/cinder-0-r2 b/metadata/md5-cache/acct-group/cinder-0-r2
new file mode 100644
index 000000000000..1a221678eecf
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cinder-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: cinder
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e4c210b586395215cbc79551c5028583
diff --git a/metadata/md5-cache/acct-group/clair-0-r1 b/metadata/md5-cache/acct-group/clair-0-r1
deleted file mode 100644
index e092952f7172..000000000000
--- a/metadata/md5-cache/acct-group/clair-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: clair
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=18eb3a4cd3705972e71a504dede58b25
diff --git a/metadata/md5-cache/acct-group/clair-0-r2 b/metadata/md5-cache/acct-group/clair-0-r2
new file mode 100644
index 000000000000..656b0bc96965
--- /dev/null
+++ b/metadata/md5-cache/acct-group/clair-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: clair
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8703a9aa88f0b72551419735892b76d3
diff --git a/metadata/md5-cache/acct-group/clamav-0-r1 b/metadata/md5-cache/acct-group/clamav-0-r1
deleted file mode 100644
index d9212492c520..000000000000
--- a/metadata/md5-cache/acct-group/clamav-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: clamav
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=807db74c7e2a1423cbb6d42275fc080f
diff --git a/metadata/md5-cache/acct-group/clamav-0-r2 b/metadata/md5-cache/acct-group/clamav-0-r2
new file mode 100644
index 000000000000..eddf25ff035b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/clamav-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: clamav
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f9098aa5f93f9fab274dc15ad4f2d89e
diff --git a/metadata/md5-cache/acct-group/cntlm-0 b/metadata/md5-cache/acct-group/cntlm-0
deleted file mode 100644
index 790333426b66..000000000000
--- a/metadata/md5-cache/acct-group/cntlm-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-proxy/cntlm
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2772cddbf81c5dce688bf854b7ff8a68
diff --git a/metadata/md5-cache/acct-group/cntlm-0-r1 b/metadata/md5-cache/acct-group/cntlm-0-r1
new file mode 100644
index 000000000000..15eaf7467956
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cntlm-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-proxy/cntlm
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d4c2293c5d1036d03edb95d7a1761529
diff --git a/metadata/md5-cache/acct-group/cockroach-0 b/metadata/md5-cache/acct-group/cockroach-0
deleted file mode 100644
index 568a2653edfa..000000000000
--- a/metadata/md5-cache/acct-group/cockroach-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for dev-db/cockroach
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=66f7da19c3d7d8a55f6ce74acd14d344
diff --git a/metadata/md5-cache/acct-group/cockroach-0-r1 b/metadata/md5-cache/acct-group/cockroach-0-r1
new file mode 100644
index 000000000000..b82fba61bc81
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cockroach-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/cockroach
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=899c65488cf1eff9c4f29fc97333d4f1
diff --git a/metadata/md5-cache/acct-group/collectd-0 b/metadata/md5-cache/acct-group/collectd-0
deleted file mode 100644
index ca46b313556d..000000000000
--- a/metadata/md5-cache/acct-group/collectd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=collectd program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9e75d550395daa5d6d9eb36a7a9cf7cf
diff --git a/metadata/md5-cache/acct-group/collectd-0-r1 b/metadata/md5-cache/acct-group/collectd-0-r1
new file mode 100644
index 000000000000..b195a9b01f26
--- /dev/null
+++ b/metadata/md5-cache/acct-group/collectd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=collectd program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d3345ae6c4363a2d3d8086db7ecc346a
diff --git a/metadata/md5-cache/acct-group/colord-0 b/metadata/md5-cache/acct-group/colord-0
deleted file mode 100644
index d282573031b5..000000000000
--- a/metadata/md5-cache/acct-group/colord-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: colord
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=12f66a38716e6f01c85b3baf6c08c98e
diff --git a/metadata/md5-cache/acct-group/colord-0-r1 b/metadata/md5-cache/acct-group/colord-0-r1
new file mode 100644
index 000000000000..9a6739208b6d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/colord-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: colord
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2457f8216bbd069536329f91c347775c
diff --git a/metadata/md5-cache/acct-group/consul-0-r1 b/metadata/md5-cache/acct-group/consul-0-r1
deleted file mode 100644
index 32f7ac581cad..000000000000
--- a/metadata/md5-cache/acct-group/consul-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: consul
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d603223a86500d48eaa2d9add139b8a6
diff --git a/metadata/md5-cache/acct-group/consul-0-r2 b/metadata/md5-cache/acct-group/consul-0-r2
new file mode 100644
index 000000000000..a67d8d00525e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/consul-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: consul
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d96b6d7da6769f828b60e9090bc7f90f
diff --git a/metadata/md5-cache/acct-group/consul-template-0-r1 b/metadata/md5-cache/acct-group/consul-template-0-r1
deleted file mode 100644
index c4d8e9daf073..000000000000
--- a/metadata/md5-cache/acct-group/consul-template-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: consul-template
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d0bfdf68e36e30aa948b2c8ec45a594f
diff --git a/metadata/md5-cache/acct-group/consul-template-0-r2 b/metadata/md5-cache/acct-group/consul-template-0-r2
new file mode 100644
index 000000000000..6a610d4fc621
--- /dev/null
+++ b/metadata/md5-cache/acct-group/consul-template-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: consul-template
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=469ea2ed7ed7347fd08929ac5af895af
diff --git a/metadata/md5-cache/acct-group/consul_exporter-0 b/metadata/md5-cache/acct-group/consul_exporter-0
deleted file mode 100644
index f85c9052da9c..000000000000
--- a/metadata/md5-cache/acct-group/consul_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: consul_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6ec52e834314e25eaa92a0031ab8d6d2
diff --git a/metadata/md5-cache/acct-group/consul_exporter-0-r1 b/metadata/md5-cache/acct-group/consul_exporter-0-r1
new file mode 100644
index 000000000000..12068ede815e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/consul_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: consul_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2e89d3282ea21dba1a78ea834d8c523f
diff --git a/metadata/md5-cache/acct-group/coredns-0 b/metadata/md5-cache/acct-group/coredns-0
deleted file mode 100644
index 4f19d933a986..000000000000
--- a/metadata/md5-cache/acct-group/coredns-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-dns/coredns
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5628c01e24ff1c3b49c3a4960e2c62f1
diff --git a/metadata/md5-cache/acct-group/coredns-0-r1 b/metadata/md5-cache/acct-group/coredns-0-r1
new file mode 100644
index 000000000000..8c34ca804436
--- /dev/null
+++ b/metadata/md5-cache/acct-group/coredns-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dns/coredns
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=774453be73e85735f4f7964cb67dcf37
diff --git a/metadata/md5-cache/acct-group/croc-0 b/metadata/md5-cache/acct-group/croc-0
deleted file mode 100644
index 5163ba05a95d..000000000000
--- a/metadata/md5-cache/acct-group/croc-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-misc/croc
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=75ec8a152e4ecc373422e51f32444c4a
diff --git a/metadata/md5-cache/acct-group/croc-0-r1 b/metadata/md5-cache/acct-group/croc-0-r1
new file mode 100644
index 000000000000..568a147b889f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/croc-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/croc
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5a9a29422da7bae7b96e296ca56a93a0
diff --git a/metadata/md5-cache/acct-group/cron-0 b/metadata/md5-cache/acct-group/cron-0
deleted file mode 100644
index 0720ab4a2cdf..000000000000
--- a/metadata/md5-cache/acct-group/cron-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-process/cronbase
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f95ae7fb5167a41e3c0c48f91bb639e6
diff --git a/metadata/md5-cache/acct-group/cron-0-r1 b/metadata/md5-cache/acct-group/cron-0-r1
new file mode 100644
index 000000000000..1001b24e97fe
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cron-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/cronbase
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=84c29d8f5ffbceb5565e1b977f4c98b7
diff --git a/metadata/md5-cache/acct-group/crontab-0 b/metadata/md5-cache/acct-group/crontab-0
deleted file mode 100644
index 101bb67d9091..000000000000
--- a/metadata/md5-cache/acct-group/crontab-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: crontab
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1ef5b4bc73f94bf6a0164e8d5de6a482
diff --git a/metadata/md5-cache/acct-group/crontab-0-r1 b/metadata/md5-cache/acct-group/crontab-0-r1
new file mode 100644
index 000000000000..469a815a4787
--- /dev/null
+++ b/metadata/md5-cache/acct-group/crontab-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: crontab
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5b795cc64102c10143ea350bf7e096c0
diff --git a/metadata/md5-cache/acct-group/cvmfs-0-r1 b/metadata/md5-cache/acct-group/cvmfs-0-r1
deleted file mode 100644
index 511ba66f267d..000000000000
--- a/metadata/md5-cache/acct-group/cvmfs-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the CernVM-FS network file system
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bce6a558bee7690a1e94911659342e53
diff --git a/metadata/md5-cache/acct-group/cvmfs-0-r2 b/metadata/md5-cache/acct-group/cvmfs-0-r2
new file mode 100644
index 000000000000..86a74900745e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/cvmfs-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the CernVM-FS network file system
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f478f3bc54f20758674d9745ef0395c8
diff --git a/metadata/md5-cache/acct-group/davfs2-0-r1 b/metadata/md5-cache/acct-group/davfs2-0-r1
deleted file mode 100644
index 0010391cda8d..000000000000
--- a/metadata/md5-cache/acct-group/davfs2-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: davfs2
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=811977e983d56622e3535a9f8d6d305e
diff --git a/metadata/md5-cache/acct-group/davfs2-0-r2 b/metadata/md5-cache/acct-group/davfs2-0-r2
new file mode 100644
index 000000000000..f19a04b7d49e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/davfs2-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: davfs2
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=278004887aa6815c1ce619f5b453e722
diff --git a/metadata/md5-cache/acct-group/dbmail-0 b/metadata/md5-cache/acct-group/dbmail-0
deleted file mode 100644
index 39422c27217a..000000000000
--- a/metadata/md5-cache/acct-group/dbmail-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: dbmail
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=771919234afef283afb35d1c1ee7cbfc
diff --git a/metadata/md5-cache/acct-group/dbmail-0-r1 b/metadata/md5-cache/acct-group/dbmail-0-r1
new file mode 100644
index 000000000000..3943891c7f6a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dbmail-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dbmail
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9122dff3259bd382d18460407eff34cf
diff --git a/metadata/md5-cache/acct-group/dbskkd-0 b/metadata/md5-cache/acct-group/dbskkd-0
deleted file mode 100644
index cb12b804c857..000000000000
--- a/metadata/md5-cache/acct-group/dbskkd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-i18n/dbskkd-cdb
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8a89ed1add86532209d1fd7e45ad43ab
diff --git a/metadata/md5-cache/acct-group/dbskkd-0-r1 b/metadata/md5-cache/acct-group/dbskkd-0-r1
new file mode 100644
index 000000000000..1334f48c1a51
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dbskkd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-i18n/dbskkd-cdb
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bca3dba051bdbb7ecf409f3a403274bb
diff --git a/metadata/md5-cache/acct-group/ddclient-0-r1 b/metadata/md5-cache/acct-group/ddclient-0-r1
deleted file mode 100644
index 4bfbbb2206f1..000000000000
--- a/metadata/md5-cache/acct-group/ddclient-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the dynamic DNS client
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e4f6e3941247b90e31d7cd75df414db0
diff --git a/metadata/md5-cache/acct-group/ddclient-0-r2 b/metadata/md5-cache/acct-group/ddclient-0-r2
new file mode 100644
index 000000000000..12e550572703
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ddclient-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the dynamic DNS client
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dcef536203ded10ec74f3c27e34fc28f
diff --git a/metadata/md5-cache/acct-group/defang-0 b/metadata/md5-cache/acct-group/defang-0
deleted file mode 100644
index ca0787178a62..000000000000
--- a/metadata/md5-cache/acct-group/defang-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for mail-filter/mimedefang
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ae1a5144285da33843bd64bdf424c7ec
diff --git a/metadata/md5-cache/acct-group/defang-0-r1 b/metadata/md5-cache/acct-group/defang-0-r1
new file mode 100644
index 000000000000..ad1f1bc6ee1d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/defang-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for mail-filter/mimedefang
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d79bf743170b0d0ff3baa36590ed1588
diff --git a/metadata/md5-cache/acct-group/dehydrated-0 b/metadata/md5-cache/acct-group/dehydrated-0
deleted file mode 100644
index a9f164983c19..000000000000
--- a/metadata/md5-cache/acct-group/dehydrated-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=dehydrated program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fbaad4b6e256150c506ccdee335e1a6d
diff --git a/metadata/md5-cache/acct-group/dehydrated-0-r1 b/metadata/md5-cache/acct-group/dehydrated-0-r1
new file mode 100644
index 000000000000..de7fc4114080
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dehydrated-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=dehydrated program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=75c6a1a13199a337a45b4f411b856227
diff --git a/metadata/md5-cache/acct-group/deluge-0-r1 b/metadata/md5-cache/acct-group/deluge-0-r1
deleted file mode 100644
index 89495d91419e..000000000000
--- a/metadata/md5-cache/acct-group/deluge-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: deluge
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2001752d03bb45056f58635d95c340ad
diff --git a/metadata/md5-cache/acct-group/deluge-0-r2 b/metadata/md5-cache/acct-group/deluge-0-r2
new file mode 100644
index 000000000000..a99caaaa8335
--- /dev/null
+++ b/metadata/md5-cache/acct-group/deluge-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: deluge
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=18a1f3f8e5da7de50b060f76bf94a16b
diff --git a/metadata/md5-cache/acct-group/dhcp-0-r1 b/metadata/md5-cache/acct-group/dhcp-0-r1
deleted file mode 100644
index 78a9220f7251..000000000000
--- a/metadata/md5-cache/acct-group/dhcp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: dhcp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a5b3357b396326f7db8c294bb55251fe
diff --git a/metadata/md5-cache/acct-group/dhcp-0-r2 b/metadata/md5-cache/acct-group/dhcp-0-r2
new file mode 100644
index 000000000000..b1d921115216
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dhcp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dhcp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=73109fa23d0d615a435061d0fd582f9a
diff --git a/metadata/md5-cache/acct-group/dhcpcd-0-r1 b/metadata/md5-cache/acct-group/dhcpcd-0-r1
deleted file mode 100644
index 3b915e641804..000000000000
--- a/metadata/md5-cache/acct-group/dhcpcd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: dhcpcd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fa6ae70fc5fe03b606309c3bc9bd6562
diff --git a/metadata/md5-cache/acct-group/dhcpcd-0-r2 b/metadata/md5-cache/acct-group/dhcpcd-0-r2
new file mode 100644
index 000000000000..9f5aef4ccab9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dhcpcd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dhcpcd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c272ea800907a9dcf0a20a61e797b63d
diff --git a/metadata/md5-cache/acct-group/dialout-0-r1 b/metadata/md5-cache/acct-group/dialout-0-r1
deleted file mode 100644
index 273673551f96..000000000000
--- a/metadata/md5-cache/acct-group/dialout-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: dialout
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=91d0f007ab5cd5fbc52b3563502b37f2
diff --git a/metadata/md5-cache/acct-group/dialout-0-r2 b/metadata/md5-cache/acct-group/dialout-0-r2
new file mode 100644
index 000000000000..d004496f85ad
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dialout-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dialout
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2b48ec5627d741f38f6bb827650fead1
diff --git a/metadata/md5-cache/acct-group/dictd-0 b/metadata/md5-cache/acct-group/dictd-0
deleted file mode 100644
index ca084994cb81..000000000000
--- a/metadata/md5-cache/acct-group/dictd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=gid for app-text/dictd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b9f1e7b77ab2a45d8c382c887ca944ab
diff --git a/metadata/md5-cache/acct-group/dictd-0-r1 b/metadata/md5-cache/acct-group/dictd-0-r1
new file mode 100644
index 000000000000..0efa096fc5a4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dictd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for app-text/dictd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4030ee872affccf50bb7e266e4bf04d3
diff --git a/metadata/md5-cache/acct-group/dirsrv-0 b/metadata/md5-cache/acct-group/dirsrv-0
deleted file mode 100644
index 1c68a91de8bb..000000000000
--- a/metadata/md5-cache/acct-group/dirsrv-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-nds/389-ds-base
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5a8b0c65e8f3f088fed0760c0ba1e2af
diff --git a/metadata/md5-cache/acct-group/dirsrv-0-r1 b/metadata/md5-cache/acct-group/dirsrv-0-r1
new file mode 100644
index 000000000000..c9be9a314a72
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dirsrv-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-nds/389-ds-base
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a57bd9ebcefef3f292dda064feb68360
diff --git a/metadata/md5-cache/acct-group/disk-0-r1 b/metadata/md5-cache/acct-group/disk-0-r1
deleted file mode 100644
index e0ae73969145..000000000000
--- a/metadata/md5-cache/acct-group/disk-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: disk
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=86dc41cb27e6be3cdbb56143bf74d9a5
diff --git a/metadata/md5-cache/acct-group/disk-0-r2 b/metadata/md5-cache/acct-group/disk-0-r2
new file mode 100644
index 000000000000..91e0bb4f8f60
--- /dev/null
+++ b/metadata/md5-cache/acct-group/disk-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: disk
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9a900585eed557b50f7076e541784651
diff --git a/metadata/md5-cache/acct-group/distcc-1 b/metadata/md5-cache/acct-group/distcc-1
deleted file mode 100644
index e02945cbfb6c..000000000000
--- a/metadata/md5-cache/acct-group/distcc-1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: distcc
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b290c37d629af2aaea9afbd7a173ce31
diff --git a/metadata/md5-cache/acct-group/distcc-1-r1 b/metadata/md5-cache/acct-group/distcc-1-r1
new file mode 100644
index 000000000000..774536e11145
--- /dev/null
+++ b/metadata/md5-cache/acct-group/distcc-1-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: distcc
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2c96cd49815000b0e36f3c1aa08b7c6e
diff --git a/metadata/md5-cache/acct-group/dnrd-0 b/metadata/md5-cache/acct-group/dnrd-0
deleted file mode 100644
index b6a6036a87e7..000000000000
--- a/metadata/md5-cache/acct-group/dnrd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-dns/dnrd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8d3037d118569e8f8ec0b8d48b0d4b59
diff --git a/metadata/md5-cache/acct-group/dnrd-0-r1 b/metadata/md5-cache/acct-group/dnrd-0-r1
new file mode 100644
index 000000000000..350878e66d88
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnrd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-dns/dnrd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=615d5819aaf220d8bbd656204e37e7e4
diff --git a/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1 b/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1
deleted file mode 100644
index 4d0d35f242c4..000000000000
--- a/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-dns/dnscrypt-proxy
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2ca81421da5a3c70ffb18fd7b9657b0a
diff --git a/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r2 b/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r2
new file mode 100644
index 000000000000..cdfff1e7cd9b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnscrypt-proxy-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-dns/dnscrypt-proxy
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6f678d5460ae4b3eba453cc2e85bc599
diff --git a/metadata/md5-cache/acct-group/dnsdist-0-r1 b/metadata/md5-cache/acct-group/dnsdist-0-r1
deleted file mode 100644
index 6412ab382ed0..000000000000
--- a/metadata/md5-cache/acct-group/dnsdist-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-dns/dnsdist
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9b5f87951fed3009dede49c11b9afa06
diff --git a/metadata/md5-cache/acct-group/dnsdist-0-r2 b/metadata/md5-cache/acct-group/dnsdist-0-r2
new file mode 100644
index 000000000000..e09c9a7c9b95
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnsdist-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dns/dnsdist
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3ed217211e84f2d038788d5e81842fb8
diff --git a/metadata/md5-cache/acct-group/dnsmasq-0-r1 b/metadata/md5-cache/acct-group/dnsmasq-0-r1
deleted file mode 100644
index 69b4cd889141..000000000000
--- a/metadata/md5-cache/acct-group/dnsmasq-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: dnsmasq
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3dbed6f9131ae130ec29f1dbdc4a2325
diff --git a/metadata/md5-cache/acct-group/dnsmasq-0-r2 b/metadata/md5-cache/acct-group/dnsmasq-0-r2
new file mode 100644
index 000000000000..2cb9ecff90e7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnsmasq-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dnsmasq
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d0ed4408e7406b4f4d107f906de8f189
diff --git a/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1 b/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1
deleted file mode 100644
index cfe7ea24827d..000000000000
--- a/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: dnsmasq_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0271923fcfdba20422b2ba85d6f5506f
diff --git a/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r2 b/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r2
new file mode 100644
index 000000000000..cb63c9d3a0ab
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dnsmasq_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dnsmasq_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=27ec8aa91e7dd5394181ffc5b87ba8d5
diff --git a/metadata/md5-cache/acct-group/docker-0-r1 b/metadata/md5-cache/acct-group/docker-0-r1
deleted file mode 100644
index a386a456d358..000000000000
--- a/metadata/md5-cache/acct-group/docker-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: docker
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b75dd269af84d92273d7d2d9283739ca
diff --git a/metadata/md5-cache/acct-group/docker-0-r2 b/metadata/md5-cache/acct-group/docker-0-r2
new file mode 100644
index 000000000000..a7a61d10ba22
--- /dev/null
+++ b/metadata/md5-cache/acct-group/docker-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: docker
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=91befdfc3842cb54e21f09188dfb3951
diff --git a/metadata/md5-cache/acct-group/docker_auth-0-r1 b/metadata/md5-cache/acct-group/docker_auth-0-r1
deleted file mode 100644
index fe4b25ceb7b7..000000000000
--- a/metadata/md5-cache/acct-group/docker_auth-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: docker_auth
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cf70a18b0e53b52c356857b13d9b925d
diff --git a/metadata/md5-cache/acct-group/docker_auth-0-r2 b/metadata/md5-cache/acct-group/docker_auth-0-r2
new file mode 100644
index 000000000000..92530a440881
--- /dev/null
+++ b/metadata/md5-cache/acct-group/docker_auth-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: docker_auth
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5ba22aad9c96aa51806cd3f4a0d782d6
diff --git a/metadata/md5-cache/acct-group/dovecot-0-r1 b/metadata/md5-cache/acct-group/dovecot-0-r1
deleted file mode 100644
index 40b948c3a486..000000000000
--- a/metadata/md5-cache/acct-group/dovecot-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: dovecot
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5fbfce20e124f01e8429ba597de5b4c6
diff --git a/metadata/md5-cache/acct-group/dovecot-0-r2 b/metadata/md5-cache/acct-group/dovecot-0-r2
new file mode 100644
index 000000000000..b6ca1c558ca7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dovecot-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dovecot
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7b3a511140d474b52c89142e4e6c5b87
diff --git a/metadata/md5-cache/acct-group/dovenull-0-r1 b/metadata/md5-cache/acct-group/dovenull-0-r1
deleted file mode 100644
index 8ea919e9eeaa..000000000000
--- a/metadata/md5-cache/acct-group/dovenull-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: dovenull
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=846ac2683d3afe4409661ea229a84f08
diff --git a/metadata/md5-cache/acct-group/dovenull-0-r2 b/metadata/md5-cache/acct-group/dovenull-0-r2
new file mode 100644
index 000000000000..f3b97b6be91e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dovenull-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: dovenull
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1472053d1a74a3d7b4ae8fdf422720e3
diff --git a/metadata/md5-cache/acct-group/drone-0 b/metadata/md5-cache/acct-group/drone-0
deleted file mode 100644
index 9d943135441f..000000000000
--- a/metadata/md5-cache/acct-group/drone-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for dev-util/drone
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=553bbe639516091a183834334745a759
diff --git a/metadata/md5-cache/acct-group/drone-0-r1 b/metadata/md5-cache/acct-group/drone-0-r1
new file mode 100644
index 000000000000..6d562981df48
--- /dev/null
+++ b/metadata/md5-cache/acct-group/drone-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-util/drone
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4f293b9e0c1b09206c3c478469d18cbd
diff --git a/metadata/md5-cache/acct-group/ejabberd-0 b/metadata/md5-cache/acct-group/ejabberd-0
deleted file mode 100644
index 5efab823037d..000000000000
--- a/metadata/md5-cache/acct-group/ejabberd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-im/ejabberd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a74c1cc972d6fa63e975e87bb3bca3b1
diff --git a/metadata/md5-cache/acct-group/ejabberd-0-r1 b/metadata/md5-cache/acct-group/ejabberd-0-r1
new file mode 100644
index 000000000000..f44b1cc55148
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ejabberd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-im/ejabberd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=876169913665732d3a1c13b288442424
diff --git a/metadata/md5-cache/acct-group/elasticsearch-0-r1 b/metadata/md5-cache/acct-group/elasticsearch-0-r1
deleted file mode 100644
index deab6389703a..000000000000
--- a/metadata/md5-cache/acct-group/elasticsearch-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Elasticsearch program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f29bd724440d9fbe6c464f6ec3ba5cb4
diff --git a/metadata/md5-cache/acct-group/elasticsearch-0-r2 b/metadata/md5-cache/acct-group/elasticsearch-0-r2
new file mode 100644
index 000000000000..f3c8351fe98c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/elasticsearch-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Elasticsearch program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c6824ebeef841a6d1410771a2a11a519
diff --git a/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1 b/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1
deleted file mode 100644
index f8da481bcd7a..000000000000
--- a/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-metrics/elasticsearch_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4f358f88d206da44816419a86bad0d69
diff --git a/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r2 b/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r2
new file mode 100644
index 000000000000..0e98e052b0a8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/elasticsearch_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/elasticsearch_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=57ccaa08e49a0cc537b69471c05e97f6
diff --git a/metadata/md5-cache/acct-group/energi3-0 b/metadata/md5-cache/acct-group/energi3-0
deleted file mode 100644
index 51697519e80d..000000000000
--- a/metadata/md5-cache/acct-group/energi3-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for system-wide net-p2p/energi3
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=51174f8843252fc5de4ec4d22e193a42
diff --git a/metadata/md5-cache/acct-group/energi3-0-r1 b/metadata/md5-cache/acct-group/energi3-0-r1
new file mode 100644
index 000000000000..3da5aa9beca1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/energi3-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for system-wide net-p2p/energi3
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=016b6016277cb75629732f2abef669f0
diff --git a/metadata/md5-cache/acct-group/epam-0 b/metadata/md5-cache/acct-group/epam-0
deleted file mode 100644
index 0d5ca22d0dd7..000000000000
--- a/metadata/md5-cache/acct-group/epam-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for ejabberd's epam functionality
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8d08069d3b94f08ee762f17c556a0c09
diff --git a/metadata/md5-cache/acct-group/epam-0-r1 b/metadata/md5-cache/acct-group/epam-0-r1
new file mode 100644
index 000000000000..0695eb2e3a35
--- /dev/null
+++ b/metadata/md5-cache/acct-group/epam-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for ejabberd's epam functionality
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e21948f82d0136f6828c1a04a638353f
diff --git a/metadata/md5-cache/acct-group/epmd-0-r1 b/metadata/md5-cache/acct-group/epmd-0-r1
deleted file mode 100644
index c18ebdd5f833..000000000000
--- a/metadata/md5-cache/acct-group/epmd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for Erlang Portmapper Daemon
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=acee9cc45e6028f6f2282dfe0495b399
diff --git a/metadata/md5-cache/acct-group/epmd-0-r2 b/metadata/md5-cache/acct-group/epmd-0-r2
new file mode 100644
index 000000000000..342841b23a34
--- /dev/null
+++ b/metadata/md5-cache/acct-group/epmd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Erlang Portmapper Daemon
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f0407b599feb2abf255c42785141ded1
diff --git a/metadata/md5-cache/acct-group/err-0 b/metadata/md5-cache/acct-group/err-0
deleted file mode 100644
index 5afac7dabcc4..000000000000
--- a/metadata/md5-cache/acct-group/err-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: err
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=517da6642af981d3558123965d951361
diff --git a/metadata/md5-cache/acct-group/err-0-r1 b/metadata/md5-cache/acct-group/err-0-r1
new file mode 100644
index 000000000000..909248cb1f46
--- /dev/null
+++ b/metadata/md5-cache/acct-group/err-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: err
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2a94dd1f3e6230a7990af31c18896714
diff --git a/metadata/md5-cache/acct-group/etcd-0-r1 b/metadata/md5-cache/acct-group/etcd-0-r1
deleted file mode 100644
index 15280e1d3472..000000000000
--- a/metadata/md5-cache/acct-group/etcd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: etcd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9dc58fa3f1fab0565d4484ab99cbe077
diff --git a/metadata/md5-cache/acct-group/etcd-0-r2 b/metadata/md5-cache/acct-group/etcd-0-r2
new file mode 100644
index 000000000000..dcc3eaa7a014
--- /dev/null
+++ b/metadata/md5-cache/acct-group/etcd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: etcd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c5a40e682e6b2dcbcc93e1d3ea4e9902
diff --git a/metadata/md5-cache/acct-group/exabgp-0-r1 b/metadata/md5-cache/acct-group/exabgp-0-r1
deleted file mode 100644
index 96d50553305f..000000000000
--- a/metadata/md5-cache/acct-group/exabgp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: exabgp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=850344c1a43424d64391078e0354bce5
diff --git a/metadata/md5-cache/acct-group/exabgp-0-r2 b/metadata/md5-cache/acct-group/exabgp-0-r2
new file mode 100644
index 000000000000..20294cd7f2f8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/exabgp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: exabgp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a2b497237362ebdf5c14391d953f5fe1
diff --git a/metadata/md5-cache/acct-group/ez-ipupd-0 b/metadata/md5-cache/acct-group/ez-ipupd-0
deleted file mode 100644
index ca2f72a6edef..000000000000
--- a/metadata/md5-cache/acct-group/ez-ipupd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-dns/ez-ipupdate
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=60bb2f9985add58ca026b0dbeab6be3c
diff --git a/metadata/md5-cache/acct-group/ez-ipupd-0-r1 b/metadata/md5-cache/acct-group/ez-ipupd-0-r1
new file mode 100644
index 000000000000..291028f47ea4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ez-ipupd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-dns/ez-ipupdate
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=06f5860d8ee49c8e842dc665252f4ac5
diff --git a/metadata/md5-cache/acct-group/fax-0 b/metadata/md5-cache/acct-group/fax-0
deleted file mode 100644
index df3a8c198fc4..000000000000
--- a/metadata/md5-cache/acct-group/fax-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-dialup/mgetty
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=09e7160b529085eecf8b72c6b267e149
diff --git a/metadata/md5-cache/acct-group/fax-0-r1 b/metadata/md5-cache/acct-group/fax-0-r1
new file mode 100644
index 000000000000..f806442e8909
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fax-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dialup/mgetty
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=da0472516de449e4da6bbe4b0884afd6
diff --git a/metadata/md5-cache/acct-group/fcron-0 b/metadata/md5-cache/acct-group/fcron-0
deleted file mode 100644
index e83dcb009480..000000000000
--- a/metadata/md5-cache/acct-group/fcron-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-process/fcron
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ec67655d6dea6f914dfcde637d3ba0e6
diff --git a/metadata/md5-cache/acct-group/fcron-0-r1 b/metadata/md5-cache/acct-group/fcron-0-r1
new file mode 100644
index 000000000000..1f882f05a8cc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fcron-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/fcron
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fb28a0995eca4de1acae22a2a367b724
diff --git a/metadata/md5-cache/acct-group/fdm-0 b/metadata/md5-cache/acct-group/fdm-0
deleted file mode 100644
index 83a198d64c00..000000000000
--- a/metadata/md5-cache/acct-group/fdm-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-mail/fdm
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=99e0cfaa738b27c706372abe51ecdcf1
diff --git a/metadata/md5-cache/acct-group/fdm-0-r1 b/metadata/md5-cache/acct-group/fdm-0-r1
new file mode 100644
index 000000000000..7d2ed0140c6c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fdm-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/fdm
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=20af1728fdc90e03ee169b45ce17929f
diff --git a/metadata/md5-cache/acct-group/fetchmail-0-r1 b/metadata/md5-cache/acct-group/fetchmail-0-r1
deleted file mode 100644
index d21f099b52d8..000000000000
--- a/metadata/md5-cache/acct-group/fetchmail-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-mail/fetchmail
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d5b312fce59f915af4aa369fd0945164
diff --git a/metadata/md5-cache/acct-group/fetchmail-0-r2 b/metadata/md5-cache/acct-group/fetchmail-0-r2
new file mode 100644
index 000000000000..ff837ad7984c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fetchmail-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/fetchmail
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=12fd5483a4361d35877f508b18a3eef4
diff --git a/metadata/md5-cache/acct-group/fhem-0-r1 b/metadata/md5-cache/acct-group/fhem-0-r1
deleted file mode 100644
index 02df28a9a5c6..000000000000
--- a/metadata/md5-cache/acct-group/fhem-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the FHEM perl server for house automation
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a7e40b105a91c89edbb0d0225aa14cf2
diff --git a/metadata/md5-cache/acct-group/fhem-0-r2 b/metadata/md5-cache/acct-group/fhem-0-r2
new file mode 100644
index 000000000000..d61aa51ffefa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fhem-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the FHEM perl server for house automation
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=930921877b8f1f6916aa8d480cbbac76
diff --git a/metadata/md5-cache/acct-group/fingerprint-0-r1 b/metadata/md5-cache/acct-group/fingerprint-0-r1
deleted file mode 100644
index 88391697f62f..000000000000
--- a/metadata/md5-cache/acct-group/fingerprint-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: fingerprint
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=939cca9ed9982dca7857097e6d5ac112
diff --git a/metadata/md5-cache/acct-group/fingerprint-0-r2 b/metadata/md5-cache/acct-group/fingerprint-0-r2
new file mode 100644
index 000000000000..43da6620d7bb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fingerprint-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: fingerprint
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=31e38030ae7a775c9cdb5fd55dc9e752
diff --git a/metadata/md5-cache/acct-group/firebird-0-r1 b/metadata/md5-cache/acct-group/firebird-0-r1
deleted file mode 100644
index 2f6189405b8f..000000000000
--- a/metadata/md5-cache/acct-group/firebird-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for dev-db/firebird
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7f221147826311d75ff36c4dc74de053
diff --git a/metadata/md5-cache/acct-group/firebird-0-r2 b/metadata/md5-cache/acct-group/firebird-0-r2
new file mode 100644
index 000000000000..891048c88fae
--- /dev/null
+++ b/metadata/md5-cache/acct-group/firebird-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/firebird
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a487b4c5218fb6fc6d7f4c810acea64c
diff --git a/metadata/md5-cache/acct-group/flatpak-0 b/metadata/md5-cache/acct-group/flatpak-0
deleted file mode 100644
index b7866bd17c1c..000000000000
--- a/metadata/md5-cache/acct-group/flatpak-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: flatpak
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cf2be1a449f901bab848355546b6e2b5
diff --git a/metadata/md5-cache/acct-group/flatpak-0-r1 b/metadata/md5-cache/acct-group/flatpak-0-r1
new file mode 100644
index 000000000000..5d233554381e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/flatpak-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: flatpak
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1633dcca7cf89110f5783523d3228620
diff --git a/metadata/md5-cache/acct-group/floppy-0 b/metadata/md5-cache/acct-group/floppy-0
deleted file mode 100644
index b865609e2763..000000000000
--- a/metadata/md5-cache/acct-group/floppy-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: floppy
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1de0dc296254b68ca98ef793113dab26
diff --git a/metadata/md5-cache/acct-group/floppy-0-r1 b/metadata/md5-cache/acct-group/floppy-0-r1
new file mode 100644
index 000000000000..0e1650ba12d6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/floppy-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: floppy
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1de0dc296254b68ca98ef793113dab26
diff --git a/metadata/md5-cache/acct-group/flows-0 b/metadata/md5-cache/acct-group/flows-0
deleted file mode 100644
index 20f06fbdc573..000000000000
--- a/metadata/md5-cache/acct-group/flows-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=gid for net-analyzer/flow-tools
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a7b52fac2ecc794d2f1b0b7f58e2a33a
diff --git a/metadata/md5-cache/acct-group/flows-0-r1 b/metadata/md5-cache/acct-group/flows-0-r1
new file mode 100644
index 000000000000..269cbc8e06a6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/flows-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-analyzer/flow-tools
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=eec8e6c0006124e5e286e10ffe08873c
diff --git a/metadata/md5-cache/acct-group/fluentd-0-r1 b/metadata/md5-cache/acct-group/fluentd-0-r1
deleted file mode 100644
index bd4d769adda1..000000000000
--- a/metadata/md5-cache/acct-group/fluentd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-admin/fluentd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a5bbed77400034fd6152e2d2c49ae971
diff --git a/metadata/md5-cache/acct-group/fluentd-0-r2 b/metadata/md5-cache/acct-group/fluentd-0-r2
new file mode 100644
index 000000000000..5af2060568fc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fluentd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/fluentd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7ebe0bde6d9fd24a5161632f7ec3d084
diff --git a/metadata/md5-cache/acct-group/foldingathome-0 b/metadata/md5-cache/acct-group/foldingathome-0
deleted file mode 100644
index f1d80adc34c3..000000000000
--- a/metadata/md5-cache/acct-group/foldingathome-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sci-biology/foldingathome
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0cde01ea6a2d8c9cd2cf3f8a9a92f297
diff --git a/metadata/md5-cache/acct-group/foldingathome-0-r1 b/metadata/md5-cache/acct-group/foldingathome-0-r1
new file mode 100644
index 000000000000..4b28e8824c35
--- /dev/null
+++ b/metadata/md5-cache/acct-group/foldingathome-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sci-biology/foldingathome
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=282cc03acffcb5354dca939f0a8f60aa
diff --git a/metadata/md5-cache/acct-group/fp-multiuser-0 b/metadata/md5-cache/acct-group/fp-multiuser-0
deleted file mode 100644
index 620b7a241b07..000000000000
--- a/metadata/md5-cache/acct-group/fp-multiuser-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-vpn/fp-multiuser
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8c7e868527d3788d71045d182be27978
diff --git a/metadata/md5-cache/acct-group/fp-multiuser-0-r1 b/metadata/md5-cache/acct-group/fp-multiuser-0-r1
new file mode 100644
index 000000000000..d83c0e9dc2a0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fp-multiuser-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/fp-multiuser
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a4093881e08134cda7a58c2ce73e3de9
diff --git a/metadata/md5-cache/acct-group/freenet-0 b/metadata/md5-cache/acct-group/freenet-0
deleted file mode 100644
index 862c07feeb50..000000000000
--- a/metadata/md5-cache/acct-group/freenet-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-p2p/freenet
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=46ce36e91d3c4724f7d76ad52edd4f96
diff --git a/metadata/md5-cache/acct-group/freenet-0-r1 b/metadata/md5-cache/acct-group/freenet-0-r1
new file mode 100644
index 000000000000..fe7dfab8f817
--- /dev/null
+++ b/metadata/md5-cache/acct-group/freenet-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-p2p/freenet
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=02fc680e535e52ceffdfab6402854f81
diff --git a/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0 b/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0
deleted file mode 100644
index 94352d72dc68..000000000000
--- a/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: fritzbox_smarthome_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9ffc1669c5db5a0b2c2901ce3e963e1b
diff --git a/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r1 b/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r1
new file mode 100644
index 000000000000..03556c9d4758
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: fritzbox_smarthome_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=45c19cb89ed973dbb98c47b654467bd2
diff --git a/metadata/md5-cache/acct-group/frr-0 b/metadata/md5-cache/acct-group/frr-0
deleted file mode 100644
index 812b9dbe530f..000000000000
--- a/metadata/md5-cache/acct-group/frr-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: frr
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=20db6fffbda0e0114cd7d6667fb65181
diff --git a/metadata/md5-cache/acct-group/frr-0-r1 b/metadata/md5-cache/acct-group/frr-0-r1
new file mode 100644
index 000000000000..fa22c6174df3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/frr-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: frr
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6715d71976161fe665dd5740c310d942
diff --git a/metadata/md5-cache/acct-group/ftp-0-r1 b/metadata/md5-cache/acct-group/ftp-0-r1
deleted file mode 100644
index 16d4c15c44cc..000000000000
--- a/metadata/md5-cache/acct-group/ftp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=File Transfer Protocol server user
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ced04f4dd315cb827fcb511ba168056b
diff --git a/metadata/md5-cache/acct-group/ftp-0-r2 b/metadata/md5-cache/acct-group/ftp-0-r2
new file mode 100644
index 000000000000..f088d5c4d9d8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ftp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=File Transfer Protocol server user
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e3d7d8c16c51bc5a2beffdadd7b4f959
diff --git a/metadata/md5-cache/acct-group/ftpproxy-0 b/metadata/md5-cache/acct-group/ftpproxy-0
deleted file mode 100644
index 1de981656b9e..000000000000
--- a/metadata/md5-cache/acct-group/ftpproxy-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-ftp/frox
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c77b01054d832043821546295429c048
diff --git a/metadata/md5-cache/acct-group/ftpproxy-0-r1 b/metadata/md5-cache/acct-group/ftpproxy-0-r1
new file mode 100644
index 000000000000..36dbada2474d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ftpproxy-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-ftp/frox
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=99226a0e8663b8207af28314bb99298a
diff --git a/metadata/md5-cache/acct-group/fvwm-crystal-0-r1 b/metadata/md5-cache/acct-group/fvwm-crystal-0-r1
deleted file mode 100644
index ad3c193bc9d6..000000000000
--- a/metadata/md5-cache/acct-group/fvwm-crystal-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: fvwm-crystal
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e8a5fa55953eddb3efbba5bf55f1e845
diff --git a/metadata/md5-cache/acct-group/fvwm-crystal-0-r2 b/metadata/md5-cache/acct-group/fvwm-crystal-0-r2
new file mode 100644
index 000000000000..2fe3b92b4626
--- /dev/null
+++ b/metadata/md5-cache/acct-group/fvwm-crystal-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: fvwm-crystal
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7bc1d53b431b1757f00752982a6a2478
diff --git a/metadata/md5-cache/acct-group/gamemode-0 b/metadata/md5-cache/acct-group/gamemode-0
deleted file mode 100644
index a6725cd19800..000000000000
--- a/metadata/md5-cache/acct-group/gamemode-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the system-wide games-util/gamemode resource group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=03c55354ad54e3c695e008d64c05635d
diff --git a/metadata/md5-cache/acct-group/gamemode-0-r1 b/metadata/md5-cache/acct-group/gamemode-0-r1
new file mode 100644
index 000000000000..87f8f07d01bc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gamemode-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide games-util/gamemode resource group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2969b38b0d360ffbbe2302686d513f7e
diff --git a/metadata/md5-cache/acct-group/gamestat-0-r1 b/metadata/md5-cache/acct-group/gamestat-0-r1
deleted file mode 100644
index 501a166a247b..000000000000
--- a/metadata/md5-cache/acct-group/gamestat-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for shared high-score and game state files
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f044e9cc362103960e4c46cf0a80aa0e
diff --git a/metadata/md5-cache/acct-group/gamestat-0-r2 b/metadata/md5-cache/acct-group/gamestat-0-r2
new file mode 100644
index 000000000000..d4e2fb1c81d0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gamestat-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for shared high-score and game state files
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9427de9ac6d5cd3124166336897c4eab
diff --git a/metadata/md5-cache/acct-group/gatling-0-r1 b/metadata/md5-cache/acct-group/gatling-0-r1
deleted file mode 100644
index bfe2b4095b1b..000000000000
--- a/metadata/md5-cache/acct-group/gatling-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gatling
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=426bac7a57d9ec5838785e2dca0b83a7
diff --git a/metadata/md5-cache/acct-group/gatling-0-r2 b/metadata/md5-cache/acct-group/gatling-0-r2
new file mode 100644
index 000000000000..31c3e8a2fdcc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gatling-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gatling
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bf10839d83f4739df37e01f5e206a0ad
diff --git a/metadata/md5-cache/acct-group/gauth-0 b/metadata/md5-cache/acct-group/gauth-0
deleted file mode 100644
index b623debcb2b3..000000000000
--- a/metadata/md5-cache/acct-group/gauth-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-auth/google-authenticator-wrappers
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ec1021f72f47ec3bdc9138455b6f2ec4
diff --git a/metadata/md5-cache/acct-group/gauth-0-r1 b/metadata/md5-cache/acct-group/gauth-0-r1
new file mode 100644
index 000000000000..a7ef03f57e7d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gauth-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-auth/google-authenticator-wrappers
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bc0c9c71d8cd5e2840d8740130a6f0af
diff --git a/metadata/md5-cache/acct-group/gdm-0 b/metadata/md5-cache/acct-group/gdm-0
deleted file mode 100644
index 6d986ad0a92b..000000000000
--- a/metadata/md5-cache/acct-group/gdm-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gdm
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b265403852518ffdd71c01004d7bbe04
diff --git a/metadata/md5-cache/acct-group/gdm-0-r1 b/metadata/md5-cache/acct-group/gdm-0-r1
new file mode 100644
index 000000000000..bc8dfa98ee92
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gdm-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gdm
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1e7834d442af7a5d83072e2f2b7a1230
diff --git a/metadata/md5-cache/acct-group/geneweb-0-r1 b/metadata/md5-cache/acct-group/geneweb-0-r1
deleted file mode 100644
index 2fdaeea926af..000000000000
--- a/metadata/md5-cache/acct-group/geneweb-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for geneweb daemon
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0ff62b39946b85e801764fc1cf917c4e
diff --git a/metadata/md5-cache/acct-group/geneweb-0-r2 b/metadata/md5-cache/acct-group/geneweb-0-r2
new file mode 100644
index 000000000000..ae08f9a134de
--- /dev/null
+++ b/metadata/md5-cache/acct-group/geneweb-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for geneweb daemon
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c732b5bb035d4169113b1ac078d8b84d
diff --git a/metadata/md5-cache/acct-group/geoclue-0 b/metadata/md5-cache/acct-group/geoclue-0
deleted file mode 100644
index e31426d0fb6c..000000000000
--- a/metadata/md5-cache/acct-group/geoclue-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: geoclue
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f558758b6f349e0cb527938f5472ee36
diff --git a/metadata/md5-cache/acct-group/geoclue-0-r1 b/metadata/md5-cache/acct-group/geoclue-0-r1
new file mode 100644
index 000000000000..fc4573f42ccc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/geoclue-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: geoclue
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=71b45fa23cfebe6d0a25b3ded3a0cd0f
diff --git a/metadata/md5-cache/acct-group/gerbera-0-r1 b/metadata/md5-cache/acct-group/gerbera-0-r1
deleted file mode 100644
index 6b776151f6ca..000000000000
--- a/metadata/md5-cache/acct-group/gerbera-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Gerbera UPnP Media Server group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=05f5232d19adab18b26d0e4ce4996bfe
diff --git a/metadata/md5-cache/acct-group/gerbera-0-r2 b/metadata/md5-cache/acct-group/gerbera-0-r2
new file mode 100644
index 000000000000..eb1bb79929f6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gerbera-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Gerbera UPnP Media Server group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f7a0ff3527c5c2f9b07aaba9ff01659e
diff --git a/metadata/md5-cache/acct-group/git-0-r1 b/metadata/md5-cache/acct-group/git-0-r1
deleted file mode 100644
index 8bd98d1c0530..000000000000
--- a/metadata/md5-cache/acct-group/git-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: git
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5f17c3fbba725b49f8b6c9cd3c06a10a
diff --git a/metadata/md5-cache/acct-group/git-0-r2 b/metadata/md5-cache/acct-group/git-0-r2
new file mode 100644
index 000000000000..9308f8d878d4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/git-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: git
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7e630c293efc0155e267643e646f9286
diff --git a/metadata/md5-cache/acct-group/github-exporter-0 b/metadata/md5-cache/acct-group/github-exporter-0
deleted file mode 100644
index 53efb27ec880..000000000000
--- a/metadata/md5-cache/acct-group/github-exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: github-exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fc537f59a086c7091bab5f90266fed95
diff --git a/metadata/md5-cache/acct-group/github-exporter-0-r1 b/metadata/md5-cache/acct-group/github-exporter-0-r1
new file mode 100644
index 000000000000..e5c6b58984e8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/github-exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: github-exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e2b2d1a4866fa6f684d5cbaf701e1267
diff --git a/metadata/md5-cache/acct-group/gitlab-runner-1 b/metadata/md5-cache/acct-group/gitlab-runner-1
deleted file mode 100644
index f85aa06a295e..000000000000
--- a/metadata/md5-cache/acct-group/gitlab-runner-1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gitlab-runner
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=880f22976d82695c846340ddd33213fb
diff --git a/metadata/md5-cache/acct-group/gitlab-runner-1-r1 b/metadata/md5-cache/acct-group/gitlab-runner-1-r1
new file mode 100644
index 000000000000..b37cef02cae6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gitlab-runner-1-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gitlab-runner
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3b166dd7f9d6fa0e007923125e395c67
diff --git a/metadata/md5-cache/acct-group/gkrellmd-0-r1 b/metadata/md5-cache/acct-group/gkrellmd-0-r1
deleted file mode 100644
index 1c1afd9cbe3a..000000000000
--- a/metadata/md5-cache/acct-group/gkrellmd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gkrellmd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=09269520b7221ea9e1a999e1354abec2
diff --git a/metadata/md5-cache/acct-group/gkrellmd-0-r2 b/metadata/md5-cache/acct-group/gkrellmd-0-r2
new file mode 100644
index 000000000000..0fadc37e3ca1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gkrellmd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gkrellmd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c3daabdd333d2e1ee41262cd6ac49a39
diff --git a/metadata/md5-cache/acct-group/glance-0-r1 b/metadata/md5-cache/acct-group/glance-0-r1
deleted file mode 100644
index 22c78fb2059f..000000000000
--- a/metadata/md5-cache/acct-group/glance-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: glance
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4e0e15ccf19bfcfc90e85892a50b4cfc
diff --git a/metadata/md5-cache/acct-group/glance-0-r2 b/metadata/md5-cache/acct-group/glance-0-r2
new file mode 100644
index 000000000000..0e2d1d8cadb5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/glance-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: glance
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6559c76f34f1412380990d46ac369a90
diff --git a/metadata/md5-cache/acct-group/gluster-0-r1 b/metadata/md5-cache/acct-group/gluster-0-r1
deleted file mode 100644
index dd28c265dd7b..000000000000
--- a/metadata/md5-cache/acct-group/gluster-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gluster
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a6c6402bc483383cd9ac937132c162f1
diff --git a/metadata/md5-cache/acct-group/gluster-0-r2 b/metadata/md5-cache/acct-group/gluster-0-r2
new file mode 100644
index 000000000000..ebe7739623fe
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gluster-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gluster
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=72b0d51fede94d33df0d85a11262d979
diff --git a/metadata/md5-cache/acct-group/gns3-0 b/metadata/md5-cache/acct-group/gns3-0
deleted file mode 100644
index 7f646e7f8e74..000000000000
--- a/metadata/md5-cache/acct-group/gns3-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gns3
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=43387ab1625ee8e16949e3425eb4051c
diff --git a/metadata/md5-cache/acct-group/gns3-0-r1 b/metadata/md5-cache/acct-group/gns3-0-r1
new file mode 100644
index 000000000000..db46ee55f2b9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gns3-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gns3
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c1194e2637b978b040c67073c1b1dd5d
diff --git a/metadata/md5-cache/acct-group/gnump3d-0 b/metadata/md5-cache/acct-group/gnump3d-0
deleted file mode 100644
index 8f8e717363f7..000000000000
--- a/metadata/md5-cache/acct-group/gnump3d-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for media-sound/gnump3d
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7151feff902beba0223fbcd87b4cf0ba
diff --git a/metadata/md5-cache/acct-group/gnump3d-0-r1 b/metadata/md5-cache/acct-group/gnump3d-0-r1
new file mode 100644
index 000000000000..5f95417ff092
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gnump3d-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/gnump3d
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=88d496746aa8bf95580a510d325d1b84
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-0 b/metadata/md5-cache/acct-group/gnupg-pkcs11-0
deleted file mode 100644
index 694aa8403b59..000000000000
--- a/metadata/md5-cache/acct-group/gnupg-pkcs11-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-crypt/gnupg-pkcs11-scd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f330cbbd07cf391b6a1ba1385a1cf5a2
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r1 b/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r1
new file mode 100644
index 000000000000..33048a9a1ba5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gnupg-pkcs11-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-crypt/gnupg-pkcs11-scd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=df4259f820bbdf49d05c7f77a5cd9ada
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0 b/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0
deleted file mode 100644
index 6865dea9521d..000000000000
--- a/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-crypt/gnupg-pkcs11-scd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3b60d7d49c5e92bfaa55093ded95e39a
diff --git a/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r1 b/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r1
new file mode 100644
index 000000000000..04c20e025129
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-crypt/gnupg-pkcs11-scd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b001c3e413ff37089c90e02e10064f61
diff --git a/metadata/md5-cache/acct-group/goaccess-0 b/metadata/md5-cache/acct-group/goaccess-0
deleted file mode 100644
index 5f10f5182be4..000000000000
--- a/metadata/md5-cache/acct-group/goaccess-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: goaccess
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3d19ae8df7e8f29c29dd5c14f3380d73
diff --git a/metadata/md5-cache/acct-group/goaccess-0-r1 b/metadata/md5-cache/acct-group/goaccess-0-r1
new file mode 100644
index 000000000000..772cab868df6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/goaccess-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: goaccess
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=262dac772adfaebf2729811d5b8d0d8f
diff --git a/metadata/md5-cache/acct-group/gopher-0 b/metadata/md5-cache/acct-group/gopher-0
deleted file mode 100644
index 12c5280d8919..000000000000
--- a/metadata/md5-cache/acct-group/gopher-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gopher
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fd3a310352e8d4dad8c5e0455a63d788
diff --git a/metadata/md5-cache/acct-group/gopher-0-r1 b/metadata/md5-cache/acct-group/gopher-0-r1
new file mode 100644
index 000000000000..4f5bf0ad8ce8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gopher-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gopher
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fa0dc2ed1dcac76dc205f5480d04471b
diff --git a/metadata/md5-cache/acct-group/gopherd-0 b/metadata/md5-cache/acct-group/gopherd-0
deleted file mode 100644
index 2b2ede671d97..000000000000
--- a/metadata/md5-cache/acct-group/gopherd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-misc/geomyidae
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ce1c211c6ae847481daa3aa9519717a0
diff --git a/metadata/md5-cache/acct-group/gopherd-0-r1 b/metadata/md5-cache/acct-group/gopherd-0-r1
new file mode 100644
index 000000000000..0de0fb8d5416
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gopherd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/geomyidae
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3ea299900d54476e2e719d72de4c8ea2
diff --git a/metadata/md5-cache/acct-group/gpib-0-r1 b/metadata/md5-cache/acct-group/gpib-0-r1
deleted file mode 100644
index 0d10eaea3390..000000000000
--- a/metadata/md5-cache/acct-group/gpib-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gpib
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0db80d994fc5708816861fcaea57821e
diff --git a/metadata/md5-cache/acct-group/gpib-0-r2 b/metadata/md5-cache/acct-group/gpib-0-r2
new file mode 100644
index 000000000000..ecc8359ec875
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gpib-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gpib
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5b31588c769c43cb1cdeca3f6f702dc7
diff --git a/metadata/md5-cache/acct-group/gpio-0 b/metadata/md5-cache/acct-group/gpio-0
deleted file mode 100644
index b329bef96e98..000000000000
--- a/metadata/md5-cache/acct-group/gpio-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: gpio
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=178e2bd158816bb5da8f691bc6a1e9aa
diff --git a/metadata/md5-cache/acct-group/gpio-0-r1 b/metadata/md5-cache/acct-group/gpio-0-r1
new file mode 100644
index 000000000000..63cea2d2c6b5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gpio-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: gpio
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3d19b4ec6a4a24f96ca6183bbdb654c9
diff --git a/metadata/md5-cache/acct-group/grafana-0-r1 b/metadata/md5-cache/acct-group/grafana-0-r1
deleted file mode 100644
index 722f27459750..000000000000
--- a/metadata/md5-cache/acct-group/grafana-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=grafana program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d618b2da8969f2890ff2e5a89d74701f
diff --git a/metadata/md5-cache/acct-group/grafana-0-r2 b/metadata/md5-cache/acct-group/grafana-0-r2
new file mode 100644
index 000000000000..852f9ec1bd2d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/grafana-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=grafana program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=614b15ed9f5315414132bf878cb723f1
diff --git a/metadata/md5-cache/acct-group/graylog-0-r1 b/metadata/md5-cache/acct-group/graylog-0-r1
deleted file mode 100644
index e7c0a87125dc..000000000000
--- a/metadata/md5-cache/acct-group/graylog-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Graylog program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=edd58827a17cc3bc7156c62f6741dc49
diff --git a/metadata/md5-cache/acct-group/graylog-0-r2 b/metadata/md5-cache/acct-group/graylog-0-r2
new file mode 100644
index 000000000000..b28ff682095b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/graylog-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Graylog program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8a8c632dfc06ddd974709e828dd54666
diff --git a/metadata/md5-cache/acct-group/greetd-0-r1 b/metadata/md5-cache/acct-group/greetd-0-r1
deleted file mode 100644
index 6b5d95912072..000000000000
--- a/metadata/md5-cache/acct-group/greetd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for gui-libs/greetd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=32e8e78600943845bc97efcbf3dbfe9f
diff --git a/metadata/md5-cache/acct-group/greetd-0-r2 b/metadata/md5-cache/acct-group/greetd-0-r2
new file mode 100644
index 000000000000..a19ac37ec451
--- /dev/null
+++ b/metadata/md5-cache/acct-group/greetd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for gui-libs/greetd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2d650a08a64155de26912b6594ebbd70
diff --git a/metadata/md5-cache/acct-group/grok_exporter-0 b/metadata/md5-cache/acct-group/grok_exporter-0
deleted file mode 100644
index df33ff2db257..000000000000
--- a/metadata/md5-cache/acct-group/grok_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-metrics/grok_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=87baa22bef03e7a6173552e0b909d62f
diff --git a/metadata/md5-cache/acct-group/grok_exporter-0-r1 b/metadata/md5-cache/acct-group/grok_exporter-0-r1
new file mode 100644
index 000000000000..a77a075d7a10
--- /dev/null
+++ b/metadata/md5-cache/acct-group/grok_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/grok_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=72883073a58a19e82add34dc2be3d46d
diff --git a/metadata/md5-cache/acct-group/groonga-0 b/metadata/md5-cache/acct-group/groonga-0
deleted file mode 100644
index ef9269d73a21..000000000000
--- a/metadata/md5-cache/acct-group/groonga-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-text/groonga
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f110cb7374f2f91ee73a4f08774a510e
diff --git a/metadata/md5-cache/acct-group/groonga-0-r1 b/metadata/md5-cache/acct-group/groonga-0-r1
new file mode 100644
index 000000000000..e721a59ca3a5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/groonga-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-text/groonga
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d46761a9030d97337581fe7f05efa8ce
diff --git a/metadata/md5-cache/acct-group/gvm-0-r1 b/metadata/md5-cache/acct-group/gvm-0-r1
deleted file mode 100644
index aa98a8a2d7ac..000000000000
--- a/metadata/md5-cache/acct-group/gvm-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Greenbone vulnerability management program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=711074e5d35992d5ff60a57597cd0a82
diff --git a/metadata/md5-cache/acct-group/gvm-0-r2 b/metadata/md5-cache/acct-group/gvm-0-r2
new file mode 100644
index 000000000000..f4f7ee459c88
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gvm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Greenbone vulnerability management program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8e5119d68c77c5236a0d8f9fe9a6b0bf
diff --git a/metadata/md5-cache/acct-group/h2o-0 b/metadata/md5-cache/acct-group/h2o-0
deleted file mode 100644
index 5109473cbfce..000000000000
--- a/metadata/md5-cache/acct-group/h2o-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-servers/h2o
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4a84b01e2971202a92807c67a8eed975
diff --git a/metadata/md5-cache/acct-group/h2o-0-r1 b/metadata/md5-cache/acct-group/h2o-0-r1
new file mode 100644
index 000000000000..42bf90aa3997
--- /dev/null
+++ b/metadata/md5-cache/acct-group/h2o-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/h2o
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c11d801fc979d0f17b9e5068635a3ea6
diff --git a/metadata/md5-cache/acct-group/haclient-0 b/metadata/md5-cache/acct-group/haclient-0
deleted file mode 100644
index 76e0e29bd8bd..000000000000
--- a/metadata/md5-cache/acct-group/haclient-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-cluster/cluster-glue
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e8c9006c8133f5547390297ee87ec4af
diff --git a/metadata/md5-cache/acct-group/haclient-0-r1 b/metadata/md5-cache/acct-group/haclient-0-r1
new file mode 100644
index 000000000000..3d8fd163fa4d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/haclient-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-cluster/cluster-glue
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ec5dec99ec5dd5ff93c3370810642590
diff --git a/metadata/md5-cache/acct-group/haproxy-0-r1 b/metadata/md5-cache/acct-group/haproxy-0-r1
deleted file mode 100644
index 280f18d209e0..000000000000
--- a/metadata/md5-cache/acct-group/haproxy-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: haproxy
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ae4f37ea57a16efe675292ae95f1217a
diff --git a/metadata/md5-cache/acct-group/haproxy-0-r2 b/metadata/md5-cache/acct-group/haproxy-0-r2
new file mode 100644
index 000000000000..0b4a664e2011
--- /dev/null
+++ b/metadata/md5-cache/acct-group/haproxy-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: haproxy
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aac22fda3e9903eb2fbd3d00c18b062b
diff --git a/metadata/md5-cache/acct-group/havp-0-r1 b/metadata/md5-cache/acct-group/havp-0-r1
deleted file mode 100644
index afc70303b1ad..000000000000
--- a/metadata/md5-cache/acct-group/havp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-proxy/havp
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cf5090e1d677483d5a37f527761aa59c
diff --git a/metadata/md5-cache/acct-group/havp-0-r2 b/metadata/md5-cache/acct-group/havp-0-r2
new file mode 100644
index 000000000000..afaec381a423
--- /dev/null
+++ b/metadata/md5-cache/acct-group/havp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-proxy/havp
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cf5090e1d677483d5a37f527761aa59c
diff --git a/metadata/md5-cache/acct-group/headscale-0 b/metadata/md5-cache/acct-group/headscale-0
deleted file mode 100644
index dc1591c77e37..000000000000
--- a/metadata/md5-cache/acct-group/headscale-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: headscale
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8895ef50b91938766322b26376abf7a1
diff --git a/metadata/md5-cache/acct-group/headscale-0-r1 b/metadata/md5-cache/acct-group/headscale-0-r1
new file mode 100644
index 000000000000..b81e0ad9df8c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/headscale-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: headscale
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=768ea38bfe6e1be6955b4ea2062e15d8
diff --git a/metadata/md5-cache/acct-group/heat-0-r1 b/metadata/md5-cache/acct-group/heat-0-r1
deleted file mode 100644
index 18a6d4e9ee2b..000000000000
--- a/metadata/md5-cache/acct-group/heat-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: heat
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=33f81fce01773239f6d9362751ac6bd5
diff --git a/metadata/md5-cache/acct-group/heat-0-r2 b/metadata/md5-cache/acct-group/heat-0-r2
new file mode 100644
index 000000000000..8d42b613e564
--- /dev/null
+++ b/metadata/md5-cache/acct-group/heat-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: heat
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0b1f5bd726a764fbe9fe2a028e7e376a
diff --git a/metadata/md5-cache/acct-group/hsqldb-0 b/metadata/md5-cache/acct-group/hsqldb-0
deleted file mode 100644
index 17c372ac6f13..000000000000
--- a/metadata/md5-cache/acct-group/hsqldb-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for hsqldb
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a5c9cd370d0cf6d0f574d8b73f4e7870
diff --git a/metadata/md5-cache/acct-group/hsqldb-0-r1 b/metadata/md5-cache/acct-group/hsqldb-0-r1
new file mode 100644
index 000000000000..6719221198af
--- /dev/null
+++ b/metadata/md5-cache/acct-group/hsqldb-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for hsqldb
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=804dab5b531173e9bc1197f5362a5a28
diff --git a/metadata/md5-cache/acct-group/http-0 b/metadata/md5-cache/acct-group/http-0
deleted file mode 100644
index 2a420b505c18..000000000000
--- a/metadata/md5-cache/acct-group/http-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: http
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5bebfb2cc5cfcfc7d8306f27fe3bbf36
diff --git a/metadata/md5-cache/acct-group/http-0-r1 b/metadata/md5-cache/acct-group/http-0-r1
new file mode 100644
index 000000000000..05e5b9a4ef3e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/http-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: http
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2f061c6e0ec191d0deb15c3c0dd4db15
diff --git a/metadata/md5-cache/acct-group/i2c-0 b/metadata/md5-cache/acct-group/i2c-0
deleted file mode 100644
index fd370c537e55..000000000000
--- a/metadata/md5-cache/acct-group/i2c-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: i2c
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cb34b401160f16ecb0948083dc1b9549
diff --git a/metadata/md5-cache/acct-group/i2c-0-r1 b/metadata/md5-cache/acct-group/i2c-0-r1
new file mode 100644
index 000000000000..9a9d02e2dc69
--- /dev/null
+++ b/metadata/md5-cache/acct-group/i2c-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: i2c
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=117c9c3be0f324454df40966c52e2ea9
diff --git a/metadata/md5-cache/acct-group/i2p-0-r1 b/metadata/md5-cache/acct-group/i2p-0-r1
deleted file mode 100644
index 5a7d045228f4..000000000000
--- a/metadata/md5-cache/acct-group/i2p-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for system-wide net-vpn/i2p
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=082252b9be81784908c88fa29d126850
diff --git a/metadata/md5-cache/acct-group/i2p-0-r2 b/metadata/md5-cache/acct-group/i2p-0-r2
new file mode 100644
index 000000000000..b8c9fd8ee064
--- /dev/null
+++ b/metadata/md5-cache/acct-group/i2p-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for system-wide net-vpn/i2p
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c496b9045dd4a220300d01db440141bb
diff --git a/metadata/md5-cache/acct-group/i2pd-0-r1 b/metadata/md5-cache/acct-group/i2pd-0-r1
deleted file mode 100644
index 14a27c470a62..000000000000
--- a/metadata/md5-cache/acct-group/i2pd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the system-wide net-vpn/i2pd server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=43935f26a17b74de60674170e2104c33
diff --git a/metadata/md5-cache/acct-group/i2pd-0-r2 b/metadata/md5-cache/acct-group/i2pd-0-r2
new file mode 100644
index 000000000000..b5968b8cd32f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/i2pd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide net-vpn/i2pd server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f0c369e5b4e3e0959ba16449cbacd8c3
diff --git a/metadata/md5-cache/acct-group/icecast-0 b/metadata/md5-cache/acct-group/icecast-0
deleted file mode 100644
index 329aa0ca64f7..000000000000
--- a/metadata/md5-cache/acct-group/icecast-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-misc/icecast
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=95cb7ebe9f2c38367630c8d2020a6653
diff --git a/metadata/md5-cache/acct-group/icecast-0-r1 b/metadata/md5-cache/acct-group/icecast-0-r1
new file mode 100644
index 000000000000..ebc1aa44b028
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icecast-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/icecast
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ab1f197aced5875c4dbd76fb5817b3e3
diff --git a/metadata/md5-cache/acct-group/icecream-0 b/metadata/md5-cache/acct-group/icecream-0
deleted file mode 100644
index db28ecc7e1b6..000000000000
--- a/metadata/md5-cache/acct-group/icecream-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-devel/icecream
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9ce1bdeb0490c71db009e4b8d05656aa
diff --git a/metadata/md5-cache/acct-group/icecream-0-r1 b/metadata/md5-cache/acct-group/icecream-0-r1
new file mode 100644
index 000000000000..f74667d1bd51
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icecream-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-devel/icecream
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a83abcfaba8eae2a903b7df6a413d9a0
diff --git a/metadata/md5-cache/acct-group/ices-0 b/metadata/md5-cache/acct-group/ices-0
deleted file mode 100644
index 74425eae60c8..000000000000
--- a/metadata/md5-cache/acct-group/ices-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-misc/ices
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6332ce88917781f8f66742e8b3818337
diff --git a/metadata/md5-cache/acct-group/ices-0-r1 b/metadata/md5-cache/acct-group/ices-0-r1
new file mode 100644
index 000000000000..589d1c8b3da0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ices-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/ices
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=727de7698dc768ccfccd161abd76d38e
diff --git a/metadata/md5-cache/acct-group/icinga-0-r1 b/metadata/md5-cache/acct-group/icinga-0-r1
deleted file mode 100644
index 610df3cc4364..000000000000
--- a/metadata/md5-cache/acct-group/icinga-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: icinga
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=614559440f7ec571540f4589ad9a0065
diff --git a/metadata/md5-cache/acct-group/icinga-0-r2 b/metadata/md5-cache/acct-group/icinga-0-r2
new file mode 100644
index 000000000000..fb64614384a4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icinga-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: icinga
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e34b27d0aba61323fc90096b3f4e22f6
diff --git a/metadata/md5-cache/acct-group/icingacmd-0-r1 b/metadata/md5-cache/acct-group/icingacmd-0-r1
deleted file mode 100644
index 7d3a7e7895c6..000000000000
--- a/metadata/md5-cache/acct-group/icingacmd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: icingacmd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f4595df7e944a279aa3ae2256e9b402b
diff --git a/metadata/md5-cache/acct-group/icingacmd-0-r2 b/metadata/md5-cache/acct-group/icingacmd-0-r2
new file mode 100644
index 000000000000..be0e48f96719
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icingacmd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: icingacmd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=47725f9e21636ac11e07cab03986022f
diff --git a/metadata/md5-cache/acct-group/icingaweb2-0-r1 b/metadata/md5-cache/acct-group/icingaweb2-0-r1
deleted file mode 100644
index 0f13496b61cf..000000000000
--- a/metadata/md5-cache/acct-group/icingaweb2-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: icingaweb2
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=31b96a6637e3db722b1a05e0b9fc5fcf
diff --git a/metadata/md5-cache/acct-group/icingaweb2-0-r2 b/metadata/md5-cache/acct-group/icingaweb2-0-r2
new file mode 100644
index 000000000000..d8e56d9bb225
--- /dev/null
+++ b/metadata/md5-cache/acct-group/icingaweb2-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: icingaweb2
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0615ce0291c9b1c79d2902e1f15dd538
diff --git a/metadata/md5-cache/acct-group/inadyn-0 b/metadata/md5-cache/acct-group/inadyn-0
deleted file mode 100644
index 1ec2a4ebcf69..000000000000
--- a/metadata/md5-cache/acct-group/inadyn-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: inadyn
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bca18a0e458f589f3abf6676b2b84df9
diff --git a/metadata/md5-cache/acct-group/inadyn-0-r1 b/metadata/md5-cache/acct-group/inadyn-0-r1
new file mode 100644
index 000000000000..2caddd94c6a5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/inadyn-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: inadyn
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bca18a0e458f589f3abf6676b2b84df9
diff --git a/metadata/md5-cache/acct-group/influxdb-0-r1 b/metadata/md5-cache/acct-group/influxdb-0-r1
deleted file mode 100644
index 315a1bc3255d..000000000000
--- a/metadata/md5-cache/acct-group/influxdb-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: influxdb
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2250aebd19871f52eeec6d23f8195974
diff --git a/metadata/md5-cache/acct-group/influxdb-0-r2 b/metadata/md5-cache/acct-group/influxdb-0-r2
new file mode 100644
index 000000000000..2b76e94d3fd9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/influxdb-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: influxdb
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4eb8546afa421321fd7c715e5103365d
diff --git a/metadata/md5-cache/acct-group/input-0-r1 b/metadata/md5-cache/acct-group/input-0-r1
deleted file mode 100644
index 111a608f3f2c..000000000000
--- a/metadata/md5-cache/acct-group/input-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: input
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=98a31fab0bb705f662da004d6af750e4
diff --git a/metadata/md5-cache/acct-group/input-0-r2 b/metadata/md5-cache/acct-group/input-0-r2
new file mode 100644
index 000000000000..0d50016eee1a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/input-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: input
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=546e03af1b25fc371fdb3fbcd77ebf97
diff --git a/metadata/md5-cache/acct-group/inspircd-0-r1 b/metadata/md5-cache/acct-group/inspircd-0-r1
deleted file mode 100644
index c4da17c4ffe9..000000000000
--- a/metadata/md5-cache/acct-group/inspircd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: inspircd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1f8614a826878f04dd8c252e4439197c
diff --git a/metadata/md5-cache/acct-group/inspircd-0-r2 b/metadata/md5-cache/acct-group/inspircd-0-r2
new file mode 100644
index 000000000000..78bfcda5ace8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/inspircd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: inspircd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e03dd8aae9e5fb9e21eda92d54384c0b
diff --git a/metadata/md5-cache/acct-group/ipfs-0-r1 b/metadata/md5-cache/acct-group/ipfs-0-r1
deleted file mode 100644
index 8183fa7341c3..000000000000
--- a/metadata/md5-cache/acct-group/ipfs-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the system-wide net-p2p/go-ipfs-bin server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cc3f334330dea843efa34b55869546ce
diff --git a/metadata/md5-cache/acct-group/ipfs-0-r2 b/metadata/md5-cache/acct-group/ipfs-0-r2
new file mode 100644
index 000000000000..38cae3119249
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ipfs-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide net-p2p/go-ipfs-bin server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d1b080cd1df0a265af658554fe5acd9d
diff --git a/metadata/md5-cache/acct-group/ipsec-0 b/metadata/md5-cache/acct-group/ipsec-0
deleted file mode 100644
index 1b775c18ad1b..000000000000
--- a/metadata/md5-cache/acct-group/ipsec-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=ipsec (strongswan) program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cd946e2b23225795e12a1cc3cac334f7
diff --git a/metadata/md5-cache/acct-group/ipsec-0-r1 b/metadata/md5-cache/acct-group/ipsec-0-r1
new file mode 100644
index 000000000000..96e4463e51cd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ipsec-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=ipsec (strongswan) program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=39e00237360ca37f616dc8ddf8d6ef2e
diff --git a/metadata/md5-cache/acct-group/ipsentinel-0 b/metadata/md5-cache/acct-group/ipsentinel-0
deleted file mode 100644
index aa59cb6e7d55..000000000000
--- a/metadata/md5-cache/acct-group/ipsentinel-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-misc/ip-sentinel
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=aaaca4b3d345d2b4647e7f4bebebcbcc
diff --git a/metadata/md5-cache/acct-group/ipsentinel-0-r1 b/metadata/md5-cache/acct-group/ipsentinel-0-r1
new file mode 100644
index 000000000000..e9c76d2d1791
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ipsentinel-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/ip-sentinel
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=891e6fc4efea571f0e58c67cafee784d
diff --git a/metadata/md5-cache/acct-group/iroffer-0 b/metadata/md5-cache/acct-group/iroffer-0
deleted file mode 100644
index 22d0de9d9daf..000000000000
--- a/metadata/md5-cache/acct-group/iroffer-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: iroffer
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4da5b0b99b99777b583ad6bd68bf9df8
diff --git a/metadata/md5-cache/acct-group/iroffer-0-r1 b/metadata/md5-cache/acct-group/iroffer-0-r1
new file mode 100644
index 000000000000..45237e7bd3eb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/iroffer-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: iroffer
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8992873cf7d7b10d66744967edd214e9
diff --git a/metadata/md5-cache/acct-group/jellyfin-0 b/metadata/md5-cache/acct-group/jellyfin-0
deleted file mode 100644
index 25eb1ec180b8..000000000000
--- a/metadata/md5-cache/acct-group/jellyfin-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: jellyfin
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b759085b2aac874f25772b8f20aa743a
diff --git a/metadata/md5-cache/acct-group/jellyfin-0-r1 b/metadata/md5-cache/acct-group/jellyfin-0-r1
new file mode 100644
index 000000000000..f3b610f464fd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/jellyfin-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: jellyfin
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5f7651a48a14a5779cdad03ff9fe7f4f
diff --git a/metadata/md5-cache/acct-group/jenkins-0 b/metadata/md5-cache/acct-group/jenkins-0
deleted file mode 100644
index 2d43a212c6e1..000000000000
--- a/metadata/md5-cache/acct-group/jenkins-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Jenkins program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=24872d231394a6b99fb6ff274b556f3d
diff --git a/metadata/md5-cache/acct-group/jenkins-0-r1 b/metadata/md5-cache/acct-group/jenkins-0-r1
new file mode 100644
index 000000000000..ac0ebe616a92
--- /dev/null
+++ b/metadata/md5-cache/acct-group/jenkins-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Jenkins program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c1cc20b0610cae84e72473ae5be90f24
diff --git a/metadata/md5-cache/acct-group/kafka-0-r1 b/metadata/md5-cache/acct-group/kafka-0-r1
deleted file mode 100644
index 1771f79cc337..000000000000
--- a/metadata/md5-cache/acct-group/kafka-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: kafka
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=27a680dabdce72e2686eb91ff806dc8d
diff --git a/metadata/md5-cache/acct-group/kafka-0-r2 b/metadata/md5-cache/acct-group/kafka-0-r2
new file mode 100644
index 000000000000..9227aaa9aa26
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kafka-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kafka
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b25d1b07e3519c918923456d1d16549d
diff --git a/metadata/md5-cache/acct-group/kapacitor-0-r1 b/metadata/md5-cache/acct-group/kapacitor-0-r1
deleted file mode 100644
index 51e871c0a2bc..000000000000
--- a/metadata/md5-cache/acct-group/kapacitor-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: kapacitor
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9e4ad2122df3f8582ff442354e9f926e
diff --git a/metadata/md5-cache/acct-group/kapacitor-0-r2 b/metadata/md5-cache/acct-group/kapacitor-0-r2
new file mode 100644
index 000000000000..2550071a29ef
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kapacitor-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kapacitor
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a6f00b3ec1f9add589aab5e2c2893133
diff --git a/metadata/md5-cache/acct-group/karma-0 b/metadata/md5-cache/acct-group/karma-0
deleted file mode 100644
index e026c3927c8d..000000000000
--- a/metadata/md5-cache/acct-group/karma-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-apps/karma-bin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=58fcc43bee645083bc6dd2f5f1bc071f
diff --git a/metadata/md5-cache/acct-group/karma-0-r1 b/metadata/md5-cache/acct-group/karma-0-r1
new file mode 100644
index 000000000000..af2ce4900a45
--- /dev/null
+++ b/metadata/md5-cache/acct-group/karma-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/karma-bin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9c25e3c229f5d603cf70ba18aeb01cd3
diff --git a/metadata/md5-cache/acct-group/keystone-0-r1 b/metadata/md5-cache/acct-group/keystone-0-r1
deleted file mode 100644
index a4b4fd850d98..000000000000
--- a/metadata/md5-cache/acct-group/keystone-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: keystone
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3d0739f8634948fbc860e400bfcba344
diff --git a/metadata/md5-cache/acct-group/keystone-0-r2 b/metadata/md5-cache/acct-group/keystone-0-r2
new file mode 100644
index 000000000000..5327999d35ae
--- /dev/null
+++ b/metadata/md5-cache/acct-group/keystone-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: keystone
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8416abef0baf9a17e2da1f8d3fdcfa06
diff --git a/metadata/md5-cache/acct-group/kibana-0-r1 b/metadata/md5-cache/acct-group/kibana-0-r1
deleted file mode 100644
index 8d984d1ac92e..000000000000
--- a/metadata/md5-cache/acct-group/kibana-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Kibana program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=947de83e05df1d1ee7382cab80c951b8
diff --git a/metadata/md5-cache/acct-group/kibana-0-r2 b/metadata/md5-cache/acct-group/kibana-0-r2
new file mode 100644
index 000000000000..e107e723660a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kibana-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Kibana program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0ace256d6cf32832fffa6a46b7a7ca6f
diff --git a/metadata/md5-cache/acct-group/kismet-0-r1 b/metadata/md5-cache/acct-group/kismet-0-r1
deleted file mode 100644
index 10867971b2b1..000000000000
--- a/metadata/md5-cache/acct-group/kismet-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=net-wireless/kismet
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9ac5db94d7469f3ee73629f9afdf3804
diff --git a/metadata/md5-cache/acct-group/kismet-0-r2 b/metadata/md5-cache/acct-group/kismet-0-r2
new file mode 100644
index 000000000000..208ef003d0cd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kismet-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=net-wireless/kismet
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d4dc90d6d45e52cee38739cc18c2393b
diff --git a/metadata/md5-cache/acct-group/kmem-0-r1 b/metadata/md5-cache/acct-group/kmem-0-r1
deleted file mode 100644
index 9be2593b8e0c..000000000000
--- a/metadata/md5-cache/acct-group/kmem-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: kmem
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fe0ca6a296e1cd2a7cc95b45e44992be
diff --git a/metadata/md5-cache/acct-group/kmem-0-r2 b/metadata/md5-cache/acct-group/kmem-0-r2
new file mode 100644
index 000000000000..ff3722c61e6a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kmem-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kmem
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=61bb2c4e792837f38fc594cc7058f597
diff --git a/metadata/md5-cache/acct-group/knot-0-r1 b/metadata/md5-cache/acct-group/knot-0-r1
deleted file mode 100644
index 61fbfe733555..000000000000
--- a/metadata/md5-cache/acct-group/knot-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: knot
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e58cf9a4d5ec12dce8afbadafb67b0f9
diff --git a/metadata/md5-cache/acct-group/knot-0-r2 b/metadata/md5-cache/acct-group/knot-0-r2
new file mode 100644
index 000000000000..25b4e8b02a42
--- /dev/null
+++ b/metadata/md5-cache/acct-group/knot-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: knot
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3448023d9d49414e2245bef009385f38
diff --git a/metadata/md5-cache/acct-group/knot-resolver-0 b/metadata/md5-cache/acct-group/knot-resolver-0
deleted file mode 100644
index dafd74e5daf5..000000000000
--- a/metadata/md5-cache/acct-group/knot-resolver-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: knot-resolver
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f85b2563726e3c4a428fbe52aa420667
diff --git a/metadata/md5-cache/acct-group/knot-resolver-0-r1 b/metadata/md5-cache/acct-group/knot-resolver-0-r1
new file mode 100644
index 000000000000..5702a796bf4e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/knot-resolver-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: knot-resolver
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b4f91398e2aa55bd9e8963a2af166e0a
diff --git a/metadata/md5-cache/acct-group/kube-apiserver-0-r1 b/metadata/md5-cache/acct-group/kube-apiserver-0-r1
deleted file mode 100644
index e331be7bf730..000000000000
--- a/metadata/md5-cache/acct-group/kube-apiserver-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: kube-apiserver
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5053745b8e5ef4a0066b76470ec2b8a4
diff --git a/metadata/md5-cache/acct-group/kube-apiserver-0-r2 b/metadata/md5-cache/acct-group/kube-apiserver-0-r2
new file mode 100644
index 000000000000..32c4ca12a1e5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kube-apiserver-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kube-apiserver
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=059c1780f74c2ea8f44085bd62184db2
diff --git a/metadata/md5-cache/acct-group/kube-controller-manager-0-r1 b/metadata/md5-cache/acct-group/kube-controller-manager-0-r1
deleted file mode 100644
index 185ef7d1663f..000000000000
--- a/metadata/md5-cache/acct-group/kube-controller-manager-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: kube-controller-manager
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=52dcd39d5feefe9d2d4f4e0352efefd5
diff --git a/metadata/md5-cache/acct-group/kube-controller-manager-0-r2 b/metadata/md5-cache/acct-group/kube-controller-manager-0-r2
new file mode 100644
index 000000000000..cf8ea43899ad
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kube-controller-manager-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kube-controller-manager
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=47b58e1ad9597264ad900562d5a68eb3
diff --git a/metadata/md5-cache/acct-group/kube-scheduler-0-r1 b/metadata/md5-cache/acct-group/kube-scheduler-0-r1
deleted file mode 100644
index bcbaf1952fc4..000000000000
--- a/metadata/md5-cache/acct-group/kube-scheduler-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: kube-scheduler
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=39b6ca5740588827ec6cecc56b9d735c
diff --git a/metadata/md5-cache/acct-group/kube-scheduler-0-r2 b/metadata/md5-cache/acct-group/kube-scheduler-0-r2
new file mode 100644
index 000000000000..560945a28cfa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kube-scheduler-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kube-scheduler
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=45957af585cd6bcffc088f26b82be71c
diff --git a/metadata/md5-cache/acct-group/kvm-0-r1 b/metadata/md5-cache/acct-group/kvm-0-r1
deleted file mode 100644
index b4f88a95bd41..000000000000
--- a/metadata/md5-cache/acct-group/kvm-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: kvm
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d9b2019c6ecdceed977a7c5d76312ea7
diff --git a/metadata/md5-cache/acct-group/kvm-0-r2 b/metadata/md5-cache/acct-group/kvm-0-r2
new file mode 100644
index 000000000000..89934a5cc027
--- /dev/null
+++ b/metadata/md5-cache/acct-group/kvm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: kvm
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e47f092ae0cce9cf39b7c58bca70780b
diff --git a/metadata/md5-cache/acct-group/ldap-0 b/metadata/md5-cache/acct-group/ldap-0
deleted file mode 100644
index 648e2901886e..000000000000
--- a/metadata/md5-cache/acct-group/ldap-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: ldap
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3db0dfd8fb9c52c5a6968da67d7f3924
diff --git a/metadata/md5-cache/acct-group/ldap-0-r1 b/metadata/md5-cache/acct-group/ldap-0-r1
new file mode 100644
index 000000000000..f119f24fbb62
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ldap-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ldap
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cb1c293e91ce3b1d32e3e513375811d9
diff --git a/metadata/md5-cache/acct-group/libreoffice-0 b/metadata/md5-cache/acct-group/libreoffice-0
deleted file mode 100644
index 3cb01762b16f..000000000000
--- a/metadata/md5-cache/acct-group/libreoffice-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: libreoffice
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8f57d901c6cc37aeb6ebd41f158d12bd
diff --git a/metadata/md5-cache/acct-group/libreoffice-0-r1 b/metadata/md5-cache/acct-group/libreoffice-0-r1
new file mode 100644
index 000000000000..2b1f200b3bc6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/libreoffice-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: libreoffice
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2bb676d413f5ec8a2a98ccc47e985ce7
diff --git a/metadata/md5-cache/acct-group/libvirt-0-r1 b/metadata/md5-cache/acct-group/libvirt-0-r1
deleted file mode 100644
index 68787bac85d0..000000000000
--- a/metadata/md5-cache/acct-group/libvirt-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: libvirt
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=87ae6216c43b59d90e9bee95240ccd37
diff --git a/metadata/md5-cache/acct-group/libvirt-0-r2 b/metadata/md5-cache/acct-group/libvirt-0-r2
new file mode 100644
index 000000000000..0d6611a6fba4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/libvirt-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: libvirt
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2c3cfd31e9c11ebe3f974769def0b2cd
diff --git a/metadata/md5-cache/acct-group/lightdm-0-r1 b/metadata/md5-cache/acct-group/lightdm-0-r1
deleted file mode 100644
index ec4435ce666e..000000000000
--- a/metadata/md5-cache/acct-group/lightdm-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for x11-misc/lightdm
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3079a45e510d5f347e6ccb491a7dadd9
diff --git a/metadata/md5-cache/acct-group/lightdm-0-r2 b/metadata/md5-cache/acct-group/lightdm-0-r2
new file mode 100644
index 000000000000..dc01b11cdf79
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lightdm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for x11-misc/lightdm
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b6667ab4b8ce7f527bb86af92ba94790
diff --git a/metadata/md5-cache/acct-group/lighttpd-0-r1 b/metadata/md5-cache/acct-group/lighttpd-0-r1
deleted file mode 100644
index 2b5337ff5dcb..000000000000
--- a/metadata/md5-cache/acct-group/lighttpd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: lighttpd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2be863cecef258cae52996a81bd9a452
diff --git a/metadata/md5-cache/acct-group/lighttpd-0-r2 b/metadata/md5-cache/acct-group/lighttpd-0-r2
new file mode 100644
index 000000000000..bb864d62f5bf
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lighttpd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: lighttpd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f5ef23030725eb565f39cd7044d7a915
diff --git a/metadata/md5-cache/acct-group/litecoin-0 b/metadata/md5-cache/acct-group/litecoin-0
deleted file mode 100644
index 10c5a96693ea..000000000000
--- a/metadata/md5-cache/acct-group/litecoin-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-p2p/litecoind
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e976c6dff0bfe09905c9cc80af56bdca
diff --git a/metadata/md5-cache/acct-group/litecoin-0-r1 b/metadata/md5-cache/acct-group/litecoin-0-r1
new file mode 100644
index 000000000000..54c94bb18430
--- /dev/null
+++ b/metadata/md5-cache/acct-group/litecoin-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-p2p/litecoind
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=75efa47f1d34d7eb57eafa1f52392905
diff --git a/metadata/md5-cache/acct-group/lldpd-0-r1 b/metadata/md5-cache/acct-group/lldpd-0-r1
deleted file mode 100644
index 0a6b0c34db9c..000000000000
--- a/metadata/md5-cache/acct-group/lldpd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: lldpd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=597a2ba74d68f241d224b78a433cddb4
diff --git a/metadata/md5-cache/acct-group/lldpd-0-r2 b/metadata/md5-cache/acct-group/lldpd-0-r2
new file mode 100644
index 000000000000..f90a0820b9cb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lldpd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: lldpd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=84939573530ea066bb9269647c1e1427
diff --git a/metadata/md5-cache/acct-group/locate-0-r1 b/metadata/md5-cache/acct-group/locate-0-r1
deleted file mode 100644
index 21082b27d0af..000000000000
--- a/metadata/md5-cache/acct-group/locate-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: locate
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7c59c59581c0af4dc53bbcfc7c5ad9a8
diff --git a/metadata/md5-cache/acct-group/locate-0-r2 b/metadata/md5-cache/acct-group/locate-0-r2
new file mode 100644
index 000000000000..b5549d9c354c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/locate-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: locate
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=278587af9ec9fb5819dd85024ac36430
diff --git a/metadata/md5-cache/acct-group/logcheck-0 b/metadata/md5-cache/acct-group/logcheck-0
deleted file mode 100644
index 8bf9eeaa8e00..000000000000
--- a/metadata/md5-cache/acct-group/logcheck-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-admin/logcheck
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f47aabdfd659a4525e54b1af77eaa423
diff --git a/metadata/md5-cache/acct-group/logcheck-0-r1 b/metadata/md5-cache/acct-group/logcheck-0-r1
new file mode 100644
index 000000000000..d43e06002d1a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/logcheck-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-admin/logcheck
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cc9a6d465d7b65b91e74037debe10783
diff --git a/metadata/md5-cache/acct-group/logstash-0-r1 b/metadata/md5-cache/acct-group/logstash-0-r1
deleted file mode 100644
index 8191371bf48e..000000000000
--- a/metadata/md5-cache/acct-group/logstash-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Logstash program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6df1d6292c925bbc7262edcb56260ccd
diff --git a/metadata/md5-cache/acct-group/logstash-0-r2 b/metadata/md5-cache/acct-group/logstash-0-r2
new file mode 100644
index 000000000000..374dbc65f491
--- /dev/null
+++ b/metadata/md5-cache/acct-group/logstash-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Logstash program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8c0c9a6e60156e95feb255d870fda6e2
diff --git a/metadata/md5-cache/acct-group/logsurfer-0 b/metadata/md5-cache/acct-group/logsurfer-0
deleted file mode 100644
index 3ee48026e690..000000000000
--- a/metadata/md5-cache/acct-group/logsurfer-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-admin/logsurfer
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6e5eaa8bf1014673fdbd20e5cacffb6d
diff --git a/metadata/md5-cache/acct-group/logsurfer-0-r1 b/metadata/md5-cache/acct-group/logsurfer-0-r1
new file mode 100644
index 000000000000..7ad79f766d40
--- /dev/null
+++ b/metadata/md5-cache/acct-group/logsurfer-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-admin/logsurfer
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=acc66d053c819d66de21a32a329a3ea3
diff --git a/metadata/md5-cache/acct-group/lp-0-r1 b/metadata/md5-cache/acct-group/lp-0-r1
deleted file mode 100644
index fc3208fea566..000000000000
--- a/metadata/md5-cache/acct-group/lp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: lp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=34e277522a71e44dc5019512cda7a94d
diff --git a/metadata/md5-cache/acct-group/lp-0-r2 b/metadata/md5-cache/acct-group/lp-0-r2
new file mode 100644
index 000000000000..3b5304028b7c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: lp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3627df9b2c24ccc71db066a5427b04a2
diff --git a/metadata/md5-cache/acct-group/lpadmin-0-r1 b/metadata/md5-cache/acct-group/lpadmin-0-r1
deleted file mode 100644
index 4c5dd0a8e874..000000000000
--- a/metadata/md5-cache/acct-group/lpadmin-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: lpadmin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4092909cf907de72bd73ebdc4038d250
diff --git a/metadata/md5-cache/acct-group/lpadmin-0-r2 b/metadata/md5-cache/acct-group/lpadmin-0-r2
new file mode 100644
index 000000000000..3fd296c44361
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lpadmin-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: lpadmin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4eee62fa518caf61e7cfeeb8dfba4189
diff --git a/metadata/md5-cache/acct-group/lxc-0 b/metadata/md5-cache/acct-group/lxc-0
deleted file mode 100644
index ed0cf5208d86..000000000000
--- a/metadata/md5-cache/acct-group/lxc-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-containers/lxc
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4cceec23bd9c933a0c70c008ab3759d9
diff --git a/metadata/md5-cache/acct-group/lxc-0-r1 b/metadata/md5-cache/acct-group/lxc-0-r1
new file mode 100644
index 000000000000..1e5f5b881248
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lxc-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-containers/lxc
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4a2aa9b19d7a77ce55eecf42d2af16a3
diff --git a/metadata/md5-cache/acct-group/lxd-0-r1 b/metadata/md5-cache/acct-group/lxd-0-r1
deleted file mode 100644
index a6db7c7b5ccb..000000000000
--- a/metadata/md5-cache/acct-group/lxd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-containers/lxd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4699ae360aed34e6b423ce9406061d0d
diff --git a/metadata/md5-cache/acct-group/lxd-0-r2 b/metadata/md5-cache/acct-group/lxd-0-r2
new file mode 100644
index 000000000000..161855ae43bb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lxd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-containers/lxd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=94f31dbe17e9b556ccc1ca94008bc8c5
diff --git a/metadata/md5-cache/acct-group/mail-0-r1 b/metadata/md5-cache/acct-group/mail-0-r1
deleted file mode 100644
index 3b6a7372db4f..000000000000
--- a/metadata/md5-cache/acct-group/mail-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Mail program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=df7f2454a5da6ec40e392d95c58773f6
diff --git a/metadata/md5-cache/acct-group/mail-0-r2 b/metadata/md5-cache/acct-group/mail-0-r2
new file mode 100644
index 000000000000..53c0aff7c465
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mail-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Mail program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2d6bdcc46c23ef8d0c7355d1ad7261d7
diff --git a/metadata/md5-cache/acct-group/man-0-r1 b/metadata/md5-cache/acct-group/man-0-r1
deleted file mode 100644
index f9798b1ecc31..000000000000
--- a/metadata/md5-cache/acct-group/man-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: man
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bc3744ff4cff30e824fa7947a44e84cd
diff --git a/metadata/md5-cache/acct-group/man-0-r2 b/metadata/md5-cache/acct-group/man-0-r2
new file mode 100644
index 000000000000..8d7149d99a51
--- /dev/null
+++ b/metadata/md5-cache/acct-group/man-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: man
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6fff94dd4b14c8a3fc2e5de439721e68
diff --git a/metadata/md5-cache/acct-group/maradns-0-r1 b/metadata/md5-cache/acct-group/maradns-0-r1
deleted file mode 100644
index 568186092a4f..000000000000
--- a/metadata/md5-cache/acct-group/maradns-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: maradns
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0b120d9ef47a9b58921447e145cfba83
diff --git a/metadata/md5-cache/acct-group/maradns-0-r2 b/metadata/md5-cache/acct-group/maradns-0-r2
new file mode 100644
index 000000000000..45cbb0a5a2f7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/maradns-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: maradns
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d62743dfbf040de7659eea2e72c4be43
diff --git a/metadata/md5-cache/acct-group/memcached-0-r1 b/metadata/md5-cache/acct-group/memcached-0-r1
deleted file mode 100644
index 4987cfd65ce4..000000000000
--- a/metadata/md5-cache/acct-group/memcached-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: memcached
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1e325a3cdfb3722fda6e3aaa83d6a162
diff --git a/metadata/md5-cache/acct-group/memcached-0-r2 b/metadata/md5-cache/acct-group/memcached-0-r2
new file mode 100644
index 000000000000..51163f85c75a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/memcached-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: memcached
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9869b0236e9da0a8203feb4212a90340
diff --git a/metadata/md5-cache/acct-group/memcached_exporter-0 b/metadata/md5-cache/acct-group/memcached_exporter-0
deleted file mode 100644
index 69cbcdabe25c..000000000000
--- a/metadata/md5-cache/acct-group/memcached_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: memcached_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dc8f63bbf7d3521e03a0de99ab820a1e
diff --git a/metadata/md5-cache/acct-group/memcached_exporter-0-r1 b/metadata/md5-cache/acct-group/memcached_exporter-0-r1
new file mode 100644
index 000000000000..302f1f94a232
--- /dev/null
+++ b/metadata/md5-cache/acct-group/memcached_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: memcached_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=441a51174c92a34407ac13348e927ed3
diff --git a/metadata/md5-cache/acct-group/messagebus-0-r1 b/metadata/md5-cache/acct-group/messagebus-0-r1
deleted file mode 100644
index fc8fab9fbea6..000000000000
--- a/metadata/md5-cache/acct-group/messagebus-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: messagebus
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=860f2596cf94e95665239c83f026878a
diff --git a/metadata/md5-cache/acct-group/messagebus-0-r2 b/metadata/md5-cache/acct-group/messagebus-0-r2
new file mode 100644
index 000000000000..667c7d7affc6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/messagebus-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: messagebus
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a8698d0a3465bed7515edd29e41701aa
diff --git a/metadata/md5-cache/acct-group/mgraph-0 b/metadata/md5-cache/acct-group/mgraph-0
deleted file mode 100644
index e4326924ed03..000000000000
--- a/metadata/md5-cache/acct-group/mgraph-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-mail/mailgraph
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6345345d829146536dbc3fe3673913fe
diff --git a/metadata/md5-cache/acct-group/mgraph-0-r1 b/metadata/md5-cache/acct-group/mgraph-0-r1
new file mode 100644
index 000000000000..116e1dde5c0f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mgraph-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/mailgraph
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=add4ab818ab659a9b0280c430f336f55
diff --git a/metadata/md5-cache/acct-group/milter-regex-0-r1 b/metadata/md5-cache/acct-group/milter-regex-0-r1
deleted file mode 100644
index 6cb91ee58eca..000000000000
--- a/metadata/md5-cache/acct-group/milter-regex-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for mail-filter/milter-regex
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c286cc6151cd347d255237afe6a7b95f
diff --git a/metadata/md5-cache/acct-group/milter-regex-0-r2 b/metadata/md5-cache/acct-group/milter-regex-0-r2
new file mode 100644
index 000000000000..4d3f31ede954
--- /dev/null
+++ b/metadata/md5-cache/acct-group/milter-regex-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-filter/milter-regex
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6c815ac507f6ce2fa73a76f26d098191
diff --git a/metadata/md5-cache/acct-group/minbif-0 b/metadata/md5-cache/acct-group/minbif-0
deleted file mode 100644
index 010f18f06e07..000000000000
--- a/metadata/md5-cache/acct-group/minbif-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-im/minbif
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c76205c31b09f6c8aca8bb05f502d699
diff --git a/metadata/md5-cache/acct-group/minbif-0-r1 b/metadata/md5-cache/acct-group/minbif-0-r1
new file mode 100644
index 000000000000..e4e4a476e53d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minbif-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-im/minbif
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=eebcc3037ab576c7c0cf6d30443323af
diff --git a/metadata/md5-cache/acct-group/minecraft-0-r1 b/metadata/md5-cache/acct-group/minecraft-0-r1
deleted file mode 100644
index 4030ab565b2a..000000000000
--- a/metadata/md5-cache/acct-group/minecraft-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the Minecraft server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=07b9a54b36bf205d245a634658b5bdca
diff --git a/metadata/md5-cache/acct-group/minecraft-0-r2 b/metadata/md5-cache/acct-group/minecraft-0-r2
new file mode 100644
index 000000000000..95cfd30e4845
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minecraft-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Minecraft server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=413129f6a466ec487dc0e186909ac8a2
diff --git a/metadata/md5-cache/acct-group/minetest-0-r1 b/metadata/md5-cache/acct-group/minetest-0-r1
deleted file mode 100644
index 9b5937334432..000000000000
--- a/metadata/md5-cache/acct-group/minetest-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the Minetest server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4931474a343565983bc41ee65479966b
diff --git a/metadata/md5-cache/acct-group/minetest-0-r2 b/metadata/md5-cache/acct-group/minetest-0-r2
new file mode 100644
index 000000000000..996e3e137ff7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minetest-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Minetest server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3f63aafd4176cc193b18a783eb618a3b
diff --git a/metadata/md5-cache/acct-group/minidlna-0 b/metadata/md5-cache/acct-group/minidlna-0
deleted file mode 100644
index c827f2bcc0d6..000000000000
--- a/metadata/md5-cache/acct-group/minidlna-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: minidlna
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0fe840718048e692eaf606ea5325d081
diff --git a/metadata/md5-cache/acct-group/minidlna-0-r1 b/metadata/md5-cache/acct-group/minidlna-0-r1
new file mode 100644
index 000000000000..33423f85f0d9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minidlna-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: minidlna
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3392b1b574942709beecd38a283cfb39
diff --git a/metadata/md5-cache/acct-group/minio-0 b/metadata/md5-cache/acct-group/minio-0
deleted file mode 100644
index 948f8b043299..000000000000
--- a/metadata/md5-cache/acct-group/minio-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: minio
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e27b295ea1d7a3168d3a5e8ddb61d81c
diff --git a/metadata/md5-cache/acct-group/minio-0-r1 b/metadata/md5-cache/acct-group/minio-0-r1
new file mode 100644
index 000000000000..1f33b5d92927
--- /dev/null
+++ b/metadata/md5-cache/acct-group/minio-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: minio
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bf6cc8a23d6b9ffe65646ce292d01409
diff --git a/metadata/md5-cache/acct-group/mogile-0 b/metadata/md5-cache/acct-group/mogile-0
deleted file mode 100644
index d5ab48b916ae..000000000000
--- a/metadata/md5-cache/acct-group/mogile-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=MogileFS group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=eb8dccd0a48e96ca4a7973fdd82c48d5
diff --git a/metadata/md5-cache/acct-group/mogile-0-r1 b/metadata/md5-cache/acct-group/mogile-0-r1
new file mode 100644
index 000000000000..c7e748286d04
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mogile-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=MogileFS group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cb4ed72eb27f4e1a62869f0551a2424a
diff --git a/metadata/md5-cache/acct-group/mongodb-0-r1 b/metadata/md5-cache/acct-group/mongodb-0-r1
deleted file mode 100644
index 47513e065786..000000000000
--- a/metadata/md5-cache/acct-group/mongodb-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=MongoDB program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3bf1d667ee317fc26d5bfb0b89bd54a0
diff --git a/metadata/md5-cache/acct-group/mongodb-0-r2 b/metadata/md5-cache/acct-group/mongodb-0-r2
new file mode 100644
index 000000000000..79f0b4e1b41e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mongodb-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=MongoDB program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=de01836b63f4270a71a753ca0a5a7ce2
diff --git a/metadata/md5-cache/acct-group/mongodb_exporter-0 b/metadata/md5-cache/acct-group/mongodb_exporter-0
deleted file mode 100644
index 961c8b292baa..000000000000
--- a/metadata/md5-cache/acct-group/mongodb_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: mongodb_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=33bf666a5db0c5a772cc4d65d563ce0c
diff --git a/metadata/md5-cache/acct-group/mongodb_exporter-0-r1 b/metadata/md5-cache/acct-group/mongodb_exporter-0-r1
new file mode 100644
index 000000000000..a1a9c882ea44
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mongodb_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: mongodb_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c66d329871b16883ecca3e1ef52d4eb3
diff --git a/metadata/md5-cache/acct-group/monitorix-0-r1 b/metadata/md5-cache/acct-group/monitorix-0-r1
deleted file mode 100644
index b418fee9f5e0..000000000000
--- a/metadata/md5-cache/acct-group/monitorix-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Monitorix system tool group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=676caa4ebe1136cd3d2e4dd2248ce500
diff --git a/metadata/md5-cache/acct-group/monitorix-0-r2 b/metadata/md5-cache/acct-group/monitorix-0-r2
new file mode 100644
index 000000000000..f75f4f510891
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monitorix-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Monitorix system tool group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5ac59b800af2ac3b86574f0c3ed5d767
diff --git a/metadata/md5-cache/acct-group/monkeyd-0 b/metadata/md5-cache/acct-group/monkeyd-0
deleted file mode 100644
index 77de848b81af..000000000000
--- a/metadata/md5-cache/acct-group/monkeyd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-servers/monkeyd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4c53e5082a920b16acd70700eddc8b94
diff --git a/metadata/md5-cache/acct-group/monkeyd-0-r1 b/metadata/md5-cache/acct-group/monkeyd-0-r1
new file mode 100644
index 000000000000..53fc3782773c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monkeyd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/monkeyd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=413eafb7a2147e83f31cb6cabf99a931
diff --git a/metadata/md5-cache/acct-group/monkeysphere-0-r1 b/metadata/md5-cache/acct-group/monkeysphere-0-r1
deleted file mode 100644
index 054bf7ec2f58..000000000000
--- a/metadata/md5-cache/acct-group/monkeysphere-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=monkeysphere program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2e21df9eebb5ce23b63d3e08ad3f6743
diff --git a/metadata/md5-cache/acct-group/monkeysphere-0-r2 b/metadata/md5-cache/acct-group/monkeysphere-0-r2
new file mode 100644
index 000000000000..aaeee94ad666
--- /dev/null
+++ b/metadata/md5-cache/acct-group/monkeysphere-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=monkeysphere program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=779d8890bb794b2fda76ee2b09dbc586
diff --git a/metadata/md5-cache/acct-group/mosquitto-0-r1 b/metadata/md5-cache/acct-group/mosquitto-0-r1
deleted file mode 100644
index a26251333b74..000000000000
--- a/metadata/md5-cache/acct-group/mosquitto-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the mosquitto MQTT broker
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1d93482e08b728073792f35ad3197779
diff --git a/metadata/md5-cache/acct-group/mosquitto-0-r2 b/metadata/md5-cache/acct-group/mosquitto-0-r2
new file mode 100644
index 000000000000..08bc1c153473
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mosquitto-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the mosquitto MQTT broker
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dc217055cfcedfac102b7c9ba73f9293
diff --git a/metadata/md5-cache/acct-group/motion-0-r1 b/metadata/md5-cache/acct-group/motion-0-r1
deleted file mode 100644
index 7bc235b461aa..000000000000
--- a/metadata/md5-cache/acct-group/motion-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: motion
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3830275cd7a4c71ee27217edea3bc413
diff --git a/metadata/md5-cache/acct-group/motion-0-r2 b/metadata/md5-cache/acct-group/motion-0-r2
new file mode 100644
index 000000000000..ce716d31e503
--- /dev/null
+++ b/metadata/md5-cache/acct-group/motion-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: motion
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=025f5c7e008e6c01a3bbc77f15e25f2d
diff --git a/metadata/md5-cache/acct-group/msmtpd-0-r1 b/metadata/md5-cache/acct-group/msmtpd-0-r1
deleted file mode 100644
index aa304129388b..000000000000
--- a/metadata/md5-cache/acct-group/msmtpd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: msmtpd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=05a49a4727b726689e845d607a968ec5
diff --git a/metadata/md5-cache/acct-group/msmtpd-0-r2 b/metadata/md5-cache/acct-group/msmtpd-0-r2
new file mode 100644
index 000000000000..a2ad3fa00e07
--- /dev/null
+++ b/metadata/md5-cache/acct-group/msmtpd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: msmtpd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ec171961315fc509677134ec0ee2f76b
diff --git a/metadata/md5-cache/acct-group/munge-0 b/metadata/md5-cache/acct-group/munge-0
deleted file mode 100644
index 524e44c1000a..000000000000
--- a/metadata/md5-cache/acct-group/munge-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-auth/munge
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f4271f090e2d7c3b9daaaa7b2dcfc250
diff --git a/metadata/md5-cache/acct-group/munge-0-r1 b/metadata/md5-cache/acct-group/munge-0-r1
new file mode 100644
index 000000000000..0ae2b086979e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/munge-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-auth/munge
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bfc637fca5fcbd243ef0482e69036ae9
diff --git a/metadata/md5-cache/acct-group/munin-0-r1 b/metadata/md5-cache/acct-group/munin-0-r1
deleted file mode 100644
index 0903bb678f5f..000000000000
--- a/metadata/md5-cache/acct-group/munin-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: munin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=98b464359f4edd282b9907144542d12e
diff --git a/metadata/md5-cache/acct-group/munin-0-r2 b/metadata/md5-cache/acct-group/munin-0-r2
new file mode 100644
index 000000000000..b6e197510cd4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/munin-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: munin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fb5038d6a79fe1b34d7d53d50e066a5b
diff --git a/metadata/md5-cache/acct-group/murmur-0-r1 b/metadata/md5-cache/acct-group/murmur-0-r1
deleted file mode 100644
index 9d263fe17a3b..000000000000
--- a/metadata/md5-cache/acct-group/murmur-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: murmur
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=073eb06b74fcebce02306ae4042a6c81
diff --git a/metadata/md5-cache/acct-group/murmur-0-r2 b/metadata/md5-cache/acct-group/murmur-0-r2
new file mode 100644
index 000000000000..842c325b7bcb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/murmur-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: murmur
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4706331cb4052d4c177b366fa01f2e4a
diff --git a/metadata/md5-cache/acct-group/mysql-0-r1 b/metadata/md5-cache/acct-group/mysql-0-r1
deleted file mode 100644
index 86601de50d4c..000000000000
--- a/metadata/md5-cache/acct-group/mysql-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=MySQL program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e8d05229154e1bc1a029f8e56a618e6f
diff --git a/metadata/md5-cache/acct-group/mysql-0-r2 b/metadata/md5-cache/acct-group/mysql-0-r2
new file mode 100644
index 000000000000..6b8ed8b31a46
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mysql-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=MySQL program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d269e9b0063a0cfb1dd74c90ac8a5eff
diff --git a/metadata/md5-cache/acct-group/mysqld_exporter-0-r1 b/metadata/md5-cache/acct-group/mysqld_exporter-0-r1
deleted file mode 100644
index 9a2f5b2c21bc..000000000000
--- a/metadata/md5-cache/acct-group/mysqld_exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: mysqld_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6e0e84b5ddca0241b982f7537ab31097
diff --git a/metadata/md5-cache/acct-group/mysqld_exporter-0-r2 b/metadata/md5-cache/acct-group/mysqld_exporter-0-r2
new file mode 100644
index 000000000000..7458fb479d13
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mysqld_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: mysqld_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e59a6ad3bdd9112a051f3dec4b49f8cd
diff --git a/metadata/md5-cache/acct-group/mythtv-0-r1 b/metadata/md5-cache/acct-group/mythtv-0-r1
deleted file mode 100644
index f43ad78c0f46..000000000000
--- a/metadata/md5-cache/acct-group/mythtv-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Mythtv mythbackend server/deamon group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e805d52dce53503a96104e9591c06e39
diff --git a/metadata/md5-cache/acct-group/mythtv-0-r2 b/metadata/md5-cache/acct-group/mythtv-0-r2
new file mode 100644
index 000000000000..9ca5ecb80e1b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/mythtv-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Mythtv mythbackend server/deamon group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7320e7fb047958898f6b5b842c2ac7c4
diff --git a/metadata/md5-cache/acct-group/nagios-0-r1 b/metadata/md5-cache/acct-group/nagios-0-r1
deleted file mode 100644
index d2868592acda..000000000000
--- a/metadata/md5-cache/acct-group/nagios-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: nagios
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=326535b7e0fc7dd8049f7228af275525
diff --git a/metadata/md5-cache/acct-group/nagios-0-r2 b/metadata/md5-cache/acct-group/nagios-0-r2
new file mode 100644
index 000000000000..e244a81813e4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nagios-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nagios
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f84cd6c773d4b9c73d714e0e6020431f
diff --git a/metadata/md5-cache/acct-group/named-0-r1 b/metadata/md5-cache/acct-group/named-0-r1
deleted file mode 100644
index 496831b58cdc..000000000000
--- a/metadata/md5-cache/acct-group/named-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: named
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=167cc1f18b1fcddbd4615ca0adbafa17
diff --git a/metadata/md5-cache/acct-group/named-0-r2 b/metadata/md5-cache/acct-group/named-0-r2
new file mode 100644
index 000000000000..8b9f17ad118a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/named-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: named
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d1a7635329d2b80cfbb8240d05001891
diff --git a/metadata/md5-cache/acct-group/netbox-0-r1 b/metadata/md5-cache/acct-group/netbox-0-r1
deleted file mode 100644
index 5f0d68069d10..000000000000
--- a/metadata/md5-cache/acct-group/netbox-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: netbox
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=65ef9a0acf0ef3eb808cc22bb6b14ca3
diff --git a/metadata/md5-cache/acct-group/netbox-0-r2 b/metadata/md5-cache/acct-group/netbox-0-r2
new file mode 100644
index 000000000000..00fb1bdce8b0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/netbox-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: netbox
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f29c002d8d766748f0f61a1079af54a1
diff --git a/metadata/md5-cache/acct-group/netdata-0-r1 b/metadata/md5-cache/acct-group/netdata-0-r1
deleted file mode 100644
index 148c77005113..000000000000
--- a/metadata/md5-cache/acct-group/netdata-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: netdata
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=34b26041debe1ccfc3c378fe73e04f6c
diff --git a/metadata/md5-cache/acct-group/netdata-0-r2 b/metadata/md5-cache/acct-group/netdata-0-r2
new file mode 100644
index 000000000000..43a36f17e76c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/netdata-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: netdata
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=37992f7448c068f1849df78bb69b4cce
diff --git a/metadata/md5-cache/acct-group/netdev-0-r1 b/metadata/md5-cache/acct-group/netdev-0-r1
deleted file mode 100644
index 82ab3581a978..000000000000
--- a/metadata/md5-cache/acct-group/netdev-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for netdev (avahi)
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7673f8b57c7ecf176bbc51574059a022
diff --git a/metadata/md5-cache/acct-group/netdev-0-r2 b/metadata/md5-cache/acct-group/netdev-0-r2
new file mode 100644
index 000000000000..a74369af0f9c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/netdev-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for netdev (avahi)
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=59573bc9b286d23514d3af3e1518b064
diff --git a/metadata/md5-cache/acct-group/netperf-0 b/metadata/md5-cache/acct-group/netperf-0
deleted file mode 100644
index 81621487a43c..000000000000
--- a/metadata/md5-cache/acct-group/netperf-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-analyzer/netperf
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=36de3a0e486846e535e569a5d34c271d
diff --git a/metadata/md5-cache/acct-group/netperf-0-r1 b/metadata/md5-cache/acct-group/netperf-0-r1
new file mode 100644
index 000000000000..523083435167
--- /dev/null
+++ b/metadata/md5-cache/acct-group/netperf-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/netperf
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=122e03340d111e65d16dfc129a06896d
diff --git a/metadata/md5-cache/acct-group/neutron-0-r1 b/metadata/md5-cache/acct-group/neutron-0-r1
deleted file mode 100644
index ca3825c2ee89..000000000000
--- a/metadata/md5-cache/acct-group/neutron-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: neutron
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c058f2e93fc39a15c0e0e4f13a8921a9
diff --git a/metadata/md5-cache/acct-group/neutron-0-r2 b/metadata/md5-cache/acct-group/neutron-0-r2
new file mode 100644
index 000000000000..a96381fd6b22
--- /dev/null
+++ b/metadata/md5-cache/acct-group/neutron-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: neutron
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9be5e9e8589607769f814ec16687edc7
diff --git a/metadata/md5-cache/acct-group/nginx-0-r1 b/metadata/md5-cache/acct-group/nginx-0-r1
deleted file mode 100644
index 81f1c3a0a66a..000000000000
--- a/metadata/md5-cache/acct-group/nginx-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-servers/nginx
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=47c6e7e599368a44c50df99b92509dd6
diff --git a/metadata/md5-cache/acct-group/nginx-0-r2 b/metadata/md5-cache/acct-group/nginx-0-r2
new file mode 100644
index 000000000000..880862256b53
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nginx-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/nginx
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cb19076cb30460256368841903e95ccb
diff --git a/metadata/md5-cache/acct-group/nginx-unit-0 b/metadata/md5-cache/acct-group/nginx-unit-0
deleted file mode 100644
index aa186f285a0c..000000000000
--- a/metadata/md5-cache/acct-group/nginx-unit-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-servers/nginx-unit
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7175a3c971d7f7decdfe05e160cab9c3
diff --git a/metadata/md5-cache/acct-group/nginx-unit-0-r1 b/metadata/md5-cache/acct-group/nginx-unit-0-r1
new file mode 100644
index 000000000000..9f6768f8540f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nginx-unit-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/nginx-unit
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7175a3c971d7f7decdfe05e160cab9c3
diff --git a/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1 b/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1
deleted file mode 100644
index d9e2956588b4..000000000000
--- a/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: nginx-vts-exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=371e403874b8c2ccabd967a8ff7d6444
diff --git a/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r2 b/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r2
new file mode 100644
index 000000000000..7ea78d5b62fd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nginx-vts-exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nginx-vts-exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ed598e7aa71465d549a84af0243c4a5b
diff --git a/metadata/md5-cache/acct-group/ngircd-0-r1 b/metadata/md5-cache/acct-group/ngircd-0-r1
deleted file mode 100644
index b504889409b8..000000000000
--- a/metadata/md5-cache/acct-group/ngircd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for ngircd (IRC daemon)
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fa4de52a3ae1cc1f1a555e161f3a21af
diff --git a/metadata/md5-cache/acct-group/ngircd-0-r2 b/metadata/md5-cache/acct-group/ngircd-0-r2
new file mode 100644
index 000000000000..44290f7b20a6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ngircd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for ngircd (IRC daemon)
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f96ebe24c0c6e40957a34c040eb6cfbc
diff --git a/metadata/md5-cache/acct-group/ngrep-0-r1 b/metadata/md5-cache/acct-group/ngrep-0-r1
deleted file mode 100644
index a90eaca3562b..000000000000
--- a/metadata/md5-cache/acct-group/ngrep-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-analyzer/ngrep
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=21b9b50342a1745d1821796d410bf95a
diff --git a/metadata/md5-cache/acct-group/ngrep-0-r2 b/metadata/md5-cache/acct-group/ngrep-0-r2
new file mode 100644
index 000000000000..34282764b40a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ngrep-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/ngrep
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0beef07e597d882cfc35cf3b3db2b453
diff --git a/metadata/md5-cache/acct-group/nm-openconnect-0 b/metadata/md5-cache/acct-group/nm-openconnect-0
deleted file mode 100644
index 838c6cd09cda..000000000000
--- a/metadata/md5-cache/acct-group/nm-openconnect-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-vpn/networkmanager-openconnect
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=828688dff44247448fcb77741ca82c4b
diff --git a/metadata/md5-cache/acct-group/nm-openconnect-0-r1 b/metadata/md5-cache/acct-group/nm-openconnect-0-r1
new file mode 100644
index 000000000000..e193ab0f808c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nm-openconnect-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/networkmanager-openconnect
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=40bfc8abff9fdb9a1737cf3431ed8fd3
diff --git a/metadata/md5-cache/acct-group/nm-openvpn-0 b/metadata/md5-cache/acct-group/nm-openvpn-0
deleted file mode 100644
index ca88dd9791d9..000000000000
--- a/metadata/md5-cache/acct-group/nm-openvpn-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-vpn/networkmanager-openvpn
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=435972a37aa86bf93a159432669be8c0
diff --git a/metadata/md5-cache/acct-group/nm-openvpn-0-r1 b/metadata/md5-cache/acct-group/nm-openvpn-0-r1
new file mode 100644
index 000000000000..263506b7299a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nm-openvpn-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-vpn/networkmanager-openvpn
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5bf212550b302f873041e5fb750d974a
diff --git a/metadata/md5-cache/acct-group/nobody-0 b/metadata/md5-cache/acct-group/nobody-0
deleted file mode 100644
index 20b1ca194d81..000000000000
--- a/metadata/md5-cache/acct-group/nobody-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: nobody
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8758ecac83bafc0d1197df48dd925fd2
diff --git a/metadata/md5-cache/acct-group/nobody-0-r1 b/metadata/md5-cache/acct-group/nobody-0-r1
new file mode 100644
index 000000000000..b2e15904cfab
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nobody-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nobody
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a983bcba784d5ac25cca796a35d7f3bc
diff --git a/metadata/md5-cache/acct-group/node_exporter-0-r1 b/metadata/md5-cache/acct-group/node_exporter-0-r1
deleted file mode 100644
index 63455a2a3f3d..000000000000
--- a/metadata/md5-cache/acct-group/node_exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: node_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6fa2ae942bd21fc2ed167fdb3c8691e3
diff --git a/metadata/md5-cache/acct-group/node_exporter-0-r2 b/metadata/md5-cache/acct-group/node_exporter-0-r2
new file mode 100644
index 000000000000..c871eb91c419
--- /dev/null
+++ b/metadata/md5-cache/acct-group/node_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: node_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2dc8762fd37021e1898f2437a31f8751
diff --git a/metadata/md5-cache/acct-group/nofiles-0-r1 b/metadata/md5-cache/acct-group/nofiles-0-r1
deleted file mode 100644
index d0a25d21763b..000000000000
--- a/metadata/md5-cache/acct-group/nofiles-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: nofiles
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ec57eb799e3c136d40ef8af9bd0d8827
diff --git a/metadata/md5-cache/acct-group/nofiles-0-r2 b/metadata/md5-cache/acct-group/nofiles-0-r2
new file mode 100644
index 000000000000..6b46aaab73fe
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nofiles-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nofiles
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7293ee48927bc47df6470a410be36067
diff --git a/metadata/md5-cache/acct-group/notary-0 b/metadata/md5-cache/acct-group/notary-0
deleted file mode 100644
index 07e4a3557939..000000000000
--- a/metadata/md5-cache/acct-group/notary-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-misc/notary
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1e501e1e320c5a526a89c16508ae40ed
diff --git a/metadata/md5-cache/acct-group/notary-0-r1 b/metadata/md5-cache/acct-group/notary-0-r1
new file mode 100644
index 000000000000..aab88e37dc96
--- /dev/null
+++ b/metadata/md5-cache/acct-group/notary-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-misc/notary
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=37929d197aaf790be14fa956244bb38c
diff --git a/metadata/md5-cache/acct-group/nova-0-r1 b/metadata/md5-cache/acct-group/nova-0-r1
deleted file mode 100644
index e9fd7c260719..000000000000
--- a/metadata/md5-cache/acct-group/nova-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: nova
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=68731c2a87b669070f2036a658e5378c
diff --git a/metadata/md5-cache/acct-group/nova-0-r2 b/metadata/md5-cache/acct-group/nova-0-r2
new file mode 100644
index 000000000000..4985555dbd84
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nova-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nova
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7d6fc9b4f52c4ab5a57bb126e6ab40c6
diff --git a/metadata/md5-cache/acct-group/nsd-0-r1 b/metadata/md5-cache/acct-group/nsd-0-r1
deleted file mode 100644
index 0b50199fb8f4..000000000000
--- a/metadata/md5-cache/acct-group/nsd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: nsd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d9ac42adab7c0123fb4d89c5b9a87e94
diff --git a/metadata/md5-cache/acct-group/nsd-0-r2 b/metadata/md5-cache/acct-group/nsd-0-r2
new file mode 100644
index 000000000000..960f18cd1c98
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nsd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nsd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5aff6e17701fbd812b15a3e5260d66c7
diff --git a/metadata/md5-cache/acct-group/nslcd-0-r1 b/metadata/md5-cache/acct-group/nslcd-0-r1
deleted file mode 100644
index b67be9674025..000000000000
--- a/metadata/md5-cache/acct-group/nslcd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: nslcd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0d665e6cb6e5536bc1dd678572ef427e
diff --git a/metadata/md5-cache/acct-group/nslcd-0-r2 b/metadata/md5-cache/acct-group/nslcd-0-r2
new file mode 100644
index 000000000000..ecaf0b685459
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nslcd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: nslcd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c95088450e35ab780818a750da09a190
diff --git a/metadata/md5-cache/acct-group/ntopng-0 b/metadata/md5-cache/acct-group/ntopng-0
deleted file mode 100644
index 5d07aab261f9..000000000000
--- a/metadata/md5-cache/acct-group/ntopng-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: ntopng
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=35e9e7e095b309ec30d298df5ef73598
diff --git a/metadata/md5-cache/acct-group/ntopng-0-r1 b/metadata/md5-cache/acct-group/ntopng-0-r1
new file mode 100644
index 000000000000..7a2f158738a0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ntopng-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ntopng
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=54f52eeaea04da981e41383477f530b5
diff --git a/metadata/md5-cache/acct-group/ntp-0-r1 b/metadata/md5-cache/acct-group/ntp-0-r1
deleted file mode 100644
index ef930935798a..000000000000
--- a/metadata/md5-cache/acct-group/ntp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: ntp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b944216def225db8a4e6d36df6d79253
diff --git a/metadata/md5-cache/acct-group/ntp-0-r2 b/metadata/md5-cache/acct-group/ntp-0-r2
new file mode 100644
index 000000000000..666adbf35e80
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ntp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ntp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7099c5b630d3c9ed4195c76c7793b612
diff --git a/metadata/md5-cache/acct-group/nullmail-0 b/metadata/md5-cache/acct-group/nullmail-0
deleted file mode 100644
index 894b72272832..000000000000
--- a/metadata/md5-cache/acct-group/nullmail-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the nullmailer
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=03002131a7409438844d4496bd39709b
diff --git a/metadata/md5-cache/acct-group/nullmail-0-r1 b/metadata/md5-cache/acct-group/nullmail-0-r1
new file mode 100644
index 000000000000..6e401616a271
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nullmail-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the nullmailer
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d992b134cc7f6fb6ff2df2b4ee912f65
diff --git a/metadata/md5-cache/acct-group/nut-0 b/metadata/md5-cache/acct-group/nut-0
deleted file mode 100644
index 8478b43e78fe..000000000000
--- a/metadata/md5-cache/acct-group/nut-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the Network-UPS Tools
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=06b31b41041e4d1a605271e08371c5be
diff --git a/metadata/md5-cache/acct-group/nut-0-r1 b/metadata/md5-cache/acct-group/nut-0-r1
new file mode 100644
index 000000000000..b0e9fb638b7b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nut-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Network-UPS Tools
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6e6fea128db4953c11f17a1f7e94da2e
diff --git a/metadata/md5-cache/acct-group/nzbget-0 b/metadata/md5-cache/acct-group/nzbget-0
deleted file mode 100644
index f7711ab7f13a..000000000000
--- a/metadata/md5-cache/acct-group/nzbget-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-nntp/nzbget
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c6ec1d3cc1d3ffdcb57a8b831ac2886c
diff --git a/metadata/md5-cache/acct-group/nzbget-0-r1 b/metadata/md5-cache/acct-group/nzbget-0-r1
new file mode 100644
index 000000000000..9accf2d1efdb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nzbget-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-nntp/nzbget
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=590878c801b7d6fd07d9670aeea67e0c
diff --git a/metadata/md5-cache/acct-group/oidentd-0-r1 b/metadata/md5-cache/acct-group/oidentd-0-r1
deleted file mode 100644
index 29bd96f66dbb..000000000000
--- a/metadata/md5-cache/acct-group/oidentd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: oidentd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e314a1278ff5232a107383ed41b95900
diff --git a/metadata/md5-cache/acct-group/oidentd-0-r2 b/metadata/md5-cache/acct-group/oidentd-0-r2
new file mode 100644
index 000000000000..2ef3fa949bc2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/oidentd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: oidentd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c766ad422b3eaf5a2ae44c8d501f564e
diff --git a/metadata/md5-cache/acct-group/openct-0-r1 b/metadata/md5-cache/acct-group/openct-0-r1
deleted file mode 100644
index b0c76472dfb7..000000000000
--- a/metadata/md5-cache/acct-group/openct-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: openct
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7ae8badd59b78a22a19e96bd974bccc1
diff --git a/metadata/md5-cache/acct-group/openct-0-r2 b/metadata/md5-cache/acct-group/openct-0-r2
new file mode 100644
index 000000000000..5cccac217658
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openct-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: openct
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=df4b42283905cbcc957c66bdc828fa07
diff --git a/metadata/md5-cache/acct-group/opendkim-0-r1 b/metadata/md5-cache/acct-group/opendkim-0-r1
deleted file mode 100644
index 4d8a15da0bfb..000000000000
--- a/metadata/md5-cache/acct-group/opendkim-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for OpenDKIM
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5c029cf0da543d31566d1480be4dc981
diff --git a/metadata/md5-cache/acct-group/opendkim-0-r2 b/metadata/md5-cache/acct-group/opendkim-0-r2
new file mode 100644
index 000000000000..ac406d6bc89f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/opendkim-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for OpenDKIM
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=56400d5d7de6e75bb935df561c615aa9
diff --git a/metadata/md5-cache/acct-group/opendmarc-1 b/metadata/md5-cache/acct-group/opendmarc-1
deleted file mode 100644
index 18b476f03b4e..000000000000
--- a/metadata/md5-cache/acct-group/opendmarc-1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for mail-filter/opendmarc
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=733375fffc601727af32838d78f78ed3
diff --git a/metadata/md5-cache/acct-group/opendmarc-1-r1 b/metadata/md5-cache/acct-group/opendmarc-1-r1
new file mode 100644
index 000000000000..4b276f2f9828
--- /dev/null
+++ b/metadata/md5-cache/acct-group/opendmarc-1-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-filter/opendmarc
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3cc9db573b3d62e3bc670098a9f5489a
diff --git a/metadata/md5-cache/acct-group/opendnssec-0 b/metadata/md5-cache/acct-group/opendnssec-0
deleted file mode 100644
index f27ef5fc8e5a..000000000000
--- a/metadata/md5-cache/acct-group/opendnssec-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-dns/opendnssec
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=abc693e4c90009a43cb59b2149e9ea9c
diff --git a/metadata/md5-cache/acct-group/opendnssec-0-r1 b/metadata/md5-cache/acct-group/opendnssec-0-r1
new file mode 100644
index 000000000000..6ea526a409eb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/opendnssec-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-dns/opendnssec
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7eab05c2b0bc1c6adb3a1b4a7e19a5d2
diff --git a/metadata/md5-cache/acct-group/openntpd-0-r1 b/metadata/md5-cache/acct-group/openntpd-0-r1
deleted file mode 100644
index ede2830ed09c..000000000000
--- a/metadata/md5-cache/acct-group/openntpd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: openntpd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3422620740b2551aa2e8fd086b0af290
diff --git a/metadata/md5-cache/acct-group/openntpd-0-r2 b/metadata/md5-cache/acct-group/openntpd-0-r2
new file mode 100644
index 000000000000..6061101a549b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openntpd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: openntpd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cf20d2c689603c7b0189a6651674a2c2
diff --git a/metadata/md5-cache/acct-group/openrct2-0-r1 b/metadata/md5-cache/acct-group/openrct2-0-r1
deleted file mode 100644
index 817c22ca6abd..000000000000
--- a/metadata/md5-cache/acct-group/openrct2-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the OpenRCT2 dedicated server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4a35352505c94280edbef8b207dc7cfc
diff --git a/metadata/md5-cache/acct-group/openrct2-0-r2 b/metadata/md5-cache/acct-group/openrct2-0-r2
new file mode 100644
index 000000000000..cb47f5ac8b8e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openrct2-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the OpenRCT2 dedicated server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f3e5ba476736daffbb479fa7459954ad
diff --git a/metadata/md5-cache/acct-group/openttd-0 b/metadata/md5-cache/acct-group/openttd-0
deleted file mode 100644
index a177702d41d7..000000000000
--- a/metadata/md5-cache/acct-group/openttd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for games-simulation/openttd
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=37dc4232a20c5ae0a589793fbfeceff8
diff --git a/metadata/md5-cache/acct-group/openttd-0-r1 b/metadata/md5-cache/acct-group/openttd-0-r1
new file mode 100644
index 000000000000..912821d48d6a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openttd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for games-simulation/openttd
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fd05e97250a992045f2e53b5bf309fae
diff --git a/metadata/md5-cache/acct-group/openvpn-0-r1 b/metadata/md5-cache/acct-group/openvpn-0-r1
deleted file mode 100644
index b24a726945fc..000000000000
--- a/metadata/md5-cache/acct-group/openvpn-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: openvpn
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=54a060154a0e6cf7e576e88dd46e80c3
diff --git a/metadata/md5-cache/acct-group/openvpn-0-r2 b/metadata/md5-cache/acct-group/openvpn-0-r2
new file mode 100644
index 000000000000..25a281f71441
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openvpn-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: openvpn
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ed408f6a9be8f88c0651e455139a0ccf
diff --git a/metadata/md5-cache/acct-group/openvpn_exporter-0-r1 b/metadata/md5-cache/acct-group/openvpn_exporter-0-r1
deleted file mode 100644
index 65853f490a9f..000000000000
--- a/metadata/md5-cache/acct-group/openvpn_exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: openvpn_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4a70c13a5cc33521b2697017678f5f30
diff --git a/metadata/md5-cache/acct-group/openvpn_exporter-0-r2 b/metadata/md5-cache/acct-group/openvpn_exporter-0-r2
new file mode 100644
index 000000000000..d27975d685ba
--- /dev/null
+++ b/metadata/md5-cache/acct-group/openvpn_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: openvpn_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ef5651c132f43c851a857e6e1dde8bee
diff --git a/metadata/md5-cache/acct-group/opm-0 b/metadata/md5-cache/acct-group/opm-0
deleted file mode 100644
index 9bc61e6aade1..000000000000
--- a/metadata/md5-cache/acct-group/opm-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for an open proxy monitor
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=864adf9233b933bb62c0bbd0b04558cd
diff --git a/metadata/md5-cache/acct-group/opm-0-r1 b/metadata/md5-cache/acct-group/opm-0-r1
new file mode 100644
index 000000000000..1815989cb407
--- /dev/null
+++ b/metadata/md5-cache/acct-group/opm-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for an open proxy monitor
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0964cef9b3d6de4bd3ee86e2c791d9d2
diff --git a/metadata/md5-cache/acct-group/oprofile-0-r1 b/metadata/md5-cache/acct-group/oprofile-0-r1
deleted file mode 100644
index 6767f002985a..000000000000
--- a/metadata/md5-cache/acct-group/oprofile-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for dev-util/oprofile JIT code processing
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=463da443d4bc817924c9c3695a11ad95
diff --git a/metadata/md5-cache/acct-group/oprofile-0-r2 b/metadata/md5-cache/acct-group/oprofile-0-r2
new file mode 100644
index 000000000000..2ac2d8168fe2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/oprofile-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-util/oprofile JIT code processing
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ae7f058f404cb82d4e9db4f7a20bf330
diff --git a/metadata/md5-cache/acct-group/oragono-0 b/metadata/md5-cache/acct-group/oragono-0
deleted file mode 100644
index 4f890e886d37..000000000000
--- a/metadata/md5-cache/acct-group/oragono-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the Oragono IRC server
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=00a80ddc7917241e83dbf31efbf74f4e
diff --git a/metadata/md5-cache/acct-group/oragono-0-r1 b/metadata/md5-cache/acct-group/oragono-0-r1
new file mode 100644
index 000000000000..92d634c9edb2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/oragono-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the Oragono IRC server
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=adac30975677e899d765223640441c94
diff --git a/metadata/md5-cache/acct-group/ossec-0-r1 b/metadata/md5-cache/acct-group/ossec-0-r1
deleted file mode 100644
index 628e2d2010e3..000000000000
--- a/metadata/md5-cache/acct-group/ossec-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-analyzer/ossec-hids
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b3f929f8c4212f258598b9ea21a0a5b3
diff --git a/metadata/md5-cache/acct-group/ossec-0-r2 b/metadata/md5-cache/acct-group/ossec-0-r2
new file mode 100644
index 000000000000..338fa3c22e3e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ossec-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-analyzer/ossec-hids
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a79e34dd2cc7a8d313ed96b9298b388e
diff --git a/metadata/md5-cache/acct-group/owntracks-0 b/metadata/md5-cache/acct-group/owntracks-0
deleted file mode 100644
index 1693ef53e858..000000000000
--- a/metadata/md5-cache/acct-group/owntracks-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for sci-geosciences/owntracks-recorder
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5ce9801a9d85a87eabc13bf930daf643
diff --git a/metadata/md5-cache/acct-group/owntracks-0-r1 b/metadata/md5-cache/acct-group/owntracks-0-r1
new file mode 100644
index 000000000000..6fe59cf33541
--- /dev/null
+++ b/metadata/md5-cache/acct-group/owntracks-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sci-geosciences/owntracks-recorder
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d60a962d753421a4f908ee2135fd5349
diff --git a/metadata/md5-cache/acct-group/p2p-0 b/metadata/md5-cache/acct-group/p2p-0
deleted file mode 100644
index 13d4688cda56..000000000000
--- a/metadata/md5-cache/acct-group/p2p-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for mldonkey
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0919eacea3b9a36ed7503f44b1eb889e
diff --git a/metadata/md5-cache/acct-group/p2p-0-r1 b/metadata/md5-cache/acct-group/p2p-0-r1
new file mode 100644
index 000000000000..a7eaf1d14266
--- /dev/null
+++ b/metadata/md5-cache/acct-group/p2p-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mldonkey
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c0c68cc0ddd1d55fdace887cc429cefc
diff --git a/metadata/md5-cache/acct-group/partimag-0-r1 b/metadata/md5-cache/acct-group/partimag-0-r1
deleted file mode 100644
index 9a22d17294f3..000000000000
--- a/metadata/md5-cache/acct-group/partimag-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-block/partimage
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ba00c180432799cd15b405d6d8431480
diff --git a/metadata/md5-cache/acct-group/partimag-0-r2 b/metadata/md5-cache/acct-group/partimag-0-r2
new file mode 100644
index 000000000000..5110eef51544
--- /dev/null
+++ b/metadata/md5-cache/acct-group/partimag-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-block/partimage
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5f146c8c25eced6d3f9f7eaf72796bd9
diff --git a/metadata/md5-cache/acct-group/pcap-0 b/metadata/md5-cache/acct-group/pcap-0
deleted file mode 100644
index f7d388c38b19..000000000000
--- a/metadata/md5-cache/acct-group/pcap-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for capturing network traffic
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b54edec284614c6f7c5c470e6cefec75
diff --git a/metadata/md5-cache/acct-group/pcap-0-r1 b/metadata/md5-cache/acct-group/pcap-0-r1
new file mode 100644
index 000000000000..1cb3f62a95fb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pcap-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for capturing network traffic
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e875aa37b096f850254b82abb693b173
diff --git a/metadata/md5-cache/acct-group/pcscd-0-r1 b/metadata/md5-cache/acct-group/pcscd-0-r1
deleted file mode 100644
index 637fbd342a66..000000000000
--- a/metadata/md5-cache/acct-group/pcscd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: pcscd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=aec8bc8ba57390489ba4fe0a4d3311bc
diff --git a/metadata/md5-cache/acct-group/pcscd-0-r2 b/metadata/md5-cache/acct-group/pcscd-0-r2
new file mode 100644
index 000000000000..f29a3578f2be
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pcscd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pcscd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=268efe9e54d63a61c08df9a0349e1365
diff --git a/metadata/md5-cache/acct-group/pdns-0-r1 b/metadata/md5-cache/acct-group/pdns-0-r1
deleted file mode 100644
index ee9fed39e115..000000000000
--- a/metadata/md5-cache/acct-group/pdns-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: pdns
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=aa85c76ad14795d0cff4f9323c08adb8
diff --git a/metadata/md5-cache/acct-group/pdns-0-r2 b/metadata/md5-cache/acct-group/pdns-0-r2
new file mode 100644
index 000000000000..5c6f37b53c93
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pdns-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pdns
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3d1cb5088b614846d6f54ef5d1ee659b
diff --git a/metadata/md5-cache/acct-group/pdnsd-0-r1 b/metadata/md5-cache/acct-group/pdnsd-0-r1
deleted file mode 100644
index 74c5a63f5301..000000000000
--- a/metadata/md5-cache/acct-group/pdnsd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: pdnsd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=03cb63a021c4717898cc98235ea25a16
diff --git a/metadata/md5-cache/acct-group/pdnsd-0-r2 b/metadata/md5-cache/acct-group/pdnsd-0-r2
new file mode 100644
index 000000000000..ea4defdab120
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pdnsd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pdnsd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=04f113527860abd77cb7c7e72b45818f
diff --git a/metadata/md5-cache/acct-group/pgagent-0 b/metadata/md5-cache/acct-group/pgagent-0
deleted file mode 100644
index 6b65423f2c92..000000000000
--- a/metadata/md5-cache/acct-group/pgagent-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for dev-db/pgagent
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b724096dd1af210d584316579db9a1c3
diff --git a/metadata/md5-cache/acct-group/pgagent-0-r1 b/metadata/md5-cache/acct-group/pgagent-0-r1
new file mode 100644
index 000000000000..dc65a44b4293
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pgagent-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for dev-db/pgagent
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a2425b9b22898f9f41e0f1f75fe926d9
diff --git a/metadata/md5-cache/acct-group/pipewire-0 b/metadata/md5-cache/acct-group/pipewire-0
deleted file mode 100644
index b80a5a3b3e35..000000000000
--- a/metadata/md5-cache/acct-group/pipewire-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: pipewire
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=19d544345876a95c03608275f9f27182
diff --git a/metadata/md5-cache/acct-group/pipewire-0-r1 b/metadata/md5-cache/acct-group/pipewire-0-r1
new file mode 100644
index 000000000000..dc4038813e2b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pipewire-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pipewire
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=58fb6fa93d93f6a7799e1a94f9480ec2
diff --git a/metadata/md5-cache/acct-group/pkcs11-0 b/metadata/md5-cache/acct-group/pkcs11-0
deleted file mode 100644
index 4785552a0215..000000000000
--- a/metadata/md5-cache/acct-group/pkcs11-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for dev-libs/opencryptoki
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4f60387e00c9fb0d6a92b45c2aeabc47
diff --git a/metadata/md5-cache/acct-group/pkcs11-0-r1 b/metadata/md5-cache/acct-group/pkcs11-0-r1
new file mode 100644
index 000000000000..bab45dfb33dd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pkcs11-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for dev-libs/opencryptoki
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dd4c49c4eb3d7dc1991e813343fe1395
diff --git a/metadata/md5-cache/acct-group/placement-0-r1 b/metadata/md5-cache/acct-group/placement-0-r1
deleted file mode 100644
index e2ad42623713..000000000000
--- a/metadata/md5-cache/acct-group/placement-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: placement
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7d315bb1371677e9fe580d9209b28041
diff --git a/metadata/md5-cache/acct-group/placement-0-r2 b/metadata/md5-cache/acct-group/placement-0-r2
new file mode 100644
index 000000000000..508e48f30af7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/placement-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: placement
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aea1e3714d341435fd1a4ef7f3ed1032
diff --git a/metadata/md5-cache/acct-group/plex-0-r1 b/metadata/md5-cache/acct-group/plex-0-r1
deleted file mode 100644
index 95d8c3cd9263..000000000000
--- a/metadata/md5-cache/acct-group/plex-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Plex Media Server group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0130489d81423e43cb2855ffc52ffa31
diff --git a/metadata/md5-cache/acct-group/plex-0-r2 b/metadata/md5-cache/acct-group/plex-0-r2
new file mode 100644
index 000000000000..ba3f891d17d2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/plex-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Plex Media Server group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=149f1094f942b769bf9a24bf9934f5c5
diff --git a/metadata/md5-cache/acct-group/plugdev-0-r1 b/metadata/md5-cache/acct-group/plugdev-0-r1
deleted file mode 100644
index 350f932fb89e..000000000000
--- a/metadata/md5-cache/acct-group/plugdev-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group controlling access to removable media
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b33c32ef98fcea71cbc08197e1009825
diff --git a/metadata/md5-cache/acct-group/plugdev-0-r2 b/metadata/md5-cache/acct-group/plugdev-0-r2
new file mode 100644
index 000000000000..2dcfefd7fbbb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/plugdev-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group controlling access to removable media
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2422b900635f57974917b5b57c94ee6f
diff --git a/metadata/md5-cache/acct-group/polkitd-0-r1 b/metadata/md5-cache/acct-group/polkitd-0-r1
deleted file mode 100644
index b9108b211160..000000000000
--- a/metadata/md5-cache/acct-group/polkitd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: polkitd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ed82d36920fd2f69d8ce17a32001e4eb
diff --git a/metadata/md5-cache/acct-group/polkitd-0-r2 b/metadata/md5-cache/acct-group/polkitd-0-r2
new file mode 100644
index 000000000000..f98ebdaaed9d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/polkitd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: polkitd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=091e9ff0be3d821fc6dce8ab531a1690
diff --git a/metadata/md5-cache/acct-group/polw-0 b/metadata/md5-cache/acct-group/polw-0
deleted file mode 100644
index 9a5327bb646a..000000000000
--- a/metadata/md5-cache/acct-group/polw-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for mail-filter/policyd-weight
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a9ae25a422f669676df8719deed9df84
diff --git a/metadata/md5-cache/acct-group/polw-0-r1 b/metadata/md5-cache/acct-group/polw-0-r1
new file mode 100644
index 000000000000..3c4a2aaee937
--- /dev/null
+++ b/metadata/md5-cache/acct-group/polw-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-filter/policyd-weight
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=552c094fb2f4dd9efc1bff2ba3521202
diff --git a/metadata/md5-cache/acct-group/popa3d-0 b/metadata/md5-cache/acct-group/popa3d-0
deleted file mode 100644
index 2e8729bd2a98..000000000000
--- a/metadata/md5-cache/acct-group/popa3d-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-mail/popa3d
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2bb067bc1e17d22bdb6e94d4c2c04b30
diff --git a/metadata/md5-cache/acct-group/popa3d-0-r1 b/metadata/md5-cache/acct-group/popa3d-0-r1
new file mode 100644
index 000000000000..e989d625f04a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/popa3d-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-mail/popa3d
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d41dcb997c065209c818da90638b3dd7
diff --git a/metadata/md5-cache/acct-group/portage-0 b/metadata/md5-cache/acct-group/portage-0
deleted file mode 100644
index 370aa169410d..000000000000
--- a/metadata/md5-cache/acct-group/portage-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: portage
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f0dd18569703abd68c5a3b7affe9ac7a
diff --git a/metadata/md5-cache/acct-group/portage-0-r1 b/metadata/md5-cache/acct-group/portage-0-r1
new file mode 100644
index 000000000000..99c814d63300
--- /dev/null
+++ b/metadata/md5-cache/acct-group/portage-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: portage
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c7158877d8eb809b3d7d7928a90be203
diff --git a/metadata/md5-cache/acct-group/postdrop-0-r1 b/metadata/md5-cache/acct-group/postdrop-0-r1
deleted file mode 100644
index 68449e63b92d..000000000000
--- a/metadata/md5-cache/acct-group/postdrop-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: postdrop
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0702ccb78ceb5a0de83f8036d23a5b20
diff --git a/metadata/md5-cache/acct-group/postdrop-0-r2 b/metadata/md5-cache/acct-group/postdrop-0-r2
new file mode 100644
index 000000000000..67d7aeb254e4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postdrop-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: postdrop
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fedc38c276e8ef7d518a594bb9d64c80
diff --git a/metadata/md5-cache/acct-group/postfix-0-r1 b/metadata/md5-cache/acct-group/postfix-0-r1
deleted file mode 100644
index 366a04df4ce3..000000000000
--- a/metadata/md5-cache/acct-group/postfix-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: postfix
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ebf102804845c73267bc6e97840448e0
diff --git a/metadata/md5-cache/acct-group/postfix-0-r2 b/metadata/md5-cache/acct-group/postfix-0-r2
new file mode 100644
index 000000000000..1a2a2bc284aa
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postfix-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: postfix
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=40c7af7a7b14d63ec2ea628078d02b0a
diff --git a/metadata/md5-cache/acct-group/postfix_exporter-0-r1 b/metadata/md5-cache/acct-group/postfix_exporter-0-r1
deleted file mode 100644
index 858e76ca055c..000000000000
--- a/metadata/md5-cache/acct-group/postfix_exporter-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: postfix_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b4bbd58d9302d79fadfe9c9b11fe92f8
diff --git a/metadata/md5-cache/acct-group/postfix_exporter-0-r2 b/metadata/md5-cache/acct-group/postfix_exporter-0-r2
new file mode 100644
index 000000000000..d38ee0805fbd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postfix_exporter-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: postfix_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fcc623b62f1cc66600418a2ab2fc50fb
diff --git a/metadata/md5-cache/acct-group/postfwd-0 b/metadata/md5-cache/acct-group/postfwd-0
deleted file mode 100644
index d5372129bfa7..000000000000
--- a/metadata/md5-cache/acct-group/postfwd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for mail-filter/postfwd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8ef944f4ec3fbe2445aa00af01fac571
diff --git a/metadata/md5-cache/acct-group/postfwd-0-r1 b/metadata/md5-cache/acct-group/postfwd-0-r1
new file mode 100644
index 000000000000..eb9d37fd4306
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postfwd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for mail-filter/postfwd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f6144e811b948dff80d7279e10458199
diff --git a/metadata/md5-cache/acct-group/postgres-0-r1 b/metadata/md5-cache/acct-group/postgres-0-r1
deleted file mode 100644
index d5ca0ef2a04f..000000000000
--- a/metadata/md5-cache/acct-group/postgres-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=PostgreSQL program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=81a6b6fba54b4c4b46c069a31b8db6a8
diff --git a/metadata/md5-cache/acct-group/postgres-0-r2 b/metadata/md5-cache/acct-group/postgres-0-r2
new file mode 100644
index 000000000000..20a7b5546728
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postgres-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=PostgreSQL program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0ab5bc686d459370919c0e7f001db910
diff --git a/metadata/md5-cache/acct-group/postgres_exporter-0 b/metadata/md5-cache/acct-group/postgres_exporter-0
deleted file mode 100644
index 94afe8621a9e..000000000000
--- a/metadata/md5-cache/acct-group/postgres_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: postgres_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d2fe698b80fec11241c2e3b706ea422a
diff --git a/metadata/md5-cache/acct-group/postgres_exporter-0-r1 b/metadata/md5-cache/acct-group/postgres_exporter-0-r1
new file mode 100644
index 000000000000..2fddc0dbbd4b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postgres_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: postgres_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2aff720206d6d3a52ad44d8b19c79c83
diff --git a/metadata/md5-cache/acct-group/postgrey-0 b/metadata/md5-cache/acct-group/postgrey-0
deleted file mode 100644
index a4e6713b7705..000000000000
--- a/metadata/md5-cache/acct-group/postgrey-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the postgrey mail daemon
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b699e52ccda94fcc09679f8fcd403a6a
diff --git a/metadata/md5-cache/acct-group/postgrey-0-r1 b/metadata/md5-cache/acct-group/postgrey-0-r1
new file mode 100644
index 000000000000..6eef907951ce
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postgrey-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the postgrey mail daemon
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=91cf37647266c0134715b87330c4c42b
diff --git a/metadata/md5-cache/acct-group/privoxy-0-r1 b/metadata/md5-cache/acct-group/privoxy-0-r1
deleted file mode 100644
index 693eaa7b559a..000000000000
--- a/metadata/md5-cache/acct-group/privoxy-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A privoxy: privacy oriented web proxy group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=56b3af069769af8c2d24127d8f30a43b
diff --git a/metadata/md5-cache/acct-group/privoxy-0-r2 b/metadata/md5-cache/acct-group/privoxy-0-r2
new file mode 100644
index 000000000000..0d7fdc0875a9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/privoxy-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A privoxy: privacy oriented web proxy group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5c783e9c277356e9f31fbf3bc0ba9357
diff --git a/metadata/md5-cache/acct-group/prometheus-0-r1 b/metadata/md5-cache/acct-group/prometheus-0-r1
deleted file mode 100644
index 1b2b55ff0456..000000000000
--- a/metadata/md5-cache/acct-group/prometheus-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: prometheus
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=aac72e817961e6fc2302327e78f702ea
diff --git a/metadata/md5-cache/acct-group/prometheus-0-r2 b/metadata/md5-cache/acct-group/prometheus-0-r2
new file mode 100644
index 000000000000..d5c53aaa0717
--- /dev/null
+++ b/metadata/md5-cache/acct-group/prometheus-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: prometheus
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6a62eb42c3cbac7b19c97c2cfe151ecd
diff --git a/metadata/md5-cache/acct-group/prosody-0 b/metadata/md5-cache/acct-group/prosody-0
deleted file mode 100644
index 895988c1cca6..000000000000
--- a/metadata/md5-cache/acct-group/prosody-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-im/prosody
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ac4d64f0a638d16563bdedbd96a90514
diff --git a/metadata/md5-cache/acct-group/prosody-0-r1 b/metadata/md5-cache/acct-group/prosody-0-r1
new file mode 100644
index 000000000000..ca63bae6736d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/prosody-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-im/prosody
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ada3eb1b51c6448ef75f7a716325b446
diff --git a/metadata/md5-cache/acct-group/prowlarr-0 b/metadata/md5-cache/acct-group/prowlarr-0
deleted file mode 100644
index 79967e04f062..000000000000
--- a/metadata/md5-cache/acct-group/prowlarr-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: prowlarr
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8904cfa90fda7895bf601f12c9246b71
diff --git a/metadata/md5-cache/acct-group/prowlarr-0-r1 b/metadata/md5-cache/acct-group/prowlarr-0-r1
new file mode 100644
index 000000000000..aa7eba77aa51
--- /dev/null
+++ b/metadata/md5-cache/acct-group/prowlarr-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: prowlarr
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c9721eb9829190ac94aa1158789a5e89
diff --git a/metadata/md5-cache/acct-group/psybnc-0 b/metadata/md5-cache/acct-group/psybnc-0
deleted file mode 100644
index bc75ef587f8d..000000000000
--- a/metadata/md5-cache/acct-group/psybnc-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-irc/psybnc
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=be54e5a441999e9372694b13fbc461ab
diff --git a/metadata/md5-cache/acct-group/psybnc-0-r1 b/metadata/md5-cache/acct-group/psybnc-0-r1
new file mode 100644
index 000000000000..367c47fc14c9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/psybnc-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-irc/psybnc
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=29744ad04b7f6a945930cbdb1e104abc
diff --git a/metadata/md5-cache/acct-group/pulse-0 b/metadata/md5-cache/acct-group/pulse-0
deleted file mode 100644
index 2aa2364f2965..000000000000
--- a/metadata/md5-cache/acct-group/pulse-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: pulse
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=735ba12559ca2d439df3e93e8ad9facf
diff --git a/metadata/md5-cache/acct-group/pulse-0-r1 b/metadata/md5-cache/acct-group/pulse-0-r1
new file mode 100644
index 000000000000..2f8be483400b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pulse-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pulse
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d2179f77cec9f06454577069525adf3a
diff --git a/metadata/md5-cache/acct-group/pulse-access-0 b/metadata/md5-cache/acct-group/pulse-access-0
deleted file mode 100644
index e91e0ed49212..000000000000
--- a/metadata/md5-cache/acct-group/pulse-access-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: pulse-access
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7d0c2c3018cf74e8d1894fd027b91a92
diff --git a/metadata/md5-cache/acct-group/pulse-access-0-r1 b/metadata/md5-cache/acct-group/pulse-access-0-r1
new file mode 100644
index 000000000000..f2e9e195d6a6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pulse-access-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: pulse-access
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8aa083074e861ce726074c6cc0517d2c
diff --git a/metadata/md5-cache/acct-group/puppet-0-r1 b/metadata/md5-cache/acct-group/puppet-0-r1
deleted file mode 100644
index 37f376068996..000000000000
--- a/metadata/md5-cache/acct-group/puppet-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: puppet
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0872090f0c9fe91d8e3e004a82ed51b3
diff --git a/metadata/md5-cache/acct-group/puppet-0-r2 b/metadata/md5-cache/acct-group/puppet-0-r2
new file mode 100644
index 000000000000..aa7eb724343a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/puppet-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: puppet
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ead5ec406940589522974749d4f4c853
diff --git a/metadata/md5-cache/acct-group/puppetdb-0-r1 b/metadata/md5-cache/acct-group/puppetdb-0-r1
deleted file mode 100644
index e7bde0acf9b6..000000000000
--- a/metadata/md5-cache/acct-group/puppetdb-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: puppetdb
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d2fb66e62cdd56f9910aa7b41df5ce0a
diff --git a/metadata/md5-cache/acct-group/puppetdb-0-r2 b/metadata/md5-cache/acct-group/puppetdb-0-r2
new file mode 100644
index 000000000000..ca31546a03da
--- /dev/null
+++ b/metadata/md5-cache/acct-group/puppetdb-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: puppetdb
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=518b25f89fe602c374e5638ca311ab92
diff --git a/metadata/md5-cache/acct-group/pushgateway-0 b/metadata/md5-cache/acct-group/pushgateway-0
deleted file mode 100644
index 76666146012b..000000000000
--- a/metadata/md5-cache/acct-group/pushgateway-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-metrics/pushgateway
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=973610429b1d0fb6c58b43deca928160
diff --git a/metadata/md5-cache/acct-group/pushgateway-0-r1 b/metadata/md5-cache/acct-group/pushgateway-0-r1
new file mode 100644
index 000000000000..180218f6c259
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pushgateway-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/pushgateway
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=239eb0a139d76db8fceeaee9dbdc03d4
diff --git a/metadata/md5-cache/acct-group/pvpgn-0 b/metadata/md5-cache/acct-group/pvpgn-0
deleted file mode 100644
index ed6ddb722b5f..000000000000
--- a/metadata/md5-cache/acct-group/pvpgn-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for pvpgn (gaming server for Battle.Net compatible clients)
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=95d8a6cc6ed44341522209db19b5c694
diff --git a/metadata/md5-cache/acct-group/pvpgn-0-r1 b/metadata/md5-cache/acct-group/pvpgn-0-r1
new file mode 100644
index 000000000000..f0ed1a80359f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/pvpgn-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for pvpgn (gaming server for Battle.Net compatible clients)
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=38c9381d05e6c8d5c1ba57928f4f7bf2
diff --git a/metadata/md5-cache/acct-group/qemu-0-r1 b/metadata/md5-cache/acct-group/qemu-0-r1
deleted file mode 100644
index 45caa15f8dc9..000000000000
--- a/metadata/md5-cache/acct-group/qemu-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: qemu
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=60c5dfe4397aabfe49409784f51bc2a8
diff --git a/metadata/md5-cache/acct-group/qemu-0-r2 b/metadata/md5-cache/acct-group/qemu-0-r2
new file mode 100644
index 000000000000..9e8a6cafa4b5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/qemu-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: qemu
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6302dff7b32fe9344230fdf702afe2f5
diff --git a/metadata/md5-cache/acct-group/qmail-0-r1 b/metadata/md5-cache/acct-group/qmail-0-r1
deleted file mode 100644
index a3bcc7929869..000000000000
--- a/metadata/md5-cache/acct-group/qmail-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: qmail
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=213852652a6174690fab12f921163758
diff --git a/metadata/md5-cache/acct-group/qmail-0-r2 b/metadata/md5-cache/acct-group/qmail-0-r2
new file mode 100644
index 000000000000..0a35c8e4ed9b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/qmail-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: qmail
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1b10e92f1728ce595d76e6e53d090cc0
diff --git a/metadata/md5-cache/acct-group/quagga-0-r1 b/metadata/md5-cache/acct-group/quagga-0-r1
deleted file mode 100644
index fcdff47a5454..000000000000
--- a/metadata/md5-cache/acct-group/quagga-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: quagga
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=79b08023b1940af48cb906f3700a391f
diff --git a/metadata/md5-cache/acct-group/quagga-0-r2 b/metadata/md5-cache/acct-group/quagga-0-r2
new file mode 100644
index 000000000000..136e5daabe31
--- /dev/null
+++ b/metadata/md5-cache/acct-group/quagga-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: quagga
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d102289cbff9f0a24bda50e1d96ca532
diff --git a/metadata/md5-cache/acct-group/quassel-0-r1 b/metadata/md5-cache/acct-group/quassel-0-r1
deleted file mode 100644
index e3349489c386..000000000000
--- a/metadata/md5-cache/acct-group/quassel-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: quassel
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a8770cd4c83dde286408710a5d55115c
diff --git a/metadata/md5-cache/acct-group/quassel-0-r2 b/metadata/md5-cache/acct-group/quassel-0-r2
new file mode 100644
index 000000000000..0d6499ce6871
--- /dev/null
+++ b/metadata/md5-cache/acct-group/quassel-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: quassel
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f39d3d9e8e4acdc4c9f01446d01658ab
diff --git a/metadata/md5-cache/acct-group/rabbitmq-0 b/metadata/md5-cache/acct-group/rabbitmq-0
deleted file mode 100644
index f23db9b8cf34..000000000000
--- a/metadata/md5-cache/acct-group/rabbitmq-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-misc/rabbitmq-server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ab4b417278e62a735f425076f9415f59
diff --git a/metadata/md5-cache/acct-group/rabbitmq-0-r1 b/metadata/md5-cache/acct-group/rabbitmq-0-r1
new file mode 100644
index 000000000000..e15aee885bcd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rabbitmq-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/rabbitmq-server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=84dd21650b472129de7f9ec1549b1d71
diff --git a/metadata/md5-cache/acct-group/rabbitmq_exporter-0 b/metadata/md5-cache/acct-group/rabbitmq_exporter-0
deleted file mode 100644
index a15847ecd8af..000000000000
--- a/metadata/md5-cache/acct-group/rabbitmq_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-metrics/rabbitmq_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ed80fb06b0243b2988e1ab851e9827d0
diff --git a/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r1 b/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r1
new file mode 100644
index 000000000000..765508df7b70
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rabbitmq_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/rabbitmq_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6867bee76de2a603a349d71dfb8f5782
diff --git a/metadata/md5-cache/acct-group/radarr-0 b/metadata/md5-cache/acct-group/radarr-0
deleted file mode 100644
index b2d7b59ef7e0..000000000000
--- a/metadata/md5-cache/acct-group/radarr-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: radarr
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=eff3ee3306538663ddb941a1ade1e7bf
diff --git a/metadata/md5-cache/acct-group/radarr-0-r1 b/metadata/md5-cache/acct-group/radarr-0-r1
new file mode 100644
index 000000000000..156ca6489c8e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/radarr-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: radarr
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aefda9651b8e5a8b4bd8f335adbd8bf4
diff --git a/metadata/md5-cache/acct-group/radicale-0-r1 b/metadata/md5-cache/acct-group/radicale-0-r1
deleted file mode 100644
index 68be3f39e5f5..000000000000
--- a/metadata/md5-cache/acct-group/radicale-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the www-apps/radicale
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=624bff0245761984fe21261a6a767c4c
diff --git a/metadata/md5-cache/acct-group/radicale-0-r2 b/metadata/md5-cache/acct-group/radicale-0-r2
new file mode 100644
index 000000000000..7e185cbdb750
--- /dev/null
+++ b/metadata/md5-cache/acct-group/radicale-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the www-apps/radicale
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f71fbf94f4294d9f7a70d625c219a68d
diff --git a/metadata/md5-cache/acct-group/radius-0-r1 b/metadata/md5-cache/acct-group/radius-0-r1
deleted file mode 100644
index 7390e96a47db..000000000000
--- a/metadata/md5-cache/acct-group/radius-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=FreeRadius program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=271f5d01176fd1e959f49c94b24a47e6
diff --git a/metadata/md5-cache/acct-group/radius-0-r2 b/metadata/md5-cache/acct-group/radius-0-r2
new file mode 100644
index 000000000000..b84987685177
--- /dev/null
+++ b/metadata/md5-cache/acct-group/radius-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=FreeRadius program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5916211723b68dc1d63cfc64c21a4d1f
diff --git a/metadata/md5-cache/acct-group/radvd-0 b/metadata/md5-cache/acct-group/radvd-0
deleted file mode 100644
index 2740a7ffc760..000000000000
--- a/metadata/md5-cache/acct-group/radvd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the Router Advertisement Daemon
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cc8204607b8e02e7a1fcd778a5091b0f
diff --git a/metadata/md5-cache/acct-group/radvd-0-r1 b/metadata/md5-cache/acct-group/radvd-0-r1
new file mode 100644
index 000000000000..7fb211c68b58
--- /dev/null
+++ b/metadata/md5-cache/acct-group/radvd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Router Advertisement Daemon
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=10bd3ea9505d3fb75459175fd2b4f64c
diff --git a/metadata/md5-cache/acct-group/rbldns-0-r1 b/metadata/md5-cache/acct-group/rbldns-0-r1
deleted file mode 100644
index af093fb746f7..000000000000
--- a/metadata/md5-cache/acct-group/rbldns-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: rbldns
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=843fc7f34c310dfc674db22032ed027a
diff --git a/metadata/md5-cache/acct-group/rbldns-0-r2 b/metadata/md5-cache/acct-group/rbldns-0-r2
new file mode 100644
index 000000000000..23a485bfa28f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rbldns-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: rbldns
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1a78b15ec83535837ddb91bcc2c8cdc6
diff --git a/metadata/md5-cache/acct-group/rbot-0 b/metadata/md5-cache/acct-group/rbot-0
deleted file mode 100644
index 31c67a6d630d..000000000000
--- a/metadata/md5-cache/acct-group/rbot-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-irc/rbot
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6f094ee834ca494e4b37de9f3ef04c2d
diff --git a/metadata/md5-cache/acct-group/rbot-0-r1 b/metadata/md5-cache/acct-group/rbot-0-r1
new file mode 100644
index 000000000000..2090c3b34006
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rbot-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-irc/rbot
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=538a1eb6911db561430c21ee0391d817
diff --git a/metadata/md5-cache/acct-group/readarr-0 b/metadata/md5-cache/acct-group/readarr-0
deleted file mode 100644
index 7794d9cb4b76..000000000000
--- a/metadata/md5-cache/acct-group/readarr-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: readarr
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8ba46f75f35ad678a9b3b972b9ad009a
diff --git a/metadata/md5-cache/acct-group/readarr-0-r1 b/metadata/md5-cache/acct-group/readarr-0-r1
new file mode 100644
index 000000000000..b26fffafbc49
--- /dev/null
+++ b/metadata/md5-cache/acct-group/readarr-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: readarr
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e72859d550715be70986d6599660c3f9
diff --git a/metadata/md5-cache/acct-group/realtime-0 b/metadata/md5-cache/acct-group/realtime-0
deleted file mode 100644
index bb147925b926..000000000000
--- a/metadata/md5-cache/acct-group/realtime-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=realtime privileges group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1c9d4d12ef8b62c4f7e6fdef42c9921a
diff --git a/metadata/md5-cache/acct-group/realtime-0-r1 b/metadata/md5-cache/acct-group/realtime-0-r1
new file mode 100644
index 000000000000..e9e9d8207888
--- /dev/null
+++ b/metadata/md5-cache/acct-group/realtime-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=realtime privileges group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ffea3d60df57d6157c6e251cac0a0a0b
diff --git a/metadata/md5-cache/acct-group/redis-0-r1 b/metadata/md5-cache/acct-group/redis-0-r1
deleted file mode 100644
index d8607d6278d4..000000000000
--- a/metadata/md5-cache/acct-group/redis-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Redis program group
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=71916ed717a3099620283f9bb17e6fe5
diff --git a/metadata/md5-cache/acct-group/redis-0-r2 b/metadata/md5-cache/acct-group/redis-0-r2
new file mode 100644
index 000000000000..b29a4f047414
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redis-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Redis program group
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fc7dd12fc9fdb47105825dcb13561da5
diff --git a/metadata/md5-cache/acct-group/redis_exporter-0 b/metadata/md5-cache/acct-group/redis_exporter-0
deleted file mode 100644
index a636a9bc4b56..000000000000
--- a/metadata/md5-cache/acct-group/redis_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: redis_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f3134bb1f0edf68a49604bdc83f3ac28
diff --git a/metadata/md5-cache/acct-group/redis_exporter-0-r1 b/metadata/md5-cache/acct-group/redis_exporter-0-r1
new file mode 100644
index 000000000000..3e74c23007b6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redis_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: redis_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=51fca16e7d911ee2fb5147d30786837c
diff --git a/metadata/md5-cache/acct-group/redmine-0-r1 b/metadata/md5-cache/acct-group/redmine-0-r1
deleted file mode 100644
index 7e594a025c29..000000000000
--- a/metadata/md5-cache/acct-group/redmine-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: redmine
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fe7181402dd5f6a08b555113b6db4b6d
diff --git a/metadata/md5-cache/acct-group/redmine-0-r2 b/metadata/md5-cache/acct-group/redmine-0-r2
new file mode 100644
index 000000000000..76370a947106
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redmine-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: redmine
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a555a3487fbc5e7922c75d419bc8ecbc
diff --git a/metadata/md5-cache/acct-group/redsocks-0-r1 b/metadata/md5-cache/acct-group/redsocks-0-r1
deleted file mode 100644
index 1ce08611be59..000000000000
--- a/metadata/md5-cache/acct-group/redsocks-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-proxy/redsocks
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2c7476d51a14d3aea7b28564647cfe3c
diff --git a/metadata/md5-cache/acct-group/redsocks-0-r2 b/metadata/md5-cache/acct-group/redsocks-0-r2
new file mode 100644
index 000000000000..bce2a0ae1de4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/redsocks-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-proxy/redsocks
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=72c1f748fad1058099d044c997244dd8
diff --git a/metadata/md5-cache/acct-group/reg-0-r1 b/metadata/md5-cache/acct-group/reg-0-r1
deleted file mode 100644
index cd3b1b5505a1..000000000000
--- a/metadata/md5-cache/acct-group/reg-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-containers/reg
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4a84c8da0829b79e7ab0a85c1ed25f7e
diff --git a/metadata/md5-cache/acct-group/reg-0-r2 b/metadata/md5-cache/acct-group/reg-0-r2
new file mode 100644
index 000000000000..0a5765f17b80
--- /dev/null
+++ b/metadata/md5-cache/acct-group/reg-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-containers/reg
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c2be2347ea3305c64ed4908f45a85c0c
diff --git a/metadata/md5-cache/acct-group/registry-0 b/metadata/md5-cache/acct-group/registry-0
deleted file mode 100644
index 25fa54e45fe5..000000000000
--- a/metadata/md5-cache/acct-group/registry-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-containers/docker-registry
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=46d6fadf78f77b7cd4efd7025a993364
diff --git a/metadata/md5-cache/acct-group/registry-0-r1 b/metadata/md5-cache/acct-group/registry-0-r1
new file mode 100644
index 000000000000..835984317721
--- /dev/null
+++ b/metadata/md5-cache/acct-group/registry-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-containers/docker-registry
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=63c56297aba731e6c7d96925e08a53c7
diff --git a/metadata/md5-cache/acct-group/render-0-r1 b/metadata/md5-cache/acct-group/render-0-r1
deleted file mode 100644
index f69b9499718d..000000000000
--- a/metadata/md5-cache/acct-group/render-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: render
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9a17a76bb6d610a7589790bd092c1e15
diff --git a/metadata/md5-cache/acct-group/render-0-r2 b/metadata/md5-cache/acct-group/render-0-r2
new file mode 100644
index 000000000000..2e8166f390e2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/render-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: render
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b0a1f9578dda9ea481e30d86fd8908e5
diff --git a/metadata/md5-cache/acct-group/roccat-0 b/metadata/md5-cache/acct-group/roccat-0
deleted file mode 100644
index b23501cfbd3e..000000000000
--- a/metadata/md5-cache/acct-group/roccat-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-apps/roccat-tools
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=04a2c0506ba3b5a25ece67ff0c907b7a
diff --git a/metadata/md5-cache/acct-group/roccat-0-r1 b/metadata/md5-cache/acct-group/roccat-0-r1
new file mode 100644
index 000000000000..012ee7befe6d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/roccat-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-apps/roccat-tools
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=43455afa3db570628ea8974ce8515fc5
diff --git a/metadata/md5-cache/acct-group/root-0 b/metadata/md5-cache/acct-group/root-0
deleted file mode 100644
index b6f50f4093cd..000000000000
--- a/metadata/md5-cache/acct-group/root-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: root
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a7f429a081428d341bb45314a4000434
diff --git a/metadata/md5-cache/acct-group/root-0-r1 b/metadata/md5-cache/acct-group/root-0-r1
new file mode 100644
index 000000000000..8ef8ade8982e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/root-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: root
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=da9101e1e7475c299a31c71974d667a0
diff --git a/metadata/md5-cache/acct-group/rplayd-0 b/metadata/md5-cache/acct-group/rplayd-0
deleted file mode 100644
index aca13588396b..000000000000
--- a/metadata/md5-cache/acct-group/rplayd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for media-sound/rplay
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d6fedc027767ee546f1a5350e0a4894d
diff --git a/metadata/md5-cache/acct-group/rplayd-0-r1 b/metadata/md5-cache/acct-group/rplayd-0-r1
new file mode 100644
index 000000000000..a5465b1b9c1b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rplayd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/rplay
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4ad6e6fd695ae6981ac153dd8a31c3de
diff --git a/metadata/md5-cache/acct-group/rrdcached-0 b/metadata/md5-cache/acct-group/rrdcached-0
deleted file mode 100644
index fc20684cc8ac..000000000000
--- a/metadata/md5-cache/acct-group/rrdcached-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: rrdcached
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3016e9ba7b3dd73808869c5f7c1503a1
diff --git a/metadata/md5-cache/acct-group/rrdcached-0-r1 b/metadata/md5-cache/acct-group/rrdcached-0-r1
new file mode 100644
index 000000000000..57bafc7a6d0a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rrdcached-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: rrdcached
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=513213d041a479132c8887324b78fd8b
diff --git a/metadata/md5-cache/acct-group/rslsync-0 b/metadata/md5-cache/acct-group/rslsync-0
deleted file mode 100644
index 73317c8b0435..000000000000
--- a/metadata/md5-cache/acct-group/rslsync-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-p2p/resilio-sync
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=93b159f1d708b6adf94c929a7cf3544c
diff --git a/metadata/md5-cache/acct-group/rslsync-0-r1 b/metadata/md5-cache/acct-group/rslsync-0-r1
new file mode 100644
index 000000000000..f0b7656a80e8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rslsync-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-p2p/resilio-sync
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f899dac38c8243080ec427ff355dc612
diff --git a/metadata/md5-cache/acct-group/rspamd-0-r1 b/metadata/md5-cache/acct-group/rspamd-0-r1
deleted file mode 100644
index de031a986ae0..000000000000
--- a/metadata/md5-cache/acct-group/rspamd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for rspamd - Rapid spam filtering system
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9cbb5ac6e2e998fd23f0267abbfc2fed
diff --git a/metadata/md5-cache/acct-group/rspamd-0-r2 b/metadata/md5-cache/acct-group/rspamd-0-r2
new file mode 100644
index 000000000000..d1a05d605268
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rspamd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for rspamd - Rapid spam filtering system
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b9c1bdf042fd47a93d2073e1da5487ab
diff --git a/metadata/md5-cache/acct-group/rstudio-server-0-r1 b/metadata/md5-cache/acct-group/rstudio-server-0-r1
deleted file mode 100644
index 8635f3ef597c..000000000000
--- a/metadata/md5-cache/acct-group/rstudio-server-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for sci-mathematics/rstudio
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e26c106ae4cd9bb7027b3222b64cf4f4
diff --git a/metadata/md5-cache/acct-group/rstudio-server-0-r2 b/metadata/md5-cache/acct-group/rstudio-server-0-r2
new file mode 100644
index 000000000000..3d4bf04ad9d6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rstudio-server-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for sci-mathematics/rstudio
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a6f1bf1275a1f41b4a9b8a070a5e6a19
diff --git a/metadata/md5-cache/acct-group/rt-0-r1 b/metadata/md5-cache/acct-group/rt-0-r1
deleted file mode 100644
index 112ec5bc1dd9..000000000000
--- a/metadata/md5-cache/acct-group/rt-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-apps/rt
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=743c00ae2e6bbb090e3cc37511094e41
diff --git a/metadata/md5-cache/acct-group/rt-0-r2 b/metadata/md5-cache/acct-group/rt-0-r2
new file mode 100644
index 000000000000..f39ebc0ee13a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rt-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/rt
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=742ab619e25d585b1702511bbc65daf2
diff --git a/metadata/md5-cache/acct-group/rtkit-0-r1 b/metadata/md5-cache/acct-group/rtkit-0-r1
deleted file mode 100644
index 566ecef2d7ef..000000000000
--- a/metadata/md5-cache/acct-group/rtkit-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the Realtime Policy and Watchdog Daemon
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=88ef1eac9c87beaf1e0a6e36af8e82a4
diff --git a/metadata/md5-cache/acct-group/rtkit-0-r2 b/metadata/md5-cache/acct-group/rtkit-0-r2
new file mode 100644
index 000000000000..91986d7ab172
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rtkit-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the Realtime Policy and Watchdog Daemon
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=572cb7ef563a6d12fa04a514ec191c81
diff --git a/metadata/md5-cache/acct-group/rundeck-0 b/metadata/md5-cache/acct-group/rundeck-0
deleted file mode 100644
index 68f0565f574a..000000000000
--- a/metadata/md5-cache/acct-group/rundeck-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-misc/rundeck-bin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=67809b37284cdfca7bdda2e10180be9b
diff --git a/metadata/md5-cache/acct-group/rundeck-0-r1 b/metadata/md5-cache/acct-group/rundeck-0-r1
new file mode 100644
index 000000000000..a1f54092c216
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rundeck-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/rundeck-bin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f9b0bbaed9bc95b7125bb610b6951d3c
diff --git a/metadata/md5-cache/acct-group/rwhoisd-0 b/metadata/md5-cache/acct-group/rwhoisd-0
deleted file mode 100644
index 2ed2d4c42139..000000000000
--- a/metadata/md5-cache/acct-group/rwhoisd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-misc/rwhoisd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fcb4222192123b7834ee1a97ff9cb229
diff --git a/metadata/md5-cache/acct-group/rwhoisd-0-r1 b/metadata/md5-cache/acct-group/rwhoisd-0-r1
new file mode 100644
index 000000000000..91fb00807d47
--- /dev/null
+++ b/metadata/md5-cache/acct-group/rwhoisd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/rwhoisd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3b93e55e3dc0d73038ea511ae677bc9c
diff --git a/metadata/md5-cache/acct-group/sabnzbd-0-r1 b/metadata/md5-cache/acct-group/sabnzbd-0-r1
deleted file mode 100644
index 23f35a84c0e4..000000000000
--- a/metadata/md5-cache/acct-group/sabnzbd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=SABnzbd program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d4ca27db09b666561e15572145fec31e
diff --git a/metadata/md5-cache/acct-group/sabnzbd-0-r2 b/metadata/md5-cache/acct-group/sabnzbd-0-r2
new file mode 100644
index 000000000000..dd9145242cd6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sabnzbd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=SABnzbd program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4fbbb432841aee45dd7fe6049b3c1e9d
diff --git a/metadata/md5-cache/acct-group/sagan-0 b/metadata/md5-cache/acct-group/sagan-0
deleted file mode 100644
index 0d156287fdc8..000000000000
--- a/metadata/md5-cache/acct-group/sagan-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the Sagan log monitoring system
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8ff04d9633dc4862007356624278e0e8
diff --git a/metadata/md5-cache/acct-group/sagan-0-r1 b/metadata/md5-cache/acct-group/sagan-0-r1
new file mode 100644
index 000000000000..300202f85ba2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sagan-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the Sagan log monitoring system
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=05a600b4557ea7d87df76da5853178dc
diff --git a/metadata/md5-cache/acct-group/samplicator-0 b/metadata/md5-cache/acct-group/samplicator-0
deleted file mode 100644
index 2a59b8b32626..000000000000
--- a/metadata/md5-cache/acct-group/samplicator-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-misc/samplicator
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1396d4a695f252db7c8ef8820619ba09
diff --git a/metadata/md5-cache/acct-group/samplicator-0-r1 b/metadata/md5-cache/acct-group/samplicator-0-r1
new file mode 100644
index 000000000000..399a9464d6f7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/samplicator-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/samplicator
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fdfa9d1d5a15469ea8f31e38cda95e27
diff --git a/metadata/md5-cache/acct-group/sancp-0 b/metadata/md5-cache/acct-group/sancp-0
deleted file mode 100644
index 8dad1f6bfe4c..000000000000
--- a/metadata/md5-cache/acct-group/sancp-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=gid for net-analyzer/sancp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4f68fb5ade5a80de005cc21e57aa7e88
diff --git a/metadata/md5-cache/acct-group/sancp-0-r1 b/metadata/md5-cache/acct-group/sancp-0-r1
new file mode 100644
index 000000000000..d9980580a1fc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sancp-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-analyzer/sancp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=24ca3908f6b1ddefe72c60815f380d5e
diff --git a/metadata/md5-cache/acct-group/sanlock-0-r1 b/metadata/md5-cache/acct-group/sanlock-0-r1
deleted file mode 100644
index b5c5b3378fe7..000000000000
--- a/metadata/md5-cache/acct-group/sanlock-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=shared storage lock manager
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=164869b2404ec974ccbcd89d6f081644
diff --git a/metadata/md5-cache/acct-group/sanlock-0-r2 b/metadata/md5-cache/acct-group/sanlock-0-r2
new file mode 100644
index 000000000000..5fdb7b3a3dad
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sanlock-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=shared storage lock manager
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4ced398dba9cb70ec74e91d2be2e1e2f
diff --git a/metadata/md5-cache/acct-group/sauerbraten-0-r1 b/metadata/md5-cache/acct-group/sauerbraten-0-r1
deleted file mode 100644
index f9adf3c54567..000000000000
--- a/metadata/md5-cache/acct-group/sauerbraten-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for Sauerbraten (FOSS game engine (Cube 2))
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ca3eab62f12ef6a51f169dbaf736a605
diff --git a/metadata/md5-cache/acct-group/sauerbraten-0-r2 b/metadata/md5-cache/acct-group/sauerbraten-0-r2
new file mode 100644
index 000000000000..8fe5f84324f8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sauerbraten-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Sauerbraten (FOSS game engine (Cube 2))
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b5cde767075b74e914d026cbb6b14e6d
diff --git a/metadata/md5-cache/acct-group/scanlogd-0 b/metadata/md5-cache/acct-group/scanlogd-0
deleted file mode 100644
index 61f1cc9106a5..000000000000
--- a/metadata/md5-cache/acct-group/scanlogd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-analyzer/scanlogd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=02aef9fa4c0506cfafc12a85febb743e
diff --git a/metadata/md5-cache/acct-group/scanlogd-0-r1 b/metadata/md5-cache/acct-group/scanlogd-0-r1
new file mode 100644
index 000000000000..9f89ee6ba844
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scanlogd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/scanlogd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=82c8fa34126730afcebdaf5ba9516af3
diff --git a/metadata/md5-cache/acct-group/scanner-0 b/metadata/md5-cache/acct-group/scanner-0
deleted file mode 100644
index 048a99444072..000000000000
--- a/metadata/md5-cache/acct-group/scanner-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for media-gfx/sane-backends
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9d83c80679ba09b477e36ff9c9c6d512
diff --git a/metadata/md5-cache/acct-group/scanner-0-r1 b/metadata/md5-cache/acct-group/scanner-0-r1
new file mode 100644
index 000000000000..4869084d664c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scanner-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for media-gfx/sane-backends
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=165819c77d9248fd415a13e103b327e9
diff --git a/metadata/md5-cache/acct-group/scponly-0-r1 b/metadata/md5-cache/acct-group/scponly-0-r1
deleted file mode 100644
index 78970ba812c8..000000000000
--- a/metadata/md5-cache/acct-group/scponly-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for scponly
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=acd253c1dc792a01b660ecad6b5f6c1c
diff --git a/metadata/md5-cache/acct-group/scponly-0-r2 b/metadata/md5-cache/acct-group/scponly-0-r2
new file mode 100644
index 000000000000..979a6c663bde
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scponly-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for scponly
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ee6fc70e17ae5f3cd0ad1d58431a8e85
diff --git a/metadata/md5-cache/acct-group/scsi-0 b/metadata/md5-cache/acct-group/scsi-0
deleted file mode 100644
index 703e885e8ff3..000000000000
--- a/metadata/md5-cache/acct-group/scsi-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: scsi
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=428eabc40ecfbe67a343e14dca02120e
diff --git a/metadata/md5-cache/acct-group/scsi-0-r1 b/metadata/md5-cache/acct-group/scsi-0-r1
new file mode 100644
index 000000000000..6cf70a9e7229
--- /dev/null
+++ b/metadata/md5-cache/acct-group/scsi-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: scsi
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2293e766024824cd6f97321822720b6a
diff --git a/metadata/md5-cache/acct-group/sddm-0 b/metadata/md5-cache/acct-group/sddm-0
deleted file mode 100644
index f3f278129b90..000000000000
--- a/metadata/md5-cache/acct-group/sddm-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for x11-misc/sddm
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5d78b64eec31cbf68aecf9872427c766
diff --git a/metadata/md5-cache/acct-group/sddm-0-r1 b/metadata/md5-cache/acct-group/sddm-0-r1
new file mode 100644
index 000000000000..1bbda2a75500
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sddm-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for x11-misc/sddm
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7bb6a520214f542637b9b1acb741fac3
diff --git a/metadata/md5-cache/acct-group/seat-0 b/metadata/md5-cache/acct-group/seat-0
deleted file mode 100644
index 1cfab679625b..000000000000
--- a/metadata/md5-cache/acct-group/seat-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for sys-auth/seatd
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4ae11db7bbae3f95369f896c55debee9
diff --git a/metadata/md5-cache/acct-group/seat-0-r1 b/metadata/md5-cache/acct-group/seat-0-r1
new file mode 100644
index 000000000000..51327b66b04d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/seat-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sys-auth/seatd
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=86f5ac90658e421307e6da6bf3c51d86
diff --git a/metadata/md5-cache/acct-group/serf-0 b/metadata/md5-cache/acct-group/serf-0
deleted file mode 100644
index 16de6f7592c5..000000000000
--- a/metadata/md5-cache/acct-group/serf-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-admin/serf
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=22d08b34909fac7aef088db1012834bd
diff --git a/metadata/md5-cache/acct-group/serf-0-r1 b/metadata/md5-cache/acct-group/serf-0-r1
new file mode 100644
index 000000000000..1da466f14ee0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/serf-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-admin/serf
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6a64037a677f9bc09359d8bb35f9570b
diff --git a/metadata/md5-cache/acct-group/sguil-0 b/metadata/md5-cache/acct-group/sguil-0
deleted file mode 100644
index 998d14fa5b04..000000000000
--- a/metadata/md5-cache/acct-group/sguil-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-analyzer/sguil-sensor
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d346065687075dd82b95d8ecbcfa5292
diff --git a/metadata/md5-cache/acct-group/sguil-0-r1 b/metadata/md5-cache/acct-group/sguil-0-r1
new file mode 100644
index 000000000000..5fa8d9c9d3b7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sguil-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/sguil-sensor
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=340762bc63f8873f46cf6be5aa95333a
diff --git a/metadata/md5-cache/acct-group/sgx-0 b/metadata/md5-cache/acct-group/sgx-0
deleted file mode 100644
index ebe7d1b59f3f..000000000000
--- a/metadata/md5-cache/acct-group/sgx-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: used for SGX enclaves
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=edd04247181af9db92f6f81c7d9429dd
diff --git a/metadata/md5-cache/acct-group/sgx-0-r1 b/metadata/md5-cache/acct-group/sgx-0-r1
new file mode 100644
index 000000000000..37f38329635a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sgx-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: used for SGX enclaves
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=969857ccafaf392d908924e2a7a977dd
diff --git a/metadata/md5-cache/acct-group/sigh-0 b/metadata/md5-cache/acct-group/sigh-0
deleted file mode 100644
index d0fcc37be3fd..000000000000
--- a/metadata/md5-cache/acct-group/sigh-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: sigh
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a28d0284fc5f403aabe72010ef5ea0bc
diff --git a/metadata/md5-cache/acct-group/sigh-0-r1 b/metadata/md5-cache/acct-group/sigh-0-r1
new file mode 100644
index 000000000000..956dcee8b05c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sigh-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sigh
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2f77196064e1a2116910d171c5c4c36c
diff --git a/metadata/md5-cache/acct-group/simplevirt-0-r1 b/metadata/md5-cache/acct-group/simplevirt-0-r1
deleted file mode 100644
index 2a2242893d22..000000000000
--- a/metadata/md5-cache/acct-group/simplevirt-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: simplevirt
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ae8382162a397a619f61011bea92b8e0
diff --git a/metadata/md5-cache/acct-group/simplevirt-0-r2 b/metadata/md5-cache/acct-group/simplevirt-0-r2
new file mode 100644
index 000000000000..1d293ba66d5b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/simplevirt-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: simplevirt
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7fb8acf72e5cc70f8cee43f131f5b51b
diff --git a/metadata/md5-cache/acct-group/sispmctl-0 b/metadata/md5-cache/acct-group/sispmctl-0
deleted file mode 100644
index cef6ad1fac3b..000000000000
--- a/metadata/md5-cache/acct-group/sispmctl-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for sys-power/sispmctl
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5001dcc42f138a1a6865e9cd7d166308
diff --git a/metadata/md5-cache/acct-group/sispmctl-0-r1 b/metadata/md5-cache/acct-group/sispmctl-0-r1
new file mode 100644
index 000000000000..d9e71adfad29
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sispmctl-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sys-power/sispmctl
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c792e525a3c1a168208fc1dd800d8d6d
diff --git a/metadata/md5-cache/acct-group/sks-0 b/metadata/md5-cache/acct-group/sks-0
deleted file mode 100644
index 4ac346d03d62..000000000000
--- a/metadata/md5-cache/acct-group/sks-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for SKS OpenPGP keyserver
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=815b171407bae45f6793dddd56fbd294
diff --git a/metadata/md5-cache/acct-group/sks-0-r1 b/metadata/md5-cache/acct-group/sks-0-r1
new file mode 100644
index 000000000000..be774b8d500a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sks-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for SKS OpenPGP keyserver
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9036f2f0ce9031c1010f99c615ee46ed
diff --git a/metadata/md5-cache/acct-group/slurm-0-r1 b/metadata/md5-cache/acct-group/slurm-0-r1
deleted file mode 100644
index c272566c4cdf..000000000000
--- a/metadata/md5-cache/acct-group/slurm-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the slurm - Highly Scalable Resource Manager
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=200bff04e3dd60b7329c07b1f3e9531e
diff --git a/metadata/md5-cache/acct-group/slurm-0-r2 b/metadata/md5-cache/acct-group/slurm-0-r2
new file mode 100644
index 000000000000..f5579ed57cce
--- /dev/null
+++ b/metadata/md5-cache/acct-group/slurm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the slurm - Highly Scalable Resource Manager
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=98eccb5564d19247584ffe2204380d15
diff --git a/metadata/md5-cache/acct-group/smmsp-0-r1 b/metadata/md5-cache/acct-group/smmsp-0-r1
deleted file mode 100644
index f228f50a9af1..000000000000
--- a/metadata/md5-cache/acct-group/smmsp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: smmsp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dc4a510367ca52dc2a7d3aae3ca9be57
diff --git a/metadata/md5-cache/acct-group/smmsp-0-r2 b/metadata/md5-cache/acct-group/smmsp-0-r2
new file mode 100644
index 000000000000..6a6912bd5f77
--- /dev/null
+++ b/metadata/md5-cache/acct-group/smmsp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: smmsp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3db0bfc890e39321804dc8dd6d4216c0
diff --git a/metadata/md5-cache/acct-group/smokeping-0 b/metadata/md5-cache/acct-group/smokeping-0
deleted file mode 100644
index aa25bc38a219..000000000000
--- a/metadata/md5-cache/acct-group/smokeping-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-analyzer/smokeping
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=540b8be3789b1255453122826ad9cf80
diff --git a/metadata/md5-cache/acct-group/smokeping-0-r1 b/metadata/md5-cache/acct-group/smokeping-0-r1
new file mode 100644
index 000000000000..4d4a2304e20e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/smokeping-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-analyzer/smokeping
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=955febfb360d28a0f6d2519c4457b845
diff --git a/metadata/md5-cache/acct-group/sms-0 b/metadata/md5-cache/acct-group/sms-0
deleted file mode 100644
index 6e69bf285f08..000000000000
--- a/metadata/md5-cache/acct-group/sms-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: sms
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fae06c989afc33f3f6fa87d3942cb493
diff --git a/metadata/md5-cache/acct-group/sms-0-r1 b/metadata/md5-cache/acct-group/sms-0-r1
new file mode 100644
index 000000000000..febf18139e48
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sms-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sms
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d24b3ca5e372ceed161cd62fa23eabad
diff --git a/metadata/md5-cache/acct-group/smtpd-0-r1 b/metadata/md5-cache/acct-group/smtpd-0-r1
deleted file mode 100644
index d21b02cbe4c9..000000000000
--- a/metadata/md5-cache/acct-group/smtpd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=daemon group for smtpd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c30685a7882b878d64668f0bfd9cc15c
diff --git a/metadata/md5-cache/acct-group/smtpd-0-r2 b/metadata/md5-cache/acct-group/smtpd-0-r2
new file mode 100644
index 000000000000..0cd4305bebb4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/smtpd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=daemon group for smtpd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7dc435aa06bf02b7a3621f499642b15c
diff --git a/metadata/md5-cache/acct-group/smtpq-0-r1 b/metadata/md5-cache/acct-group/smtpq-0-r1
deleted file mode 100644
index 9ae3f2447801..000000000000
--- a/metadata/md5-cache/acct-group/smtpq-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=queue group for smtpd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f833d30e72519019b0761d9c895c03ac
diff --git a/metadata/md5-cache/acct-group/smtpq-0-r2 b/metadata/md5-cache/acct-group/smtpq-0-r2
new file mode 100644
index 000000000000..c6d0861ec35d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/smtpq-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=queue group for smtpd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1f3061fca0f2260b90aaa2d65e5e66f3
diff --git a/metadata/md5-cache/acct-group/snapserver-0 b/metadata/md5-cache/acct-group/snapserver-0
deleted file mode 100644
index 8160cdd542e8..000000000000
--- a/metadata/md5-cache/acct-group/snapserver-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Server group for media-sound/snapcast
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=37d3b8fdb49dcc3e7311498e5e66bba1
diff --git a/metadata/md5-cache/acct-group/snapserver-0-r1 b/metadata/md5-cache/acct-group/snapserver-0-r1
new file mode 100644
index 000000000000..f7ffe0fb8a21
--- /dev/null
+++ b/metadata/md5-cache/acct-group/snapserver-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Server group for media-sound/snapcast
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e0d402e3edc6b3646f3b0cbba3879ae8
diff --git a/metadata/md5-cache/acct-group/sniproxy-0 b/metadata/md5-cache/acct-group/sniproxy-0
deleted file mode 100644
index 14863739cf94..000000000000
--- a/metadata/md5-cache/acct-group/sniproxy-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: sniproxy
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8a3e5a7030b2dd9512ed57773312b131
diff --git a/metadata/md5-cache/acct-group/sniproxy-0-r1 b/metadata/md5-cache/acct-group/sniproxy-0-r1
new file mode 100644
index 000000000000..bb24fa7f8d32
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sniproxy-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sniproxy
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=49e3a265c628460ce0ed98f9da6af0c2
diff --git a/metadata/md5-cache/acct-group/snmp_exporter-0 b/metadata/md5-cache/acct-group/snmp_exporter-0
deleted file mode 100644
index 5f5878dbe2c3..000000000000
--- a/metadata/md5-cache/acct-group/snmp_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-metrics/snmp_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=51beb02be8623452b80e8860639fcb6b
diff --git a/metadata/md5-cache/acct-group/snmp_exporter-0-r1 b/metadata/md5-cache/acct-group/snmp_exporter-0-r1
new file mode 100644
index 000000000000..af5be3e87fa8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/snmp_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/snmp_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3c28ef1b58f6d19e68cbe642fb7708f4
diff --git a/metadata/md5-cache/acct-group/snort-0 b/metadata/md5-cache/acct-group/snort-0
deleted file mode 100644
index be8da9e977a8..000000000000
--- a/metadata/md5-cache/acct-group/snort-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: snort
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7db8eab239d794136865bcd191626d08
diff --git a/metadata/md5-cache/acct-group/snort-0-r1 b/metadata/md5-cache/acct-group/snort-0-r1
new file mode 100644
index 000000000000..fca756c750ca
--- /dev/null
+++ b/metadata/md5-cache/acct-group/snort-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: snort
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=77cc8962fdfa8c71cda72fb7f2484e56
diff --git a/metadata/md5-cache/acct-group/sobby-0 b/metadata/md5-cache/acct-group/sobby-0
deleted file mode 100644
index 14749d158593..000000000000
--- a/metadata/md5-cache/acct-group/sobby-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: sobby
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1e5d800430e87029fc8f3f84adb9ffb8
diff --git a/metadata/md5-cache/acct-group/sobby-0-r1 b/metadata/md5-cache/acct-group/sobby-0-r1
new file mode 100644
index 000000000000..315292e5391e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sobby-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sobby
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6dddb462b5187effc8113bc916caecc0
diff --git a/metadata/md5-cache/acct-group/sobexsrv-0 b/metadata/md5-cache/acct-group/sobexsrv-0
deleted file mode 100644
index 25f18f5b00bc..000000000000
--- a/metadata/md5-cache/acct-group/sobexsrv-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sobexsrv: a secure OBEX server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=01332fcd3786d84a772dfb9b17f46c96
diff --git a/metadata/md5-cache/acct-group/sobexsrv-0-r1 b/metadata/md5-cache/acct-group/sobexsrv-0-r1
new file mode 100644
index 000000000000..5ae76d34afba
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sobexsrv-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sobexsrv: a secure OBEX server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9b42b9cc9af48b41391d1ef220b45384
diff --git a/metadata/md5-cache/acct-group/sockd-0 b/metadata/md5-cache/acct-group/sockd-0
deleted file mode 100644
index e1adb4f483c6..000000000000
--- a/metadata/md5-cache/acct-group/sockd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-proxy/dante
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b8bb4665b90241b1885ab397fa7df552
diff --git a/metadata/md5-cache/acct-group/sockd-0-r1 b/metadata/md5-cache/acct-group/sockd-0-r1
new file mode 100644
index 000000000000..30ad64dd567c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sockd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-proxy/dante
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=881fc7f80b4f4ddbefeb80899858ad5f
diff --git a/metadata/md5-cache/acct-group/sogo-0-r1 b/metadata/md5-cache/acct-group/sogo-0-r1
deleted file mode 100644
index 565a79cefadf..000000000000
--- a/metadata/md5-cache/acct-group/sogo-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for gnustep-apps/sogo
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0fb1f49c79336edc7fc0317f9099021e
diff --git a/metadata/md5-cache/acct-group/sogo-0-r2 b/metadata/md5-cache/acct-group/sogo-0-r2
new file mode 100644
index 000000000000..60358eca3dea
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sogo-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for gnustep-apps/sogo
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ab2971ff047202331bc2878828bd1941
diff --git a/metadata/md5-cache/acct-group/soju-0 b/metadata/md5-cache/acct-group/soju-0
deleted file mode 100644
index 7206ebc02cdf..000000000000
--- a/metadata/md5-cache/acct-group/soju-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=User for the net-irc/soju IRC bouncer
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7137090b1b7a84aa0447ac32ba4c63fd
diff --git a/metadata/md5-cache/acct-group/soju-0-r1 b/metadata/md5-cache/acct-group/soju-0-r1
new file mode 100644
index 000000000000..4baa1deaf08b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/soju-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=User for the net-irc/soju IRC bouncer
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=edf3e8490ceedb842667fd01e2798d07
diff --git a/metadata/md5-cache/acct-group/sonarr-0 b/metadata/md5-cache/acct-group/sonarr-0
deleted file mode 100644
index 3a1644b60be0..000000000000
--- a/metadata/md5-cache/acct-group/sonarr-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: sonarr
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=caf15b07eb1f9447960065e2812d6f2a
diff --git a/metadata/md5-cache/acct-group/sonarr-0-r1 b/metadata/md5-cache/acct-group/sonarr-0-r1
new file mode 100644
index 000000000000..e611806f3822
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sonarr-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sonarr
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0d96353ca7378b63ce1524e569aeaa82
diff --git a/metadata/md5-cache/acct-group/spamd-0-r1 b/metadata/md5-cache/acct-group/spamd-0-r1
deleted file mode 100644
index 3e9a4ab87f54..000000000000
--- a/metadata/md5-cache/acct-group/spamd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the SpamAssassin daemon
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6b8b3cbe6e7e5e125ce497dfa33f6757
diff --git a/metadata/md5-cache/acct-group/spamd-0-r2 b/metadata/md5-cache/acct-group/spamd-0-r2
new file mode 100644
index 000000000000..77d89e284363
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spamd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the SpamAssassin daemon
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5828e5ef533a811905d25aaeea3739db
diff --git a/metadata/md5-cache/acct-group/spectrum-0-r1 b/metadata/md5-cache/acct-group/spectrum-0-r1
deleted file mode 100644
index da2105621b07..000000000000
--- a/metadata/md5-cache/acct-group/spectrum-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the Spectrum messaging transport
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ad09b3c14319af729ccebba016305905
diff --git a/metadata/md5-cache/acct-group/spectrum-0-r2 b/metadata/md5-cache/acct-group/spectrum-0-r2
new file mode 100644
index 000000000000..c745956ca395
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spectrum-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the Spectrum messaging transport
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e88d8ff4d3155de3c296e937c1636679
diff --git a/metadata/md5-cache/acct-group/spi-0 b/metadata/md5-cache/acct-group/spi-0
deleted file mode 100644
index 821fb3a87ecf..000000000000
--- a/metadata/md5-cache/acct-group/spi-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: spi
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2f6307dd3c5e486b883a85a82e407f10
diff --git a/metadata/md5-cache/acct-group/spi-0-r1 b/metadata/md5-cache/acct-group/spi-0-r1
new file mode 100644
index 000000000000..1652a9184dd5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spi-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: spi
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=50c769d91575edf1870d13dfed95cd60
diff --git a/metadata/md5-cache/acct-group/spire-0-r1 b/metadata/md5-cache/acct-group/spire-0-r1
deleted file mode 100644
index 067c0a0de300..000000000000
--- a/metadata/md5-cache/acct-group/spire-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: spire
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0130c16e45708d789172c311440a2efe
diff --git a/metadata/md5-cache/acct-group/spire-0-r2 b/metadata/md5-cache/acct-group/spire-0-r2
new file mode 100644
index 000000000000..b00b2aeca47b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spire-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: spire
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5e72334ef813186cba330ad0c9f9776b
diff --git a/metadata/md5-cache/acct-group/spread-0 b/metadata/md5-cache/acct-group/spread-0
deleted file mode 100644
index a1be14a784f7..000000000000
--- a/metadata/md5-cache/acct-group/spread-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-misc/spread
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=176f32600aa265111b8437f687601eeb
diff --git a/metadata/md5-cache/acct-group/spread-0-r1 b/metadata/md5-cache/acct-group/spread-0-r1
new file mode 100644
index 000000000000..a544c6644ced
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spread-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/spread
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=80ecb23409d24516606bdd81a4d4bb5f
diff --git a/metadata/md5-cache/acct-group/sqlgrey-0-r1 b/metadata/md5-cache/acct-group/sqlgrey-0-r1
deleted file mode 100644
index 56a0bedeb508..000000000000
--- a/metadata/md5-cache/acct-group/sqlgrey-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for SQLGrey
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=82a58945cb41c1a5e372fc75e6502a45
diff --git a/metadata/md5-cache/acct-group/sqlgrey-0-r2 b/metadata/md5-cache/acct-group/sqlgrey-0-r2
new file mode 100644
index 000000000000..ae1af1f6c425
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sqlgrey-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for SQLGrey
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=201a66c75e30c4e20596d598c21a10cf
diff --git a/metadata/md5-cache/acct-group/squid-0-r1 b/metadata/md5-cache/acct-group/squid-0-r1
deleted file mode 100644
index 87a401aa80ab..000000000000
--- a/metadata/md5-cache/acct-group/squid-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: squid
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d62ae3398b0ef61de754e048c9483274
diff --git a/metadata/md5-cache/acct-group/squid-0-r2 b/metadata/md5-cache/acct-group/squid-0-r2
new file mode 100644
index 000000000000..7e3f73437c9f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/squid-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: squid
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b53a4f569a5bc95655a326d6614cb0fc
diff --git a/metadata/md5-cache/acct-group/sshd-0-r1 b/metadata/md5-cache/acct-group/sshd-0-r1
deleted file mode 100644
index da3b30906747..000000000000
--- a/metadata/md5-cache/acct-group/sshd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: sshd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=806fe511e66eff6943cb9b40e5f0d87a
diff --git a/metadata/md5-cache/acct-group/sshd-0-r2 b/metadata/md5-cache/acct-group/sshd-0-r2
new file mode 100644
index 000000000000..a61f5b90751c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sshd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: sshd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a51bc2ae3c98b6437c5209c8038a5a93
diff --git a/metadata/md5-cache/acct-group/ssmtp-0 b/metadata/md5-cache/acct-group/ssmtp-0
deleted file mode 100644
index 1f95e5472645..000000000000
--- a/metadata/md5-cache/acct-group/ssmtp-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for mail-mta/ssmtp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=704d0afbb739dc380a99e2e148670b66
diff --git a/metadata/md5-cache/acct-group/ssmtp-0-r1 b/metadata/md5-cache/acct-group/ssmtp-0-r1
new file mode 100644
index 000000000000..efa7dc7b77d0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ssmtp-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for mail-mta/ssmtp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=80167f1fb896d68672dda1dc68d969f7
diff --git a/metadata/md5-cache/acct-group/sstpc-0 b/metadata/md5-cache/acct-group/sstpc-0
deleted file mode 100644
index 2b6946751d21..000000000000
--- a/metadata/md5-cache/acct-group/sstpc-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-misc/sstp-client
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=85c7cdd937cb7ea9e35072bedd3271de
diff --git a/metadata/md5-cache/acct-group/sstpc-0-r1 b/metadata/md5-cache/acct-group/sstpc-0-r1
new file mode 100644
index 000000000000..3938a1b55132
--- /dev/null
+++ b/metadata/md5-cache/acct-group/sstpc-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/sstp-client
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=667ae42883b06c6ac7fc5c3fe4eec871
diff --git a/metadata/md5-cache/acct-group/stapdev-0 b/metadata/md5-cache/acct-group/stapdev-0
deleted file mode 100644
index df56bb4ca76c..000000000000
--- a/metadata/md5-cache/acct-group/stapdev-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: stapdev
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cb275a24c0b55db3af42aace2819ee77
diff --git a/metadata/md5-cache/acct-group/stapdev-0-r1 b/metadata/md5-cache/acct-group/stapdev-0-r1
new file mode 100644
index 000000000000..c99cb092a5b6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stapdev-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: stapdev
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0eb292cb773985f1a32838d0526a6018
diff --git a/metadata/md5-cache/acct-group/stapsys-0 b/metadata/md5-cache/acct-group/stapsys-0
deleted file mode 100644
index 9a2260eccad5..000000000000
--- a/metadata/md5-cache/acct-group/stapsys-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: stapsys
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6731407934553c09dba5a751a7e9e22a
diff --git a/metadata/md5-cache/acct-group/stapsys-0-r1 b/metadata/md5-cache/acct-group/stapsys-0-r1
new file mode 100644
index 000000000000..568545d032d0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stapsys-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: stapsys
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=af477cbd594d92e200d801b338d20ec9
diff --git a/metadata/md5-cache/acct-group/stapusr-0 b/metadata/md5-cache/acct-group/stapusr-0
deleted file mode 100644
index 6d7250441fd4..000000000000
--- a/metadata/md5-cache/acct-group/stapusr-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: stapusr
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a29e35617b88a2d27c472c7f14e8bd44
diff --git a/metadata/md5-cache/acct-group/stapusr-0-r1 b/metadata/md5-cache/acct-group/stapusr-0-r1
new file mode 100644
index 000000000000..7df234492322
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stapusr-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: stapusr
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bdd1610e5a5901acbbcd116fa1c197d6
diff --git a/metadata/md5-cache/acct-group/steamcmd-0-r1 b/metadata/md5-cache/acct-group/steamcmd-0-r1
deleted file mode 100644
index b45b098d60ce..000000000000
--- a/metadata/md5-cache/acct-group/steamcmd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the SteamCMD server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6a923e168552bdf12093a4773350247c
diff --git a/metadata/md5-cache/acct-group/steamcmd-0-r2 b/metadata/md5-cache/acct-group/steamcmd-0-r2
new file mode 100644
index 000000000000..2f36aaae0e96
--- /dev/null
+++ b/metadata/md5-cache/acct-group/steamcmd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the SteamCMD server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=842a8103bdd2a1d406c0e7092369918b
diff --git a/metadata/md5-cache/acct-group/stg-0 b/metadata/md5-cache/acct-group/stg-0
deleted file mode 100644
index 2d21d8702b4c..000000000000
--- a/metadata/md5-cache/acct-group/stg-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-misc/stargazer
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9b35921181c9e1e6d2bd2b0c68a89c6f
diff --git a/metadata/md5-cache/acct-group/stg-0-r1 b/metadata/md5-cache/acct-group/stg-0-r1
new file mode 100644
index 000000000000..49964ec7fbc5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stg-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-misc/stargazer
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=eafe6ad81418ac6d8c6d2af80ec56819
diff --git a/metadata/md5-cache/acct-group/stubby-0-r1 b/metadata/md5-cache/acct-group/stubby-0-r1
deleted file mode 100644
index aced99ed3252..000000000000
--- a/metadata/md5-cache/acct-group/stubby-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Stubby program group (from net-dns/getdns)
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3480ad0dba45926b094caadc8a7d5a08
diff --git a/metadata/md5-cache/acct-group/stubby-0-r2 b/metadata/md5-cache/acct-group/stubby-0-r2
new file mode 100644
index 000000000000..f2399216611e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stubby-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Stubby program group (from net-dns/getdns)
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5f954b33fbc0cd6e103fdd8a917c1aa1
diff --git a/metadata/md5-cache/acct-group/stunnel-0-r1 b/metadata/md5-cache/acct-group/stunnel-0-r1
deleted file mode 100644
index 683f12633fae..000000000000
--- a/metadata/md5-cache/acct-group/stunnel-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for stunnel
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6c6fb56811775f25e3e837c556bc8740
diff --git a/metadata/md5-cache/acct-group/stunnel-0-r2 b/metadata/md5-cache/acct-group/stunnel-0-r2
new file mode 100644
index 000000000000..33c100cf3445
--- /dev/null
+++ b/metadata/md5-cache/acct-group/stunnel-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for stunnel
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=692001b1b4fb1476fe1ab5574b86730d
diff --git a/metadata/md5-cache/acct-group/subsonic-0 b/metadata/md5-cache/acct-group/subsonic-0
deleted file mode 100644
index 16da8ad3afb7..000000000000
--- a/metadata/md5-cache/acct-group/subsonic-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for media-sound/subsonic-bin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b432ae97f685dd50347a0f56cfc88160
diff --git a/metadata/md5-cache/acct-group/subsonic-0-r1 b/metadata/md5-cache/acct-group/subsonic-0-r1
new file mode 100644
index 000000000000..4dbe02797ad2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/subsonic-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/subsonic-bin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=30324e4fa4f713e26dbfc850ce9a02ca
diff --git a/metadata/md5-cache/acct-group/supervisor-0-r1 b/metadata/md5-cache/acct-group/supervisor-0-r1
deleted file mode 100644
index a30b93cd2147..000000000000
--- a/metadata/md5-cache/acct-group/supervisor-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group to grant access to app-admin/supervisor's management
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4868066b65149da6442e753aac8a4f64
diff --git a/metadata/md5-cache/acct-group/supervisor-0-r2 b/metadata/md5-cache/acct-group/supervisor-0-r2
new file mode 100644
index 000000000000..359cb87ab1a0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/supervisor-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group to grant access to app-admin/supervisor's management
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5ed186d8d28028221855fae5c6af3f8d
diff --git a/metadata/md5-cache/acct-group/suricata-0-r1 b/metadata/md5-cache/acct-group/suricata-0-r1
deleted file mode 100644
index 5cc795cce0fa..000000000000
--- a/metadata/md5-cache/acct-group/suricata-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for Suricata IDS
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8b99a189e23956212f10ac0e2f3780fb
diff --git a/metadata/md5-cache/acct-group/suricata-0-r2 b/metadata/md5-cache/acct-group/suricata-0-r2
new file mode 100644
index 000000000000..a1db290040d8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/suricata-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Suricata IDS
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=78408a2a43d2e15b20042f1e3ab2307c
diff --git a/metadata/md5-cache/acct-group/svnusers-0-r1 b/metadata/md5-cache/acct-group/svnusers-0-r1
deleted file mode 100644
index 42df210122aa..000000000000
--- a/metadata/md5-cache/acct-group/svnusers-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: svnusers
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a814f58df7fb230948728e7d3f84dddc
diff --git a/metadata/md5-cache/acct-group/svnusers-0-r2 b/metadata/md5-cache/acct-group/svnusers-0-r2
new file mode 100644
index 000000000000..5c6079716cb5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/svnusers-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: svnusers
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=406e43f8fc12d9e3b4432a9ab49898f9
diff --git a/metadata/md5-cache/acct-group/svxlink-0 b/metadata/md5-cache/acct-group/svxlink-0
deleted file mode 100644
index 73eed8cc32df..000000000000
--- a/metadata/md5-cache/acct-group/svxlink-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the svxlink server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=de54ffa409b50b364b98f8527c631b3c
diff --git a/metadata/md5-cache/acct-group/svxlink-0-r1 b/metadata/md5-cache/acct-group/svxlink-0-r1
new file mode 100644
index 000000000000..2d87f710589e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/svxlink-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the svxlink server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9d6a6cf6e429c9f6259977f4a39d976e
diff --git a/metadata/md5-cache/acct-group/swift-0-r1 b/metadata/md5-cache/acct-group/swift-0-r1
deleted file mode 100644
index 3eabe31dd6e0..000000000000
--- a/metadata/md5-cache/acct-group/swift-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: swift
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f85c78533012f1083d50060e1809ee47
diff --git a/metadata/md5-cache/acct-group/swift-0-r2 b/metadata/md5-cache/acct-group/swift-0-r2
new file mode 100644
index 000000000000..39919dc738e7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/swift-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: swift
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7ee3356bc18ec6cb033342fab0c915a6
diff --git a/metadata/md5-cache/acct-group/synapse-0 b/metadata/md5-cache/acct-group/synapse-0
deleted file mode 100644
index b53baa5cea6d..000000000000
--- a/metadata/md5-cache/acct-group/synapse-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for net-im/synapse
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2f3f4cb5a37a6c6267a0b0770330f283
diff --git a/metadata/md5-cache/acct-group/synapse-0-r1 b/metadata/md5-cache/acct-group/synapse-0-r1
new file mode 100644
index 000000000000..66798e89adf2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/synapse-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for net-im/synapse
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9e5807f1dec5251c2dd17191a2292650
diff --git a/metadata/md5-cache/acct-group/syncthing-0-r1 b/metadata/md5-cache/acct-group/syncthing-0-r1
deleted file mode 100644
index b9fc82ce4c6e..000000000000
--- a/metadata/md5-cache/acct-group/syncthing-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the system-wide net-p2p/syncthing server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9c5f5629f555e17b67f5761a82885e06
diff --git a/metadata/md5-cache/acct-group/syncthing-0-r2 b/metadata/md5-cache/acct-group/syncthing-0-r2
new file mode 100644
index 000000000000..ef36abd5f3cc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/syncthing-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide net-p2p/syncthing server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=44b1d2391a626a29e366c905f38457c4
diff --git a/metadata/md5-cache/acct-group/systemd-coredump-0-r1 b/metadata/md5-cache/acct-group/systemd-coredump-0-r1
deleted file mode 100644
index 6bdc8beb2ce3..000000000000
--- a/metadata/md5-cache/acct-group/systemd-coredump-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: systemd-coredump
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=098f56a8a84ab732bbee583483a1a3c7
diff --git a/metadata/md5-cache/acct-group/systemd-coredump-0-r2 b/metadata/md5-cache/acct-group/systemd-coredump-0-r2
new file mode 100644
index 000000000000..15e934406c43
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-coredump-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-coredump
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9d78c2e9cbf684a332f07fd1323b400b
diff --git a/metadata/md5-cache/acct-group/systemd-hostname-0-r1 b/metadata/md5-cache/acct-group/systemd-hostname-0-r1
deleted file mode 100644
index f04c3f3bc6b9..000000000000
--- a/metadata/md5-cache/acct-group/systemd-hostname-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: systemd-hostname
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=80ff187fafd841c86e3f8186ab8d62df
diff --git a/metadata/md5-cache/acct-group/systemd-hostname-0-r2 b/metadata/md5-cache/acct-group/systemd-hostname-0-r2
new file mode 100644
index 000000000000..ce89318d65d0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-hostname-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-hostname
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8f71428887c08e1407c5dbe9e0201f6e
diff --git a/metadata/md5-cache/acct-group/systemd-journal-0-r1 b/metadata/md5-cache/acct-group/systemd-journal-0-r1
deleted file mode 100644
index e7159cca2f98..000000000000
--- a/metadata/md5-cache/acct-group/systemd-journal-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: systemd-journal
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=85d673f98186dc95b161e2717367d657
diff --git a/metadata/md5-cache/acct-group/systemd-journal-0-r2 b/metadata/md5-cache/acct-group/systemd-journal-0-r2
new file mode 100644
index 000000000000..ac1b8ee23646
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-journal-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-journal
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=61be895fdd401f2de1b3836a12f26ac4
diff --git a/metadata/md5-cache/acct-group/systemd-journal-remote-0-r1 b/metadata/md5-cache/acct-group/systemd-journal-remote-0-r1
deleted file mode 100644
index 182bb8ba23bb..000000000000
--- a/metadata/md5-cache/acct-group/systemd-journal-remote-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: systemd-journal-remote
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=81478f2d56b5613e7afa7b56fff6a5ba
diff --git a/metadata/md5-cache/acct-group/systemd-journal-remote-0-r2 b/metadata/md5-cache/acct-group/systemd-journal-remote-0-r2
new file mode 100644
index 000000000000..684564ab456e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-journal-remote-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-journal-remote
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1416b3e3792c6f85932e4bf0c3381515
diff --git a/metadata/md5-cache/acct-group/systemd-network-0-r1 b/metadata/md5-cache/acct-group/systemd-network-0-r1
deleted file mode 100644
index 16689b20c518..000000000000
--- a/metadata/md5-cache/acct-group/systemd-network-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: systemd-network
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0be9a3b6e0b9f7df81f931600aee7370
diff --git a/metadata/md5-cache/acct-group/systemd-network-0-r2 b/metadata/md5-cache/acct-group/systemd-network-0-r2
new file mode 100644
index 000000000000..ae16da4928d4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-network-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-network
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4f196111f74bfecfab4c9f639b49ecae
diff --git a/metadata/md5-cache/acct-group/systemd-oom-0 b/metadata/md5-cache/acct-group/systemd-oom-0
deleted file mode 100644
index f0a00fa470e7..000000000000
--- a/metadata/md5-cache/acct-group/systemd-oom-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: systemd-oom
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f9cc7caff17c876ea0b331e762d8e131
diff --git a/metadata/md5-cache/acct-group/systemd-oom-0-r1 b/metadata/md5-cache/acct-group/systemd-oom-0-r1
new file mode 100644
index 000000000000..ec1d2e64f710
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-oom-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-oom
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b44d29df3dd76751028b099a6085a5d5
diff --git a/metadata/md5-cache/acct-group/systemd-resolve-0-r1 b/metadata/md5-cache/acct-group/systemd-resolve-0-r1
deleted file mode 100644
index 194536b882f3..000000000000
--- a/metadata/md5-cache/acct-group/systemd-resolve-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: systemd-resolve
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3a07823982066aa8d38db7d02618112a
diff --git a/metadata/md5-cache/acct-group/systemd-resolve-0-r2 b/metadata/md5-cache/acct-group/systemd-resolve-0-r2
new file mode 100644
index 000000000000..72cc28c8f6c7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-resolve-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-resolve
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3b288d77ff20e1e79bc0e8b2a9ca2423
diff --git a/metadata/md5-cache/acct-group/systemd-timesync-0-r1 b/metadata/md5-cache/acct-group/systemd-timesync-0-r1
deleted file mode 100644
index cccaf7a17d2b..000000000000
--- a/metadata/md5-cache/acct-group/systemd-timesync-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: systemd-timesync
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e2c43cdf4137ec8f395bf286d3a48527
diff --git a/metadata/md5-cache/acct-group/systemd-timesync-0-r2 b/metadata/md5-cache/acct-group/systemd-timesync-0-r2
new file mode 100644
index 000000000000..a6fcf36da1da
--- /dev/null
+++ b/metadata/md5-cache/acct-group/systemd-timesync-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: systemd-timesync
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=130dc85e1fce659a0cb3a7643b088501
diff --git a/metadata/md5-cache/acct-group/tape-0-r1 b/metadata/md5-cache/acct-group/tape-0-r1
deleted file mode 100644
index b6bb7ad03bc5..000000000000
--- a/metadata/md5-cache/acct-group/tape-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: tape
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=86242ad94ac294b6bf673f2091c83e5a
diff --git a/metadata/md5-cache/acct-group/tape-0-r2 b/metadata/md5-cache/acct-group/tape-0-r2
new file mode 100644
index 000000000000..3c1eb8e4001a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tape-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: tape
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e1e6d1e741ddc52513d75aba12d33110
diff --git a/metadata/md5-cache/acct-group/taskd-0 b/metadata/md5-cache/acct-group/taskd-0
deleted file mode 100644
index 3fafcbf7fe2f..000000000000
--- a/metadata/md5-cache/acct-group/taskd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-misc/taskd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5d67c76f91bced5e03ecabf19a9fa23b
diff --git a/metadata/md5-cache/acct-group/taskd-0-r1 b/metadata/md5-cache/acct-group/taskd-0-r1
new file mode 100644
index 000000000000..cb48ddae039e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/taskd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/taskd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d33c960cf02f90c77697170866f63f4e
diff --git a/metadata/md5-cache/acct-group/teamspeak-0-r1 b/metadata/md5-cache/acct-group/teamspeak-0-r1
deleted file mode 100644
index 824bee249193..000000000000
--- a/metadata/md5-cache/acct-group/teamspeak-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the TeamSpeak server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=311108f9c2c5239074a46622df319ffb
diff --git a/metadata/md5-cache/acct-group/teamspeak-0-r2 b/metadata/md5-cache/acct-group/teamspeak-0-r2
new file mode 100644
index 000000000000..c93dce76726d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/teamspeak-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the TeamSpeak server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8052b569d6e7e0b6b2344c96cb67559f
diff --git a/metadata/md5-cache/acct-group/telegraf-0-r1 b/metadata/md5-cache/acct-group/telegraf-0-r1
deleted file mode 100644
index f8971f17efd4..000000000000
--- a/metadata/md5-cache/acct-group/telegraf-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: telegraf
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d7fee1e42b2bd162089d2dd2b97b2861
diff --git a/metadata/md5-cache/acct-group/telegraf-0-r2 b/metadata/md5-cache/acct-group/telegraf-0-r2
new file mode 100644
index 000000000000..d6b7ddd90421
--- /dev/null
+++ b/metadata/md5-cache/acct-group/telegraf-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: telegraf
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3ef4620b3c355120f57fe5df3a247f0e
diff --git a/metadata/md5-cache/acct-group/tenshi-0 b/metadata/md5-cache/acct-group/tenshi-0
deleted file mode 100644
index 51cab66ea13e..000000000000
--- a/metadata/md5-cache/acct-group/tenshi-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for app-admin/tenshi
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bd1f2bdd1c284d67c28f0e43c148848c
diff --git a/metadata/md5-cache/acct-group/tenshi-0-r1 b/metadata/md5-cache/acct-group/tenshi-0-r1
new file mode 100644
index 000000000000..1e0e903838c8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tenshi-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for app-admin/tenshi
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b4e37c73e682bf527308155c12eb582d
diff --git a/metadata/md5-cache/acct-group/thttpd-0 b/metadata/md5-cache/acct-group/thttpd-0
deleted file mode 100644
index 9b948dcf67b0..000000000000
--- a/metadata/md5-cache/acct-group/thttpd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-servers/thttpd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=56cb00c84de67a6080110a569e0a2506
diff --git a/metadata/md5-cache/acct-group/thttpd-0-r1 b/metadata/md5-cache/acct-group/thttpd-0-r1
new file mode 100644
index 000000000000..7d69369d0ff6
--- /dev/null
+++ b/metadata/md5-cache/acct-group/thttpd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/thttpd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=67ac774e0afc114ac84d5b529c30a449
diff --git a/metadata/md5-cache/acct-group/tinyproxy-0 b/metadata/md5-cache/acct-group/tinyproxy-0
deleted file mode 100644
index a74d31d135e0..000000000000
--- a/metadata/md5-cache/acct-group/tinyproxy-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=gid for net-proxy/tinyproxy
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d2940ffb6c6a7dc0b9037911b31ab0f2
diff --git a/metadata/md5-cache/acct-group/tinyproxy-0-r1 b/metadata/md5-cache/acct-group/tinyproxy-0-r1
new file mode 100644
index 000000000000..b8adbe61b868
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tinyproxy-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-proxy/tinyproxy
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d0c17795bb72d328b36388a5c7b624e2
diff --git a/metadata/md5-cache/acct-group/tomcat-0 b/metadata/md5-cache/acct-group/tomcat-0
deleted file mode 100644
index 11a98db013df..000000000000
--- a/metadata/md5-cache/acct-group/tomcat-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for Apache Tomcat
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=22d8c3118d771295733382825aa69ef1
diff --git a/metadata/md5-cache/acct-group/tomcat-0-r1 b/metadata/md5-cache/acct-group/tomcat-0-r1
new file mode 100644
index 000000000000..8626c2a1b032
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tomcat-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Apache Tomcat
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f558653a65d3e6e5ebfb61186bfa30a1
diff --git a/metadata/md5-cache/acct-group/tor-0-r1 b/metadata/md5-cache/acct-group/tor-0-r1
deleted file mode 100644
index 1180f914c80e..000000000000
--- a/metadata/md5-cache/acct-group/tor-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for tor daemon
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=525c6654cf951260d81329c7482f63cd
diff --git a/metadata/md5-cache/acct-group/tor-0-r2 b/metadata/md5-cache/acct-group/tor-0-r2
new file mode 100644
index 000000000000..3c9588070d84
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tor-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for tor daemon
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2a242db27159895f7726f4b346d22119
diff --git a/metadata/md5-cache/acct-group/tox-0-r1 b/metadata/md5-cache/acct-group/tox-0-r1
deleted file mode 100644
index cb640a062eea..000000000000
--- a/metadata/md5-cache/acct-group/tox-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group management for package net-libs/tox
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=744a69462c60b4797367a6b94ce1cef2
diff --git a/metadata/md5-cache/acct-group/tox-0-r2 b/metadata/md5-cache/acct-group/tox-0-r2
new file mode 100644
index 000000000000..30e3823d7877
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tox-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group management for package net-libs/tox
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aa1458a7642f44b44c65f0c7cc12bb07
diff --git a/metadata/md5-cache/acct-group/tpm-0 b/metadata/md5-cache/acct-group/tpm-0
deleted file mode 100644
index 5751653bf291..000000000000
--- a/metadata/md5-cache/acct-group/tpm-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: tpm
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=754bdc41179dbc03b1f873372575532b
diff --git a/metadata/md5-cache/acct-group/tpm-0-r1 b/metadata/md5-cache/acct-group/tpm-0-r1
new file mode 100644
index 000000000000..469c947fdd54
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tpm-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: tpm
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0e85365ea6dbde73e5b514fa80d0684f
diff --git a/metadata/md5-cache/acct-group/transmission-0-r1 b/metadata/md5-cache/acct-group/transmission-0-r1
deleted file mode 100644
index f678d9dff675..000000000000
--- a/metadata/md5-cache/acct-group/transmission-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: transmission
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9c96b703440173ab7e8832355cd4476d
diff --git a/metadata/md5-cache/acct-group/transmission-0-r2 b/metadata/md5-cache/acct-group/transmission-0-r2
new file mode 100644
index 000000000000..3d49091f36eb
--- /dev/null
+++ b/metadata/md5-cache/acct-group/transmission-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: transmission
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=38dde80de4f492afbbe3e7a780ed12be
diff --git a/metadata/md5-cache/acct-group/trickster-0 b/metadata/md5-cache/acct-group/trickster-0
deleted file mode 100644
index 258d7878bb37..000000000000
--- a/metadata/md5-cache/acct-group/trickster-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-apps/trickster
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a3c348cc69eb3da6e13665dbce8f49ee
diff --git a/metadata/md5-cache/acct-group/trickster-0-r1 b/metadata/md5-cache/acct-group/trickster-0-r1
new file mode 100644
index 000000000000..ccec0175851f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/trickster-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/trickster
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f083401dd7e72db17a24178173022f28
diff --git a/metadata/md5-cache/acct-group/trojan-0 b/metadata/md5-cache/acct-group/trojan-0
deleted file mode 100644
index 0c64383e31ca..000000000000
--- a/metadata/md5-cache/acct-group/trojan-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: trojan
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c91f3b464dda076c467a3c9ee6c15672
diff --git a/metadata/md5-cache/acct-group/trojan-0-r1 b/metadata/md5-cache/acct-group/trojan-0-r1
new file mode 100644
index 000000000000..0c2b5667c833
--- /dev/null
+++ b/metadata/md5-cache/acct-group/trojan-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: trojan
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8ee693abd8f9afb1f9e629cd7a0ae9b1
diff --git a/metadata/md5-cache/acct-group/tsm-0-r1 b/metadata/md5-cache/acct-group/tsm-0-r1
deleted file mode 100644
index 3d2657328263..000000000000
--- a/metadata/md5-cache/acct-group/tsm-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: tsm
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=127a3f7ff62856c6e9daf5b12e210dae
diff --git a/metadata/md5-cache/acct-group/tsm-0-r2 b/metadata/md5-cache/acct-group/tsm-0-r2
new file mode 100644
index 000000000000..f2d073cba37f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tsm-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: tsm
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=84e14400115b637e93d066b2e7c173ca
diff --git a/metadata/md5-cache/acct-group/tss-0-r1 b/metadata/md5-cache/acct-group/tss-0-r1
deleted file mode 100644
index c8d3b28f4ec6..000000000000
--- a/metadata/md5-cache/acct-group/tss-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Trusted Software Stack for TPMs group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ef98d714d41b1a6780c988c5485153ed
diff --git a/metadata/md5-cache/acct-group/tss-0-r2 b/metadata/md5-cache/acct-group/tss-0-r2
new file mode 100644
index 000000000000..4e992543fbcc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tss-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Trusted Software Stack for TPMs group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a5a79800b3c446138ae30b1a67af6894
diff --git a/metadata/md5-cache/acct-group/ttrssd-0 b/metadata/md5-cache/acct-group/ttrssd-0
deleted file mode 100644
index 0490e893f86e..000000000000
--- a/metadata/md5-cache/acct-group/ttrssd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for www-apps/tt-rss
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=30a76ee0967a01d72c9dfb92b0c4178e
diff --git a/metadata/md5-cache/acct-group/ttrssd-0-r1 b/metadata/md5-cache/acct-group/ttrssd-0-r1
new file mode 100644
index 000000000000..7e31f94c6387
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ttrssd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for www-apps/tt-rss
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7585e9be93b71d0ef4695d3fc300ad3c
diff --git a/metadata/md5-cache/acct-group/tty-0-r1 b/metadata/md5-cache/acct-group/tty-0-r1
deleted file mode 100644
index a2acb670fc8b..000000000000
--- a/metadata/md5-cache/acct-group/tty-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: tty
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=27b44f68d2a4849fe618b62c8a51f543
diff --git a/metadata/md5-cache/acct-group/tty-0-r2 b/metadata/md5-cache/acct-group/tty-0-r2
new file mode 100644
index 000000000000..a4134341fb4f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tty-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: tty
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3b125a0a82ad911b4872a997c20989a0
diff --git a/metadata/md5-cache/acct-group/turnserver-0-r1 b/metadata/md5-cache/acct-group/turnserver-0-r1
deleted file mode 100644
index cfb7dfc5328c..000000000000
--- a/metadata/md5-cache/acct-group/turnserver-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for a turn server like coturn
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=420f0043feaf030bdfe8c952a308746e
diff --git a/metadata/md5-cache/acct-group/turnserver-0-r2 b/metadata/md5-cache/acct-group/turnserver-0-r2
new file mode 100644
index 000000000000..bbaca6f0733a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/turnserver-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for a turn server like coturn
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0d10f9994cf128f686644d974122e926
diff --git a/metadata/md5-cache/acct-group/ubridge-0-r1 b/metadata/md5-cache/acct-group/ubridge-0-r1
deleted file mode 100644
index ad08c6f59ab2..000000000000
--- a/metadata/md5-cache/acct-group/ubridge-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-misc/ubridge
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d463fe93296e3ead8f2bf93b628435b7
diff --git a/metadata/md5-cache/acct-group/ubridge-0-r2 b/metadata/md5-cache/acct-group/ubridge-0-r2
new file mode 100644
index 000000000000..8eaa3f8fd025
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ubridge-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/ubridge
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c9ee2ea4179315dced0ed3a832eb29fe
diff --git a/metadata/md5-cache/acct-group/ulogd-0 b/metadata/md5-cache/acct-group/ulogd-0
deleted file mode 100644
index 408d97ab2542..000000000000
--- a/metadata/md5-cache/acct-group/ulogd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for ulogd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=694940cef46e3c004f8f129b48093a81
diff --git a/metadata/md5-cache/acct-group/ulogd-0-r1 b/metadata/md5-cache/acct-group/ulogd-0-r1
new file mode 100644
index 000000000000..7c72f9893e49
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ulogd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for ulogd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3d84bfdffa7f0eb0a9c21bf9f0273b40
diff --git a/metadata/md5-cache/acct-group/ultimaker-0-r1 b/metadata/md5-cache/acct-group/ultimaker-0-r1
deleted file mode 100644
index 37b3bbfbed05..000000000000
--- a/metadata/md5-cache/acct-group/ultimaker-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for ultimaker
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=64cee0374ba41d41097cfa02551c36a6
diff --git a/metadata/md5-cache/acct-group/ultimaker-0-r2 b/metadata/md5-cache/acct-group/ultimaker-0-r2
new file mode 100644
index 000000000000..504b9d8ca06b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ultimaker-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for ultimaker
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2a14c2b59036f9e5c9ba64463c51c75f
diff --git a/metadata/md5-cache/acct-group/unbound-0-r1 b/metadata/md5-cache/acct-group/unbound-0-r1
deleted file mode 100644
index 4f80288190da..000000000000
--- a/metadata/md5-cache/acct-group/unbound-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=unbound program group
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e62c3e46bec14e7a187a04499caa6be6
diff --git a/metadata/md5-cache/acct-group/unbound-0-r2 b/metadata/md5-cache/acct-group/unbound-0-r2
new file mode 100644
index 000000000000..c530004e2c27
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unbound-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=unbound program group
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3f3ee0217357867ca06d0b1b471c8adf
diff --git a/metadata/md5-cache/acct-group/unbound-telemetry-0 b/metadata/md5-cache/acct-group/unbound-telemetry-0
deleted file mode 100644
index f1720147c7de..000000000000
--- a/metadata/md5-cache/acct-group/unbound-telemetry-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: unbound-telemetry
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f58506b213491a1b36da7ba8eb7207b5
diff --git a/metadata/md5-cache/acct-group/unbound-telemetry-0-r1 b/metadata/md5-cache/acct-group/unbound-telemetry-0-r1
new file mode 100644
index 000000000000..076c66db5dab
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unbound-telemetry-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: unbound-telemetry
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=436c9a18384fb0b6512c45ce5eb6d6b2
diff --git a/metadata/md5-cache/acct-group/unifi-0-r1 b/metadata/md5-cache/acct-group/unifi-0-r1
deleted file mode 100644
index 012aa3fdf83c..000000000000
--- a/metadata/md5-cache/acct-group/unifi-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the UniFi controller
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=96fd1e11ea88d29018d4c6b3911632ee
diff --git a/metadata/md5-cache/acct-group/unifi-0-r2 b/metadata/md5-cache/acct-group/unifi-0-r2
new file mode 100644
index 000000000000..adcef706a9ac
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unifi-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the UniFi controller
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f459ae81844b7f7d0e9903b2782c8a1f
diff --git a/metadata/md5-cache/acct-group/unifi-video-0 b/metadata/md5-cache/acct-group/unifi-video-0
deleted file mode 100644
index 00aae9cf1df8..000000000000
--- a/metadata/md5-cache/acct-group/unifi-video-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for Unifi Video
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=15790b55684f0ce80a9f766a911d52cb
diff --git a/metadata/md5-cache/acct-group/unifi-video-0-r1 b/metadata/md5-cache/acct-group/unifi-video-0-r1
new file mode 100644
index 000000000000..a770c9372e7e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unifi-video-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Unifi Video
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=42fe7bde787ff2daab829ecc4c87a3ab
diff --git a/metadata/md5-cache/acct-group/unrealircd-0-r1 b/metadata/md5-cache/acct-group/unrealircd-0-r1
deleted file mode 100644
index 20559fbd0752..000000000000
--- a/metadata/md5-cache/acct-group/unrealircd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: unrealircd
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=332826d88877c4b7cf63801975692826
diff --git a/metadata/md5-cache/acct-group/unrealircd-0-r2 b/metadata/md5-cache/acct-group/unrealircd-0-r2
new file mode 100644
index 000000000000..6bc3924d3b43
--- /dev/null
+++ b/metadata/md5-cache/acct-group/unrealircd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: unrealircd
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1000ec6a25d8b2d4b16fce6989b78d64
diff --git a/metadata/md5-cache/acct-group/upmpdcli-0 b/metadata/md5-cache/acct-group/upmpdcli-0
deleted file mode 100644
index d3c04598fe71..000000000000
--- a/metadata/md5-cache/acct-group/upmpdcli-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for upmpdcli
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=98b7d2b1f7a08f21bfbaa06255913c62
diff --git a/metadata/md5-cache/acct-group/upmpdcli-0-r1 b/metadata/md5-cache/acct-group/upmpdcli-0-r1
new file mode 100644
index 000000000000..ebf3379226a1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/upmpdcli-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for upmpdcli
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=27f70b34d37b0ef7cbb705ef33e8016b
diff --git a/metadata/md5-cache/acct-group/uptimed-0-r2 b/metadata/md5-cache/acct-group/uptimed-0-r2
deleted file mode 100644
index 2f1d902afa6b..000000000000
--- a/metadata/md5-cache/acct-group/uptimed-0-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: uptimed
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=800dbbf05ba8a1fe41117be5550c16ca
diff --git a/metadata/md5-cache/acct-group/uptimed-0-r3 b/metadata/md5-cache/acct-group/uptimed-0-r3
new file mode 100644
index 000000000000..a453e99fef46
--- /dev/null
+++ b/metadata/md5-cache/acct-group/uptimed-0-r3
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: uptimed
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e4960e2a8cd7c081e45642c7f1b3892f
diff --git a/metadata/md5-cache/acct-group/usb-0-r1 b/metadata/md5-cache/acct-group/usb-0-r1
deleted file mode 100644
index 90ce165e620d..000000000000
--- a/metadata/md5-cache/acct-group/usb-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: usb
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9b830fe958385f19197b60db5157c4af
diff --git a/metadata/md5-cache/acct-group/usb-0-r2 b/metadata/md5-cache/acct-group/usb-0-r2
new file mode 100644
index 000000000000..8d717ec3961c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/usb-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: usb
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2496e666565227d662bc71597d2683e9
diff --git a/metadata/md5-cache/acct-group/users-0 b/metadata/md5-cache/acct-group/users-0
deleted file mode 100644
index 8eb34bf48281..000000000000
--- a/metadata/md5-cache/acct-group/users-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: users
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c8f2f31048f3de1fa53421ddd43ecdda
diff --git a/metadata/md5-cache/acct-group/users-0-r1 b/metadata/md5-cache/acct-group/users-0-r1
new file mode 100644
index 000000000000..052a88f7b913
--- /dev/null
+++ b/metadata/md5-cache/acct-group/users-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: users
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f210c3502abffd0d7d3e434f8bcd4d9b
diff --git a/metadata/md5-cache/acct-group/ushare-0 b/metadata/md5-cache/acct-group/ushare-0
deleted file mode 100644
index 7f8d3da3d5cc..000000000000
--- a/metadata/md5-cache/acct-group/ushare-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for uShare
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3395b7fe27f872333dd11ade8ca5075f
diff --git a/metadata/md5-cache/acct-group/ushare-0-r1 b/metadata/md5-cache/acct-group/ushare-0-r1
new file mode 100644
index 000000000000..342e3e1aab42
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ushare-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for uShare
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cc2cf37fb4ac1f8ad0ae5bd481f1bb22
diff --git a/metadata/md5-cache/acct-group/utmp-0-r1 b/metadata/md5-cache/acct-group/utmp-0-r1
deleted file mode 100644
index 2dbf1a71314a..000000000000
--- a/metadata/md5-cache/acct-group/utmp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: utmp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3f7fe5b7f11e59a9d8d4955f4bb1b95a
diff --git a/metadata/md5-cache/acct-group/utmp-0-r2 b/metadata/md5-cache/acct-group/utmp-0-r2
new file mode 100644
index 000000000000..6fdb5548feac
--- /dev/null
+++ b/metadata/md5-cache/acct-group/utmp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: utmp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2e940304c310971624daa5ceb2f602de
diff --git a/metadata/md5-cache/acct-group/uucp-0-r1 b/metadata/md5-cache/acct-group/uucp-0-r1
deleted file mode 100644
index 27b49ba2e0d8..000000000000
--- a/metadata/md5-cache/acct-group/uucp-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: uucp
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6b9a4f0f2f0c0a26c2ddf6da7529eb4d
diff --git a/metadata/md5-cache/acct-group/uucp-0-r2 b/metadata/md5-cache/acct-group/uucp-0-r2
new file mode 100644
index 000000000000..9315340a5aa2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/uucp-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: uucp
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=377e8600972fe08042100bd840b5e007
diff --git a/metadata/md5-cache/acct-group/uwsgi_exporter-0 b/metadata/md5-cache/acct-group/uwsgi_exporter-0
deleted file mode 100644
index f0bde2f2b2de..000000000000
--- a/metadata/md5-cache/acct-group/uwsgi_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-metrics/uwsgi_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fc7a036f684f9e4995ce90094a6672fb
diff --git a/metadata/md5-cache/acct-group/uwsgi_exporter-0-r1 b/metadata/md5-cache/acct-group/uwsgi_exporter-0-r1
new file mode 100644
index 000000000000..b24979ca12cd
--- /dev/null
+++ b/metadata/md5-cache/acct-group/uwsgi_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/uwsgi_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8609c2b62c4fe41bbcc638cf8498faf1
diff --git a/metadata/md5-cache/acct-group/vacation-0 b/metadata/md5-cache/acct-group/vacation-0
deleted file mode 100644
index a34a0711476a..000000000000
--- a/metadata/md5-cache/acct-group/vacation-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for www-apps/postfixadmin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7441efdb18b7361bb94c6172dc07899e
diff --git a/metadata/md5-cache/acct-group/vacation-0-r1 b/metadata/md5-cache/acct-group/vacation-0-r1
new file mode 100644
index 000000000000..4cb1be67d767
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vacation-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-apps/postfixadmin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=37fbc6a8bf582dfdabad68a378b698ed
diff --git a/metadata/md5-cache/acct-group/varnish-0-r1 b/metadata/md5-cache/acct-group/varnish-0-r1
deleted file mode 100644
index af64bd524005..000000000000
--- a/metadata/md5-cache/acct-group/varnish-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for varnish
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=550524133d62be9df27e5631e3e740d1
diff --git a/metadata/md5-cache/acct-group/varnish-0-r2 b/metadata/md5-cache/acct-group/varnish-0-r2
new file mode 100644
index 000000000000..3e5b13ee327f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/varnish-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for varnish
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4c8792f10a7f41b3519b5dc912145a32
diff --git a/metadata/md5-cache/acct-group/vault-0-r1 b/metadata/md5-cache/acct-group/vault-0-r1
deleted file mode 100644
index 46a3a832eb7b..000000000000
--- a/metadata/md5-cache/acct-group/vault-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: vault
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=739ba25f8da21b5046773324a790d59f
diff --git a/metadata/md5-cache/acct-group/vault-0-r2 b/metadata/md5-cache/acct-group/vault-0-r2
new file mode 100644
index 000000000000..cd49b80d6ee7
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vault-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vault
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f46e3071783a02a18ee8e56bf1ad9930
diff --git a/metadata/md5-cache/acct-group/vault_exporter-0 b/metadata/md5-cache/acct-group/vault_exporter-0
deleted file mode 100644
index a08173cfb0d5..000000000000
--- a/metadata/md5-cache/acct-group/vault_exporter-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-metrics/vault_exporter
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4f8b246ea59f49285df9b9a6d5dd2ccc
diff --git a/metadata/md5-cache/acct-group/vault_exporter-0-r1 b/metadata/md5-cache/acct-group/vault_exporter-0-r1
new file mode 100644
index 000000000000..a0c15d2e2e85
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vault_exporter-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-metrics/vault_exporter
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=156476c4c3301bbc7e9c56b7b0728b55
diff --git a/metadata/md5-cache/acct-group/vboxguest-0-r1 b/metadata/md5-cache/acct-group/vboxguest-0-r1
deleted file mode 100644
index 32dd83b25853..000000000000
--- a/metadata/md5-cache/acct-group/vboxguest-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: vboxguest
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b47bd0cfe04a7a4568a89753b589fe96
diff --git a/metadata/md5-cache/acct-group/vboxguest-0-r2 b/metadata/md5-cache/acct-group/vboxguest-0-r2
new file mode 100644
index 000000000000..62ccc1f82b55
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vboxguest-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vboxguest
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2a114c3e5ab7df66a2a3d00df8863860
diff --git a/metadata/md5-cache/acct-group/vboxsf-0-r1 b/metadata/md5-cache/acct-group/vboxsf-0-r1
deleted file mode 100644
index 943b1a9b1c9a..000000000000
--- a/metadata/md5-cache/acct-group/vboxsf-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: vboxsf
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d94845e030150651a42d0676b2bd4f15
diff --git a/metadata/md5-cache/acct-group/vboxsf-0-r2 b/metadata/md5-cache/acct-group/vboxsf-0-r2
new file mode 100644
index 000000000000..2d4cd618a2ce
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vboxsf-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vboxsf
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6463d08fc655fb31383d60dfb8cca1f2
diff --git a/metadata/md5-cache/acct-group/vboxusers-0-r1 b/metadata/md5-cache/acct-group/vboxusers-0-r1
deleted file mode 100644
index 12fa6417d9eb..000000000000
--- a/metadata/md5-cache/acct-group/vboxusers-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: vboxusers
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=af450b3b401ee9050aff2680ae05611f
diff --git a/metadata/md5-cache/acct-group/vboxusers-0-r2 b/metadata/md5-cache/acct-group/vboxusers-0-r2
new file mode 100644
index 000000000000..809d2f18327d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vboxusers-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vboxusers
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=109e630d185b4c08cc9522261161c3e5
diff --git a/metadata/md5-cache/acct-group/vdr-0-r1 b/metadata/md5-cache/acct-group/vdr-0-r1
deleted file mode 100644
index 3e2a78c69439..000000000000
--- a/metadata/md5-cache/acct-group/vdr-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for the VDR (VideoDiskRecorder)
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2b8b353d128e19962bc22c07ad0c5fc8
diff --git a/metadata/md5-cache/acct-group/vdr-0-r2 b/metadata/md5-cache/acct-group/vdr-0-r2
new file mode 100644
index 000000000000..961e62064455
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vdr-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for the VDR (VideoDiskRecorder)
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=54c7d735d90fdfff1ace94aa5fe2605d
diff --git a/metadata/md5-cache/acct-group/vdradmin-0-r1 b/metadata/md5-cache/acct-group/vdradmin-0-r1
deleted file mode 100644
index 859344cb2fef..000000000000
--- a/metadata/md5-cache/acct-group/vdradmin-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for www-misc/vdradmin-am
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=47f66ef04bd861405089b35b10fd7db0
diff --git a/metadata/md5-cache/acct-group/vdradmin-0-r2 b/metadata/md5-cache/acct-group/vdradmin-0-r2
new file mode 100644
index 000000000000..e1345b4b9ea5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vdradmin-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for www-misc/vdradmin-am
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=743ad2aa3fba1479efb1f9f65f3d9fba
diff --git a/metadata/md5-cache/acct-group/video-0-r1 b/metadata/md5-cache/acct-group/video-0-r1
deleted file mode 100644
index 32a8da7c6b56..000000000000
--- a/metadata/md5-cache/acct-group/video-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: video
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4b2e9a61d260463a29582ee18c48e1c5
diff --git a/metadata/md5-cache/acct-group/video-0-r2 b/metadata/md5-cache/acct-group/video-0-r2
new file mode 100644
index 000000000000..992bc8f4ea25
--- /dev/null
+++ b/metadata/md5-cache/acct-group/video-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: video
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f12d76f0aa770ae9772b4d1008592b0d
diff --git a/metadata/md5-cache/acct-group/vlock-0 b/metadata/md5-cache/acct-group/vlock-0
deleted file mode 100644
index bc05a3010090..000000000000
--- a/metadata/md5-cache/acct-group/vlock-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for app-misc/vlock
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6af78bc4aa7fed96164626ede04fffd9
diff --git a/metadata/md5-cache/acct-group/vlock-0-r1 b/metadata/md5-cache/acct-group/vlock-0-r1
new file mode 100644
index 000000000000..e4a226bbcd5c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vlock-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for app-misc/vlock
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7910b61e7694886f3188e5abc37dbc7d
diff --git a/metadata/md5-cache/acct-group/vnstat-0 b/metadata/md5-cache/acct-group/vnstat-0
deleted file mode 100644
index b00708106291..000000000000
--- a/metadata/md5-cache/acct-group/vnstat-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for vnstat network monitoring
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=09d7ebd5503cea35c1dd75bcbbaa4824
diff --git a/metadata/md5-cache/acct-group/vnstat-0-r1 b/metadata/md5-cache/acct-group/vnstat-0-r1
new file mode 100644
index 000000000000..548b3b40aab1
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vnstat-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for vnstat network monitoring
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8dd511e4ec779f0a660dc0e9731a6c49
diff --git a/metadata/md5-cache/acct-group/vpopmail-0-r1 b/metadata/md5-cache/acct-group/vpopmail-0-r1
deleted file mode 100644
index 551f6732abf8..000000000000
--- a/metadata/md5-cache/acct-group/vpopmail-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: vpopmail
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=082e748a5e28591c268a236379ddcc62
diff --git a/metadata/md5-cache/acct-group/vpopmail-0-r2 b/metadata/md5-cache/acct-group/vpopmail-0-r2
new file mode 100644
index 000000000000..3974bdb36dd3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/vpopmail-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: vpopmail
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7d9a5d97d998f63fe9cccdc2917679e8
diff --git a/metadata/md5-cache/acct-group/wesnoth-0-r1 b/metadata/md5-cache/acct-group/wesnoth-0-r1
deleted file mode 100644
index 84491f2274bd..000000000000
--- a/metadata/md5-cache/acct-group/wesnoth-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: wesnoth
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cb4f74bd45e2f277cd82ecd415e13ede
diff --git a/metadata/md5-cache/acct-group/wesnoth-0-r2 b/metadata/md5-cache/acct-group/wesnoth-0-r2
new file mode 100644
index 000000000000..b60e0d04c838
--- /dev/null
+++ b/metadata/md5-cache/acct-group/wesnoth-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: wesnoth
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bcf9219df87e14c564102f6cf7ecb4e6
diff --git a/metadata/md5-cache/acct-group/wheel-0-r1 b/metadata/md5-cache/acct-group/wheel-0-r1
deleted file mode 100644
index 06cfa054a647..000000000000
--- a/metadata/md5-cache/acct-group/wheel-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: wheel
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=23ea25efad05a48acc3ae75f79932a96
diff --git a/metadata/md5-cache/acct-group/wheel-0-r2 b/metadata/md5-cache/acct-group/wheel-0-r2
new file mode 100644
index 000000000000..9038f251ea2e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/wheel-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: wheel
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=50ce75ca5c841d27309e82208988b29f
diff --git a/metadata/md5-cache/acct-group/wwwoffle-0 b/metadata/md5-cache/acct-group/wwwoffle-0
deleted file mode 100644
index 54cc1701d414..000000000000
--- a/metadata/md5-cache/acct-group/wwwoffle-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-proxy/wwwoffle
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6b17465873f6d99e4a1394890a621450
diff --git a/metadata/md5-cache/acct-group/wwwoffle-0-r1 b/metadata/md5-cache/acct-group/wwwoffle-0-r1
new file mode 100644
index 000000000000..d0218dd6760d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/wwwoffle-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-proxy/wwwoffle
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8d142b63725bbdc901aebe24e00cc7c7
diff --git a/metadata/md5-cache/acct-group/x2goprint-0-r1 b/metadata/md5-cache/acct-group/x2goprint-0-r1
deleted file mode 100644
index 8d81d808a997..000000000000
--- a/metadata/md5-cache/acct-group/x2goprint-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-misc/x2goserver
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=72f1c211f7b064970bf4376370b53e6c
diff --git a/metadata/md5-cache/acct-group/x2goprint-0-r2 b/metadata/md5-cache/acct-group/x2goprint-0-r2
new file mode 100644
index 000000000000..d69e3eefedd4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/x2goprint-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/x2goserver
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ba48c64ad23be5644caec2f04e4c8c8e
diff --git a/metadata/md5-cache/acct-group/x2gouser-0-r1 b/metadata/md5-cache/acct-group/x2gouser-0-r1
deleted file mode 100644
index 814b8601ca13..000000000000
--- a/metadata/md5-cache/acct-group/x2gouser-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-misc/x2goserver
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8f8e16dad237061c1e5f2b58f6333f8b
diff --git a/metadata/md5-cache/acct-group/x2gouser-0-r2 b/metadata/md5-cache/acct-group/x2gouser-0-r2
new file mode 100644
index 000000000000..d26a9d6e11f2
--- /dev/null
+++ b/metadata/md5-cache/acct-group/x2gouser-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-misc/x2goserver
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e25e479b114a4fd371fca7c0411e972f
diff --git a/metadata/md5-cache/acct-group/xpra-0 b/metadata/md5-cache/acct-group/xpra-0
deleted file mode 100644
index 8e9b69beada2..000000000000
--- a/metadata/md5-cache/acct-group/xpra-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=group for x11-wm/xpra
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=909254e6f02205948a2190ecdb1ff3a9
diff --git a/metadata/md5-cache/acct-group/xpra-0-r1 b/metadata/md5-cache/acct-group/xpra-0-r1
new file mode 100644
index 000000000000..ce234bf0474f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/xpra-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=group for x11-wm/xpra
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7b261cb5986cb5edee1c85f45b2826ac
diff --git a/metadata/md5-cache/acct-group/xrootd-0-r1 b/metadata/md5-cache/acct-group/xrootd-0-r1
deleted file mode 100644
index 586226d67346..000000000000
--- a/metadata/md5-cache/acct-group/xrootd-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for the XRootD server
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5f8b5871b332872a9a55361782a4b6e8
diff --git a/metadata/md5-cache/acct-group/xrootd-0-r2 b/metadata/md5-cache/acct-group/xrootd-0-r2
new file mode 100644
index 000000000000..78850cd48960
--- /dev/null
+++ b/metadata/md5-cache/acct-group/xrootd-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the XRootD server
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8646de4db1232a3199dce9b1ec7f7188
diff --git a/metadata/md5-cache/acct-group/xwax-0 b/metadata/md5-cache/acct-group/xwax-0
deleted file mode 100644
index 32e9c8208aab..000000000000
--- a/metadata/md5-cache/acct-group/xwax-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for media-sound/xwax
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9bb374b6c0a8bc4913b64e0436585be0
diff --git a/metadata/md5-cache/acct-group/xwax-0-r1 b/metadata/md5-cache/acct-group/xwax-0-r1
new file mode 100644
index 000000000000..7bda733ea095
--- /dev/null
+++ b/metadata/md5-cache/acct-group/xwax-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for media-sound/xwax
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=67538f9f60611eb3a463b761fea28558
diff --git a/metadata/md5-cache/acct-group/yubihsm-connector-0 b/metadata/md5-cache/acct-group/yubihsm-connector-0
deleted file mode 100644
index 9a4c53062fec..000000000000
--- a/metadata/md5-cache/acct-group/yubihsm-connector-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: yubihsm-connector
-EAPI=8
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e45151e5a0f67567182c67ef4a7349de
diff --git a/metadata/md5-cache/acct-group/yubihsm-connector-0-r1 b/metadata/md5-cache/acct-group/yubihsm-connector-0-r1
new file mode 100644
index 000000000000..4e13e0c30e38
--- /dev/null
+++ b/metadata/md5-cache/acct-group/yubihsm-connector-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: yubihsm-connector
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e45151e5a0f67567182c67ef4a7349de
diff --git a/metadata/md5-cache/acct-group/zabbix-0 b/metadata/md5-cache/acct-group/zabbix-0
deleted file mode 100644
index 7516f4248152..000000000000
--- a/metadata/md5-cache/acct-group/zabbix-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for Zabbix
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0e5bccce5fd1cff14837041638da2f18
diff --git a/metadata/md5-cache/acct-group/zabbix-0-r1 b/metadata/md5-cache/acct-group/zabbix-0-r1
new file mode 100644
index 000000000000..566a106f8c62
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zabbix-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Zabbix
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=10bf7a1f43e517745b3076db24731237
diff --git a/metadata/md5-cache/acct-group/zeppelin-0-r1 b/metadata/md5-cache/acct-group/zeppelin-0-r1
deleted file mode 100644
index ff461eb95c05..000000000000
--- a/metadata/md5-cache/acct-group/zeppelin-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for system-wide www-apps/zeppelin-bin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=907730e5f277018a1895aff849313cca
diff --git a/metadata/md5-cache/acct-group/zeppelin-0-r2 b/metadata/md5-cache/acct-group/zeppelin-0-r2
new file mode 100644
index 000000000000..0ca2b97cf25e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zeppelin-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for system-wide www-apps/zeppelin-bin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cc8d3c0d6b6eb2284ca6c9be7579ce3c
diff --git a/metadata/md5-cache/acct-group/zetcd-0 b/metadata/md5-cache/acct-group/zetcd-0
deleted file mode 100644
index 5822ec45c568..000000000000
--- a/metadata/md5-cache/acct-group/zetcd-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for sys-cluster/zetcd
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=598749e7bac30e7c5093ed8e1b7ff25b
diff --git a/metadata/md5-cache/acct-group/zetcd-0-r1 b/metadata/md5-cache/acct-group/zetcd-0-r1
new file mode 100644
index 000000000000..b6d89ef360d5
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zetcd-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sys-cluster/zetcd
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f20fe0a7917150d2b69a9f5f7b3435ec
diff --git a/metadata/md5-cache/acct-group/ziproxy-0 b/metadata/md5-cache/acct-group/ziproxy-0
deleted file mode 100644
index 330fa5844600..000000000000
--- a/metadata/md5-cache/acct-group/ziproxy-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: ziproxy
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0df45d03f441d5b95c89b7928a2bb39a
diff --git a/metadata/md5-cache/acct-group/ziproxy-0-r1 b/metadata/md5-cache/acct-group/ziproxy-0-r1
new file mode 100644
index 000000000000..1b464642186a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ziproxy-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: ziproxy
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ebd4c1d7ae2b12ed29dd486fe3de2927
diff --git a/metadata/md5-cache/acct-group/znc-0-r1 b/metadata/md5-cache/acct-group/znc-0-r1
deleted file mode 100644
index 15536c827e66..000000000000
--- a/metadata/md5-cache/acct-group/znc-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=Group for net-irc/znc
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a61b18898abf1bdc18af3a609a3710f1
diff --git a/metadata/md5-cache/acct-group/znc-0-r2 b/metadata/md5-cache/acct-group/znc-0-r2
new file mode 100644
index 000000000000..5b2d2bb7edd9
--- /dev/null
+++ b/metadata/md5-cache/acct-group/znc-0-r2
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-irc/znc
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=37d1cbcad8973f8fa8ebbf42072c4a72
diff --git a/metadata/md5-cache/acct-group/zookeeper-0 b/metadata/md5-cache/acct-group/zookeeper-0
deleted file mode 100644
index bb000713a82c..000000000000
--- a/metadata/md5-cache/acct-group/zookeeper-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=A group for sys-cluster/zookeeper-bin
-EAPI=7
-INHERIT=acct-group
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-SLOT=0
-_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fc55b413484bdb59251081a63151870f
diff --git a/metadata/md5-cache/acct-group/zookeeper-0-r1 b/metadata/md5-cache/acct-group/zookeeper-0-r1
new file mode 100644
index 000000000000..932b23481244
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zookeeper-0-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-cluster/zookeeper-bin
+EAPI=7
+INHERIT=acct-group
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+SLOT=0
+_eclasses_=acct-group	1ba28b31fccef7f4ff1cebfad243a633	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e4fc8a8fde6477ec87024ead9ffc8013
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 6e2aeb741bef..f01401d3e7ef 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/_cron-failure-0 b/metadata/md5-cache/acct-user/_cron-failure-0
deleted file mode 100644
index ba24fb9c9e6f..000000000000
--- a/metadata/md5-cache/acct-user/_cron-failure-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-process/systemd-cron failure emails
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/_cron-failure
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ecc54dd06040ba4d4bf8200809dd19bc
diff --git a/metadata/md5-cache/acct-user/_cron-failure-0-r1 b/metadata/md5-cache/acct-user/_cron-failure-0-r1
new file mode 100644
index 000000000000..b2c67650cda3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/_cron-failure-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-process/systemd-cron failure emails
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/_cron-failure
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=712a86991fe499373b092bab5d8adf4c
diff --git a/metadata/md5-cache/acct-user/aerospike-amc-0 b/metadata/md5-cache/acct-user/aerospike-amc-0
deleted file mode 100644
index 30a276d0a19a..000000000000
--- a/metadata/md5-cache/acct-user/aerospike-amc-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-admin/aerospike-amc-community
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/aerospike-amc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b8406c570ebdfcd2b452b1b8ad1b33f9
diff --git a/metadata/md5-cache/acct-user/aerospike-amc-0-r1 b/metadata/md5-cache/acct-user/aerospike-amc-0-r1
new file mode 100644
index 000000000000..5930c643a5b8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/aerospike-amc-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-admin/aerospike-amc-community
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/aerospike-amc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f1778ee07d2bf1ed531b95a967da8200
diff --git a/metadata/md5-cache/acct-user/airdcppd-0-r1 b/metadata/md5-cache/acct-user/airdcppd-0-r1
deleted file mode 100644
index 5d72d5c38518..000000000000
--- a/metadata/md5-cache/acct-user/airdcppd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-p2p/airdcpp-webclient
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/airdcppd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a44b5508e38d441f206536d9f3891bf9
diff --git a/metadata/md5-cache/acct-user/airdcppd-0-r2 b/metadata/md5-cache/acct-user/airdcppd-0-r2
new file mode 100644
index 000000000000..68d67ceec964
--- /dev/null
+++ b/metadata/md5-cache/acct-user/airdcppd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/airdcpp-webclient
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/airdcppd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a1041dca20ed8a959fe97e7347c44378
diff --git a/metadata/md5-cache/acct-user/alertmanager-0 b/metadata/md5-cache/acct-user/alertmanager-0
deleted file mode 100644
index fac69321a1ef..000000000000
--- a/metadata/md5-cache/acct-user/alertmanager-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for alertmanager
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/alertmanager
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=151d927d42fe6e2b64ae5f9f81de72d7
diff --git a/metadata/md5-cache/acct-user/alertmanager-0-r1 b/metadata/md5-cache/acct-user/alertmanager-0-r1
new file mode 100644
index 000000000000..c8c5bb0a3ab9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/alertmanager-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for alertmanager
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/alertmanager
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c4ba3090553cc64dd50381369d574dbd
diff --git a/metadata/md5-cache/acct-user/alias-0-r1 b/metadata/md5-cache/acct-user/alias-0-r1
deleted file mode 100644
index 1664bc5dadd0..000000000000
--- a/metadata/md5-cache/acct-user/alias-0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DEPEND=acct-group/qmail
-DESCRIPTION=alias user for qmail mail delivery
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles acct-group/qmail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c92a5351a362ca55f079714ae95b0ab8
diff --git a/metadata/md5-cache/acct-user/alias-0-r2 b/metadata/md5-cache/acct-user/alias-0-r2
new file mode 100644
index 000000000000..63ea312e5ce4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/alias-0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/qmail
+DESCRIPTION=alias user for qmail mail delivery
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles acct-group/qmail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1b8e51170ec98417e03df7b46671bf05
diff --git a/metadata/md5-cache/acct-user/amanda-0 b/metadata/md5-cache/acct-user/amanda-0
deleted file mode 100644
index 937d9a20ae92..000000000000
--- a/metadata/md5-cache/acct-user/amanda-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: amanda
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/amanda
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d866b68c27368cf438c55cfe403c0a16
diff --git a/metadata/md5-cache/acct-user/amanda-0-r1 b/metadata/md5-cache/acct-user/amanda-0-r1
new file mode 100644
index 000000000000..0a54cbf409c7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/amanda-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: amanda
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/amanda
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=128ceb53c4348bdf9101058c5583135b
diff --git a/metadata/md5-cache/acct-user/amavis-0-r1 b/metadata/md5-cache/acct-user/amavis-0-r1
deleted file mode 100644
index 3e8a9620e27b..000000000000
--- a/metadata/md5-cache/acct-user/amavis-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for mail-filter/amavisd-new
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/amavis
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=36b9eb6be154c3940075740b7d232587
diff --git a/metadata/md5-cache/acct-user/amavis-0-r2 b/metadata/md5-cache/acct-user/amavis-0-r2
new file mode 100644
index 000000000000..2a70b1410cfb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/amavis-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mail-filter/amavisd-new
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/amavis
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f79c4d9e157b9315ef0d3255d27dd56a
diff --git a/metadata/md5-cache/acct-user/amule-0-r2 b/metadata/md5-cache/acct-user/amule-0-r2
deleted file mode 100644
index 7117a95dcc2b..000000000000
--- a/metadata/md5-cache/acct-user/amule-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-p2p/amule
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/amule
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=63b9e7e41e7cd23b290c22c1c0d4f310
diff --git a/metadata/md5-cache/acct-user/amule-0-r3 b/metadata/md5-cache/acct-user/amule-0-r3
new file mode 100644
index 000000000000..c115e2e7d25f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/amule-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/amule
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/amule
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c979d73d8cce628c67aef37f24fe9594
diff --git a/metadata/md5-cache/acct-user/anope-0-r1 b/metadata/md5-cache/acct-user/anope-0-r1
deleted file mode 100644
index ded88da10fa9..000000000000
--- a/metadata/md5-cache/acct-user/anope-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for Anope IRC services
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/anope
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4bfc11e876a684b6548219612338e9df
diff --git a/metadata/md5-cache/acct-user/anope-0-r2 b/metadata/md5-cache/acct-user/anope-0-r2
new file mode 100644
index 000000000000..9e86f2e030a2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/anope-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Anope IRC services
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/anope
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3fe3221017cda8241f26f24f2d02aeff
diff --git a/metadata/md5-cache/acct-user/apache-0-r2 b/metadata/md5-cache/acct-user/apache-0-r2
deleted file mode 100644
index 04376ccc96a8..000000000000
--- a/metadata/md5-cache/acct-user/apache-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: apache
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/apache
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0f642815b1a310a7a20131c8a8364a0c
diff --git a/metadata/md5-cache/acct-user/apache-0-r3 b/metadata/md5-cache/acct-user/apache-0-r3
new file mode 100644
index 000000000000..d10b4cf206f5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/apache-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: apache
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/apache
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8242e649b739bea951b3b1aec5d99fd6
diff --git a/metadata/md5-cache/acct-user/apt-cacher-ng-0 b/metadata/md5-cache/acct-user/apt-cacher-ng-0
deleted file mode 100644
index 2e476008ed2a..000000000000
--- a/metadata/md5-cache/acct-user/apt-cacher-ng-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for apt-cacher-ng
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/apt-cacher-ng
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8a5f809bc44d484ac8b8a2f449d31fb5
diff --git a/metadata/md5-cache/acct-user/apt-cacher-ng-0-r1 b/metadata/md5-cache/acct-user/apt-cacher-ng-0-r1
new file mode 100644
index 000000000000..c702c0c9bda5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/apt-cacher-ng-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for apt-cacher-ng
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/apt-cacher-ng
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=df969aae282cb28dfa7dbe7d5a209f42
diff --git a/metadata/md5-cache/acct-user/argus-0 b/metadata/md5-cache/acct-user/argus-0
deleted file mode 100644
index 2f0f69765592..000000000000
--- a/metadata/md5-cache/acct-user/argus-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=uid for net-analyzer/argus
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/argus
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=222da2d6369fda19a164f37e2584cb41
diff --git a/metadata/md5-cache/acct-user/argus-0-r1 b/metadata/md5-cache/acct-user/argus-0-r1
new file mode 100644
index 000000000000..485b46756d19
--- /dev/null
+++ b/metadata/md5-cache/acct-user/argus-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-analyzer/argus
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/argus
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c1d399c72f9e04602d511ec00feea88c
diff --git a/metadata/md5-cache/acct-user/arpwatch-0 b/metadata/md5-cache/acct-user/arpwatch-0
deleted file mode 100644
index 5bc795f8f6e9..000000000000
--- a/metadata/md5-cache/acct-user/arpwatch-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-analyzer/arpwatch
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/arpwatch
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4707c48563f39862fd0f9011e1980927
diff --git a/metadata/md5-cache/acct-user/arpwatch-0-r1 b/metadata/md5-cache/acct-user/arpwatch-0-r1
new file mode 100644
index 000000000000..bda6b9bd9728
--- /dev/null
+++ b/metadata/md5-cache/acct-user/arpwatch-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/arpwatch
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/arpwatch
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=561ab1d3aa94546f4f5ed14a0f2afc96
diff --git a/metadata/md5-cache/acct-user/artifactory-0 b/metadata/md5-cache/acct-user/artifactory-0
deleted file mode 100644
index 3bb49464293a..000000000000
--- a/metadata/md5-cache/acct-user/artifactory-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for dev-util/artifactory-bin
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/artifactory
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e60384b5e0a0d7aa4ad92f9d55a15cab
diff --git a/metadata/md5-cache/acct-user/artifactory-0-r1 b/metadata/md5-cache/acct-user/artifactory-0-r1
new file mode 100644
index 000000000000..a1b708a52deb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/artifactory-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for dev-util/artifactory-bin
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/artifactory
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f9b0f86f049b01f415691c04e5304bcb
diff --git a/metadata/md5-cache/acct-user/aspnet-0 b/metadata/md5-cache/acct-user/aspnet-0
deleted file mode 100644
index 157ba22a7e4f..000000000000
--- a/metadata/md5-cache/acct-user/aspnet-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the www-servers/xsp dotnet server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/aspnet
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bfd7f0c86adac2e8e2e8c9d85fadffcf
diff --git a/metadata/md5-cache/acct-user/aspnet-0-r1 b/metadata/md5-cache/acct-user/aspnet-0-r1
new file mode 100644
index 000000000000..62f5ad25475e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/aspnet-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the www-servers/xsp dotnet server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/aspnet
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3772741e7fc0022be7968a0844fa4eb5
diff --git a/metadata/md5-cache/acct-user/asterisk-0-r1 b/metadata/md5-cache/acct-user/asterisk-0-r1
deleted file mode 100644
index 3c300adb3908..000000000000
--- a/metadata/md5-cache/acct-user/asterisk-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for asterisk
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/asterisk acct-group/dialout
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e0c1517d8b9cb7997b5dba3be7ce79d9
diff --git a/metadata/md5-cache/acct-user/asterisk-0-r2 b/metadata/md5-cache/acct-user/asterisk-0-r2
new file mode 100644
index 000000000000..a2b715eea772
--- /dev/null
+++ b/metadata/md5-cache/acct-user/asterisk-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for asterisk
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/asterisk acct-group/dialout
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=317818ec52f8557e19eb3692f3824c6f
diff --git a/metadata/md5-cache/acct-user/at-0 b/metadata/md5-cache/acct-user/at-0
deleted file mode 100644
index 8637de91c36f..000000000000
--- a/metadata/md5-cache/acct-user/at-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for at daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/at
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=21a239ba0e3008cec1bb7958bbb0c964
diff --git a/metadata/md5-cache/acct-user/at-0-r1 b/metadata/md5-cache/acct-user/at-0-r1
new file mode 100644
index 000000000000..0154e2c5526b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/at-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for at daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/at
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=84cafb5886499882fb16e15d4fd57794
diff --git a/metadata/md5-cache/acct-user/atheme-services-0-r1 b/metadata/md5-cache/acct-user/atheme-services-0-r1
deleted file mode 100644
index b172efee4528..000000000000
--- a/metadata/md5-cache/acct-user/atheme-services-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for Atheme IRC services
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/atheme-services
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2a52a8faf1acdc14224df657bc819117
diff --git a/metadata/md5-cache/acct-user/atheme-services-0-r2 b/metadata/md5-cache/acct-user/atheme-services-0-r2
new file mode 100644
index 000000000000..b2c7e6a04bc3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/atheme-services-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Atheme IRC services
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/atheme-services
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8e0180b2b87481583fe5b9097bfa7019
diff --git a/metadata/md5-cache/acct-user/automatic-0 b/metadata/md5-cache/acct-user/automatic-0
deleted file mode 100644
index bae161c6c389..000000000000
--- a/metadata/md5-cache/acct-user/automatic-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: automatic
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/automatic
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b0a9766f073fa4740019dbd5f533ddba
diff --git a/metadata/md5-cache/acct-user/automatic-0-r1 b/metadata/md5-cache/acct-user/automatic-0-r1
new file mode 100644
index 000000000000..61ab3c01b8cd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/automatic-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: automatic
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/automatic
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b0a9766f073fa4740019dbd5f533ddba
diff --git a/metadata/md5-cache/acct-user/automx2-0-r1 b/metadata/md5-cache/acct-user/automx2-0-r1
deleted file mode 100644
index 7081f918f335..000000000000
--- a/metadata/md5-cache/acct-user/automx2-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-mail/automx2
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/automx2
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1299f2f3ed6e4a9f91f04b3d234a27db
diff --git a/metadata/md5-cache/acct-user/automx2-0-r2 b/metadata/md5-cache/acct-user/automx2-0-r2
new file mode 100644
index 000000000000..002b7d188c82
--- /dev/null
+++ b/metadata/md5-cache/acct-user/automx2-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/automx2
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/automx2
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=273be6a76a268498a0065a9b6879b4a8
diff --git a/metadata/md5-cache/acct-user/avahi-0-r1 b/metadata/md5-cache/acct-user/avahi-0-r1
deleted file mode 100644
index d75ac9efa82b..000000000000
--- a/metadata/md5-cache/acct-user/avahi-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for avahi
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/avahi
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6301a4763510098216598ce82d83b460
diff --git a/metadata/md5-cache/acct-user/avahi-0-r2 b/metadata/md5-cache/acct-user/avahi-0-r2
new file mode 100644
index 000000000000..392ec55f4a44
--- /dev/null
+++ b/metadata/md5-cache/acct-user/avahi-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for avahi
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/avahi
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1e68685c1f600766c3cddebf345270e7
diff --git a/metadata/md5-cache/acct-user/avahi-autoipd-0-r1 b/metadata/md5-cache/acct-user/avahi-autoipd-0-r1
deleted file mode 100644
index 2ba1ec4ae336..000000000000
--- a/metadata/md5-cache/acct-user/avahi-autoipd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for avahi-autoipd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/avahi-autoipd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7844d38f03ca170ca5ed5f1f1fe994b0
diff --git a/metadata/md5-cache/acct-user/avahi-autoipd-0-r2 b/metadata/md5-cache/acct-user/avahi-autoipd-0-r2
new file mode 100644
index 000000000000..59ba17ce605f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/avahi-autoipd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for avahi-autoipd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/avahi-autoipd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5ec561c7bbebd60f12b0b6608a37a0b0
diff --git a/metadata/md5-cache/acct-user/axtls-0 b/metadata/md5-cache/acct-user/axtls-0
deleted file mode 100644
index 1eaa5655ab3a..000000000000
--- a/metadata/md5-cache/acct-user/axtls-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-libs/axtls
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/axtls
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=44cedc1e0721ae08d51b1514e8f287af
diff --git a/metadata/md5-cache/acct-user/axtls-0-r1 b/metadata/md5-cache/acct-user/axtls-0-r1
new file mode 100644
index 000000000000..c0cf1a9bd8bd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/axtls-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-libs/axtls
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/axtls
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=52dea4c5bcc787f67a3837e829d1e1fb
diff --git a/metadata/md5-cache/acct-user/backuppc-0 b/metadata/md5-cache/acct-user/backuppc-0
deleted file mode 100644
index a6198b7fbb48..000000000000
--- a/metadata/md5-cache/acct-user/backuppc-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for app-backup/backuppc
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/backuppc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=16a2f4e7c6e5e316494aac387f0d20a1
diff --git a/metadata/md5-cache/acct-user/backuppc-0-r1 b/metadata/md5-cache/acct-user/backuppc-0-r1
new file mode 100644
index 000000000000..d4baae146796
--- /dev/null
+++ b/metadata/md5-cache/acct-user/backuppc-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-backup/backuppc
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/backuppc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=492ed0fe6d4bd3364564da3da937f534
diff --git a/metadata/md5-cache/acct-user/bacula-0-r1 b/metadata/md5-cache/acct-user/bacula-0-r1
deleted file mode 100644
index 94e55e95c2fa..000000000000
--- a/metadata/md5-cache/acct-user/bacula-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A group for the bacula backup system
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/bacula acct-group/disk acct-group/tape acct-group/cdrom
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3a64c40848cc440659caf58cbf3d90ca
diff --git a/metadata/md5-cache/acct-user/bacula-0-r2 b/metadata/md5-cache/acct-user/bacula-0-r2
new file mode 100644
index 000000000000..3ca3280eb01a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bacula-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A group for the bacula backup system
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/bacula acct-group/disk acct-group/tape acct-group/cdrom
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=797094fc972a08c232dd6914a79f7ba0
diff --git a/metadata/md5-cache/acct-user/bareos-0-r1 b/metadata/md5-cache/acct-user/bareos-0-r1
deleted file mode 100644
index bbdfe1a2c62d..000000000000
--- a/metadata/md5-cache/acct-user/bareos-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the bareos network backup suite
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/bareos acct-group/disk acct-group/tape acct-group/cdrom
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=75791ba57ff4099999fa2522064aaa19
diff --git a/metadata/md5-cache/acct-user/bareos-0-r2 b/metadata/md5-cache/acct-user/bareos-0-r2
new file mode 100644
index 000000000000..2c02cfc7e340
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bareos-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the bareos network backup suite
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/bareos acct-group/disk acct-group/tape acct-group/cdrom
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ac1f389deede73add344d5a920359f0a
diff --git a/metadata/md5-cache/acct-user/beanstalk-0 b/metadata/md5-cache/acct-user/beanstalk-0
deleted file mode 100644
index d81419424b8c..000000000000
--- a/metadata/md5-cache/acct-user/beanstalk-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-misc/beanstalkd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/beanstalk
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d428bab06befd35f4b2de7c601ee0f53
diff --git a/metadata/md5-cache/acct-user/beanstalk-0-r1 b/metadata/md5-cache/acct-user/beanstalk-0-r1
new file mode 100644
index 000000000000..2540dc951e22
--- /dev/null
+++ b/metadata/md5-cache/acct-user/beanstalk-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-misc/beanstalkd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/beanstalk
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5e13b202cd49ea9f6eb3d404bc904760
diff --git a/metadata/md5-cache/acct-user/bedrock-0-r1 b/metadata/md5-cache/acct-user/bedrock-0-r1
deleted file mode 100644
index f692c4042584..000000000000
--- a/metadata/md5-cache/acct-user/bedrock-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the Minecraft Bedrock server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/bedrock
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1f65d6c04dfe471f284ffe129e30ee09
diff --git a/metadata/md5-cache/acct-user/bedrock-0-r2 b/metadata/md5-cache/acct-user/bedrock-0-r2
new file mode 100644
index 000000000000..f292dfae1293
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bedrock-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Minecraft Bedrock server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/bedrock
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=34863b96c65b4f0108a8c372f4d8c6f1
diff --git a/metadata/md5-cache/acct-user/biboumi-0 b/metadata/md5-cache/acct-user/biboumi-0
deleted file mode 100644
index 80c19bcb491e..000000000000
--- a/metadata/md5-cache/acct-user/biboumi-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-im/biboumi
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/biboumi
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b0a4737136b7d8c0719546359c5b07ee
diff --git a/metadata/md5-cache/acct-user/biboumi-0-r1 b/metadata/md5-cache/acct-user/biboumi-0-r1
new file mode 100644
index 000000000000..dd2b6c3ef486
--- /dev/null
+++ b/metadata/md5-cache/acct-user/biboumi-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-im/biboumi
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/biboumi
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=927c5b733f12ab93c2ff877994171357
diff --git a/metadata/md5-cache/acct-user/bind_exporter-0-r1 b/metadata/md5-cache/acct-user/bind_exporter-0-r1
deleted file mode 100644
index fd822fe9d31d..000000000000
--- a/metadata/md5-cache/acct-user/bind_exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for bind_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/bind_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d811040ae3c3a689ea52abb32cb463cf
diff --git a/metadata/md5-cache/acct-user/bind_exporter-0-r2 b/metadata/md5-cache/acct-user/bind_exporter-0-r2
new file mode 100644
index 000000000000..7896b125f73f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bind_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for bind_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/bind_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4ebc71282a2fde6bc3c9de8f2448db5c
diff --git a/metadata/md5-cache/acct-user/bird-0 b/metadata/md5-cache/acct-user/bird-0
deleted file mode 100644
index b5e1a266976b..000000000000
--- a/metadata/md5-cache/acct-user/bird-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for BIRD
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/bird
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=892d703c0ddb13ab2eb41b02b41612e8
diff --git a/metadata/md5-cache/acct-user/bird-0-r1 b/metadata/md5-cache/acct-user/bird-0-r1
new file mode 100644
index 000000000000..123e9c1762d7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bird-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for BIRD
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/bird
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2c0c1d2a803bff6d6f66fc69ad34cb50
diff --git a/metadata/md5-cache/acct-user/bitcoin-0-r1 b/metadata/md5-cache/acct-user/bitcoin-0-r1
deleted file mode 100644
index bc607e4c8144..000000000000
--- a/metadata/md5-cache/acct-user/bitcoin-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System-wide Bitcoin services user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/bitcoin
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=68263c09894fc20f1f43b21826ae1fd3
diff --git a/metadata/md5-cache/acct-user/bitcoin-0-r2 b/metadata/md5-cache/acct-user/bitcoin-0-r2
new file mode 100644
index 000000000000..111c9ec662e9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bitcoin-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System-wide Bitcoin services user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/bitcoin
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=80690fe50db140379a1b1050c4e4609f
diff --git a/metadata/md5-cache/acct-user/bitflu-0 b/metadata/md5-cache/acct-user/bitflu-0
deleted file mode 100644
index 9bd742724966..000000000000
--- a/metadata/md5-cache/acct-user/bitflu-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-p2p/bitflu
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/bitflu
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ddb48332cd63899e18c3712a4de7e9f1
diff --git a/metadata/md5-cache/acct-user/bitflu-0-r1 b/metadata/md5-cache/acct-user/bitflu-0-r1
new file mode 100644
index 000000000000..1a7bf0ee0cec
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bitflu-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-p2p/bitflu
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/bitflu
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4ccdb8385cbcf2157a783fd75ed940a6
diff --git a/metadata/md5-cache/acct-user/bitlbee-0-r1 b/metadata/md5-cache/acct-user/bitlbee-0-r1
deleted file mode 100644
index f4ec0848ddcb..000000000000
--- a/metadata/md5-cache/acct-user/bitlbee-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for biltbee
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/bitlbee
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ab583cdffafe97b6b4532ce4d45b4e5e
diff --git a/metadata/md5-cache/acct-user/bitlbee-0-r2 b/metadata/md5-cache/acct-user/bitlbee-0-r2
new file mode 100644
index 000000000000..750556fe5f8b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/bitlbee-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for biltbee
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/bitlbee
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=08b3317f5944f8906c74350aae1c91ca
diff --git a/metadata/md5-cache/acct-user/blackbox_exporter-0 b/metadata/md5-cache/acct-user/blackbox_exporter-0
deleted file mode 100644
index e19885cab96a..000000000000
--- a/metadata/md5-cache/acct-user/blackbox_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for blackbox_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/blackbox_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=533600d7e1d56eff2f69ef699c599a35
diff --git a/metadata/md5-cache/acct-user/blackbox_exporter-0-r1 b/metadata/md5-cache/acct-user/blackbox_exporter-0-r1
new file mode 100644
index 000000000000..03ddc478887d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/blackbox_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for blackbox_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/blackbox_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5d1dc810f8fa7385a2136caad6a32eb4
diff --git a/metadata/md5-cache/acct-user/boinc-0 b/metadata/md5-cache/acct-user/boinc-0
deleted file mode 100644
index d3f9886c3553..000000000000
--- a/metadata/md5-cache/acct-user/boinc-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for sci-misc/boinc
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/boinc acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a91d8dcf129e5c29d7f855d094e2c8c4
diff --git a/metadata/md5-cache/acct-user/boinc-0-r1 b/metadata/md5-cache/acct-user/boinc-0-r1
new file mode 100644
index 000000000000..e4548304c7d0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/boinc-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for sci-misc/boinc
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/boinc acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b97658ff3eb88cf2dab1cb4d6c447032
diff --git a/metadata/md5-cache/acct-user/brltty-0 b/metadata/md5-cache/acct-user/brltty-0
deleted file mode 100644
index 0c315b4676ea..000000000000
--- a/metadata/md5-cache/acct-user/brltty-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for brltty
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/brltty acct-group/audio acct-group/brlapi acct-group/dialout acct-group/input acct-group/pulse-access acct-group/root acct-group/tty
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f0beb34a04f802039e7e0fee88e0aabd
diff --git a/metadata/md5-cache/acct-user/brltty-0-r1 b/metadata/md5-cache/acct-user/brltty-0-r1
new file mode 100644
index 000000000000..5ae1b87613ff
--- /dev/null
+++ b/metadata/md5-cache/acct-user/brltty-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for brltty
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/brltty acct-group/audio acct-group/brlapi acct-group/dialout acct-group/input acct-group/pulse-access acct-group/root acct-group/tty
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b0e5d4d1a291c6ac5fb4a14991d33a1e
diff --git a/metadata/md5-cache/acct-user/buildbot-0-r1 b/metadata/md5-cache/acct-user/buildbot-0-r1
deleted file mode 100644
index bdd40a99690d..000000000000
--- a/metadata/md5-cache/acct-user/buildbot-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Buildbot program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/buildbot
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9ab71e65305556059a7e9bf897eac00d
diff --git a/metadata/md5-cache/acct-user/buildbot-0-r2 b/metadata/md5-cache/acct-user/buildbot-0-r2
new file mode 100644
index 000000000000..36fe90665eb3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/buildbot-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Buildbot program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/buildbot
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=609b89e78c13b832a7f51a93bcd43196
diff --git a/metadata/md5-cache/acct-user/burp-0-r1 b/metadata/md5-cache/acct-user/burp-0-r1
deleted file mode 100644
index 74626ae37b1f..000000000000
--- a/metadata/md5-cache/acct-user/burp-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the app-backup/burp server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/burp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6217de606db593a33ffc45564ce876fa
diff --git a/metadata/md5-cache/acct-user/burp-0-r2 b/metadata/md5-cache/acct-user/burp-0-r2
new file mode 100644
index 000000000000..94a43fb7fb6f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/burp-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the app-backup/burp server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/burp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d8bac1e536412b421442bb9db95e433e
diff --git a/metadata/md5-cache/acct-user/burrow_exporter-0-r1 b/metadata/md5-cache/acct-user/burrow_exporter-0-r1
deleted file mode 100644
index cb63727a6a57..000000000000
--- a/metadata/md5-cache/acct-user/burrow_exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/burrow_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/burrow_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=529dc3349fc7c90148559c4449dd6f58
diff --git a/metadata/md5-cache/acct-user/burrow_exporter-0-r2 b/metadata/md5-cache/acct-user/burrow_exporter-0-r2
new file mode 100644
index 000000000000..2ecbae54e447
--- /dev/null
+++ b/metadata/md5-cache/acct-user/burrow_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/burrow_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/burrow_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c175456c6dfd0728f29ae59a2a1b220c
diff --git a/metadata/md5-cache/acct-user/cadvisor-0-r1 b/metadata/md5-cache/acct-user/cadvisor-0-r1
deleted file mode 100644
index 00840e8590d8..000000000000
--- a/metadata/md5-cache/acct-user/cadvisor-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for cadvisor
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/cadvisor
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=eaf2103fb7ae3ca7aca5d55781cd3f7f
diff --git a/metadata/md5-cache/acct-user/cadvisor-0-r2 b/metadata/md5-cache/acct-user/cadvisor-0-r2
new file mode 100644
index 000000000000..0b7f3d219302
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cadvisor-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for cadvisor
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/cadvisor
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=77e99571a02d872ad3c2932039617e37
diff --git a/metadata/md5-cache/acct-user/cancd-0-r1 b/metadata/md5-cache/acct-user/cancd-0-r1
deleted file mode 100644
index 5c601cf1e7dc..000000000000
--- a/metadata/md5-cache/acct-user/cancd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the CA NetConsole Daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/cancd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1443d8bd42607b6fad614b7e0fa0b6c5
diff --git a/metadata/md5-cache/acct-user/cancd-0-r2 b/metadata/md5-cache/acct-user/cancd-0-r2
new file mode 100644
index 000000000000..ee922c6c4d1b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cancd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the CA NetConsole Daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/cancd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9e21b7ed42017fcbdd6f89eeae677109
diff --git a/metadata/md5-cache/acct-user/carbon-0-r1 b/metadata/md5-cache/acct-user/carbon-0-r1
deleted file mode 100644
index 9bcccaf5e407..000000000000
--- a/metadata/md5-cache/acct-user/carbon-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for graphite/carbon suite
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/carbon
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=347401450caecefafe0453440c6c5034
diff --git a/metadata/md5-cache/acct-user/carbon-0-r2 b/metadata/md5-cache/acct-user/carbon-0-r2
new file mode 100644
index 000000000000..8da65c3867a9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/carbon-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for graphite/carbon suite
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/carbon
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=226eeb1edbc68f05e76c8bf8d1b2f60d
diff --git a/metadata/md5-cache/acct-user/ceph-0-r1 b/metadata/md5-cache/acct-user/ceph-0-r1
deleted file mode 100644
index 625802982c43..000000000000
--- a/metadata/md5-cache/acct-user/ceph-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for ceph
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ceph
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=46c57a11397816f3786b4c9b94fbb6b6
diff --git a/metadata/md5-cache/acct-user/ceph-0-r2 b/metadata/md5-cache/acct-user/ceph-0-r2
new file mode 100644
index 000000000000..31db69501919
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ceph-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ceph
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ceph
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=46c57a11397816f3786b4c9b94fbb6b6
diff --git a/metadata/md5-cache/acct-user/cgit-0 b/metadata/md5-cache/acct-user/cgit-0
deleted file mode 100644
index e0991c49aa8e..000000000000
--- a/metadata/md5-cache/acct-user/cgit-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=a fast web-interface for git repositories
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/cgit
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1330e2bad987b1cddf3e675a0897a01c
diff --git a/metadata/md5-cache/acct-user/cgit-0-r1 b/metadata/md5-cache/acct-user/cgit-0-r1
new file mode 100644
index 000000000000..e8a380ba181c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cgit-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=a fast web-interface for git repositories
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/cgit
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b08a7d5f6e91f6fa77f6c82c9534a036
diff --git a/metadata/md5-cache/acct-user/chronograf-0-r1 b/metadata/md5-cache/acct-user/chronograf-0-r1
deleted file mode 100644
index 321591346bcc..000000000000
--- a/metadata/md5-cache/acct-user/chronograf-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for chronograf
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/chronograf
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5c385aa3a8f60186a5218c946189b004
diff --git a/metadata/md5-cache/acct-user/chronograf-0-r2 b/metadata/md5-cache/acct-user/chronograf-0-r2
new file mode 100644
index 000000000000..8999907a80a6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/chronograf-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for chronograf
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/chronograf
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d1672643005d026bdba94b4783890e69
diff --git a/metadata/md5-cache/acct-user/cinder-0-r1 b/metadata/md5-cache/acct-user/cinder-0-r1
deleted file mode 100644
index 160f78171396..000000000000
--- a/metadata/md5-cache/acct-user/cinder-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for the openstack cinder service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/cinder
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d6043b82f68f3c23301104449ea4661c
diff --git a/metadata/md5-cache/acct-user/cinder-0-r2 b/metadata/md5-cache/acct-user/cinder-0-r2
new file mode 100644
index 000000000000..bdf3b00cf49b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cinder-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for the openstack cinder service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/cinder
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=618179a7347122881c2f0f4619f2801e
diff --git a/metadata/md5-cache/acct-user/clair-0-r1 b/metadata/md5-cache/acct-user/clair-0-r1
deleted file mode 100644
index 4a84c76cfc81..000000000000
--- a/metadata/md5-cache/acct-user/clair-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for clair
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/clair
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d338099321233bbe7fbae8af34def3f7
diff --git a/metadata/md5-cache/acct-user/clair-0-r2 b/metadata/md5-cache/acct-user/clair-0-r2
new file mode 100644
index 000000000000..95bb585d0576
--- /dev/null
+++ b/metadata/md5-cache/acct-user/clair-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for clair
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/clair
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=28488465a495fb0309352e37c55689df
diff --git a/metadata/md5-cache/acct-user/clamav-0-r1 b/metadata/md5-cache/acct-user/clamav-0-r1
deleted file mode 100644
index 9892aa9bc6f6..000000000000
--- a/metadata/md5-cache/acct-user/clamav-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: clamav
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/clamav
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7e3ed2c42096b55e9f6b00112ff16ea3
diff --git a/metadata/md5-cache/acct-user/clamav-0-r2 b/metadata/md5-cache/acct-user/clamav-0-r2
new file mode 100644
index 000000000000..27912dff531f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/clamav-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: clamav
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/clamav
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d7e4f6fde918d234daff074dc17885df
diff --git a/metadata/md5-cache/acct-user/cntlm-0 b/metadata/md5-cache/acct-user/cntlm-0
deleted file mode 100644
index 5f05d5460931..000000000000
--- a/metadata/md5-cache/acct-user/cntlm-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-proxy/cntlm
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/cntlm
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9c25d365cdaac7410b25078726cddf89
diff --git a/metadata/md5-cache/acct-user/cntlm-0-r1 b/metadata/md5-cache/acct-user/cntlm-0-r1
new file mode 100644
index 000000000000..2b3318a551c5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cntlm-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-proxy/cntlm
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/cntlm
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=64b4cbea6a1c433fa9f4dbba275f9f54
diff --git a/metadata/md5-cache/acct-user/cockroach-0 b/metadata/md5-cache/acct-user/cockroach-0
deleted file mode 100644
index f9e920acc659..000000000000
--- a/metadata/md5-cache/acct-user/cockroach-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for dev-db/cockroach
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/cockroach
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=66aad5eb86372334bebb73c64835f23d
diff --git a/metadata/md5-cache/acct-user/cockroach-0-r1 b/metadata/md5-cache/acct-user/cockroach-0-r1
new file mode 100644
index 000000000000..75e221102d34
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cockroach-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-db/cockroach
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/cockroach
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8daa45a7af7fbc347c5553375e26108a
diff --git a/metadata/md5-cache/acct-user/collectd-0 b/metadata/md5-cache/acct-user/collectd-0
deleted file mode 100644
index 8b0272657779..000000000000
--- a/metadata/md5-cache/acct-user/collectd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=collectd program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/collectd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=521d6d57277dcf453aa95271f14d7a50
diff --git a/metadata/md5-cache/acct-user/collectd-0-r1 b/metadata/md5-cache/acct-user/collectd-0-r1
new file mode 100644
index 000000000000..14cee3cc7739
--- /dev/null
+++ b/metadata/md5-cache/acct-user/collectd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=collectd program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/collectd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e6041ecd2b9b9ae7f816e9bba3d58932
diff --git a/metadata/md5-cache/acct-user/colord-0 b/metadata/md5-cache/acct-user/colord-0
deleted file mode 100644
index 52b9e5009214..000000000000
--- a/metadata/md5-cache/acct-user/colord-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for running the colord service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/colord
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=21553e935997d4ffcc065c8ce3c8ee48
diff --git a/metadata/md5-cache/acct-user/colord-0-r1 b/metadata/md5-cache/acct-user/colord-0-r1
new file mode 100644
index 000000000000..c5b8e98e84c4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/colord-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running the colord service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/colord
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f0ee334cbaa6645908a6cfb884013f41
diff --git a/metadata/md5-cache/acct-user/consul-0-r1 b/metadata/md5-cache/acct-user/consul-0-r1
deleted file mode 100644
index cf4bbdb5624e..000000000000
--- a/metadata/md5-cache/acct-user/consul-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for consul
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/consul
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=918f97b4efc6a767b593af459c435fbf
diff --git a/metadata/md5-cache/acct-user/consul-0-r2 b/metadata/md5-cache/acct-user/consul-0-r2
new file mode 100644
index 000000000000..c47cb6aef2a3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/consul-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for consul
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/consul
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6a6ed770c7e65351b0a3f0a9dc3eae2c
diff --git a/metadata/md5-cache/acct-user/consul-template-0-r1 b/metadata/md5-cache/acct-user/consul-template-0-r1
deleted file mode 100644
index 7c1feb7cd1bc..000000000000
--- a/metadata/md5-cache/acct-user/consul-template-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for consul-template
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/consul-template
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f9219ca574fe585e9271ac1d10dcd016
diff --git a/metadata/md5-cache/acct-user/consul-template-0-r2 b/metadata/md5-cache/acct-user/consul-template-0-r2
new file mode 100644
index 000000000000..231bb6e0b6b8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/consul-template-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for consul-template
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/consul-template
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=add00cae9a610312cb376db294f24f25
diff --git a/metadata/md5-cache/acct-user/consul_exporter-0 b/metadata/md5-cache/acct-user/consul_exporter-0
deleted file mode 100644
index 7921f5c010b8..000000000000
--- a/metadata/md5-cache/acct-user/consul_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for consul_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/consul_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2aa1052a032c5336074e58085a0671fb
diff --git a/metadata/md5-cache/acct-user/consul_exporter-0-r1 b/metadata/md5-cache/acct-user/consul_exporter-0-r1
new file mode 100644
index 000000000000..41b06d8296c4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/consul_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for consul_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/consul_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5e2a152d249164210984575df66c1506
diff --git a/metadata/md5-cache/acct-user/coredns-0 b/metadata/md5-cache/acct-user/coredns-0
deleted file mode 100644
index 3825b1343483..000000000000
--- a/metadata/md5-cache/acct-user/coredns-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-dns/coredns
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/coredns
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1f915ff6afe1b8407ba80064e5864e70
diff --git a/metadata/md5-cache/acct-user/coredns-0-r1 b/metadata/md5-cache/acct-user/coredns-0-r1
new file mode 100644
index 000000000000..5703d7a1bc9f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/coredns-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dns/coredns
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/coredns
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dc1f586bb3728a0fbc8836153042da98
diff --git a/metadata/md5-cache/acct-user/croc-0 b/metadata/md5-cache/acct-user/croc-0
deleted file mode 100644
index d0eeecfb2979..000000000000
--- a/metadata/md5-cache/acct-user/croc-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-misc/croc
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/croc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d5ea8b37692621e966b9806869b1666b
diff --git a/metadata/md5-cache/acct-user/croc-0-r1 b/metadata/md5-cache/acct-user/croc-0-r1
new file mode 100644
index 000000000000..1f8aa703adb1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/croc-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/croc
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/croc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=66f3ad847f118df0d069fe9983ad5887
diff --git a/metadata/md5-cache/acct-user/cron-0 b/metadata/md5-cache/acct-user/cron-0
deleted file mode 100644
index b62f590f782a..000000000000
--- a/metadata/md5-cache/acct-user/cron-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-process/cronbase
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/cron
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c2819ca285608b93f49f335b68e466db
diff --git a/metadata/md5-cache/acct-user/cron-0-r1 b/metadata/md5-cache/acct-user/cron-0-r1
new file mode 100644
index 000000000000..45767a70c111
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cron-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-process/cronbase
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/cron
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9d8b36621b47ae2ec985930182f77a59
diff --git a/metadata/md5-cache/acct-user/cvmfs-0-r1 b/metadata/md5-cache/acct-user/cvmfs-0-r1
deleted file mode 100644
index 18e91eab0a23..000000000000
--- a/metadata/md5-cache/acct-user/cvmfs-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the CernVM-FS network file system
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/cvmfs
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fe7a733faa9a9c32a75c5fc230bce8e7
diff --git a/metadata/md5-cache/acct-user/cvmfs-0-r2 b/metadata/md5-cache/acct-user/cvmfs-0-r2
new file mode 100644
index 000000000000..0aeab49437f3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cvmfs-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the CernVM-FS network file system
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/cvmfs
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=45378ccb212f72eac3a198b7edda1e76
diff --git a/metadata/md5-cache/acct-user/cyrus-0-r2 b/metadata/md5-cache/acct-user/cyrus-0-r2
deleted file mode 100644
index faae6a45d8fb..000000000000
--- a/metadata/md5-cache/acct-user/cyrus-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for cyrus-imapd daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9efe9911343a837f41b59fdb988b88c2
diff --git a/metadata/md5-cache/acct-user/cyrus-0-r3 b/metadata/md5-cache/acct-user/cyrus-0-r3
new file mode 100644
index 000000000000..07811baadaa4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cyrus-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for cyrus-imapd daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e6c21daf8b84c01cb212bba08b46b8cc
diff --git a/metadata/md5-cache/acct-user/darkstat-0 b/metadata/md5-cache/acct-user/darkstat-0
deleted file mode 100644
index 365a62d720d1..000000000000
--- a/metadata/md5-cache/acct-user/darkstat-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=uid for net-analyzer/darkstat
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e9376a3ad7c7035f059b2a8180d44fcd
diff --git a/metadata/md5-cache/acct-user/darkstat-0-r1 b/metadata/md5-cache/acct-user/darkstat-0-r1
new file mode 100644
index 000000000000..5fa1018a62e1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/darkstat-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-analyzer/darkstat
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fbece9403a56f6081e0f22565096705b
diff --git a/metadata/md5-cache/acct-user/davfs2-0-r1 b/metadata/md5-cache/acct-user/davfs2-0-r1
deleted file mode 100644
index 032981e3934d..000000000000
--- a/metadata/md5-cache/acct-user/davfs2-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: davfs2
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/davfs2
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=87845b0c86cbda824a799fc0210bf97a
diff --git a/metadata/md5-cache/acct-user/davfs2-0-r2 b/metadata/md5-cache/acct-user/davfs2-0-r2
new file mode 100644
index 000000000000..d82bb1a5de23
--- /dev/null
+++ b/metadata/md5-cache/acct-user/davfs2-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: davfs2
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/davfs2
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a1c126be292351eb562a33fac5d39ef8
diff --git a/metadata/md5-cache/acct-user/dbmail-0 b/metadata/md5-cache/acct-user/dbmail-0
deleted file mode 100644
index bbe3c860f060..000000000000
--- a/metadata/md5-cache/acct-user/dbmail-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: dbmail
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dbmail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=609b4d8134035f8a71dc39219834da53
diff --git a/metadata/md5-cache/acct-user/dbmail-0-r1 b/metadata/md5-cache/acct-user/dbmail-0-r1
new file mode 100644
index 000000000000..0f32a3031c36
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dbmail-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: dbmail
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dbmail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a16f1d73c6d88733e52a5bdc1af51594
diff --git a/metadata/md5-cache/acct-user/dbskkd-0 b/metadata/md5-cache/acct-user/dbskkd-0
deleted file mode 100644
index 355d70af7093..000000000000
--- a/metadata/md5-cache/acct-user/dbskkd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-i18n/dbskkd-cdb
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dbskkd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0d63b9757f7a8cfd70a9101d007cc477
diff --git a/metadata/md5-cache/acct-user/dbskkd-0-r1 b/metadata/md5-cache/acct-user/dbskkd-0-r1
new file mode 100644
index 000000000000..c22c057fea31
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dbskkd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-i18n/dbskkd-cdb
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dbskkd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4965d3299b47c3f34a1acee11153d1d1
diff --git a/metadata/md5-cache/acct-user/ddclient-0-r1 b/metadata/md5-cache/acct-user/ddclient-0-r1
deleted file mode 100644
index d85de5ea0d5b..000000000000
--- a/metadata/md5-cache/acct-user/ddclient-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the dynamic DNS client
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ddclient
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b5ab181dfbc5a44ebcec760f072542d9
diff --git a/metadata/md5-cache/acct-user/ddclient-0-r2 b/metadata/md5-cache/acct-user/ddclient-0-r2
new file mode 100644
index 000000000000..b45f2c2d179f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ddclient-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the dynamic DNS client
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ddclient
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3e6dcd959df32d6315932ad4e00effcf
diff --git a/metadata/md5-cache/acct-user/defang-0 b/metadata/md5-cache/acct-user/defang-0
deleted file mode 100644
index 550b5f0e33b4..000000000000
--- a/metadata/md5-cache/acct-user/defang-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for mail-filter/mimedefang
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/defang
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8608edd94d877284d1a80b284caf04a3
diff --git a/metadata/md5-cache/acct-user/defang-0-r1 b/metadata/md5-cache/acct-user/defang-0-r1
new file mode 100644
index 000000000000..4c9f47737434
--- /dev/null
+++ b/metadata/md5-cache/acct-user/defang-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for mail-filter/mimedefang
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/defang
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=31b985fe980663f033a7e20f59afb6ca
diff --git a/metadata/md5-cache/acct-user/dehydrated-0 b/metadata/md5-cache/acct-user/dehydrated-0
deleted file mode 100644
index 59af56c514e3..000000000000
--- a/metadata/md5-cache/acct-user/dehydrated-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=dehydrated program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dehydrated
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9f2d6a6b35e6d1bc033fc8b513e610ff
diff --git a/metadata/md5-cache/acct-user/dehydrated-0-r1 b/metadata/md5-cache/acct-user/dehydrated-0-r1
new file mode 100644
index 000000000000..e1b7559f6d07
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dehydrated-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=dehydrated program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dehydrated
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=51bf19e5618a3efd5009961ecdab51ed
diff --git a/metadata/md5-cache/acct-user/deluge-0-r1 b/metadata/md5-cache/acct-user/deluge-0-r1
deleted file mode 100644
index 7ad0b2c09795..000000000000
--- a/metadata/md5-cache/acct-user/deluge-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for deluge
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/deluge
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=99267a68f305416a767b97ccff954d43
diff --git a/metadata/md5-cache/acct-user/deluge-0-r2 b/metadata/md5-cache/acct-user/deluge-0-r2
new file mode 100644
index 000000000000..c36afce87bda
--- /dev/null
+++ b/metadata/md5-cache/acct-user/deluge-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for deluge
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/deluge
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=99267a68f305416a767b97ccff954d43
diff --git a/metadata/md5-cache/acct-user/dhcp-0-r1 b/metadata/md5-cache/acct-user/dhcp-0-r1
deleted file mode 100644
index a96e41780ac3..000000000000
--- a/metadata/md5-cache/acct-user/dhcp-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for dhcp daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dhcp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=99676fd2e887a56cb54e592ffc4581ba
diff --git a/metadata/md5-cache/acct-user/dhcp-0-r2 b/metadata/md5-cache/acct-user/dhcp-0-r2
new file mode 100644
index 000000000000..8eafba346aa6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dhcp-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dhcp daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dhcp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0defccd8494ed81ee2071f2d7bf36a32
diff --git a/metadata/md5-cache/acct-user/dhcpcd-0-r1 b/metadata/md5-cache/acct-user/dhcpcd-0-r1
deleted file mode 100644
index c26bbd287466..000000000000
--- a/metadata/md5-cache/acct-user/dhcpcd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for dhcpcd client
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dhcpcd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=be32f62b63deac788149a684573026b9
diff --git a/metadata/md5-cache/acct-user/dhcpcd-0-r2 b/metadata/md5-cache/acct-user/dhcpcd-0-r2
new file mode 100644
index 000000000000..925cff86e09a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dhcpcd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dhcpcd client
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dhcpcd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fbc64120e0ccdf5145fe76d8b92cc569
diff --git a/metadata/md5-cache/acct-user/dictd-0 b/metadata/md5-cache/acct-user/dictd-0
deleted file mode 100644
index d63695fa7c88..000000000000
--- a/metadata/md5-cache/acct-user/dictd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=uid for app-text/dictd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dictd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7db555a3252aed175ed77ac80fd9fdc8
diff --git a/metadata/md5-cache/acct-user/dictd-0-r1 b/metadata/md5-cache/acct-user/dictd-0-r1
new file mode 100644
index 000000000000..a718dc99a0bc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dictd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for app-text/dictd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dictd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=509fa0f05a9f6561bf6042e27d4cea7d
diff --git a/metadata/md5-cache/acct-user/dirsrv-0 b/metadata/md5-cache/acct-user/dirsrv-0
deleted file mode 100644
index 068107586f07..000000000000
--- a/metadata/md5-cache/acct-user/dirsrv-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-nds/389-ds-base
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dirsrv
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f97f40ede2dfde50f9f8f4c8ce020194
diff --git a/metadata/md5-cache/acct-user/dirsrv-0-r1 b/metadata/md5-cache/acct-user/dirsrv-0-r1
new file mode 100644
index 000000000000..80b4a927ea58
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dirsrv-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-nds/389-ds-base
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dirsrv
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=32a186651bdf6e46e87a7402c55ad068
diff --git a/metadata/md5-cache/acct-user/distcc-1 b/metadata/md5-cache/acct-user/distcc-1
deleted file mode 100644
index 1bda297d027e..000000000000
--- a/metadata/md5-cache/acct-user/distcc-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User used to run distcc daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/distcc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3668c87a5e0bd1ad67d735179da7cb4b
diff --git a/metadata/md5-cache/acct-user/distcc-1-r1 b/metadata/md5-cache/acct-user/distcc-1-r1
new file mode 100644
index 000000000000..db00f00dd8bd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/distcc-1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User used to run distcc daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/distcc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bb576de378d4efeadd19ee183f39cb53
diff --git a/metadata/md5-cache/acct-user/dnrd-0 b/metadata/md5-cache/acct-user/dnrd-0
deleted file mode 100644
index f31713e837ae..000000000000
--- a/metadata/md5-cache/acct-user/dnrd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-dns/dnrd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dnrd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9d8eefc1cc0f9f860f6651b79b31f6af
diff --git a/metadata/md5-cache/acct-user/dnrd-0-r1 b/metadata/md5-cache/acct-user/dnrd-0-r1
new file mode 100644
index 000000000000..da13d0ac8c12
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnrd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/dnrd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dnrd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=419db02eaf1338657846af6a7d46265b
diff --git a/metadata/md5-cache/acct-user/dnscache-0 b/metadata/md5-cache/acct-user/dnscache-0
deleted file mode 100644
index 26bd7e8eceea..000000000000
--- a/metadata/md5-cache/acct-user/dnscache-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: dnscache
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3af24d2e954e8e83bdf93b8c789d49a4
diff --git a/metadata/md5-cache/acct-user/dnscache-0-r1 b/metadata/md5-cache/acct-user/dnscache-0-r1
new file mode 100644
index 000000000000..c2d8af98b696
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnscache-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: dnscache
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b9f2e1cf6a2bf872f750171e393a5562
diff --git a/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1 b/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1
deleted file mode 100644
index 1aa9229915a3..000000000000
--- a/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-dns/dnscrypt-proxy
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dnscrypt-proxy
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=695f040ecbd6db8a9a6667f5943c7c67
diff --git a/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r2 b/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r2
new file mode 100644
index 000000000000..d2c9957df808
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnscrypt-proxy-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/dnscrypt-proxy
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dnscrypt-proxy
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9152758df406faa505f41685a8bbc3af
diff --git a/metadata/md5-cache/acct-user/dnsdist-0-r1 b/metadata/md5-cache/acct-user/dnsdist-0-r1
deleted file mode 100644
index 51cab27077ed..000000000000
--- a/metadata/md5-cache/acct-user/dnsdist-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-dns/dnsdist
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dnsdist
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=711c93f81b38b4122e3c95561db020e3
diff --git a/metadata/md5-cache/acct-user/dnsdist-0-r2 b/metadata/md5-cache/acct-user/dnsdist-0-r2
new file mode 100644
index 000000000000..4189d1659def
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnsdist-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dns/dnsdist
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dnsdist
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4a19790f7fda1064976564a57af321a0
diff --git a/metadata/md5-cache/acct-user/dnslog-0 b/metadata/md5-cache/acct-user/dnslog-0
deleted file mode 100644
index 19c9d835d2ab..000000000000
--- a/metadata/md5-cache/acct-user/dnslog-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: dnslog
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9bc5793150e173959690db67824efea1
diff --git a/metadata/md5-cache/acct-user/dnslog-0-r1 b/metadata/md5-cache/acct-user/dnslog-0-r1
new file mode 100644
index 000000000000..2d1ef69d70ea
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnslog-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: dnslog
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1ea9a2397bb7c7398f372d0b24fc5f93
diff --git a/metadata/md5-cache/acct-user/dnsmasq-0-r1 b/metadata/md5-cache/acct-user/dnsmasq-0-r1
deleted file mode 100644
index ff307b36f212..000000000000
--- a/metadata/md5-cache/acct-user/dnsmasq-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-dns/dnsmasq
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dnsmasq
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d8d30c8c2622399f55fa104d18829168
diff --git a/metadata/md5-cache/acct-user/dnsmasq-0-r2 b/metadata/md5-cache/acct-user/dnsmasq-0-r2
new file mode 100644
index 000000000000..4396eb393494
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnsmasq-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/dnsmasq
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dnsmasq
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a3244cd3ba7057f91acd72d798aa1f02
diff --git a/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1 b/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1
deleted file mode 100644
index c257b7bdc4b3..000000000000
--- a/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for dnsmasq_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dnsmasq_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ec2a22e3cd34c8b1651e7de50c18dfbe
diff --git a/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r2 b/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r2
new file mode 100644
index 000000000000..89820a8378dc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dnsmasq_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dnsmasq_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dnsmasq_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d840821dd87b229ed71ca87a26920675
diff --git a/metadata/md5-cache/acct-user/docker_auth-0-r1 b/metadata/md5-cache/acct-user/docker_auth-0-r1
deleted file mode 100644
index 57989feace11..000000000000
--- a/metadata/md5-cache/acct-user/docker_auth-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for docker_auth
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/docker_auth
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e27fa67d8a9f35c5ff5e7a5428ef89a7
diff --git a/metadata/md5-cache/acct-user/docker_auth-0-r2 b/metadata/md5-cache/acct-user/docker_auth-0-r2
new file mode 100644
index 000000000000..e7c70de225a9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/docker_auth-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for docker_auth
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/docker_auth
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c8a3f2a12ed513a6b46e15eff8f1d930
diff --git a/metadata/md5-cache/acct-user/dovecot-0-r1 b/metadata/md5-cache/acct-user/dovecot-0-r1
deleted file mode 100644
index c312ce20fb8e..000000000000
--- a/metadata/md5-cache/acct-user/dovecot-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for dovecot daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dovecot
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f4321754731ab4156e1c5655159bfdf1
diff --git a/metadata/md5-cache/acct-user/dovecot-0-r2 b/metadata/md5-cache/acct-user/dovecot-0-r2
new file mode 100644
index 000000000000..d3e104a90260
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dovecot-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dovecot daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dovecot
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=45aef79d43bb198ef00d84fb475e8a6d
diff --git a/metadata/md5-cache/acct-user/dovenull-0-r1 b/metadata/md5-cache/acct-user/dovenull-0-r1
deleted file mode 100644
index e42e32b9697a..000000000000
--- a/metadata/md5-cache/acct-user/dovenull-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for dovecot daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dovenull
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ada054df4b0c1dcdf599404952e87702
diff --git a/metadata/md5-cache/acct-user/dovenull-0-r2 b/metadata/md5-cache/acct-user/dovenull-0-r2
new file mode 100644
index 000000000000..5d13b0fb89d3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dovenull-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dovecot daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dovenull
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8e20d29d818a7a2770cedfe5e75cf59e
diff --git a/metadata/md5-cache/acct-user/drone-0 b/metadata/md5-cache/acct-user/drone-0
deleted file mode 100644
index b9a81573e912..000000000000
--- a/metadata/md5-cache/acct-user/drone-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for dev-util/drone
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/drone
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b101d8dc32e3ab4b73d49f91dd3280f5
diff --git a/metadata/md5-cache/acct-user/drone-0-r1 b/metadata/md5-cache/acct-user/drone-0-r1
new file mode 100644
index 000000000000..9d523d711d8e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/drone-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-util/drone
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/drone
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=36bd2c7c157a859ee49579ec77c217c7
diff --git a/metadata/md5-cache/acct-user/duende-0-r1 b/metadata/md5-cache/acct-user/duende-0-r1
deleted file mode 100644
index 8a857bbb5c1c..000000000000
--- a/metadata/md5-cache/acct-user/duende-0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DEPEND=acct-group/maradns
-DESCRIPTION=System user: duende
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/maradns acct-group/maradns
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5395e0bef2c329ca8fcdaf4d76b7ebf0
diff --git a/metadata/md5-cache/acct-user/duende-0-r2 b/metadata/md5-cache/acct-user/duende-0-r2
new file mode 100644
index 000000000000..295c866a6fe4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/duende-0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/maradns
+DESCRIPTION=System user: duende
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/maradns acct-group/maradns
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1aa505b6f1113b6fd96422163fed7a6a
diff --git a/metadata/md5-cache/acct-user/ejabberd-2 b/metadata/md5-cache/acct-user/ejabberd-2
deleted file mode 100644
index 136cbaa1e1c6..000000000000
--- a/metadata/md5-cache/acct-user/ejabberd-2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend setup
-DESCRIPTION=User for net-im/ejabberd
-EAPI=8
-INHERIT=acct-user
-IUSE=pam
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=pam? ( acct-group/epam ) acct-group/ejabberd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a0ff5abf8d8d9bfac3d3506d40edb425
diff --git a/metadata/md5-cache/acct-user/ejabberd-2-r1 b/metadata/md5-cache/acct-user/ejabberd-2-r1
new file mode 100644
index 000000000000..ad105d27dc9d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ejabberd-2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend setup
+DESCRIPTION=User for net-im/ejabberd
+EAPI=8
+INHERIT=acct-user
+IUSE=pam
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=pam? ( acct-group/epam ) acct-group/ejabberd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=718ee81a16575decd09f3f81de61134d
diff --git a/metadata/md5-cache/acct-user/elasticsearch-0-r1 b/metadata/md5-cache/acct-user/elasticsearch-0-r1
deleted file mode 100644
index 6c31baf0e0c7..000000000000
--- a/metadata/md5-cache/acct-user/elasticsearch-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Elasticsearch program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/elasticsearch
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=db19c19b6e7a9b98a1b29f509821cde4
diff --git a/metadata/md5-cache/acct-user/elasticsearch-0-r2 b/metadata/md5-cache/acct-user/elasticsearch-0-r2
new file mode 100644
index 000000000000..617f72bde769
--- /dev/null
+++ b/metadata/md5-cache/acct-user/elasticsearch-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Elasticsearch program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/elasticsearch
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ca55885d088ea11ac6e9d7dd7d88adda
diff --git a/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1 b/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1
deleted file mode 100644
index e84ebb906880..000000000000
--- a/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/elasticsearch_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/elasticsearch_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f0f4091be7f82aeba583ddd08dce2611
diff --git a/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r2 b/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r2
new file mode 100644
index 000000000000..282e3c3b18ca
--- /dev/null
+++ b/metadata/md5-cache/acct-user/elasticsearch_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/elasticsearch_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/elasticsearch_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7a211fe29116823018d90879a4d3ac9f
diff --git a/metadata/md5-cache/acct-user/energi3-0 b/metadata/md5-cache/acct-user/energi3-0
deleted file mode 100644
index c749b35cc4b8..000000000000
--- a/metadata/md5-cache/acct-user/energi3-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-p2p/energi3
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/energi3
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c7287bb08088dab497aef50b007b8174
diff --git a/metadata/md5-cache/acct-user/energi3-0-r1 b/metadata/md5-cache/acct-user/energi3-0-r1
new file mode 100644
index 000000000000..2a753389a152
--- /dev/null
+++ b/metadata/md5-cache/acct-user/energi3-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/energi3
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/energi3
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=124fa2a993145cc77836ede2c9881438
diff --git a/metadata/md5-cache/acct-user/epmd-0-r1 b/metadata/md5-cache/acct-user/epmd-0-r1
deleted file mode 100644
index 049753fd3856..000000000000
--- a/metadata/md5-cache/acct-user/epmd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for Erlang Portmapper Daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/epmd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ed03e977c47334b73d5146b0d9f4df9e
diff --git a/metadata/md5-cache/acct-user/epmd-0-r2 b/metadata/md5-cache/acct-user/epmd-0-r2
new file mode 100644
index 000000000000..16d54181d72e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/epmd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Erlang Portmapper Daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/epmd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9dd07822fdf1a117da939d11b48c84ba
diff --git a/metadata/md5-cache/acct-user/err-0 b/metadata/md5-cache/acct-user/err-0
deleted file mode 100644
index cd6504dffc8d..000000000000
--- a/metadata/md5-cache/acct-user/err-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: err
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/err
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=49a3c83c80b86313f816f70efae98f38
diff --git a/metadata/md5-cache/acct-user/err-0-r1 b/metadata/md5-cache/acct-user/err-0-r1
new file mode 100644
index 000000000000..b5f0928668f6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/err-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: err
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/err
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=06de227be2b3b26672667131aa967d6b
diff --git a/metadata/md5-cache/acct-user/etcd-0-r1 b/metadata/md5-cache/acct-user/etcd-0-r1
deleted file mode 100644
index b9236c5e8506..000000000000
--- a/metadata/md5-cache/acct-user/etcd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for etcd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/etcd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b6ee5d4863af3c0fd94925b4bd0f949d
diff --git a/metadata/md5-cache/acct-user/etcd-0-r2 b/metadata/md5-cache/acct-user/etcd-0-r2
new file mode 100644
index 000000000000..f4d74bbbb02b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/etcd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for etcd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/etcd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=79b1cd54c4b810b305f983d71770aa95
diff --git a/metadata/md5-cache/acct-user/exabgp-0-r1 b/metadata/md5-cache/acct-user/exabgp-0-r1
deleted file mode 100644
index bd86fb1bed91..000000000000
--- a/metadata/md5-cache/acct-user/exabgp-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-misc/exabgp
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/exabgp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=af5479646683f110706d956f2a1e77a6
diff --git a/metadata/md5-cache/acct-user/exabgp-0-r2 b/metadata/md5-cache/acct-user/exabgp-0-r2
new file mode 100644
index 000000000000..384c2dfcf448
--- /dev/null
+++ b/metadata/md5-cache/acct-user/exabgp-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/exabgp
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/exabgp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=421feb7f045aec00f4876396e98ff33b
diff --git a/metadata/md5-cache/acct-user/ez-ipupd-0 b/metadata/md5-cache/acct-user/ez-ipupd-0
deleted file mode 100644
index 573ae33e7f5c..000000000000
--- a/metadata/md5-cache/acct-user/ez-ipupd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-dns/ez-ipupdate
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ez-ipupd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=107ee2a4fa52c54449ef0bc27ca85a9b
diff --git a/metadata/md5-cache/acct-user/ez-ipupd-0-r1 b/metadata/md5-cache/acct-user/ez-ipupd-0-r1
new file mode 100644
index 000000000000..8a60e5187d9b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ez-ipupd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/ez-ipupdate
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ez-ipupd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4d0c269f45480f6bbb5c19872c3ee9ad
diff --git a/metadata/md5-cache/acct-user/fax-0 b/metadata/md5-cache/acct-user/fax-0
deleted file mode 100644
index cd7fbfd310e6..000000000000
--- a/metadata/md5-cache/acct-user/fax-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-dialup/mgetty
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/fax
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3813ca1d3a4fb18f9db260f7c6b26d68
diff --git a/metadata/md5-cache/acct-user/fax-0-r1 b/metadata/md5-cache/acct-user/fax-0-r1
new file mode 100644
index 000000000000..65069ff63780
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fax-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dialup/mgetty
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/fax
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=101845d49afa2133cc61f3b41e55e622
diff --git a/metadata/md5-cache/acct-user/fcron-0 b/metadata/md5-cache/acct-user/fcron-0
deleted file mode 100644
index f6514ca555f8..000000000000
--- a/metadata/md5-cache/acct-user/fcron-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-process/fcron
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/fcron
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=60303e01aeee92417f612299f765953d
diff --git a/metadata/md5-cache/acct-user/fcron-0-r1 b/metadata/md5-cache/acct-user/fcron-0-r1
new file mode 100644
index 000000000000..505b798946eb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fcron-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-process/fcron
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/fcron
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=92b260010edfaed65d70c8f63141aed5
diff --git a/metadata/md5-cache/acct-user/fdm-0 b/metadata/md5-cache/acct-user/fdm-0
deleted file mode 100644
index 4a80c8e88ea4..000000000000
--- a/metadata/md5-cache/acct-user/fdm-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-mail/fdm
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/fdm
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9b3a59673f458783b10fba43a2d7e7f1
diff --git a/metadata/md5-cache/acct-user/fdm-0-r1 b/metadata/md5-cache/acct-user/fdm-0-r1
new file mode 100644
index 000000000000..e9eec23ee869
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fdm-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/fdm
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/fdm
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=97075f0b7a44b33e2e5a12fcc3ec7637
diff --git a/metadata/md5-cache/acct-user/fetchmail-0-r1 b/metadata/md5-cache/acct-user/fetchmail-0-r1
deleted file mode 100644
index d6e325e1dddd..000000000000
--- a/metadata/md5-cache/acct-user/fetchmail-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-mail/fetchmail
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/fetchmail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d3d21fa443b96154c83f83c4aa174fcf
diff --git a/metadata/md5-cache/acct-user/fetchmail-0-r2 b/metadata/md5-cache/acct-user/fetchmail-0-r2
new file mode 100644
index 000000000000..7284fef286eb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fetchmail-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/fetchmail
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/fetchmail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d54fc9d161c93a2a5c6f124eea193950
diff --git a/metadata/md5-cache/acct-user/fhem-0-r1 b/metadata/md5-cache/acct-user/fhem-0-r1
deleted file mode 100644
index f807890841db..000000000000
--- a/metadata/md5-cache/acct-user/fhem-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the FHEM perl server for house automation
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/fhem
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=58998b96956b5a68e853cf16a6b5d8f5
diff --git a/metadata/md5-cache/acct-user/fhem-0-r2 b/metadata/md5-cache/acct-user/fhem-0-r2
new file mode 100644
index 000000000000..ad533607ad20
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fhem-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the FHEM perl server for house automation
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/fhem
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b652225c7720923502562ee8debc0a05
diff --git a/metadata/md5-cache/acct-user/firebird-0-r2 b/metadata/md5-cache/acct-user/firebird-0-r2
deleted file mode 100644
index cfadebc6448b..000000000000
--- a/metadata/md5-cache/acct-user/firebird-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend setup
-DESCRIPTION=A user for dev-db/firebird
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/firebird
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b3aa67d534425143142795aabe29cdc6
diff --git a/metadata/md5-cache/acct-user/firebird-0-r3 b/metadata/md5-cache/acct-user/firebird-0-r3
new file mode 100644
index 000000000000..1b569a0eb44e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/firebird-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend setup
+DESCRIPTION=A user for dev-db/firebird
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/firebird
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aefdf34d32e2a2d6db5658ff6dfc756d
diff --git a/metadata/md5-cache/acct-user/flatpak-0 b/metadata/md5-cache/acct-user/flatpak-0
deleted file mode 100644
index d1f25c2be321..000000000000
--- a/metadata/md5-cache/acct-user/flatpak-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: flatpak
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/flatpak
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7fe430f6d2af3c892e6666effcb722c8
diff --git a/metadata/md5-cache/acct-user/flatpak-0-r1 b/metadata/md5-cache/acct-user/flatpak-0-r1
new file mode 100644
index 000000000000..0b058c10e24e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/flatpak-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: flatpak
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/flatpak
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=47974c0c9fd53604db7e4a1c3e65f8fa
diff --git a/metadata/md5-cache/acct-user/flows-0 b/metadata/md5-cache/acct-user/flows-0
deleted file mode 100644
index 6f4fcf1c35d9..000000000000
--- a/metadata/md5-cache/acct-user/flows-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=uid for net-analyzer/flow-tools
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/flows
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=44d0fea430d3ee921a56666cd214c92d
diff --git a/metadata/md5-cache/acct-user/flows-0-r1 b/metadata/md5-cache/acct-user/flows-0-r1
new file mode 100644
index 000000000000..2ce44ca66e29
--- /dev/null
+++ b/metadata/md5-cache/acct-user/flows-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-analyzer/flow-tools
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/flows
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=87deb1a84f2a322168132b3ae64d34ba
diff --git a/metadata/md5-cache/acct-user/fluentd-0-r1 b/metadata/md5-cache/acct-user/fluentd-0-r1
deleted file mode 100644
index 7d450610f8b9..000000000000
--- a/metadata/md5-cache/acct-user/fluentd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-admin/fluentd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/fluentd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=da23e9cbd7b28600db1ad6c12002c526
diff --git a/metadata/md5-cache/acct-user/fluentd-0-r2 b/metadata/md5-cache/acct-user/fluentd-0-r2
new file mode 100644
index 000000000000..28f8423a79ee
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fluentd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-admin/fluentd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/fluentd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a8ae10da44e5ec2ff2f817fd432d63fe
diff --git a/metadata/md5-cache/acct-user/fnord-0 b/metadata/md5-cache/acct-user/fnord-0
deleted file mode 100644
index 4df8350e56be..000000000000
--- a/metadata/md5-cache/acct-user/fnord-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for www-servers/fnord
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cc50abc168ec31427393a8e3a7f4e775
diff --git a/metadata/md5-cache/acct-user/fnord-0-r1 b/metadata/md5-cache/acct-user/fnord-0-r1
new file mode 100644
index 000000000000..be1e4e3ad81b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fnord-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-servers/fnord
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=91c6889edcb9ba9f6ede9338182f593c
diff --git a/metadata/md5-cache/acct-user/fnordlog-0 b/metadata/md5-cache/acct-user/fnordlog-0
deleted file mode 100644
index eddb753d0a80..000000000000
--- a/metadata/md5-cache/acct-user/fnordlog-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for www-servers/fnord
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7deae5559b07e9b7f37da175479e3f5c
diff --git a/metadata/md5-cache/acct-user/fnordlog-0-r1 b/metadata/md5-cache/acct-user/fnordlog-0-r1
new file mode 100644
index 000000000000..50a48b87d8b1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fnordlog-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-servers/fnord
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=30ca3e6f37d9a0a8ecacbcf9cd426915
diff --git a/metadata/md5-cache/acct-user/foldingathome-0 b/metadata/md5-cache/acct-user/foldingathome-0
deleted file mode 100644
index 9141efd1c264..000000000000
--- a/metadata/md5-cache/acct-user/foldingathome-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sci-biology/foldingathome
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/foldingathome acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=15354c7a83738a10ac4cf490281d3c3c
diff --git a/metadata/md5-cache/acct-user/foldingathome-0-r1 b/metadata/md5-cache/acct-user/foldingathome-0-r1
new file mode 100644
index 000000000000..39e22184f1d5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/foldingathome-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sci-biology/foldingathome
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/foldingathome acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a17502f199bd3486f83501272c17f409
diff --git a/metadata/md5-cache/acct-user/fp-multiuser-0 b/metadata/md5-cache/acct-user/fp-multiuser-0
deleted file mode 100644
index bd5dc84dcde2..000000000000
--- a/metadata/md5-cache/acct-user/fp-multiuser-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-vpn/fp-multiuser
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/fp-multiuser
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=658d55896a79f22acebb00791f5dbe40
diff --git a/metadata/md5-cache/acct-user/fp-multiuser-0-r1 b/metadata/md5-cache/acct-user/fp-multiuser-0-r1
new file mode 100644
index 000000000000..17a0ff44e454
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fp-multiuser-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-vpn/fp-multiuser
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/fp-multiuser
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=da9e9049e3154aea12a1db5a9285182f
diff --git a/metadata/md5-cache/acct-user/freenet-0 b/metadata/md5-cache/acct-user/freenet-0
deleted file mode 100644
index 1727c428caba..000000000000
--- a/metadata/md5-cache/acct-user/freenet-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-p2p/freenet
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/freenet
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0d30fb11c1a9e68b5c6fb28d6d4f86da
diff --git a/metadata/md5-cache/acct-user/freenet-0-r1 b/metadata/md5-cache/acct-user/freenet-0-r1
new file mode 100644
index 000000000000..cb0961015fa7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/freenet-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/freenet
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/freenet
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cc9ec09c0cddf47ef6d515f243063b66
diff --git a/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0 b/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0
deleted file mode 100644
index 200aae7c61cc..000000000000
--- a/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=FRITZ!Box Smart Home Exporter User
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/fritzbox_smarthome_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=daeccf71021c5e55a123fb4df7d568d9
diff --git a/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r1 b/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r1
new file mode 100644
index 000000000000..6c0e00475d73
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=FRITZ!Box Smart Home Exporter User
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/fritzbox_smarthome_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=467279be65e5121ef77fab28558a58de
diff --git a/metadata/md5-cache/acct-user/frr-0 b/metadata/md5-cache/acct-user/frr-0
deleted file mode 100644
index d6c0b8d50bc6..000000000000
--- a/metadata/md5-cache/acct-user/frr-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: frr
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/frr
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=61ef64be33c5e2f86ede9e59b7183d29
diff --git a/metadata/md5-cache/acct-user/frr-0-r1 b/metadata/md5-cache/acct-user/frr-0-r1
new file mode 100644
index 000000000000..86d1ef1465fa
--- /dev/null
+++ b/metadata/md5-cache/acct-user/frr-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: frr
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/frr
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6c6a6b6de7ed663b3cdae13b72e9e350
diff --git a/metadata/md5-cache/acct-user/ftp-0-r3 b/metadata/md5-cache/acct-user/ftp-0-r3
deleted file mode 100644
index a15ede09fc3b..000000000000
--- a/metadata/md5-cache/acct-user/ftp-0-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=File Transfer Protocol (FTP) server user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ftp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=49b4ddc17a9d9af8f33d94993b0e5677
diff --git a/metadata/md5-cache/acct-user/ftp-0-r4 b/metadata/md5-cache/acct-user/ftp-0-r4
new file mode 100644
index 000000000000..5d833cee9dc7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ftp-0-r4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=File Transfer Protocol (FTP) server user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ftp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f923db32ac401716a5eef55d699dcfb6
diff --git a/metadata/md5-cache/acct-user/ftpproxy-0 b/metadata/md5-cache/acct-user/ftpproxy-0
deleted file mode 100644
index a2a7dc37c84c..000000000000
--- a/metadata/md5-cache/acct-user/ftpproxy-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-ftp/frox
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ftpproxy
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b143967a367115b2e1351920bf2e4aff
diff --git a/metadata/md5-cache/acct-user/ftpproxy-0-r1 b/metadata/md5-cache/acct-user/ftpproxy-0-r1
new file mode 100644
index 000000000000..8089449ec73a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ftpproxy-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-ftp/frox
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ftpproxy
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6b8023e3445d15bb09803780d63082f5
diff --git a/metadata/md5-cache/acct-user/gatling-0-r1 b/metadata/md5-cache/acct-user/gatling-0-r1
deleted file mode 100644
index 10da4488b83b..000000000000
--- a/metadata/md5-cache/acct-user/gatling-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: gatling
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gatling
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7dc2482ce98b65df3f73ac7cf1d2f107
diff --git a/metadata/md5-cache/acct-user/gatling-0-r2 b/metadata/md5-cache/acct-user/gatling-0-r2
new file mode 100644
index 000000000000..777e3e047990
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gatling-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: gatling
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gatling
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c6fffceda380466e53e8399fe0244d1c
diff --git a/metadata/md5-cache/acct-user/gauth-0 b/metadata/md5-cache/acct-user/gauth-0
deleted file mode 100644
index 3856017cbe7a..000000000000
--- a/metadata/md5-cache/acct-user/gauth-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-auth/google-authenticator-wrappers
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gauth
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ace589234d55c74382bfbe3ddedc998d
diff --git a/metadata/md5-cache/acct-user/gauth-0-r1 b/metadata/md5-cache/acct-user/gauth-0-r1
new file mode 100644
index 000000000000..c4ee17993f51
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gauth-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-auth/google-authenticator-wrappers
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gauth
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5b0c48543a36d5ea9396a252198c5281
diff --git a/metadata/md5-cache/acct-user/gdm-0 b/metadata/md5-cache/acct-user/gdm-0
deleted file mode 100644
index bba67def015a..000000000000
--- a/metadata/md5-cache/acct-user/gdm-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for running GDM
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gdm acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=190793717f4743ec7191bf2f3999b5e5
diff --git a/metadata/md5-cache/acct-user/gdm-0-r1 b/metadata/md5-cache/acct-user/gdm-0-r1
new file mode 100644
index 000000000000..4ee7fdaa5216
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gdm-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running GDM
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gdm acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2f2714a6b03e3c5c81bfa952e8240d16
diff --git a/metadata/md5-cache/acct-user/geneweb-0-r1 b/metadata/md5-cache/acct-user/geneweb-0-r1
deleted file mode 100644
index 8c205a1655c7..000000000000
--- a/metadata/md5-cache/acct-user/geneweb-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user id for geneweb daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/geneweb
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6b9116072ec09349c40e75b56cdcdf85
diff --git a/metadata/md5-cache/acct-user/geneweb-0-r2 b/metadata/md5-cache/acct-user/geneweb-0-r2
new file mode 100644
index 000000000000..b9f276629d29
--- /dev/null
+++ b/metadata/md5-cache/acct-user/geneweb-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user id for geneweb daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/geneweb
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c1dfed07c7f9ad42e57d39f9d345ea3e
diff --git a/metadata/md5-cache/acct-user/geoclue-0 b/metadata/md5-cache/acct-user/geoclue-0
deleted file mode 100644
index 78cda898db6c..000000000000
--- a/metadata/md5-cache/acct-user/geoclue-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for running the GeoClue D-Bus geolocation service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/geoclue
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4412cf4c1b057e1e1bc1baf8450d4820
diff --git a/metadata/md5-cache/acct-user/geoclue-0-r1 b/metadata/md5-cache/acct-user/geoclue-0-r1
new file mode 100644
index 000000000000..40635b17cb00
--- /dev/null
+++ b/metadata/md5-cache/acct-user/geoclue-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running the GeoClue D-Bus geolocation service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/geoclue
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=519a7a51cc3e907d2cff76e34413ecf9
diff --git a/metadata/md5-cache/acct-user/gerbera-0-r1 b/metadata/md5-cache/acct-user/gerbera-0-r1
deleted file mode 100644
index e18776d576c4..000000000000
--- a/metadata/md5-cache/acct-user/gerbera-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Gerbera UPnP Media Server user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gerbera acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9f69a3f13d8a9d7013b2eac1e6e140c8
diff --git a/metadata/md5-cache/acct-user/gerbera-0-r2 b/metadata/md5-cache/acct-user/gerbera-0-r2
new file mode 100644
index 000000000000..2c3905fbe47e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gerbera-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Gerbera UPnP Media Server user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gerbera acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e0e0c2d47330356918db4c67e6efe88c
diff --git a/metadata/md5-cache/acct-user/git-0-r2 b/metadata/md5-cache/acct-user/git-0-r2
deleted file mode 100644
index 76f01a503f6a..000000000000
--- a/metadata/md5-cache/acct-user/git-0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend setup
-DESCRIPTION=Git repository hosting user
-EAPI=8
-INHERIT=acct-user
-IUSE=git gitea gitolite
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/git
-REQUIRED_USE=^^ ( git gitea gitolite )
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1c44a2f38bff7ffdf236af1d70d21f70
diff --git a/metadata/md5-cache/acct-user/git-0-r3 b/metadata/md5-cache/acct-user/git-0-r3
new file mode 100644
index 000000000000..398f2fa484d2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/git-0-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst prerm pretend setup
+DESCRIPTION=Git repository hosting user
+EAPI=8
+INHERIT=acct-user
+IUSE=git gitea gitolite
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/git
+REQUIRED_USE=^^ ( git gitea gitolite )
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1c44a2f38bff7ffdf236af1d70d21f70
diff --git a/metadata/md5-cache/acct-user/github-exporter-0 b/metadata/md5-cache/acct-user/github-exporter-0
deleted file mode 100644
index 2168a6c97e98..000000000000
--- a/metadata/md5-cache/acct-user/github-exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for github-exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/github-exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4c1517ee1a64c602a6e511bdd4a9fa4e
diff --git a/metadata/md5-cache/acct-user/github-exporter-0-r1 b/metadata/md5-cache/acct-user/github-exporter-0-r1
new file mode 100644
index 000000000000..a5af17fd940d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/github-exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for github-exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/github-exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dd80dab37f690bcab55dc4988a7fb11a
diff --git a/metadata/md5-cache/acct-user/gitlab-runner-1 b/metadata/md5-cache/acct-user/gitlab-runner-1
deleted file mode 100644
index d9926d30d527..000000000000
--- a/metadata/md5-cache/acct-user/gitlab-runner-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Dedicated user for gitlab-runner
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gitlab-runner
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0e9f5b8931e42daa3b0db0c5c5fff53a
diff --git a/metadata/md5-cache/acct-user/gitlab-runner-1-r1 b/metadata/md5-cache/acct-user/gitlab-runner-1-r1
new file mode 100644
index 000000000000..1f6b0a12dd5c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gitlab-runner-1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Dedicated user for gitlab-runner
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gitlab-runner
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e47b370fd8a732df07b99f7ea6c353f5
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0-r1 b/metadata/md5-cache/acct-user/gkrellmd-0-r1
deleted file mode 100644
index 75f93b73da1a..000000000000
--- a/metadata/md5-cache/acct-user/gkrellmd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for gkrellm daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gkrellmd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0c379134a244494bf3467ffe08505868
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0-r2 b/metadata/md5-cache/acct-user/gkrellmd-0-r2
new file mode 100644
index 000000000000..a59c80241eb4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gkrellmd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for gkrellm daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gkrellmd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=134e09e4ebb2c47f835f560a3912eb1d
diff --git a/metadata/md5-cache/acct-user/glance-0-r1 b/metadata/md5-cache/acct-user/glance-0-r1
deleted file mode 100644
index e84e5500882f..000000000000
--- a/metadata/md5-cache/acct-user/glance-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for the glance openstack service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/glance
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9416bc7d36dc727632cb6aa9603ac385
diff --git a/metadata/md5-cache/acct-user/glance-0-r2 b/metadata/md5-cache/acct-user/glance-0-r2
new file mode 100644
index 000000000000..a8a981d19052
--- /dev/null
+++ b/metadata/md5-cache/acct-user/glance-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for the glance openstack service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/glance
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8fda5639bc0871115914abb31990e04d
diff --git a/metadata/md5-cache/acct-user/gluster-0-r1 b/metadata/md5-cache/acct-user/gluster-0-r1
deleted file mode 100644
index 12d8b4019744..000000000000
--- a/metadata/md5-cache/acct-user/gluster-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: gluster
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gluster
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ed95e7393dc719c414a03fdf122946c7
diff --git a/metadata/md5-cache/acct-user/gluster-0-r2 b/metadata/md5-cache/acct-user/gluster-0-r2
new file mode 100644
index 000000000000..a5066bb26671
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gluster-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: gluster
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gluster
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0e93a3e85003a9ca89491c6ec6e6a26c
diff --git a/metadata/md5-cache/acct-user/gns3-0 b/metadata/md5-cache/acct-user/gns3-0
deleted file mode 100644
index 3a78dfdb4a2e..000000000000
--- a/metadata/md5-cache/acct-user/gns3-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: gns3
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gns3 acct-group/ubridge
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=45fd47d8529d37e10179925c6f2d3dfc
diff --git a/metadata/md5-cache/acct-user/gns3-0-r1 b/metadata/md5-cache/acct-user/gns3-0-r1
new file mode 100644
index 000000000000..f5552dd3de03
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gns3-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: gns3
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gns3 acct-group/ubridge
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e732b5619b0c26f62621fcb9c7dcae1b
diff --git a/metadata/md5-cache/acct-user/gnump3d-0 b/metadata/md5-cache/acct-user/gnump3d-0
deleted file mode 100644
index 7ff734764437..000000000000
--- a/metadata/md5-cache/acct-user/gnump3d-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for media-sound/gnump3d
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gnump3d
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3f7258d07681bf67e372d62b5b81df4e
diff --git a/metadata/md5-cache/acct-user/gnump3d-0-r1 b/metadata/md5-cache/acct-user/gnump3d-0-r1
new file mode 100644
index 000000000000..78b369b22d59
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gnump3d-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/gnump3d
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gnump3d
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=911b9eff185b17c710afd2f4844f5872
diff --git a/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0 b/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0
deleted file mode 100644
index 6e15539964fc..000000000000
--- a/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for app-crypt/gnupg-pkcs11-scd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gnupg-pkcs11-scd-proxy acct-group/gnupg-pkcs11
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f473ac37e48a2a516205825a81350031
diff --git a/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r1 b/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r1
new file mode 100644
index 000000000000..09a2ecef5bb7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-crypt/gnupg-pkcs11-scd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gnupg-pkcs11-scd-proxy acct-group/gnupg-pkcs11
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=22da69569c3832c489a6cf00ca49b031
diff --git a/metadata/md5-cache/acct-user/goaccess-0 b/metadata/md5-cache/acct-user/goaccess-0
deleted file mode 100644
index 2f31d9293d8a..000000000000
--- a/metadata/md5-cache/acct-user/goaccess-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: goaccess
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/goaccess
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=74b337178a44747eb21c026bc10e663b
diff --git a/metadata/md5-cache/acct-user/goaccess-0-r1 b/metadata/md5-cache/acct-user/goaccess-0-r1
new file mode 100644
index 000000000000..360ed1f60341
--- /dev/null
+++ b/metadata/md5-cache/acct-user/goaccess-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: goaccess
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/goaccess
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=74b337178a44747eb21c026bc10e663b
diff --git a/metadata/md5-cache/acct-user/gopher-0 b/metadata/md5-cache/acct-user/gopher-0
deleted file mode 100644
index fe18b00f57e0..000000000000
--- a/metadata/md5-cache/acct-user/gopher-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for gofish
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gopher
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=afc5c4dff1bdadd057bc0cb3231d9526
diff --git a/metadata/md5-cache/acct-user/gopher-0-r1 b/metadata/md5-cache/acct-user/gopher-0-r1
new file mode 100644
index 000000000000..2e4de2ab54a6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gopher-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for gofish
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gopher
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ccef16b33ec80779dffbf8118eb78fd1
diff --git a/metadata/md5-cache/acct-user/gopherd-0 b/metadata/md5-cache/acct-user/gopherd-0
deleted file mode 100644
index 2d83be3c6adf..000000000000
--- a/metadata/md5-cache/acct-user/gopherd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-misc/geomyidae
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gopherd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5e858a349a9de4d5c926f028264698a4
diff --git a/metadata/md5-cache/acct-user/gopherd-0-r1 b/metadata/md5-cache/acct-user/gopherd-0-r1
new file mode 100644
index 000000000000..b8cd27403eb0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gopherd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/geomyidae
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gopherd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6f88cb1126756ffab34dc5459d66c28b
diff --git a/metadata/md5-cache/acct-user/gpsd-0-r2 b/metadata/md5-cache/acct-user/gpsd-0-r2
deleted file mode 100644
index 34efb0d5f489..000000000000
--- a/metadata/md5-cache/acct-user/gpsd-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for gpsd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/dialout acct-group/uucp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f5e091b329f4d12dff93c77d630aca0e
diff --git a/metadata/md5-cache/acct-user/gpsd-0-r3 b/metadata/md5-cache/acct-user/gpsd-0-r3
new file mode 100644
index 000000000000..63b1aab52447
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gpsd-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for gpsd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/dialout acct-group/uucp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=08e5454b104f06c6d748517a193da7e0
diff --git a/metadata/md5-cache/acct-user/grafana-0-r1 b/metadata/md5-cache/acct-user/grafana-0-r1
deleted file mode 100644
index f3e3d6bfd0fe..000000000000
--- a/metadata/md5-cache/acct-user/grafana-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=grafana program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/grafana
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8c20a07a72bc54b680266ca29c1dc64c
diff --git a/metadata/md5-cache/acct-user/grafana-0-r2 b/metadata/md5-cache/acct-user/grafana-0-r2
new file mode 100644
index 000000000000..2fa56a533b73
--- /dev/null
+++ b/metadata/md5-cache/acct-user/grafana-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=grafana program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/grafana
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d6a4e19959051bf218ab3595125222dc
diff --git a/metadata/md5-cache/acct-user/graylog-0-r1 b/metadata/md5-cache/acct-user/graylog-0-r1
deleted file mode 100644
index 27f04d6430c6..000000000000
--- a/metadata/md5-cache/acct-user/graylog-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Graylog program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/graylog
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e56d7a6597f74b650e0803adb29702ce
diff --git a/metadata/md5-cache/acct-user/graylog-0-r2 b/metadata/md5-cache/acct-user/graylog-0-r2
new file mode 100644
index 000000000000..697befef1901
--- /dev/null
+++ b/metadata/md5-cache/acct-user/graylog-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Graylog program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/graylog
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ae202790586f576f05592134dd9b3dfd
diff --git a/metadata/md5-cache/acct-user/greetd-0-r1 b/metadata/md5-cache/acct-user/greetd-0-r1
deleted file mode 100644
index 248e9c803a7e..000000000000
--- a/metadata/md5-cache/acct-user/greetd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for gui-libs/greetd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/greetd acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4212aaa4e6eedb6a31c980877c3f8911
diff --git a/metadata/md5-cache/acct-user/greetd-0-r2 b/metadata/md5-cache/acct-user/greetd-0-r2
new file mode 100644
index 000000000000..8b55199d8d20
--- /dev/null
+++ b/metadata/md5-cache/acct-user/greetd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for gui-libs/greetd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/greetd acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8ebc6c1770c474019e9b280673f00104
diff --git a/metadata/md5-cache/acct-user/grok_exporter-0 b/metadata/md5-cache/acct-user/grok_exporter-0
deleted file mode 100644
index b90f0cf83cf9..000000000000
--- a/metadata/md5-cache/acct-user/grok_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/grok_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/grok_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ba5327500a75647a6757e628d2a2843f
diff --git a/metadata/md5-cache/acct-user/grok_exporter-0-r1 b/metadata/md5-cache/acct-user/grok_exporter-0-r1
new file mode 100644
index 000000000000..c8eeb3a4a07d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/grok_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/grok_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/grok_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4121feaf05fdc1ed2546364499a6ef58
diff --git a/metadata/md5-cache/acct-user/groonga-0 b/metadata/md5-cache/acct-user/groonga-0
deleted file mode 100644
index 649df21f1fa2..000000000000
--- a/metadata/md5-cache/acct-user/groonga-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for app-text/groonga
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/groonga
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=419550c6812dcb3380f7ea7f0e17de63
diff --git a/metadata/md5-cache/acct-user/groonga-0-r1 b/metadata/md5-cache/acct-user/groonga-0-r1
new file mode 100644
index 000000000000..af0000bb8ecc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/groonga-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-text/groonga
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/groonga
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=06b37f1e66e6a0cfd01b70566c5e8e2d
diff --git a/metadata/md5-cache/acct-user/gvm-0-r1 b/metadata/md5-cache/acct-user/gvm-0-r1
deleted file mode 100644
index 0a9795f7dc34..000000000000
--- a/metadata/md5-cache/acct-user/gvm-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Greenbone vulnerability management program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/gvm
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b695af84c5cdfd96a3edaa6925ac4fca
diff --git a/metadata/md5-cache/acct-user/gvm-0-r2 b/metadata/md5-cache/acct-user/gvm-0-r2
new file mode 100644
index 000000000000..8049af9bfc8c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/gvm-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Greenbone vulnerability management program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/gvm
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8c1f1908862d4f0265e961aac8464b91
diff --git a/metadata/md5-cache/acct-user/h2o-0 b/metadata/md5-cache/acct-user/h2o-0
deleted file mode 100644
index ecba85b17ed0..000000000000
--- a/metadata/md5-cache/acct-user/h2o-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for www-servers/h2o
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/h2o
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=84d34875c5c2b0d96294b7c7a6e76243
diff --git a/metadata/md5-cache/acct-user/h2o-0-r1 b/metadata/md5-cache/acct-user/h2o-0-r1
new file mode 100644
index 000000000000..0b8dd021852f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/h2o-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-servers/h2o
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/h2o
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=71275641ccd9e193887f9a3b729bf595
diff --git a/metadata/md5-cache/acct-user/hacluster-0 b/metadata/md5-cache/acct-user/hacluster-0
deleted file mode 100644
index 93ac86e86b71..000000000000
--- a/metadata/md5-cache/acct-user/hacluster-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-cluster/cluster-glue
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/haclient
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a4785e58af07bbb098c8dfceab3e8550
diff --git a/metadata/md5-cache/acct-user/hacluster-0-r1 b/metadata/md5-cache/acct-user/hacluster-0-r1
new file mode 100644
index 000000000000..1bf861bc29b6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/hacluster-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-cluster/cluster-glue
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/haclient
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6b9a8c466adb63d8ca9afb8e84c81285
diff --git a/metadata/md5-cache/acct-user/haproxy-0-r1 b/metadata/md5-cache/acct-user/haproxy-0-r1
deleted file mode 100644
index 97eb1c910805..000000000000
--- a/metadata/md5-cache/acct-user/haproxy-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: haproxy
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/haproxy
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ba210488f5ffed41222d32cbf0dffa91
diff --git a/metadata/md5-cache/acct-user/haproxy-0-r2 b/metadata/md5-cache/acct-user/haproxy-0-r2
new file mode 100644
index 000000000000..38a412dddb72
--- /dev/null
+++ b/metadata/md5-cache/acct-user/haproxy-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: haproxy
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/haproxy
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f8d9b1864f37ca89c7d4ff8064777c5e
diff --git a/metadata/md5-cache/acct-user/havp-0-r1 b/metadata/md5-cache/acct-user/havp-0-r1
deleted file mode 100644
index 0771d0f21cfb..000000000000
--- a/metadata/md5-cache/acct-user/havp-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-proxy/havp
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/havp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e773de8822f60264f0d172536ea31263
diff --git a/metadata/md5-cache/acct-user/havp-0-r2 b/metadata/md5-cache/acct-user/havp-0-r2
new file mode 100644
index 000000000000..1ea5b96de564
--- /dev/null
+++ b/metadata/md5-cache/acct-user/havp-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-proxy/havp
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/havp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e773de8822f60264f0d172536ea31263
diff --git a/metadata/md5-cache/acct-user/headscale-0 b/metadata/md5-cache/acct-user/headscale-0
deleted file mode 100644
index 6fa90a917bac..000000000000
--- a/metadata/md5-cache/acct-user/headscale-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Headscale Server hosting user
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/headscale
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=37f6905ae07a6b4833a1e0fa801bdf1e
diff --git a/metadata/md5-cache/acct-user/headscale-0-r1 b/metadata/md5-cache/acct-user/headscale-0-r1
new file mode 100644
index 000000000000..c0bb32ee8f66
--- /dev/null
+++ b/metadata/md5-cache/acct-user/headscale-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Headscale Server hosting user
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/headscale
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=37f6905ae07a6b4833a1e0fa801bdf1e
diff --git a/metadata/md5-cache/acct-user/heat-0-r1 b/metadata/md5-cache/acct-user/heat-0-r1
deleted file mode 100644
index f02c4d94bc19..000000000000
--- a/metadata/md5-cache/acct-user/heat-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for the heat openstack service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/heat
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=11c65953154c88544415d29a37a27e01
diff --git a/metadata/md5-cache/acct-user/heat-0-r2 b/metadata/md5-cache/acct-user/heat-0-r2
new file mode 100644
index 000000000000..54873d3689ff
--- /dev/null
+++ b/metadata/md5-cache/acct-user/heat-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for the heat openstack service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/heat
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2640b79cd4d63adbe85e5c7d110c8242
diff --git a/metadata/md5-cache/acct-user/hsqldb-0 b/metadata/md5-cache/acct-user/hsqldb-0
deleted file mode 100644
index 338412152e30..000000000000
--- a/metadata/md5-cache/acct-user/hsqldb-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for hsqldb
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/hsqldb
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=483a6301f6684dc271e14de86f33d47d
diff --git a/metadata/md5-cache/acct-user/hsqldb-0-r1 b/metadata/md5-cache/acct-user/hsqldb-0-r1
new file mode 100644
index 000000000000..7606089ae63a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/hsqldb-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for hsqldb
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/hsqldb
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=64c1d598b00a4f06cd028ede88be244d
diff --git a/metadata/md5-cache/acct-user/http-0 b/metadata/md5-cache/acct-user/http-0
deleted file mode 100644
index cbc6231b66e1..000000000000
--- a/metadata/md5-cache/acct-user/http-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for www-servers/caddy
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/http
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=446904e0b6d97a6d049ac9ffd4f886a5
diff --git a/metadata/md5-cache/acct-user/http-0-r1 b/metadata/md5-cache/acct-user/http-0-r1
new file mode 100644
index 000000000000..c948af085db3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/http-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-servers/caddy
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/http
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a49c866633e2123fcbec7e26f949cc47
diff --git a/metadata/md5-cache/acct-user/i2p-0-r1 b/metadata/md5-cache/acct-user/i2p-0-r1
deleted file mode 100644
index 89d08d43e193..000000000000
--- a/metadata/md5-cache/acct-user/i2p-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for system-wide net-vpn/i2p
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/i2p
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b1e2c67be65cdf4e20898210cb5e74b5
diff --git a/metadata/md5-cache/acct-user/i2p-0-r2 b/metadata/md5-cache/acct-user/i2p-0-r2
new file mode 100644
index 000000000000..ec4eba87adcd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/i2p-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for system-wide net-vpn/i2p
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/i2p
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ccc5bbf48a589ad6969a75d479b9bce0
diff --git a/metadata/md5-cache/acct-user/i2pd-0-r1 b/metadata/md5-cache/acct-user/i2pd-0-r1
deleted file mode 100644
index f4da77db42c9..000000000000
--- a/metadata/md5-cache/acct-user/i2pd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the system-wide net-vpn/i2pd server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/i2pd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=be35aeeea194ba2a4e0ce86d361ae634
diff --git a/metadata/md5-cache/acct-user/i2pd-0-r2 b/metadata/md5-cache/acct-user/i2pd-0-r2
new file mode 100644
index 000000000000..d34149ba818a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/i2pd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the system-wide net-vpn/i2pd server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/i2pd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=15af2114c7d981d536171a58a503d015
diff --git a/metadata/md5-cache/acct-user/icecast-0 b/metadata/md5-cache/acct-user/icecast-0
deleted file mode 100644
index fcc40f27a3ab..000000000000
--- a/metadata/md5-cache/acct-user/icecast-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-misc/icecast
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/icecast
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=738823659241bc06f5909906818561cd
diff --git a/metadata/md5-cache/acct-user/icecast-0-r1 b/metadata/md5-cache/acct-user/icecast-0-r1
new file mode 100644
index 000000000000..599bd59e30a0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icecast-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/icecast
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/icecast
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8e021f6785133fbe7762dff23f272046
diff --git a/metadata/md5-cache/acct-user/icecream-0 b/metadata/md5-cache/acct-user/icecream-0
deleted file mode 100644
index 49bf748b2d1d..000000000000
--- a/metadata/md5-cache/acct-user/icecream-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-devel/icecream
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/icecream
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3db4fae16a7e1bff79225ffc82a794ed
diff --git a/metadata/md5-cache/acct-user/icecream-0-r1 b/metadata/md5-cache/acct-user/icecream-0-r1
new file mode 100644
index 000000000000..6c225264f85d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icecream-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-devel/icecream
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/icecream
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=eabdabf2dcf3e6f9b03aa695c8de1019
diff --git a/metadata/md5-cache/acct-user/ices-0 b/metadata/md5-cache/acct-user/ices-0
deleted file mode 100644
index 9babc2d8d861..000000000000
--- a/metadata/md5-cache/acct-user/ices-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-misc/ices
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ices
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7265d152afcbb3a3205dba24db3050f1
diff --git a/metadata/md5-cache/acct-user/ices-0-r1 b/metadata/md5-cache/acct-user/ices-0-r1
new file mode 100644
index 000000000000..aeed17e1f43f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ices-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/ices
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ices
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c50abac985d206285e0751b738dc8a40
diff --git a/metadata/md5-cache/acct-user/icinga-0-r1 b/metadata/md5-cache/acct-user/icinga-0-r1
deleted file mode 100644
index bcdb7afb245c..000000000000
--- a/metadata/md5-cache/acct-user/icinga-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Icinga User
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/icinga acct-group/icingacmd acct-group/nagios
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=08adb2cc23fb2a9727865d8a7d5461f4
diff --git a/metadata/md5-cache/acct-user/icinga-0-r2 b/metadata/md5-cache/acct-user/icinga-0-r2
new file mode 100644
index 000000000000..dfd5ad062468
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icinga-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Icinga User
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/icinga acct-group/icingacmd acct-group/nagios
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d546bb873d86559dfdd1b3a1a61613bd
diff --git a/metadata/md5-cache/acct-user/icingadirector-0 b/metadata/md5-cache/acct-user/icingadirector-0
deleted file mode 100644
index 8422504a02c9..000000000000
--- a/metadata/md5-cache/acct-user/icingadirector-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Icinga Director User
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/icingaweb2
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b162a15c228756de640930729e24b25b
diff --git a/metadata/md5-cache/acct-user/icingadirector-0-r1 b/metadata/md5-cache/acct-user/icingadirector-0-r1
new file mode 100644
index 000000000000..f28e6a6adbe7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/icingadirector-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Icinga Director User
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/icingaweb2
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=501365fc3012676e0b7ac9146e44b71c
diff --git a/metadata/md5-cache/acct-user/inadyn-0 b/metadata/md5-cache/acct-user/inadyn-0
deleted file mode 100644
index 50b0b61b87b8..000000000000
--- a/metadata/md5-cache/acct-user/inadyn-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-dns/inadyn
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/inadyn
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f1b4b5a8efcd6bc445df80d06c997adb
diff --git a/metadata/md5-cache/acct-user/inadyn-0-r1 b/metadata/md5-cache/acct-user/inadyn-0-r1
new file mode 100644
index 000000000000..7238368f3f4a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/inadyn-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dns/inadyn
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/inadyn
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f1b4b5a8efcd6bc445df80d06c997adb
diff --git a/metadata/md5-cache/acct-user/influxdb-0-r1 b/metadata/md5-cache/acct-user/influxdb-0-r1
deleted file mode 100644
index c9adf20e2103..000000000000
--- a/metadata/md5-cache/acct-user/influxdb-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for influxdb
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/influxdb
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=37b4c81f4ba4ff36ef3de7858b1cb350
diff --git a/metadata/md5-cache/acct-user/influxdb-0-r2 b/metadata/md5-cache/acct-user/influxdb-0-r2
new file mode 100644
index 000000000000..1ebef6b74162
--- /dev/null
+++ b/metadata/md5-cache/acct-user/influxdb-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for influxdb
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/influxdb
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b7b69877888c86b7432ba6628cd47a7e
diff --git a/metadata/md5-cache/acct-user/inspircd-0-r1 b/metadata/md5-cache/acct-user/inspircd-0-r1
deleted file mode 100644
index bb432184d389..000000000000
--- a/metadata/md5-cache/acct-user/inspircd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for InspIRCd server daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/inspircd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=269fc7c628c019545caa22ee01f4ba6d
diff --git a/metadata/md5-cache/acct-user/inspircd-0-r2 b/metadata/md5-cache/acct-user/inspircd-0-r2
new file mode 100644
index 000000000000..e30f221dc1a6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/inspircd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for InspIRCd server daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/inspircd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=01826ce9f8ada0143b517c1b2c69ab19
diff --git a/metadata/md5-cache/acct-user/ipfs-0-r1 b/metadata/md5-cache/acct-user/ipfs-0-r1
deleted file mode 100644
index 2a3561cda686..000000000000
--- a/metadata/md5-cache/acct-user/ipfs-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the system-wide net-p2p/go-ipfs-bin server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ipfs
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5a26194c7398e7c67af6b0f5c7a83a33
diff --git a/metadata/md5-cache/acct-user/ipfs-0-r2 b/metadata/md5-cache/acct-user/ipfs-0-r2
new file mode 100644
index 000000000000..3c4620c72b89
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ipfs-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the system-wide net-p2p/go-ipfs-bin server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ipfs
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=47997c59cf263c623edb3ccd21350e8f
diff --git a/metadata/md5-cache/acct-user/ippl-0-r1 b/metadata/md5-cache/acct-user/ippl-0-r1
deleted file mode 100644
index ceaa7568c94a..000000000000
--- a/metadata/md5-cache/acct-user/ippl-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for net-analyzer/ippl
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2b03815f1289c6d60dc12e9ea2d438cc
diff --git a/metadata/md5-cache/acct-user/ippl-0-r2 b/metadata/md5-cache/acct-user/ippl-0-r2
new file mode 100644
index 000000000000..ac55590e896a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ippl-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for net-analyzer/ippl
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=26d27d87cb61a3220a5f0d8346d558f3
diff --git a/metadata/md5-cache/acct-user/ipsec-0 b/metadata/md5-cache/acct-user/ipsec-0
deleted file mode 100644
index 9040efdb70a3..000000000000
--- a/metadata/md5-cache/acct-user/ipsec-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=ipsec (strongswan) program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ipsec
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=39c9f12b9f6a5143c4306b8b5895ca09
diff --git a/metadata/md5-cache/acct-user/ipsec-0-r1 b/metadata/md5-cache/acct-user/ipsec-0-r1
new file mode 100644
index 000000000000..f7e60025f6af
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ipsec-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=ipsec (strongswan) program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ipsec
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b64062d9b953cb5c065099714ed9c5e4
diff --git a/metadata/md5-cache/acct-user/ipsentinel-0 b/metadata/md5-cache/acct-user/ipsentinel-0
deleted file mode 100644
index 80622dc2fc13..000000000000
--- a/metadata/md5-cache/acct-user/ipsentinel-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-misc/ip-sentinel
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ipsentinel
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b135aa760c7b6ad44422667ffd81083f
diff --git a/metadata/md5-cache/acct-user/ipsentinel-0-r1 b/metadata/md5-cache/acct-user/ipsentinel-0-r1
new file mode 100644
index 000000000000..e55bf327eb74
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ipsentinel-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/ip-sentinel
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ipsentinel
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=86228b629656c51e104660e19fe06dc8
diff --git a/metadata/md5-cache/acct-user/iroffer-0 b/metadata/md5-cache/acct-user/iroffer-0
deleted file mode 100644
index feab431f1580..000000000000
--- a/metadata/md5-cache/acct-user/iroffer-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: iroffer
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/iroffer
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=95c02a58f8b33970cd3d1cda6d5162a6
diff --git a/metadata/md5-cache/acct-user/iroffer-0-r1 b/metadata/md5-cache/acct-user/iroffer-0-r1
new file mode 100644
index 000000000000..4c7f9dab6dfd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/iroffer-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: iroffer
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/iroffer
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=54151b4de392e1ee9dd01adee87fac19
diff --git a/metadata/md5-cache/acct-user/jellyfin-0-r1 b/metadata/md5-cache/acct-user/jellyfin-0-r1
deleted file mode 100644
index ff021765c109..000000000000
--- a/metadata/md5-cache/acct-user/jellyfin-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: jellyfin
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/jellyfin acct-group/render acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9c1f486928deec349109dac81ade3684
diff --git a/metadata/md5-cache/acct-user/jellyfin-0-r2 b/metadata/md5-cache/acct-user/jellyfin-0-r2
new file mode 100644
index 000000000000..131129c90109
--- /dev/null
+++ b/metadata/md5-cache/acct-user/jellyfin-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: jellyfin
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/jellyfin acct-group/render acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ae050bfba8c94689f23c8f86ecab5440
diff --git a/metadata/md5-cache/acct-user/jenkins-0 b/metadata/md5-cache/acct-user/jenkins-0
deleted file mode 100644
index 0db2e35e9437..000000000000
--- a/metadata/md5-cache/acct-user/jenkins-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Jenkins program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/jenkins
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6476de20d170d83a85d0b3418fbb7ac5
diff --git a/metadata/md5-cache/acct-user/jenkins-0-r1 b/metadata/md5-cache/acct-user/jenkins-0-r1
new file mode 100644
index 000000000000..57278f857db6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/jenkins-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Jenkins program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/jenkins
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4f4645e0c665238845ca859fad3b8382
diff --git a/metadata/md5-cache/acct-user/kafka-0-r1 b/metadata/md5-cache/acct-user/kafka-0-r1
deleted file mode 100644
index aee4b8e4ae56..000000000000
--- a/metadata/md5-cache/acct-user/kafka-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for kafka
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/kafka
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8302b25f09f91ff16ab244aaa735181b
diff --git a/metadata/md5-cache/acct-user/kafka-0-r2 b/metadata/md5-cache/acct-user/kafka-0-r2
new file mode 100644
index 000000000000..852d31a5bed4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kafka-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for kafka
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/kafka
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8e27eb4df266b960c9521f83dd8889ad
diff --git a/metadata/md5-cache/acct-user/kapacitor-0-r1 b/metadata/md5-cache/acct-user/kapacitor-0-r1
deleted file mode 100644
index aafa1410d9d7..000000000000
--- a/metadata/md5-cache/acct-user/kapacitor-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for kapacitor
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/kapacitor
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f0aa7116fa65c870ed03717150239466
diff --git a/metadata/md5-cache/acct-user/kapacitor-0-r2 b/metadata/md5-cache/acct-user/kapacitor-0-r2
new file mode 100644
index 000000000000..6e9d8c391b76
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kapacitor-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for kapacitor
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/kapacitor
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7c77e0609af14ebe72d1ddf935a40cea
diff --git a/metadata/md5-cache/acct-user/karma-0 b/metadata/md5-cache/acct-user/karma-0
deleted file mode 100644
index 7a6171bb4afd..000000000000
--- a/metadata/md5-cache/acct-user/karma-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for www-apps/karma-bin
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/karma
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=73629794b8664d114c6abd4804aebb7b
diff --git a/metadata/md5-cache/acct-user/karma-0-r1 b/metadata/md5-cache/acct-user/karma-0-r1
new file mode 100644
index 000000000000..3e2edcfefb87
--- /dev/null
+++ b/metadata/md5-cache/acct-user/karma-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/karma-bin
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/karma
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=04544bfca84a1959d69402e50d999eb7
diff --git a/metadata/md5-cache/acct-user/keystone-0-r1 b/metadata/md5-cache/acct-user/keystone-0-r1
deleted file mode 100644
index 767be8ad9da6..000000000000
--- a/metadata/md5-cache/acct-user/keystone-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for the keystone openstack service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/keystone
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3a6966e2aab7f774aec7fe695f11b9ef
diff --git a/metadata/md5-cache/acct-user/keystone-0-r2 b/metadata/md5-cache/acct-user/keystone-0-r2
new file mode 100644
index 000000000000..072114562d0a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/keystone-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for the keystone openstack service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/keystone
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=70c3453450a5a70952f8c148e127df75
diff --git a/metadata/md5-cache/acct-user/kibana-0-r1 b/metadata/md5-cache/acct-user/kibana-0-r1
deleted file mode 100644
index 73ca3efaf1be..000000000000
--- a/metadata/md5-cache/acct-user/kibana-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Kibana program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/kibana
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5661d8551c1db87e196691b7fd5f2d0f
diff --git a/metadata/md5-cache/acct-user/kibana-0-r2 b/metadata/md5-cache/acct-user/kibana-0-r2
new file mode 100644
index 000000000000..b9e4ee7f60fe
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kibana-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Kibana program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/kibana
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a393284492426b565a6c3d5a790a24e5
diff --git a/metadata/md5-cache/acct-user/kismet-0-r1 b/metadata/md5-cache/acct-user/kismet-0-r1
deleted file mode 100644
index 1da14b5c56fa..000000000000
--- a/metadata/md5-cache/acct-user/kismet-0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DEPEND=acct-group/kismet
-DESCRIPTION=net-wireless/kismet
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/kismet acct-group/kismet
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=481e3c617f9b5cbc5aa71e5d474ea119
diff --git a/metadata/md5-cache/acct-user/kismet-0-r2 b/metadata/md5-cache/acct-user/kismet-0-r2
new file mode 100644
index 000000000000..cc7d0245f81e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kismet-0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/kismet
+DESCRIPTION=net-wireless/kismet
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/kismet acct-group/kismet
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b358bff68cdda5deafd2e6c2d8e22baa
diff --git a/metadata/md5-cache/acct-user/knot-0-r1 b/metadata/md5-cache/acct-user/knot-0-r1
deleted file mode 100644
index 74bedaf6c703..000000000000
--- a/metadata/md5-cache/acct-user/knot-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for knot DNS server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/knot
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=112d1e2c08b711ce1adb06c28a0cede2
diff --git a/metadata/md5-cache/acct-user/knot-0-r2 b/metadata/md5-cache/acct-user/knot-0-r2
new file mode 100644
index 000000000000..c27a25b06e91
--- /dev/null
+++ b/metadata/md5-cache/acct-user/knot-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for knot DNS server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/knot
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d53037ae9011b021df19e78b2743ab17
diff --git a/metadata/md5-cache/acct-user/knot-resolver-0 b/metadata/md5-cache/acct-user/knot-resolver-0
deleted file mode 100644
index 9309961ee173..000000000000
--- a/metadata/md5-cache/acct-user/knot-resolver-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: knot-resolver
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/knot-resolver
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d234e3f614c1d6a741316e9fe11b27cf
diff --git a/metadata/md5-cache/acct-user/knot-resolver-0-r1 b/metadata/md5-cache/acct-user/knot-resolver-0-r1
new file mode 100644
index 000000000000..d56c6b162d69
--- /dev/null
+++ b/metadata/md5-cache/acct-user/knot-resolver-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: knot-resolver
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/knot-resolver
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=703bbe3c71c475408e4454feedd0dd22
diff --git a/metadata/md5-cache/acct-user/kube-apiserver-0-r1 b/metadata/md5-cache/acct-user/kube-apiserver-0-r1
deleted file mode 100644
index 46fa62ed1181..000000000000
--- a/metadata/md5-cache/acct-user/kube-apiserver-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for kube-apiserver
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/kube-apiserver
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7810afddb6357eee9b4a96229040a645
diff --git a/metadata/md5-cache/acct-user/kube-apiserver-0-r2 b/metadata/md5-cache/acct-user/kube-apiserver-0-r2
new file mode 100644
index 000000000000..d0ca3b82c73d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kube-apiserver-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for kube-apiserver
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/kube-apiserver
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=00f7a93499e35e1cc34fb088f8458e70
diff --git a/metadata/md5-cache/acct-user/kube-controller-manager-0-r1 b/metadata/md5-cache/acct-user/kube-controller-manager-0-r1
deleted file mode 100644
index a0ce825ba7dc..000000000000
--- a/metadata/md5-cache/acct-user/kube-controller-manager-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for kube-controller-manager
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/kube-controller-manager
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ea7783b40f308e0d78e89207fa9b409e
diff --git a/metadata/md5-cache/acct-user/kube-controller-manager-0-r2 b/metadata/md5-cache/acct-user/kube-controller-manager-0-r2
new file mode 100644
index 000000000000..0553f3b15f9e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kube-controller-manager-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for kube-controller-manager
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/kube-controller-manager
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9e9fc581bc942a6b08924d4a468fa9bf
diff --git a/metadata/md5-cache/acct-user/kube-scheduler-0-r1 b/metadata/md5-cache/acct-user/kube-scheduler-0-r1
deleted file mode 100644
index 2c9070111692..000000000000
--- a/metadata/md5-cache/acct-user/kube-scheduler-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for kube-scheduler
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/kube-scheduler
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f21856a412a70e3e5b3185faaccb3a9c
diff --git a/metadata/md5-cache/acct-user/kube-scheduler-0-r2 b/metadata/md5-cache/acct-user/kube-scheduler-0-r2
new file mode 100644
index 000000000000..f6ca7ae55075
--- /dev/null
+++ b/metadata/md5-cache/acct-user/kube-scheduler-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for kube-scheduler
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/kube-scheduler
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a0a982561338e480086f1810273deab7
diff --git a/metadata/md5-cache/acct-user/ldap-0 b/metadata/md5-cache/acct-user/ldap-0
deleted file mode 100644
index e95f0690326b..000000000000
--- a/metadata/md5-cache/acct-user/ldap-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend setup
-DESCRIPTION=A user for ldap
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ldap
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d3708de6655d27fa665bf33091712f45
diff --git a/metadata/md5-cache/acct-user/ldap-0-r1 b/metadata/md5-cache/acct-user/ldap-0-r1
new file mode 100644
index 000000000000..4614a3b24c0a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ldap-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend setup
+DESCRIPTION=A user for ldap
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ldap
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dd86020e96648d3ef1772fd71aa98286
diff --git a/metadata/md5-cache/acct-user/libreoffice-0 b/metadata/md5-cache/acct-user/libreoffice-0
deleted file mode 100644
index 5cb2af29a490..000000000000
--- a/metadata/md5-cache/acct-user/libreoffice-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the headless LibreOffice server
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/libreoffice
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6c75b947bbe8ccf755f9953ff8b8159b
diff --git a/metadata/md5-cache/acct-user/libreoffice-0-r1 b/metadata/md5-cache/acct-user/libreoffice-0-r1
new file mode 100644
index 000000000000..59a3a04293d6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/libreoffice-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the headless LibreOffice server
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/libreoffice
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dd94f6403eef299ca7f36764184a7ae4
diff --git a/metadata/md5-cache/acct-user/lightdm-0 b/metadata/md5-cache/acct-user/lightdm-0
deleted file mode 100644
index 1e321aa32dc3..000000000000
--- a/metadata/md5-cache/acct-user/lightdm-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for x11-misc/lightdm
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/lightdm acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dba4f39194dfaa6516e36be4094a8378
diff --git a/metadata/md5-cache/acct-user/lightdm-0-r1 b/metadata/md5-cache/acct-user/lightdm-0-r1
new file mode 100644
index 000000000000..4ddfd6449e39
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lightdm-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for x11-misc/lightdm
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/lightdm acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cbc01b9759c5d794846217ba6f1e7ac9
diff --git a/metadata/md5-cache/acct-user/lighttpd-0-r1 b/metadata/md5-cache/acct-user/lighttpd-0-r1
deleted file mode 100644
index 59fbb86d2656..000000000000
--- a/metadata/md5-cache/acct-user/lighttpd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for lighttpd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/lighttpd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a59ead6de77457aacb7b168bd38c53ed
diff --git a/metadata/md5-cache/acct-user/lighttpd-0-r2 b/metadata/md5-cache/acct-user/lighttpd-0-r2
new file mode 100644
index 000000000000..5970084dfabe
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lighttpd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for lighttpd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/lighttpd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a30a3df342fb7744b5e40775664897a2
diff --git a/metadata/md5-cache/acct-user/litecoin-0 b/metadata/md5-cache/acct-user/litecoin-0
deleted file mode 100644
index 002abe5d3251..000000000000
--- a/metadata/md5-cache/acct-user/litecoin-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-p2p/litecoind
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/litecoin
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dc6b8835fc0e4e2e7dd33e38bb05b4b3
diff --git a/metadata/md5-cache/acct-user/litecoin-0-r1 b/metadata/md5-cache/acct-user/litecoin-0-r1
new file mode 100644
index 000000000000..80bcc1849c65
--- /dev/null
+++ b/metadata/md5-cache/acct-user/litecoin-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-p2p/litecoind
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/litecoin
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7337c3275c5fb4489f0bbc54f93eca50
diff --git a/metadata/md5-cache/acct-user/lldpd-0-r1 b/metadata/md5-cache/acct-user/lldpd-0-r1
deleted file mode 100644
index 58ee55a900b2..000000000000
--- a/metadata/md5-cache/acct-user/lldpd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-misc/lldpd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/lldpd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9cf92a8d94054e18694e86da9a985048
diff --git a/metadata/md5-cache/acct-user/lldpd-0-r2 b/metadata/md5-cache/acct-user/lldpd-0-r2
new file mode 100644
index 000000000000..5d550827d523
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lldpd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/lldpd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/lldpd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=97378f7d88e08c5d2d2d103c29105924
diff --git a/metadata/md5-cache/acct-user/logcheck-0 b/metadata/md5-cache/acct-user/logcheck-0
deleted file mode 100644
index b6dc9e5b3575..000000000000
--- a/metadata/md5-cache/acct-user/logcheck-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for app-admin/logcheck
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/logcheck
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=89d38b7b044686504ba87dd51b0707eb
diff --git a/metadata/md5-cache/acct-user/logcheck-0-r1 b/metadata/md5-cache/acct-user/logcheck-0-r1
new file mode 100644
index 000000000000..5c236d564ae1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/logcheck-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-admin/logcheck
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/logcheck
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b48184cf357d6b633dcb529144c14bec
diff --git a/metadata/md5-cache/acct-user/logstash-0-r1 b/metadata/md5-cache/acct-user/logstash-0-r1
deleted file mode 100644
index 8f302917aba7..000000000000
--- a/metadata/md5-cache/acct-user/logstash-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Logstash program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/logstash
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=959dfc2072179dcf62baf844c87071d5
diff --git a/metadata/md5-cache/acct-user/logstash-0-r2 b/metadata/md5-cache/acct-user/logstash-0-r2
new file mode 100644
index 000000000000..869f3398f99c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/logstash-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Logstash program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/logstash
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8f1ddf00ffacb30dda81c6593e2c396e
diff --git a/metadata/md5-cache/acct-user/logsurfer-0 b/metadata/md5-cache/acct-user/logsurfer-0
deleted file mode 100644
index f1620eec4401..000000000000
--- a/metadata/md5-cache/acct-user/logsurfer-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for app-admin/logsurfer
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/logsurfer
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5022c459e43422f5c03c7ee7de616a1a
diff --git a/metadata/md5-cache/acct-user/logsurfer-0-r1 b/metadata/md5-cache/acct-user/logsurfer-0-r1
new file mode 100644
index 000000000000..ac87eb5995b9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/logsurfer-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-admin/logsurfer
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/logsurfer
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=21b96cfa5ea5a2923c7d11bc7afd489c
diff --git a/metadata/md5-cache/acct-user/lxc-0 b/metadata/md5-cache/acct-user/lxc-0
deleted file mode 100644
index 8d573c142a13..000000000000
--- a/metadata/md5-cache/acct-user/lxc-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for app-containers/lxc
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/lxc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c2b36965ad3de82b54f7ee3ea28126e5
diff --git a/metadata/md5-cache/acct-user/lxc-0-r1 b/metadata/md5-cache/acct-user/lxc-0-r1
new file mode 100644
index 000000000000..d90ff6e02115
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lxc-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-containers/lxc
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/lxc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dc4ae6d532a6d8a3db729e923127e478
diff --git a/metadata/md5-cache/acct-user/mail-0-r1 b/metadata/md5-cache/acct-user/mail-0-r1
deleted file mode 100644
index c7c61d889992..000000000000
--- a/metadata/md5-cache/acct-user/mail-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Mail program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bb05bb64f66c9418d95e473c974bbb44
diff --git a/metadata/md5-cache/acct-user/mail-0-r2 b/metadata/md5-cache/acct-user/mail-0-r2
new file mode 100644
index 000000000000..de7f02b90345
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mail-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Mail program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cf2b4cd361528e0922ce0302c4c6cf2c
diff --git a/metadata/md5-cache/acct-user/man-1-r1 b/metadata/md5-cache/acct-user/man-1-r1
deleted file mode 100644
index 6825f9ac6332..000000000000
--- a/metadata/md5-cache/acct-user/man-1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: man
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/man
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f1bb0b2061b8de3c31ac22a97078c082
diff --git a/metadata/md5-cache/acct-user/man-1-r2 b/metadata/md5-cache/acct-user/man-1-r2
new file mode 100644
index 000000000000..6e3ea7d963a1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/man-1-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: man
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/man
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2f02d83de526170b15842ffe8e9126f5
diff --git a/metadata/md5-cache/acct-user/maradns-0-r1 b/metadata/md5-cache/acct-user/maradns-0-r1
deleted file mode 100644
index b3c2fc18b7e4..000000000000
--- a/metadata/md5-cache/acct-user/maradns-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: maradns
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/maradns
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0d1d57ff842cacbd17ae61bb849a6fa3
diff --git a/metadata/md5-cache/acct-user/maradns-0-r2 b/metadata/md5-cache/acct-user/maradns-0-r2
new file mode 100644
index 000000000000..775f9aeae703
--- /dev/null
+++ b/metadata/md5-cache/acct-user/maradns-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: maradns
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/maradns
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8c227f3988e635c6ea0680f5d4750b94
diff --git a/metadata/md5-cache/acct-user/memcached-0-r1 b/metadata/md5-cache/acct-user/memcached-0-r1
deleted file mode 100644
index 82dd4327ad1e..000000000000
--- a/metadata/md5-cache/acct-user/memcached-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the memcached service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/memcached
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=09dd2fd3cceb6e638f77c53828575dba
diff --git a/metadata/md5-cache/acct-user/memcached-0-r2 b/metadata/md5-cache/acct-user/memcached-0-r2
new file mode 100644
index 000000000000..bd321ac02870
--- /dev/null
+++ b/metadata/md5-cache/acct-user/memcached-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the memcached service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/memcached
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e7c9ac8c69c5c91156cafcf4e9af95d8
diff --git a/metadata/md5-cache/acct-user/memcached_exporter-0 b/metadata/md5-cache/acct-user/memcached_exporter-0
deleted file mode 100644
index d025b20af0f9..000000000000
--- a/metadata/md5-cache/acct-user/memcached_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for memcached_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/memcached_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=79ac6b6ec2da1ed951f8c0629e838c14
diff --git a/metadata/md5-cache/acct-user/memcached_exporter-0-r1 b/metadata/md5-cache/acct-user/memcached_exporter-0-r1
new file mode 100644
index 000000000000..f90b356d59cb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/memcached_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for memcached_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/memcached_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4876bf4c0bb6330f6da6fd0aefedc3fa
diff --git a/metadata/md5-cache/acct-user/messagebus-0-r1 b/metadata/md5-cache/acct-user/messagebus-0-r1
deleted file mode 100644
index d711381f7057..000000000000
--- a/metadata/md5-cache/acct-user/messagebus-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: messagebus
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/messagebus
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9c94b03f063aee703c2fba80172adbec
diff --git a/metadata/md5-cache/acct-user/messagebus-0-r2 b/metadata/md5-cache/acct-user/messagebus-0-r2
new file mode 100644
index 000000000000..9d291454d610
--- /dev/null
+++ b/metadata/md5-cache/acct-user/messagebus-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: messagebus
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/messagebus
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a573995077242e3b8db7f6acf4dc8a59
diff --git a/metadata/md5-cache/acct-user/mgraph-0 b/metadata/md5-cache/acct-user/mgraph-0
deleted file mode 100644
index 999d62180e43..000000000000
--- a/metadata/md5-cache/acct-user/mgraph-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-mail/mailgraph
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mgraph acct-group/adm
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a206ba8bd86db9b8815e49ced1f361b7
diff --git a/metadata/md5-cache/acct-user/mgraph-0-r1 b/metadata/md5-cache/acct-user/mgraph-0-r1
new file mode 100644
index 000000000000..aac387942369
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mgraph-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/mailgraph
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mgraph acct-group/adm
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7d62f9377052b0b89ee16f4592186940
diff --git a/metadata/md5-cache/acct-user/milter-regex-0-r1 b/metadata/md5-cache/acct-user/milter-regex-0-r1
deleted file mode 100644
index 0494c743a497..000000000000
--- a/metadata/md5-cache/acct-user/milter-regex-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for mail-filter/milter-regex
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/milter-regex
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a010221e9c80a8cd1e74fd545a56d33c
diff --git a/metadata/md5-cache/acct-user/milter-regex-0-r2 b/metadata/md5-cache/acct-user/milter-regex-0-r2
new file mode 100644
index 000000000000..63a1f7d81d74
--- /dev/null
+++ b/metadata/md5-cache/acct-user/milter-regex-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mail-filter/milter-regex
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/milter-regex
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2c31f9eaa89ccb74e6e69b2e4bb55f41
diff --git a/metadata/md5-cache/acct-user/minbif-0 b/metadata/md5-cache/acct-user/minbif-0
deleted file mode 100644
index 28aa41de7166..000000000000
--- a/metadata/md5-cache/acct-user/minbif-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-im/minbif
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/minbif
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b63a77cfd87df4694de26f1246883407
diff --git a/metadata/md5-cache/acct-user/minbif-0-r1 b/metadata/md5-cache/acct-user/minbif-0-r1
new file mode 100644
index 000000000000..609ac8ff8b3e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minbif-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-im/minbif
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/minbif
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=644a1bbbc6390f8c3f1728df668764df
diff --git a/metadata/md5-cache/acct-user/minecraft-0-r1 b/metadata/md5-cache/acct-user/minecraft-0-r1
deleted file mode 100644
index 9ae35c020002..000000000000
--- a/metadata/md5-cache/acct-user/minecraft-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the Minecraft server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/minecraft
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=027114ca3e5d54c2b7613ad3b5deb407
diff --git a/metadata/md5-cache/acct-user/minecraft-0-r2 b/metadata/md5-cache/acct-user/minecraft-0-r2
new file mode 100644
index 000000000000..adec0de3849f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minecraft-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Minecraft server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/minecraft
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=db59205fd8abe92daf1ec41bcb8db7fd
diff --git a/metadata/md5-cache/acct-user/minetest-1-r1 b/metadata/md5-cache/acct-user/minetest-1-r1
deleted file mode 100644
index ab79c704421a..000000000000
--- a/metadata/md5-cache/acct-user/minetest-1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the Minetest server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/minetest
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=08e017c6a32d177006cadb452a673147
diff --git a/metadata/md5-cache/acct-user/minetest-1-r2 b/metadata/md5-cache/acct-user/minetest-1-r2
new file mode 100644
index 000000000000..b401cef4d391
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minetest-1-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Minetest server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/minetest
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=695f415e96d602499f3961562b144175
diff --git a/metadata/md5-cache/acct-user/minidlna-0 b/metadata/md5-cache/acct-user/minidlna-0
deleted file mode 100644
index 50e746416a15..000000000000
--- a/metadata/md5-cache/acct-user/minidlna-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: minidlna
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/minidlna
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=568763878748638d96eeb052812ed034
diff --git a/metadata/md5-cache/acct-user/minidlna-0-r1 b/metadata/md5-cache/acct-user/minidlna-0-r1
new file mode 100644
index 000000000000..101b81c6b769
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minidlna-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: minidlna
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/minidlna
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c15e07e3af0707d64bf61c92bad1e56b
diff --git a/metadata/md5-cache/acct-user/miniflux-0 b/metadata/md5-cache/acct-user/miniflux-0
deleted file mode 100644
index 47ecac7a32de..000000000000
--- a/metadata/md5-cache/acct-user/miniflux-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for www-apps/miniflux
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nobody
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f494a800ac5f2bc0510974edc9127ab6
diff --git a/metadata/md5-cache/acct-user/miniflux-0-r1 b/metadata/md5-cache/acct-user/miniflux-0-r1
new file mode 100644
index 000000000000..54d854d68aa9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/miniflux-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-apps/miniflux
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nobody
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fd1ea72b1c41fe30c7e7ba1436b05b0d
diff --git a/metadata/md5-cache/acct-user/minio-0 b/metadata/md5-cache/acct-user/minio-0
deleted file mode 100644
index a7be43eb214e..000000000000
--- a/metadata/md5-cache/acct-user/minio-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for minio
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/minio
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fd2637573aa1b6d76fd49391ded77082
diff --git a/metadata/md5-cache/acct-user/minio-0-r1 b/metadata/md5-cache/acct-user/minio-0-r1
new file mode 100644
index 000000000000..39b172a7e7a7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/minio-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for minio
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/minio
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=431f8c1e3d76fc84302d4489a06e5faf
diff --git a/metadata/md5-cache/acct-user/mogile-0 b/metadata/md5-cache/acct-user/mogile-0
deleted file mode 100644
index ec7988927b80..000000000000
--- a/metadata/md5-cache/acct-user/mogile-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=MogileFS user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mogile
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ed25de7fec60192f627a12c91ec0d8de
diff --git a/metadata/md5-cache/acct-user/mogile-0-r1 b/metadata/md5-cache/acct-user/mogile-0-r1
new file mode 100644
index 000000000000..4f2a93b56130
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mogile-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=MogileFS user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mogile
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=af3d3573e3daa281abc981f310bddd2b
diff --git a/metadata/md5-cache/acct-user/mongodb-0-r1 b/metadata/md5-cache/acct-user/mongodb-0-r1
deleted file mode 100644
index b1f76b49f446..000000000000
--- a/metadata/md5-cache/acct-user/mongodb-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=MongoDB program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mongodb
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=601866d39a5a012c543e2c88e5648611
diff --git a/metadata/md5-cache/acct-user/mongodb-0-r2 b/metadata/md5-cache/acct-user/mongodb-0-r2
new file mode 100644
index 000000000000..ee9d1ebe671a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mongodb-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=MongoDB program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mongodb
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=48a9f81dd42a788194750e3d41a79010
diff --git a/metadata/md5-cache/acct-user/mongodb_exporter-0 b/metadata/md5-cache/acct-user/mongodb_exporter-0
deleted file mode 100644
index 51c61b09ac4a..000000000000
--- a/metadata/md5-cache/acct-user/mongodb_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for mongodb_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mongodb_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b6fcf3627898d87f7464fb9d2ff21b07
diff --git a/metadata/md5-cache/acct-user/mongodb_exporter-0-r1 b/metadata/md5-cache/acct-user/mongodb_exporter-0-r1
new file mode 100644
index 000000000000..3326d349a242
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mongodb_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for mongodb_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mongodb_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2d87ed26605791b8271feeb2759ec47d
diff --git a/metadata/md5-cache/acct-user/monitorix-0-r1 b/metadata/md5-cache/acct-user/monitorix-0-r1
deleted file mode 100644
index 581f4664bad9..000000000000
--- a/metadata/md5-cache/acct-user/monitorix-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Monitorix system tool user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/monitorix
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cf33618dd6efc727570b7f7e7312babf
diff --git a/metadata/md5-cache/acct-user/monitorix-0-r2 b/metadata/md5-cache/acct-user/monitorix-0-r2
new file mode 100644
index 000000000000..6bf0f786a256
--- /dev/null
+++ b/metadata/md5-cache/acct-user/monitorix-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Monitorix system tool user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/monitorix
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5bfe21a2d816970ff30848815bf54eb5
diff --git a/metadata/md5-cache/acct-user/monkeyd-0 b/metadata/md5-cache/acct-user/monkeyd-0
deleted file mode 100644
index 3f8bcbadd0a5..000000000000
--- a/metadata/md5-cache/acct-user/monkeyd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for www-servers/monkeyd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/monkeyd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=94b756967fe12cbb5adaaa57eafb487d
diff --git a/metadata/md5-cache/acct-user/monkeyd-0-r1 b/metadata/md5-cache/acct-user/monkeyd-0-r1
new file mode 100644
index 000000000000..f65fd18dd74e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/monkeyd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-servers/monkeyd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/monkeyd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=09319fa2a5095bfe9f64c91f77b964fc
diff --git a/metadata/md5-cache/acct-user/monkeysphere-0-r1 b/metadata/md5-cache/acct-user/monkeysphere-0-r1
deleted file mode 100644
index 6f31fef7a4af..000000000000
--- a/metadata/md5-cache/acct-user/monkeysphere-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=monkeysphere program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/monkeysphere
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cf64c76963a0f387e27ab91660a22138
diff --git a/metadata/md5-cache/acct-user/monkeysphere-0-r2 b/metadata/md5-cache/acct-user/monkeysphere-0-r2
new file mode 100644
index 000000000000..512c1569e21e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/monkeysphere-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=monkeysphere program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/monkeysphere
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d9b4b2e3ddca33962da4dc867d905f18
diff --git a/metadata/md5-cache/acct-user/mosquitto-0-r1 b/metadata/md5-cache/acct-user/mosquitto-0-r1
deleted file mode 100644
index a1ae4a3c37b3..000000000000
--- a/metadata/md5-cache/acct-user/mosquitto-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the mosquitto MQTT broker
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mosquitto
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c848acce312790800bec0711a0402e2c
diff --git a/metadata/md5-cache/acct-user/mosquitto-0-r2 b/metadata/md5-cache/acct-user/mosquitto-0-r2
new file mode 100644
index 000000000000..6e4f6a31a7a5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mosquitto-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the mosquitto MQTT broker
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mosquitto
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1c8e3665b90c9c3a2360681b810fa1cf
diff --git a/metadata/md5-cache/acct-user/motion-0-r1 b/metadata/md5-cache/acct-user/motion-0-r1
deleted file mode 100644
index bc2e26df2c20..000000000000
--- a/metadata/md5-cache/acct-user/motion-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=added by portage for motion, a software motion detector
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/motion acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9a6a7905a6682b51b9984aa63c558b09
diff --git a/metadata/md5-cache/acct-user/motion-0-r2 b/metadata/md5-cache/acct-user/motion-0-r2
new file mode 100644
index 000000000000..a54572ab2346
--- /dev/null
+++ b/metadata/md5-cache/acct-user/motion-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=added by portage for motion, a software motion detector
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/motion acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6b2cd938892f7a8c7aafbe32ade0df37
diff --git a/metadata/md5-cache/acct-user/mpd-0-r1 b/metadata/md5-cache/acct-user/mpd-0-r1
deleted file mode 100644
index 9ac85966186b..000000000000
--- a/metadata/md5-cache/acct-user/mpd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for music player daemon (mpd)
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/audio
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6ddca8eb3f013ebcc84913721712b86b
diff --git a/metadata/md5-cache/acct-user/mpd-0-r2 b/metadata/md5-cache/acct-user/mpd-0-r2
new file mode 100644
index 000000000000..89341a653c75
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mpd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for music player daemon (mpd)
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/audio
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=281c2ae65b61744dd4aff8ed1bd49339
diff --git a/metadata/md5-cache/acct-user/msmtpd-0-r1 b/metadata/md5-cache/acct-user/msmtpd-0-r1
deleted file mode 100644
index 3a89af50b529..000000000000
--- a/metadata/md5-cache/acct-user/msmtpd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for msmtp daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/msmtpd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a0df89c403b68c835be661281617b459
diff --git a/metadata/md5-cache/acct-user/msmtpd-0-r2 b/metadata/md5-cache/acct-user/msmtpd-0-r2
new file mode 100644
index 000000000000..d4db6fc5e215
--- /dev/null
+++ b/metadata/md5-cache/acct-user/msmtpd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for msmtp daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/msmtpd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8b569d5dacf389d53c8aa45ea9751889
diff --git a/metadata/md5-cache/acct-user/munge-0 b/metadata/md5-cache/acct-user/munge-0
deleted file mode 100644
index b4ec8ce7a8a7..000000000000
--- a/metadata/md5-cache/acct-user/munge-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-auth/munge
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/munge
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e95e51d8ee577c03505c085f675dbf41
diff --git a/metadata/md5-cache/acct-user/munge-0-r1 b/metadata/md5-cache/acct-user/munge-0-r1
new file mode 100644
index 000000000000..b6b02140d5de
--- /dev/null
+++ b/metadata/md5-cache/acct-user/munge-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-auth/munge
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/munge
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=274063a29121ca43f12632d391507ccc
diff --git a/metadata/md5-cache/acct-user/munin-0-r1 b/metadata/md5-cache/acct-user/munin-0-r1
deleted file mode 100644
index 9281da1ade78..000000000000
--- a/metadata/md5-cache/acct-user/munin-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for munin
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/munin
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8866c1d2740e0953df9d8206a0e5f69f
diff --git a/metadata/md5-cache/acct-user/munin-0-r2 b/metadata/md5-cache/acct-user/munin-0-r2
new file mode 100644
index 000000000000..33d53d73c902
--- /dev/null
+++ b/metadata/md5-cache/acct-user/munin-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for munin
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/munin
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8866c1d2740e0953df9d8206a0e5f69f
diff --git a/metadata/md5-cache/acct-user/munin-async-0-r1 b/metadata/md5-cache/acct-user/munin-async-0-r1
deleted file mode 100644
index ccef0ece4f9e..000000000000
--- a/metadata/md5-cache/acct-user/munin-async-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for munin async proxy node
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/munin
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=20c0d6d602d40a393e8b7ff595d358b8
diff --git a/metadata/md5-cache/acct-user/munin-async-0-r2 b/metadata/md5-cache/acct-user/munin-async-0-r2
new file mode 100644
index 000000000000..aebabe4239ec
--- /dev/null
+++ b/metadata/md5-cache/acct-user/munin-async-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for munin async proxy node
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/munin
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=20c0d6d602d40a393e8b7ff595d358b8
diff --git a/metadata/md5-cache/acct-user/murmur-0-r1 b/metadata/md5-cache/acct-user/murmur-0-r1
deleted file mode 100644
index f038a7044a32..000000000000
--- a/metadata/md5-cache/acct-user/murmur-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for murmur daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/murmur
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=42ba66759f91dd8851bcad19aeac7366
diff --git a/metadata/md5-cache/acct-user/murmur-0-r2 b/metadata/md5-cache/acct-user/murmur-0-r2
new file mode 100644
index 000000000000..b5d4c0874539
--- /dev/null
+++ b/metadata/md5-cache/acct-user/murmur-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for murmur daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/murmur
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=35eb3f7c77390818aa6c6d4301c0f5a8
diff --git a/metadata/md5-cache/acct-user/mysql-0-r1 b/metadata/md5-cache/acct-user/mysql-0-r1
deleted file mode 100644
index 9763c06a8ae0..000000000000
--- a/metadata/md5-cache/acct-user/mysql-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=MySQL program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mysql
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9cabf9fffe5a4f75a5618b1676743afc
diff --git a/metadata/md5-cache/acct-user/mysql-0-r2 b/metadata/md5-cache/acct-user/mysql-0-r2
new file mode 100644
index 000000000000..fe536cc9285b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mysql-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=MySQL program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mysql
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d245d1a554695e3d3993077dba285084
diff --git a/metadata/md5-cache/acct-user/mysqld_exporter-0-r1 b/metadata/md5-cache/acct-user/mysqld_exporter-0-r1
deleted file mode 100644
index 97e1fc82018e..000000000000
--- a/metadata/md5-cache/acct-user/mysqld_exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=mysqld_exporter User
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mysqld_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f40a5ce40ccc4a40455de843f68f1e08
diff --git a/metadata/md5-cache/acct-user/mysqld_exporter-0-r2 b/metadata/md5-cache/acct-user/mysqld_exporter-0-r2
new file mode 100644
index 000000000000..8f03d269d5fb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mysqld_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=mysqld_exporter User
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mysqld_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1a9204939f2c674eed7195245bbbc105
diff --git a/metadata/md5-cache/acct-user/mythtv-0-r1 b/metadata/md5-cache/acct-user/mythtv-0-r1
deleted file mode 100644
index e1db55bd0811..000000000000
--- a/metadata/md5-cache/acct-user/mythtv-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Mythtv mythbackend server/daemon user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mythtv acct-group/video acct-group/audio acct-group/cdrom acct-group/tty
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a9ce2f5bdb114729cadd7c4e70ba73d4
diff --git a/metadata/md5-cache/acct-user/mythtv-0-r2 b/metadata/md5-cache/acct-user/mythtv-0-r2
new file mode 100644
index 000000000000..d7e2888471bb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/mythtv-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Mythtv mythbackend server/daemon user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mythtv acct-group/video acct-group/audio acct-group/cdrom acct-group/tty
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=528ca4e9192344f634728b82912e9398
diff --git a/metadata/md5-cache/acct-user/nagios-0-r1 b/metadata/md5-cache/acct-user/nagios-0-r1
deleted file mode 100644
index 38763d9c4a60..000000000000
--- a/metadata/md5-cache/acct-user/nagios-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: nagios
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nagios
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8583f9acf3e2d3f01c1055593828839b
diff --git a/metadata/md5-cache/acct-user/nagios-0-r2 b/metadata/md5-cache/acct-user/nagios-0-r2
new file mode 100644
index 000000000000..beebcc357f36
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nagios-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: nagios
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nagios
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=54e3eb560846edcb5fe6a5be5e093ce1
diff --git a/metadata/md5-cache/acct-user/named-0-r1 b/metadata/md5-cache/acct-user/named-0-r1
deleted file mode 100644
index f6caeac5e133..000000000000
--- a/metadata/md5-cache/acct-user/named-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-dns/bind
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/named
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=adc9d9642e78068c8f906ce02a7775f2
diff --git a/metadata/md5-cache/acct-user/named-0-r2 b/metadata/md5-cache/acct-user/named-0-r2
new file mode 100644
index 000000000000..43dddef432b2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/named-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dns/bind
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/named
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=adc9d9642e78068c8f906ce02a7775f2
diff --git a/metadata/md5-cache/acct-user/netbox-0-r1 b/metadata/md5-cache/acct-user/netbox-0-r1
deleted file mode 100644
index fe8b277c2700..000000000000
--- a/metadata/md5-cache/acct-user/netbox-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for netbox
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/netbox
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7576a9a5839d05ecefdb466a6d9d8972
diff --git a/metadata/md5-cache/acct-user/netbox-0-r2 b/metadata/md5-cache/acct-user/netbox-0-r2
new file mode 100644
index 000000000000..ee52b909f2df
--- /dev/null
+++ b/metadata/md5-cache/acct-user/netbox-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for netbox
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/netbox
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f05ed20f8375b6137b1e566dd0447c4f
diff --git a/metadata/md5-cache/acct-user/netdata-1 b/metadata/md5-cache/acct-user/netdata-1
deleted file mode 100644
index bb0c2a46a9c2..000000000000
--- a/metadata/md5-cache/acct-user/netdata-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for netdata
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/netdata
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=28ed0b57a147eaf51ceb3b83c166c27d
diff --git a/metadata/md5-cache/acct-user/netdata-1-r1 b/metadata/md5-cache/acct-user/netdata-1-r1
new file mode 100644
index 000000000000..97750369db85
--- /dev/null
+++ b/metadata/md5-cache/acct-user/netdata-1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for netdata
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/netdata
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9c4c0fe8488cc989b78d48f5b83d2d04
diff --git a/metadata/md5-cache/acct-user/netperf-0 b/metadata/md5-cache/acct-user/netperf-0
deleted file mode 100644
index 6cb293b73b68..000000000000
--- a/metadata/md5-cache/acct-user/netperf-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-analyzer/netperf
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/netperf
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dbda66e6e1bb22cd52211ce5eef82e50
diff --git a/metadata/md5-cache/acct-user/netperf-0-r1 b/metadata/md5-cache/acct-user/netperf-0-r1
new file mode 100644
index 000000000000..6b89fac20164
--- /dev/null
+++ b/metadata/md5-cache/acct-user/netperf-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/netperf
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/netperf
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7de39916b8e41a514a4d13a3ce96d0b5
diff --git a/metadata/md5-cache/acct-user/neutron-0-r1 b/metadata/md5-cache/acct-user/neutron-0-r1
deleted file mode 100644
index 0cf9986b0c1c..000000000000
--- a/metadata/md5-cache/acct-user/neutron-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for the openstack neutron service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/neutron
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a97deaa3ef65b7cd8085c81caaa2ac4e
diff --git a/metadata/md5-cache/acct-user/neutron-0-r2 b/metadata/md5-cache/acct-user/neutron-0-r2
new file mode 100644
index 000000000000..4e963f4186e5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/neutron-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for the openstack neutron service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/neutron
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9d15f12161d5cff6d14caf6b270fa423
diff --git a/metadata/md5-cache/acct-user/nginx-0 b/metadata/md5-cache/acct-user/nginx-0
deleted file mode 100644
index 35d3f17cef13..000000000000
--- a/metadata/md5-cache/acct-user/nginx-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: nginx
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nginx
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=90af3dd27cdabdbf7767ed2bdbb28efb
diff --git a/metadata/md5-cache/acct-user/nginx-0-r1 b/metadata/md5-cache/acct-user/nginx-0-r1
new file mode 100644
index 000000000000..b3f7c41ae206
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nginx-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: nginx
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nginx
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4050e70ce46da90eb6aaf528a834e8b0
diff --git a/metadata/md5-cache/acct-user/nginx-unit-0 b/metadata/md5-cache/acct-user/nginx-unit-0
deleted file mode 100644
index 36ecaadca4a5..000000000000
--- a/metadata/md5-cache/acct-user/nginx-unit-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: nginx-unit
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nginx-unit
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=64529f54f97b88f633355de9c0b932f3
diff --git a/metadata/md5-cache/acct-user/nginx-unit-0-r1 b/metadata/md5-cache/acct-user/nginx-unit-0-r1
new file mode 100644
index 000000000000..b015d22c1c4a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nginx-unit-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: nginx-unit
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nginx-unit
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=64529f54f97b88f633355de9c0b932f3
diff --git a/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1 b/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1
deleted file mode 100644
index 3ad357a1f543..000000000000
--- a/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for nginx-vts-exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nginx-vts-exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a56a4c1fa44a45183ea8632919357429
diff --git a/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r2 b/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r2
new file mode 100644
index 000000000000..57a92542104e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nginx-vts-exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for nginx-vts-exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nginx-vts-exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=33c6beb7b6e3a694dcce3f155d277f1a
diff --git a/metadata/md5-cache/acct-user/ngircd-0-r1 b/metadata/md5-cache/acct-user/ngircd-0-r1
deleted file mode 100644
index caf4f083378c..000000000000
--- a/metadata/md5-cache/acct-user/ngircd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for ngircd (IRC daemon)
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ngircd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=17ace4c3bf01519f0ce34a5a8993a325
diff --git a/metadata/md5-cache/acct-user/ngircd-0-r2 b/metadata/md5-cache/acct-user/ngircd-0-r2
new file mode 100644
index 000000000000..4fb49c16527b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ngircd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ngircd (IRC daemon)
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ngircd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=99f329e395add060fe5cd70e4d0dcded
diff --git a/metadata/md5-cache/acct-user/ngrep-0-r1 b/metadata/md5-cache/acct-user/ngrep-0-r1
deleted file mode 100644
index 5306329038de..000000000000
--- a/metadata/md5-cache/acct-user/ngrep-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-analyzer/ngrep
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ngrep
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1467c1cd405ff0a40d0560fe998b20be
diff --git a/metadata/md5-cache/acct-user/ngrep-0-r2 b/metadata/md5-cache/acct-user/ngrep-0-r2
new file mode 100644
index 000000000000..74dcefa7dbe7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ngrep-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/ngrep
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ngrep
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a06018fffb26720eaa9bd2630f21aa41
diff --git a/metadata/md5-cache/acct-user/nm-openconnect-0 b/metadata/md5-cache/acct-user/nm-openconnect-0
deleted file mode 100644
index 76689df8f2c7..000000000000
--- a/metadata/md5-cache/acct-user/nm-openconnect-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-vpn/networkmanager-openconnect
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nm-openconnect
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=63065cf78508e8ec5e09aab52f51685f
diff --git a/metadata/md5-cache/acct-user/nm-openconnect-0-r1 b/metadata/md5-cache/acct-user/nm-openconnect-0-r1
new file mode 100644
index 000000000000..55b7e574b9a7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nm-openconnect-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-vpn/networkmanager-openconnect
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nm-openconnect
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9db7f1fcc8446f190a5ff47384a2bb2a
diff --git a/metadata/md5-cache/acct-user/nm-openvpn-0 b/metadata/md5-cache/acct-user/nm-openvpn-0
deleted file mode 100644
index 86d5c5976be3..000000000000
--- a/metadata/md5-cache/acct-user/nm-openvpn-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-vpn/networkmanager-openvpn
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nm-openvpn
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4927ffdf1a2a6f32a90e602952917260
diff --git a/metadata/md5-cache/acct-user/nm-openvpn-0-r1 b/metadata/md5-cache/acct-user/nm-openvpn-0-r1
new file mode 100644
index 000000000000..271893ca0f86
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nm-openvpn-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-vpn/networkmanager-openvpn
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nm-openvpn
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8afd431b78de38ac0384ab5d129f1984
diff --git a/metadata/md5-cache/acct-user/nobody-0 b/metadata/md5-cache/acct-user/nobody-0
deleted file mode 100644
index 834927b7e661..000000000000
--- a/metadata/md5-cache/acct-user/nobody-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: nobody
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nobody acct-user/root
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=816eb3d51b7c839f67ae1febd90bd6d1
diff --git a/metadata/md5-cache/acct-user/nobody-0-r1 b/metadata/md5-cache/acct-user/nobody-0-r1
new file mode 100644
index 000000000000..107417cc1aa5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nobody-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: nobody
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nobody acct-user/root
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cfaca877556e8623b96abf9ee3941d1a
diff --git a/metadata/md5-cache/acct-user/node_exporter-0-r1 b/metadata/md5-cache/acct-user/node_exporter-0-r1
deleted file mode 100644
index c1bc4859a403..000000000000
--- a/metadata/md5-cache/acct-user/node_exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=node_exporter User
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/node_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d778fc3a09c99b8386e1db641a763b9a
diff --git a/metadata/md5-cache/acct-user/node_exporter-0-r2 b/metadata/md5-cache/acct-user/node_exporter-0-r2
new file mode 100644
index 000000000000..924494edbb22
--- /dev/null
+++ b/metadata/md5-cache/acct-user/node_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=node_exporter User
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/node_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9153f9c0e8c311fc943130ae86ab1f1f
diff --git a/metadata/md5-cache/acct-user/notary-0 b/metadata/md5-cache/acct-user/notary-0
deleted file mode 100644
index 5eb86b2eeba4..000000000000
--- a/metadata/md5-cache/acct-user/notary-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for app-misc/notary
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/notary
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7aed91b82d426f8c2ba2aa290a53de9b
diff --git a/metadata/md5-cache/acct-user/notary-0-r1 b/metadata/md5-cache/acct-user/notary-0-r1
new file mode 100644
index 000000000000..8aea2335ae2f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/notary-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-misc/notary
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/notary
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=574881f5f3b0a6290404d98f6ecf341b
diff --git a/metadata/md5-cache/acct-user/nova-0-r1 b/metadata/md5-cache/acct-user/nova-0-r1
deleted file mode 100644
index 1bb029c8a952..000000000000
--- a/metadata/md5-cache/acct-user/nova-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for the openstack nova service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nova
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f97663b2cf9abbd1a770cda5d05a4ad0
diff --git a/metadata/md5-cache/acct-user/nova-0-r2 b/metadata/md5-cache/acct-user/nova-0-r2
new file mode 100644
index 000000000000..77a23a43a753
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nova-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for the openstack nova service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nova
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3e68c7d15494dea6c88b07a62b79beea
diff --git a/metadata/md5-cache/acct-user/nsd-0-r1 b/metadata/md5-cache/acct-user/nsd-0-r1
deleted file mode 100644
index b97cb0fa436f..000000000000
--- a/metadata/md5-cache/acct-user/nsd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for nsd daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nsd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=816d3193fe33e5c1aede678bcaf4439a
diff --git a/metadata/md5-cache/acct-user/nsd-0-r2 b/metadata/md5-cache/acct-user/nsd-0-r2
new file mode 100644
index 000000000000..01d828f60adc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nsd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for nsd daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nsd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=481b8b95b4c9a66bef57f9fdf98acbf1
diff --git a/metadata/md5-cache/acct-user/nslcd-0-r1 b/metadata/md5-cache/acct-user/nslcd-0-r1
deleted file mode 100644
index 3c56f51c3f7b..000000000000
--- a/metadata/md5-cache/acct-user/nslcd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for nss-pam-ldapd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nslcd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b4891d75ca03c228b9aac53382da2850
diff --git a/metadata/md5-cache/acct-user/nslcd-0-r2 b/metadata/md5-cache/acct-user/nslcd-0-r2
new file mode 100644
index 000000000000..ea0094ae7e96
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nslcd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for nss-pam-ldapd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nslcd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3715a9c87be36c1b2f1951404c71464b
diff --git a/metadata/md5-cache/acct-user/ntopng-0 b/metadata/md5-cache/acct-user/ntopng-0
deleted file mode 100644
index dbec925b1ad7..000000000000
--- a/metadata/md5-cache/acct-user/ntopng-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for ntopng
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ntopng
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f9530dca7147a8f8db81067e2a54f72d
diff --git a/metadata/md5-cache/acct-user/ntopng-0-r1 b/metadata/md5-cache/acct-user/ntopng-0-r1
new file mode 100644
index 000000000000..504112900338
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ntopng-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ntopng
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ntopng
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=22e18220fc3ae9b882cffeae2f7f12de
diff --git a/metadata/md5-cache/acct-user/ntp-0-r1 b/metadata/md5-cache/acct-user/ntp-0-r1
deleted file mode 100644
index be476e8c12f4..000000000000
--- a/metadata/md5-cache/acct-user/ntp-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for ntp daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ntp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=57856c55cbef6893441aa052618fae40
diff --git a/metadata/md5-cache/acct-user/ntp-0-r2 b/metadata/md5-cache/acct-user/ntp-0-r2
new file mode 100644
index 000000000000..d27f6bc0796d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ntp-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for ntp daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ntp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bd702e5839404e5d821922a7dd8b34c5
diff --git a/metadata/md5-cache/acct-user/nullmail-0 b/metadata/md5-cache/acct-user/nullmail-0
deleted file mode 100644
index 0f622e84d4d1..000000000000
--- a/metadata/md5-cache/acct-user/nullmail-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the nullmailer
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nullmail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cf7721392d184d4b2b8088bbde3b79a4
diff --git a/metadata/md5-cache/acct-user/nullmail-0-r1 b/metadata/md5-cache/acct-user/nullmail-0-r1
new file mode 100644
index 000000000000..49c80f3a8e0f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nullmail-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the nullmailer
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nullmail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=07c4ba734b4a7f513db385d58b4c8049
diff --git a/metadata/md5-cache/acct-user/nut-0-r1 b/metadata/md5-cache/acct-user/nut-0-r1
deleted file mode 100644
index d485f9ed7405..000000000000
--- a/metadata/md5-cache/acct-user/nut-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the Network-UPS Tools
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nut acct-group/uucp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=878629348f905d79b5f7fb5fee10b52a
diff --git a/metadata/md5-cache/acct-user/nut-0-r2 b/metadata/md5-cache/acct-user/nut-0-r2
new file mode 100644
index 000000000000..41459699fc59
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nut-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Network-UPS Tools
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nut acct-group/uucp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=75395ce3fd8e7a7208622d95b50be4b4
diff --git a/metadata/md5-cache/acct-user/nvpd-0 b/metadata/md5-cache/acct-user/nvpd-0
deleted file mode 100644
index 5c902c32f6c8..000000000000
--- a/metadata/md5-cache/acct-user/nvpd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for nvidia-persistenced
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9459b202f51b8f5599dabce749867981
diff --git a/metadata/md5-cache/acct-user/nvpd-0-r1 b/metadata/md5-cache/acct-user/nvpd-0-r1
new file mode 100644
index 000000000000..823b48e59802
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nvpd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for nvidia-persistenced
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5bd42beec60f2f7deaf6c6444d8b9004
diff --git a/metadata/md5-cache/acct-user/nzbget-0 b/metadata/md5-cache/acct-user/nzbget-0
deleted file mode 100644
index 2e1b7a22c3d5..000000000000
--- a/metadata/md5-cache/acct-user/nzbget-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-nntp/nzbget
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nzbget
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=67b53d8b00ceec66d072e25b08c1c994
diff --git a/metadata/md5-cache/acct-user/nzbget-0-r1 b/metadata/md5-cache/acct-user/nzbget-0-r1
new file mode 100644
index 000000000000..c86882bbd282
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nzbget-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-nntp/nzbget
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nzbget
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e276854664c6262ffb520786348725c7
diff --git a/metadata/md5-cache/acct-user/oidentd-0-r1 b/metadata/md5-cache/acct-user/oidentd-0-r1
deleted file mode 100644
index a81174e5fb89..000000000000
--- a/metadata/md5-cache/acct-user/oidentd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: oidentd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/oidentd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=eb0ab619c6874e1d70482c66ac70b5a2
diff --git a/metadata/md5-cache/acct-user/oidentd-0-r2 b/metadata/md5-cache/acct-user/oidentd-0-r2
new file mode 100644
index 000000000000..bcc720221e6b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/oidentd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: oidentd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/oidentd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7f491639c385b0d1516dddb770acd7c3
diff --git a/metadata/md5-cache/acct-user/openctd-0 b/metadata/md5-cache/acct-user/openctd-0
deleted file mode 100644
index 51deaab6de53..000000000000
--- a/metadata/md5-cache/acct-user/openctd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for dev-libs/openct
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/openct
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9f351d816fed92fcc82ab99b9a9c2f38
diff --git a/metadata/md5-cache/acct-user/openctd-0-r1 b/metadata/md5-cache/acct-user/openctd-0-r1
new file mode 100644
index 000000000000..22855d52e2c3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openctd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for dev-libs/openct
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/openct
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ca004a1a170ff54bcb577212c6af9885
diff --git a/metadata/md5-cache/acct-user/opendkim-0-r1 b/metadata/md5-cache/acct-user/opendkim-0-r1
deleted file mode 100644
index fb7373b8d6a3..000000000000
--- a/metadata/md5-cache/acct-user/opendkim-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for OpenDKIM
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/opendkim
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7168bc00504be62b4a4cad7dabdac216
diff --git a/metadata/md5-cache/acct-user/opendkim-0-r2 b/metadata/md5-cache/acct-user/opendkim-0-r2
new file mode 100644
index 000000000000..dcc9235180e0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opendkim-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for OpenDKIM
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/opendkim
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e6d83c15ca4a6005a6cf2062f9651009
diff --git a/metadata/md5-cache/acct-user/opendmarc-0 b/metadata/md5-cache/acct-user/opendmarc-0
deleted file mode 100644
index 629a60a3830a..000000000000
--- a/metadata/md5-cache/acct-user/opendmarc-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for mail-filter/opendmarc
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/opendmarc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=48e8fb549b651417c87f30cf005dbe81
diff --git a/metadata/md5-cache/acct-user/opendmarc-0-r1 b/metadata/md5-cache/acct-user/opendmarc-0-r1
new file mode 100644
index 000000000000..90d34d4fbcdc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opendmarc-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mail-filter/opendmarc
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/opendmarc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aac927e4bf719856e1185ac85ad02a6f
diff --git a/metadata/md5-cache/acct-user/opendnssec-0 b/metadata/md5-cache/acct-user/opendnssec-0
deleted file mode 100644
index 5a036168fd03..000000000000
--- a/metadata/md5-cache/acct-user/opendnssec-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-dns/opendnssec
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/opendnssec
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6f6647d11fee25a9625dea44298db219
diff --git a/metadata/md5-cache/acct-user/opendnssec-0-r1 b/metadata/md5-cache/acct-user/opendnssec-0-r1
new file mode 100644
index 000000000000..67acd9c0b028
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opendnssec-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-dns/opendnssec
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/opendnssec
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8d55040b913141a9baa15a3266ab56cc
diff --git a/metadata/md5-cache/acct-user/openntpd-0-r1 b/metadata/md5-cache/acct-user/openntpd-0-r1
deleted file mode 100644
index 8563aa4272f8..000000000000
--- a/metadata/md5-cache/acct-user/openntpd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for openntpd daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/openntpd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=52804713097b1827440394b94808c25d
diff --git a/metadata/md5-cache/acct-user/openntpd-0-r2 b/metadata/md5-cache/acct-user/openntpd-0-r2
new file mode 100644
index 000000000000..62dec1241974
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openntpd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for openntpd daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/openntpd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9c73adb6be33daac353ebf927de6da39
diff --git a/metadata/md5-cache/acct-user/openrct2-0-r1 b/metadata/md5-cache/acct-user/openrct2-0-r1
deleted file mode 100644
index fd273fee6613..000000000000
--- a/metadata/md5-cache/acct-user/openrct2-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the OpenRCT2 dedicated server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/openrct2
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=780673639d3bf2ac0234c12eb6c891e9
diff --git a/metadata/md5-cache/acct-user/openrct2-0-r2 b/metadata/md5-cache/acct-user/openrct2-0-r2
new file mode 100644
index 000000000000..427e83bf67b7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openrct2-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the OpenRCT2 dedicated server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/openrct2
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4ca971d09ae5415e8be23fec2e31f6a0
diff --git a/metadata/md5-cache/acct-user/openttd-0 b/metadata/md5-cache/acct-user/openttd-0
deleted file mode 100644
index 78ac6c4de3cf..000000000000
--- a/metadata/md5-cache/acct-user/openttd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for games-simulation/openttd
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/openttd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a0055f41a5daa9904a917986522f7fd0
diff --git a/metadata/md5-cache/acct-user/openttd-0-r1 b/metadata/md5-cache/acct-user/openttd-0-r1
new file mode 100644
index 000000000000..f561a8d148de
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openttd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for games-simulation/openttd
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/openttd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=af102ee0e1290d887477b1e2a02c2f47
diff --git a/metadata/md5-cache/acct-user/openvpn-0-r1 b/metadata/md5-cache/acct-user/openvpn-0-r1
deleted file mode 100644
index 0de7105d91d8..000000000000
--- a/metadata/md5-cache/acct-user/openvpn-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-vpn/openvpn
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/openvpn
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=421c0ea56908184887566fb94caaa733
diff --git a/metadata/md5-cache/acct-user/openvpn-0-r2 b/metadata/md5-cache/acct-user/openvpn-0-r2
new file mode 100644
index 000000000000..2dd78aa0fd21
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openvpn-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-vpn/openvpn
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/openvpn
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=697ec47821cc48eced1a4ac8838186db
diff --git a/metadata/md5-cache/acct-user/openvpn_exporter-0-r1 b/metadata/md5-cache/acct-user/openvpn_exporter-0-r1
deleted file mode 100644
index 5995f99bfb2f..000000000000
--- a/metadata/md5-cache/acct-user/openvpn_exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for openvpn_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/openvpn_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0e1faf6421e4d3f4c37e0945b78c5f2f
diff --git a/metadata/md5-cache/acct-user/openvpn_exporter-0-r2 b/metadata/md5-cache/acct-user/openvpn_exporter-0-r2
new file mode 100644
index 000000000000..61ddede4b61a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/openvpn_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for openvpn_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/openvpn_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cda17d6a39606bd4a71e6840389294a6
diff --git a/metadata/md5-cache/acct-user/opm-0-r1 b/metadata/md5-cache/acct-user/opm-0-r1
deleted file mode 100644
index 303e054247ba..000000000000
--- a/metadata/md5-cache/acct-user/opm-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for an open proxy monitor
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/opm
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=82b017c2325ea9391eb65e445803d031
diff --git a/metadata/md5-cache/acct-user/opm-0-r2 b/metadata/md5-cache/acct-user/opm-0-r2
new file mode 100644
index 000000000000..e55d4be35956
--- /dev/null
+++ b/metadata/md5-cache/acct-user/opm-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for an open proxy monitor
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/opm
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=73ebd80b9b42e919a4bffa671c55f53a
diff --git a/metadata/md5-cache/acct-user/oprofile-0-r1 b/metadata/md5-cache/acct-user/oprofile-0-r1
deleted file mode 100644
index b3a38929a90d..000000000000
--- a/metadata/md5-cache/acct-user/oprofile-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for dev-util/oprofile JIT code processing
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/oprofile
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=eb4712745ce81a80155b2a188fff4f2f
diff --git a/metadata/md5-cache/acct-user/oprofile-0-r2 b/metadata/md5-cache/acct-user/oprofile-0-r2
new file mode 100644
index 000000000000..e5251a33c45d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/oprofile-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-util/oprofile JIT code processing
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/oprofile
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1a6d8079478e6487d807503ad6975c15
diff --git a/metadata/md5-cache/acct-user/oragono-0 b/metadata/md5-cache/acct-user/oragono-0
deleted file mode 100644
index 3b2d1ada77f2..000000000000
--- a/metadata/md5-cache/acct-user/oragono-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the Oragono IRC server
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/oragono
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=67efe51d87d1d3b5feaba941e1e36da7
diff --git a/metadata/md5-cache/acct-user/oragono-0-r1 b/metadata/md5-cache/acct-user/oragono-0-r1
new file mode 100644
index 000000000000..ad3d10befa56
--- /dev/null
+++ b/metadata/md5-cache/acct-user/oragono-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the Oragono IRC server
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/oragono
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=12497a1c924114208800fda56a3336a4
diff --git a/metadata/md5-cache/acct-user/ossec-0-r1 b/metadata/md5-cache/acct-user/ossec-0-r1
deleted file mode 100644
index 16f0e77ec57e..000000000000
--- a/metadata/md5-cache/acct-user/ossec-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=net-analyzer/ossec-hids (agentlessd, analysisd, monitord)
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ossec
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f6b0f9e703368a37306c92be4fbd65e7
diff --git a/metadata/md5-cache/acct-user/ossec-0-r2 b/metadata/md5-cache/acct-user/ossec-0-r2
new file mode 100644
index 000000000000..2bfcecf71b7f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ossec-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=net-analyzer/ossec-hids (agentlessd, analysisd, monitord)
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ossec
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=44d6d50468aedd24ade965bd27532886
diff --git a/metadata/md5-cache/acct-user/ossecm-0-r1 b/metadata/md5-cache/acct-user/ossecm-0-r1
deleted file mode 100644
index 7a929d1a653c..000000000000
--- a/metadata/md5-cache/acct-user/ossecm-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=net-analyzer/ossec-hids (csyslogd, maild)
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ossec
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ac6a55a88e2a142399b8aacb83aa6587
diff --git a/metadata/md5-cache/acct-user/ossecm-0-r2 b/metadata/md5-cache/acct-user/ossecm-0-r2
new file mode 100644
index 000000000000..537f0e42ec2b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ossecm-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=net-analyzer/ossec-hids (csyslogd, maild)
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ossec
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=656df67d33cf45e0a75fe2333e253598
diff --git a/metadata/md5-cache/acct-user/ossecr-0-r1 b/metadata/md5-cache/acct-user/ossecr-0-r1
deleted file mode 100644
index a34820917aed..000000000000
--- a/metadata/md5-cache/acct-user/ossecr-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=net-analyzer/ossec-hids (remoted)
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ossec
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=41b8f3fd1fee1b78a619d3be3dfae343
diff --git a/metadata/md5-cache/acct-user/ossecr-0-r2 b/metadata/md5-cache/acct-user/ossecr-0-r2
new file mode 100644
index 000000000000..80d4bf74e653
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ossecr-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=net-analyzer/ossec-hids (remoted)
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ossec
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bf6c26a80bc1908014360bdf6d9aa037
diff --git a/metadata/md5-cache/acct-user/owntracks-0 b/metadata/md5-cache/acct-user/owntracks-0
deleted file mode 100644
index a67b0e05a414..000000000000
--- a/metadata/md5-cache/acct-user/owntracks-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for sci-geosciences/owntracks-recorder
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/owntracks
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d0983d7c7b4759762ee1b14435267cea
diff --git a/metadata/md5-cache/acct-user/owntracks-0-r1 b/metadata/md5-cache/acct-user/owntracks-0-r1
new file mode 100644
index 000000000000..269f106b1bef
--- /dev/null
+++ b/metadata/md5-cache/acct-user/owntracks-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for sci-geosciences/owntracks-recorder
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/owntracks
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fe552219a9b31ca9f5a29c45497929ca
diff --git a/metadata/md5-cache/acct-user/p2p-0 b/metadata/md5-cache/acct-user/p2p-0
deleted file mode 100644
index 8f760cb69f39..000000000000
--- a/metadata/md5-cache/acct-user/p2p-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for mldonkey
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/p2p
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=68a830d2f31aa89fe04588493c193713
diff --git a/metadata/md5-cache/acct-user/p2p-0-r1 b/metadata/md5-cache/acct-user/p2p-0-r1
new file mode 100644
index 000000000000..4f5b5916bc1f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/p2p-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mldonkey
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/p2p
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=875858a07de4fcbd19d1f9351a9e8234
diff --git a/metadata/md5-cache/acct-user/partimag-0 b/metadata/md5-cache/acct-user/partimag-0
deleted file mode 100644
index e4a197eebb45..000000000000
--- a/metadata/md5-cache/acct-user/partimag-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-block/partimag
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/partimag
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d33ef001c2aaadef77a868064026574e
diff --git a/metadata/md5-cache/acct-user/partimag-0-r1 b/metadata/md5-cache/acct-user/partimag-0-r1
new file mode 100644
index 000000000000..5da04e030605
--- /dev/null
+++ b/metadata/md5-cache/acct-user/partimag-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-block/partimag
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/partimag
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=43e37f3a17edaf225dcee090d9eea878
diff --git a/metadata/md5-cache/acct-user/pcap-0 b/metadata/md5-cache/acct-user/pcap-0
deleted file mode 100644
index bf48bea441aa..000000000000
--- a/metadata/md5-cache/acct-user/pcap-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for capturing network traffic
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pcap
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c3d6daf46137a4c7ee2ae752983a13d6
diff --git a/metadata/md5-cache/acct-user/pcap-0-r1 b/metadata/md5-cache/acct-user/pcap-0-r1
new file mode 100644
index 000000000000..30c9a1650056
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pcap-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for capturing network traffic
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pcap
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7e58b9d49c64073027515e24a98710bb
diff --git a/metadata/md5-cache/acct-user/pcscd-0-r1 b/metadata/md5-cache/acct-user/pcscd-0-r1
deleted file mode 100644
index 46e688510608..000000000000
--- a/metadata/md5-cache/acct-user/pcscd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for pcsc-lite
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pcscd acct-group/openct acct-group/usb
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c5cad9823484267ce60585127ed6f723
diff --git a/metadata/md5-cache/acct-user/pcscd-0-r2 b/metadata/md5-cache/acct-user/pcscd-0-r2
new file mode 100644
index 000000000000..ab8a0f0ffcab
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pcscd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for pcsc-lite
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pcscd acct-group/openct acct-group/usb
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e05b9fa505169ec7ea6807ba1b55e66f
diff --git a/metadata/md5-cache/acct-user/pdns-0-r1 b/metadata/md5-cache/acct-user/pdns-0-r1
deleted file mode 100644
index 24445cf12904..000000000000
--- a/metadata/md5-cache/acct-user/pdns-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: pdns
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pdns
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=69badd6190a0158ef68dbddc5e230688
diff --git a/metadata/md5-cache/acct-user/pdns-0-r2 b/metadata/md5-cache/acct-user/pdns-0-r2
new file mode 100644
index 000000000000..d6a9f28bf637
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pdns-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: pdns
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pdns
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c64a4ec210c9bc8a8d45462c4e9ab4b4
diff --git a/metadata/md5-cache/acct-user/pdnsd-0-r1 b/metadata/md5-cache/acct-user/pdnsd-0-r1
deleted file mode 100644
index f7c85aa140f3..000000000000
--- a/metadata/md5-cache/acct-user/pdnsd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for pdns daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pdnsd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4369da0310b095c3edf76308af00e9e0
diff --git a/metadata/md5-cache/acct-user/pdnsd-0-r2 b/metadata/md5-cache/acct-user/pdnsd-0-r2
new file mode 100644
index 000000000000..6c3a1a56988c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pdnsd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for pdns daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pdnsd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f0ae8f14e1ccc9f3511e65e7932aaeda
diff --git a/metadata/md5-cache/acct-user/pgagent-0 b/metadata/md5-cache/acct-user/pgagent-0
deleted file mode 100644
index df4e7f0912c2..000000000000
--- a/metadata/md5-cache/acct-user/pgagent-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=pgagent program user
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pgagent
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f09b944e4bcf05369c02def5bfb42a05
diff --git a/metadata/md5-cache/acct-user/pgagent-0-r1 b/metadata/md5-cache/acct-user/pgagent-0-r1
new file mode 100644
index 000000000000..c6283775932c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pgagent-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=pgagent program user
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pgagent
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5549f03e9e70a32f71a5355875a5b025
diff --git a/metadata/md5-cache/acct-user/pgbouncer-0 b/metadata/md5-cache/acct-user/pgbouncer-0
deleted file mode 100644
index 262f7c4ea0ad..000000000000
--- a/metadata/md5-cache/acct-user/pgbouncer-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=PgBouncer program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/postgres
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=520fef38f21adc79848ca43748e86b02
diff --git a/metadata/md5-cache/acct-user/pgbouncer-0-r1 b/metadata/md5-cache/acct-user/pgbouncer-0-r1
new file mode 100644
index 000000000000..18ea466de1f4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pgbouncer-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=PgBouncer program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/postgres
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2ea93bac90d2c21d70ad6e9765da3839
diff --git a/metadata/md5-cache/acct-user/pgpool-0 b/metadata/md5-cache/acct-user/pgpool-0
deleted file mode 100644
index 69ec1a594d8f..000000000000
--- a/metadata/md5-cache/acct-user/pgpool-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for dev-db/pgpool2
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/postgres
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5a134184568567cde73f00b1aca1f814
diff --git a/metadata/md5-cache/acct-user/pgpool-0-r1 b/metadata/md5-cache/acct-user/pgpool-0-r1
new file mode 100644
index 000000000000..87f53dc03214
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pgpool-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-db/pgpool2
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/postgres
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d4d5472431f74366746d70bffb603737
diff --git a/metadata/md5-cache/acct-user/pipewire-0 b/metadata/md5-cache/acct-user/pipewire-0
deleted file mode 100644
index 6566754e659e..000000000000
--- a/metadata/md5-cache/acct-user/pipewire-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for running PipeWire as a system-wide instance
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pipewire acct-group/audio
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=db6898ee64da9b97b88b1fa07accc0cf
diff --git a/metadata/md5-cache/acct-user/pipewire-0-r1 b/metadata/md5-cache/acct-user/pipewire-0-r1
new file mode 100644
index 000000000000..04e4448c8350
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pipewire-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running PipeWire as a system-wide instance
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pipewire acct-group/audio
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c676559f41fa9e060b7fc455b5232026
diff --git a/metadata/md5-cache/acct-user/pipewire-1 b/metadata/md5-cache/acct-user/pipewire-1
deleted file mode 100644
index ebd05a9a1691..000000000000
--- a/metadata/md5-cache/acct-user/pipewire-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for running PipeWire as a system-wide instance
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pipewire acct-group/audio
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6e22dbdd2ee3bc310947e1db36482fae
diff --git a/metadata/md5-cache/acct-user/pipewire-1-r1 b/metadata/md5-cache/acct-user/pipewire-1-r1
new file mode 100644
index 000000000000..2412f33afa4f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pipewire-1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running PipeWire as a system-wide instance
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pipewire acct-group/audio
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6e22dbdd2ee3bc310947e1db36482fae
diff --git a/metadata/md5-cache/acct-user/placement-0-r1 b/metadata/md5-cache/acct-user/placement-0-r1
deleted file mode 100644
index 68e60a0e3abd..000000000000
--- a/metadata/md5-cache/acct-user/placement-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the placement openstack service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/placement
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=504e2951bc35a7a7cc780250b0ea85c5
diff --git a/metadata/md5-cache/acct-user/placement-0-r2 b/metadata/md5-cache/acct-user/placement-0-r2
new file mode 100644
index 000000000000..a01d4aa15886
--- /dev/null
+++ b/metadata/md5-cache/acct-user/placement-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the placement openstack service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/placement
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2aee4c76bbf04ed7406d42a863b7f31a
diff --git a/metadata/md5-cache/acct-user/plex-0-r1 b/metadata/md5-cache/acct-user/plex-0-r1
deleted file mode 100644
index 7a1e66c53f35..000000000000
--- a/metadata/md5-cache/acct-user/plex-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Plex Media Server user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/plex acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ef1223f5756854027a7a112bd8b6e297
diff --git a/metadata/md5-cache/acct-user/plex-0-r2 b/metadata/md5-cache/acct-user/plex-0-r2
new file mode 100644
index 000000000000..9ce5fb3ba27e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/plex-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Plex Media Server user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/plex acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4cf068483c2b33c3048a114374f867de
diff --git a/metadata/md5-cache/acct-user/polkitd-0-r1 b/metadata/md5-cache/acct-user/polkitd-0-r1
deleted file mode 100644
index ac1b309834e3..000000000000
--- a/metadata/md5-cache/acct-user/polkitd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: polkitd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/polkitd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dddcb00c8b8baca2a30d547eb71d0cbb
diff --git a/metadata/md5-cache/acct-user/polkitd-0-r2 b/metadata/md5-cache/acct-user/polkitd-0-r2
new file mode 100644
index 000000000000..3bbbdfd29a61
--- /dev/null
+++ b/metadata/md5-cache/acct-user/polkitd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: polkitd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/polkitd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=27e4ab9b2a8f04c09ef6b6ccd3bd1fd6
diff --git a/metadata/md5-cache/acct-user/polw-0 b/metadata/md5-cache/acct-user/polw-0
deleted file mode 100644
index e22e2ad9000c..000000000000
--- a/metadata/md5-cache/acct-user/polw-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for mail-filter/policyd-weight
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/polw
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5600b4cd7d207fc62e7650d64ea32fe0
diff --git a/metadata/md5-cache/acct-user/polw-0-r1 b/metadata/md5-cache/acct-user/polw-0-r1
new file mode 100644
index 000000000000..e5b7b0c6f2e4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/polw-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for mail-filter/policyd-weight
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/polw
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=33d44d9199d178454090659cf6e09555
diff --git a/metadata/md5-cache/acct-user/popa3d-0 b/metadata/md5-cache/acct-user/popa3d-0
deleted file mode 100644
index 6efa65e60608..000000000000
--- a/metadata/md5-cache/acct-user/popa3d-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-mail/popa3d
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/popa3d
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=99527ff6b307c51b82f581a26a7d0d75
diff --git a/metadata/md5-cache/acct-user/popa3d-0-r1 b/metadata/md5-cache/acct-user/popa3d-0-r1
new file mode 100644
index 000000000000..4a8551cff81d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/popa3d-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-mail/popa3d
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/popa3d
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1606fc6b1940b94574e884f47e3c0747
diff --git a/metadata/md5-cache/acct-user/portage-0-r1 b/metadata/md5-cache/acct-user/portage-0-r1
deleted file mode 100644
index 0c4331aa142f..000000000000
--- a/metadata/md5-cache/acct-user/portage-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: portage
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/portage
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=73be6261319ecb76cfcb5f0d443b0f42
diff --git a/metadata/md5-cache/acct-user/portage-0-r2 b/metadata/md5-cache/acct-user/portage-0-r2
new file mode 100644
index 000000000000..43dda32d3ffd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/portage-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: portage
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/portage
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=73be6261319ecb76cfcb5f0d443b0f42
diff --git a/metadata/md5-cache/acct-user/postfix-0-r1 b/metadata/md5-cache/acct-user/postfix-0-r1
deleted file mode 100644
index 4ab581c08103..000000000000
--- a/metadata/md5-cache/acct-user/postfix-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for postfix daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/postfix acct-group/mail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f4dbc4a57bfb59b3d83ea164324dba3f
diff --git a/metadata/md5-cache/acct-user/postfix-0-r2 b/metadata/md5-cache/acct-user/postfix-0-r2
new file mode 100644
index 000000000000..398e651ddd90
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postfix-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for postfix daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/postfix acct-group/mail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=63e239fc4320530350fc8e99723ee753
diff --git a/metadata/md5-cache/acct-user/postfix_exporter-0-r1 b/metadata/md5-cache/acct-user/postfix_exporter-0-r1
deleted file mode 100644
index bc9171d50d45..000000000000
--- a/metadata/md5-cache/acct-user/postfix_exporter-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for postfix_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/postfix_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=034edf7db06f7a51bb24582e6b668bd4
diff --git a/metadata/md5-cache/acct-user/postfix_exporter-0-r2 b/metadata/md5-cache/acct-user/postfix_exporter-0-r2
new file mode 100644
index 000000000000..04ad161b358a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postfix_exporter-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for postfix_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/postfix_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ab4708a3cd5a0cf9c518fe01b5e3170b
diff --git a/metadata/md5-cache/acct-user/postfwd-0 b/metadata/md5-cache/acct-user/postfwd-0
deleted file mode 100644
index b7cfaf310aad..000000000000
--- a/metadata/md5-cache/acct-user/postfwd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for mail-filter/postfwd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/postfwd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c6211055da29b42d5c010e16493bddbd
diff --git a/metadata/md5-cache/acct-user/postfwd-0-r1 b/metadata/md5-cache/acct-user/postfwd-0-r1
new file mode 100644
index 000000000000..a6896c07ce48
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postfwd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for mail-filter/postfwd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/postfwd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=64ae852135fa57c7e0d2a34b25810e1b
diff --git a/metadata/md5-cache/acct-user/postgres-0-r1 b/metadata/md5-cache/acct-user/postgres-0-r1
deleted file mode 100644
index c2f21ad35584..000000000000
--- a/metadata/md5-cache/acct-user/postgres-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=PostgreSQL program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/postgres
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=00dfa89c3e86d7c05cad6a2f3d328eb6
diff --git a/metadata/md5-cache/acct-user/postgres-0-r2 b/metadata/md5-cache/acct-user/postgres-0-r2
new file mode 100644
index 000000000000..90cad461c85e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postgres-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=PostgreSQL program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/postgres
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ac12ee14657fdf492bb9732d18ccd54a
diff --git a/metadata/md5-cache/acct-user/postgres_exporter-0 b/metadata/md5-cache/acct-user/postgres_exporter-0
deleted file mode 100644
index af266966bbf3..000000000000
--- a/metadata/md5-cache/acct-user/postgres_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for postgres_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/postgres_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2edc0c4db0d58066f8f4491237473ac8
diff --git a/metadata/md5-cache/acct-user/postgres_exporter-0-r1 b/metadata/md5-cache/acct-user/postgres_exporter-0-r1
new file mode 100644
index 000000000000..564eaf7a9ce5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postgres_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for postgres_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/postgres_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0695e1e1baf9a907aae6cfbb4f426147
diff --git a/metadata/md5-cache/acct-user/postgrey-0 b/metadata/md5-cache/acct-user/postgrey-0
deleted file mode 100644
index 58717ed092e3..000000000000
--- a/metadata/md5-cache/acct-user/postgrey-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the postgrey mail daemon
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/postgrey
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cfcc3d7a572a262aa757734ecfd3e0f9
diff --git a/metadata/md5-cache/acct-user/postgrey-0-r1 b/metadata/md5-cache/acct-user/postgrey-0-r1
new file mode 100644
index 000000000000..3c2a192ff010
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postgrey-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the postgrey mail daemon
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/postgrey
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dda6835aa11c17b10dd0c500d279c6a6
diff --git a/metadata/md5-cache/acct-user/postmaster-0-r1 b/metadata/md5-cache/acct-user/postmaster-0-r1
deleted file mode 100644
index a41e00e001ce..000000000000
--- a/metadata/md5-cache/acct-user/postmaster-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Postmaster user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/mail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e851b4448be51b93a8bc9bd003572c5e
diff --git a/metadata/md5-cache/acct-user/postmaster-0-r2 b/metadata/md5-cache/acct-user/postmaster-0-r2
new file mode 100644
index 000000000000..9195d90f9c0c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postmaster-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Postmaster user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/mail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=bca4266995c12fba6a7e70dd55f0d0ef
diff --git a/metadata/md5-cache/acct-user/privoxy-0-r1 b/metadata/md5-cache/acct-user/privoxy-0-r1
deleted file mode 100644
index 309d13f10def..000000000000
--- a/metadata/md5-cache/acct-user/privoxy-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A privoxy: privacy oriented web proxy user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/privoxy
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8df0bf68d01e7064f875a2ae3f9cc0b3
diff --git a/metadata/md5-cache/acct-user/privoxy-0-r2 b/metadata/md5-cache/acct-user/privoxy-0-r2
new file mode 100644
index 000000000000..613ec4fe25ab
--- /dev/null
+++ b/metadata/md5-cache/acct-user/privoxy-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A privoxy: privacy oriented web proxy user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/privoxy
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6074eb40a9e163fa4799d1a2dfbe66ee
diff --git a/metadata/md5-cache/acct-user/prometheus-0-r1 b/metadata/md5-cache/acct-user/prometheus-0-r1
deleted file mode 100644
index 579aeeb4d2de..000000000000
--- a/metadata/md5-cache/acct-user/prometheus-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for prometheus
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/prometheus
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9f6c97821a2a4bd2fdfb1f2489403ca4
diff --git a/metadata/md5-cache/acct-user/prometheus-0-r2 b/metadata/md5-cache/acct-user/prometheus-0-r2
new file mode 100644
index 000000000000..2061230649c3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/prometheus-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for prometheus
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/prometheus
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7068b8729f1bd54599246e096cae436d
diff --git a/metadata/md5-cache/acct-user/prosody-0 b/metadata/md5-cache/acct-user/prosody-0
deleted file mode 100644
index 0467bf907e9b..000000000000
--- a/metadata/md5-cache/acct-user/prosody-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-im/prosody
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/prosody
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7e24ef65ba8e87512b26c231d29346d6
diff --git a/metadata/md5-cache/acct-user/prosody-0-r1 b/metadata/md5-cache/acct-user/prosody-0-r1
new file mode 100644
index 000000000000..e4f8a1e34754
--- /dev/null
+++ b/metadata/md5-cache/acct-user/prosody-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-im/prosody
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/prosody
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=eea1167026ab1de4f1563a5a6491a546
diff --git a/metadata/md5-cache/acct-user/prowlarr-0 b/metadata/md5-cache/acct-user/prowlarr-0
deleted file mode 100644
index 0a9b8d201dcf..000000000000
--- a/metadata/md5-cache/acct-user/prowlarr-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for prowlarr
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/prowlarr
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=fd23898ecedd055efd50a5096767c31a
diff --git a/metadata/md5-cache/acct-user/prowlarr-0-r1 b/metadata/md5-cache/acct-user/prowlarr-0-r1
new file mode 100644
index 000000000000..fb6f51e59564
--- /dev/null
+++ b/metadata/md5-cache/acct-user/prowlarr-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for prowlarr
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/prowlarr
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5d9bccd2303f69bc0ac57e41f31a299d
diff --git a/metadata/md5-cache/acct-user/psybnc-0 b/metadata/md5-cache/acct-user/psybnc-0
deleted file mode 100644
index 9ced19982400..000000000000
--- a/metadata/md5-cache/acct-user/psybnc-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-irc/psybnc
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/psybnc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=06187d4ccf7b3eed6030a2c18f59c110
diff --git a/metadata/md5-cache/acct-user/psybnc-0-r1 b/metadata/md5-cache/acct-user/psybnc-0-r1
new file mode 100644
index 000000000000..86083ae3ed79
--- /dev/null
+++ b/metadata/md5-cache/acct-user/psybnc-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-irc/psybnc
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/psybnc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5988d909ef3c724f58d028ce42fdecd8
diff --git a/metadata/md5-cache/acct-user/pulse-0 b/metadata/md5-cache/acct-user/pulse-0
deleted file mode 100644
index fc42d03ea00f..000000000000
--- a/metadata/md5-cache/acct-user/pulse-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for running the PulseAudio daemon as a system-wide instance
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pulse acct-group/audio
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b2d41bbc13bef4e5284ec6a9723c164f
diff --git a/metadata/md5-cache/acct-user/pulse-0-r1 b/metadata/md5-cache/acct-user/pulse-0-r1
new file mode 100644
index 000000000000..d3fb25702852
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pulse-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running the PulseAudio daemon as a system-wide instance
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pulse acct-group/audio
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4c216620ed8578e8960654cb8ca22de5
diff --git a/metadata/md5-cache/acct-user/puppet-0-r1 b/metadata/md5-cache/acct-user/puppet-0-r1
deleted file mode 100644
index 26271fafcfe7..000000000000
--- a/metadata/md5-cache/acct-user/puppet-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for puppet services
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/puppet
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bc15fcfef0d51555047209d3115d2438
diff --git a/metadata/md5-cache/acct-user/puppet-0-r2 b/metadata/md5-cache/acct-user/puppet-0-r2
new file mode 100644
index 000000000000..43e286b8fb19
--- /dev/null
+++ b/metadata/md5-cache/acct-user/puppet-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for puppet services
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/puppet
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2ec9760504e4db82d8b87acb46dd0874
diff --git a/metadata/md5-cache/acct-user/puppetdb-0-r1 b/metadata/md5-cache/acct-user/puppetdb-0-r1
deleted file mode 100644
index 4e528f370cc2..000000000000
--- a/metadata/md5-cache/acct-user/puppetdb-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the puppetdb service
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/puppetdb
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=85c625a10647b07be704defb5caaae20
diff --git a/metadata/md5-cache/acct-user/puppetdb-0-r2 b/metadata/md5-cache/acct-user/puppetdb-0-r2
new file mode 100644
index 000000000000..c5191df7f630
--- /dev/null
+++ b/metadata/md5-cache/acct-user/puppetdb-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the puppetdb service
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/puppetdb
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=133f523e4750c99319ca41ee97219016
diff --git a/metadata/md5-cache/acct-user/pushgateway-0 b/metadata/md5-cache/acct-user/pushgateway-0
deleted file mode 100644
index e02f61ceb090..000000000000
--- a/metadata/md5-cache/acct-user/pushgateway-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/pushgateway
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pushgateway
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bc6d33f7e01abe59db15140d536e13ef
diff --git a/metadata/md5-cache/acct-user/pushgateway-0-r1 b/metadata/md5-cache/acct-user/pushgateway-0-r1
new file mode 100644
index 000000000000..f22aaa7168b2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pushgateway-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/pushgateway
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pushgateway
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a7e614ca75e46f44ef532e2b34aa2ae1
diff --git a/metadata/md5-cache/acct-user/pvpgn-0 b/metadata/md5-cache/acct-user/pvpgn-0
deleted file mode 100644
index d94ebf5a0217..000000000000
--- a/metadata/md5-cache/acct-user/pvpgn-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for pvpgn (gaming server for Battle.Net compatible clients)
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/pvpgn
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8b7c45afbac936739b49978021efb93e
diff --git a/metadata/md5-cache/acct-user/pvpgn-0-r1 b/metadata/md5-cache/acct-user/pvpgn-0-r1
new file mode 100644
index 000000000000..72509f378b42
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pvpgn-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for pvpgn (gaming server for Battle.Net compatible clients)
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/pvpgn
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=75358d4338e492c6f531053d1f55b4c5
diff --git a/metadata/md5-cache/acct-user/qemu-0-r1 b/metadata/md5-cache/acct-user/qemu-0-r1
deleted file mode 100644
index fd510d2c1c07..000000000000
--- a/metadata/md5-cache/acct-user/qemu-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: qemu
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/qemu acct-group/kvm
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e9ed90f0240d0a260b1942de7298395c
diff --git a/metadata/md5-cache/acct-user/qemu-0-r2 b/metadata/md5-cache/acct-user/qemu-0-r2
new file mode 100644
index 000000000000..d69ccaf8512b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qemu-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: qemu
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/qemu acct-group/kvm
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7952496e680259d1bc80a02dc6fb492f
diff --git a/metadata/md5-cache/acct-user/qmaild-0-r1 b/metadata/md5-cache/acct-user/qmaild-0-r1
deleted file mode 100644
index 9c63481593c1..000000000000
--- a/metadata/md5-cache/acct-user/qmaild-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for qmail-smtpd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=581b4c7b56e4b341ca7d1bbfa10081f7
diff --git a/metadata/md5-cache/acct-user/qmaild-0-r2 b/metadata/md5-cache/acct-user/qmaild-0-r2
new file mode 100644
index 000000000000..6f5f1828f6a7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmaild-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail-smtpd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=88d6cf8e0262010b484d51ba92806924
diff --git a/metadata/md5-cache/acct-user/qmaill-0-r1 b/metadata/md5-cache/acct-user/qmaill-0-r1
deleted file mode 100644
index ae7c4c14c796..000000000000
--- a/metadata/md5-cache/acct-user/qmaill-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for qmail logging
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d028b00363e69075c41c197048d5a5a9
diff --git a/metadata/md5-cache/acct-user/qmaill-0-r2 b/metadata/md5-cache/acct-user/qmaill-0-r2
new file mode 100644
index 000000000000..bcbaf221f3e1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmaill-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail logging
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8a9e5471db3d0269656261c0793446ee
diff --git a/metadata/md5-cache/acct-user/qmailp-0-r1 b/metadata/md5-cache/acct-user/qmailp-0-r1
deleted file mode 100644
index 456eb3af5111..000000000000
--- a/metadata/md5-cache/acct-user/qmailp-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for qmail-getpw
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=07477df152a07a71f53f89929a381b16
diff --git a/metadata/md5-cache/acct-user/qmailp-0-r2 b/metadata/md5-cache/acct-user/qmailp-0-r2
new file mode 100644
index 000000000000..97523d64177d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmailp-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail-getpw
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cf5ca68abb5219fd94eef9fed978840b
diff --git a/metadata/md5-cache/acct-user/qmailq-0-r1 b/metadata/md5-cache/acct-user/qmailq-0-r1
deleted file mode 100644
index 2dce1831ca94..000000000000
--- a/metadata/md5-cache/acct-user/qmailq-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for qmail queue
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/qmail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7f039586834520c6a2353a00a066385b
diff --git a/metadata/md5-cache/acct-user/qmailq-0-r2 b/metadata/md5-cache/acct-user/qmailq-0-r2
new file mode 100644
index 000000000000..a73901d2bba8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmailq-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail queue
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/qmail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c21437243a55b2fca2ccae6d57db1549
diff --git a/metadata/md5-cache/acct-user/qmailr-0-r1 b/metadata/md5-cache/acct-user/qmailr-0-r1
deleted file mode 100644
index 7b84606fc17d..000000000000
--- a/metadata/md5-cache/acct-user/qmailr-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for qmail-rspawn and qmail-remote
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/qmail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=10cec18930bd453c732b5767d9c21cc5
diff --git a/metadata/md5-cache/acct-user/qmailr-0-r2 b/metadata/md5-cache/acct-user/qmailr-0-r2
new file mode 100644
index 000000000000..962cb048cf44
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmailr-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail-rspawn and qmail-remote
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/qmail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7377a2e0d8e46006fd73e6542eba240f
diff --git a/metadata/md5-cache/acct-user/qmails-0-r1 b/metadata/md5-cache/acct-user/qmails-0-r1
deleted file mode 100644
index 57ec85ec5c85..000000000000
--- a/metadata/md5-cache/acct-user/qmails-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for qmail-smtpd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/qmail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=441030961a89c121a924464f7850f226
diff --git a/metadata/md5-cache/acct-user/qmails-0-r2 b/metadata/md5-cache/acct-user/qmails-0-r2
new file mode 100644
index 000000000000..c18340de674f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/qmails-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for qmail-smtpd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/qmail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2b5c52b24742b57ee35807cc8e517966
diff --git a/metadata/md5-cache/acct-user/quagga-0-r1 b/metadata/md5-cache/acct-user/quagga-0-r1
deleted file mode 100644
index 367012e3293b..000000000000
--- a/metadata/md5-cache/acct-user/quagga-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: quagga
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/quagga
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=956efff66e65b3a7acacdd78acbd006f
diff --git a/metadata/md5-cache/acct-user/quagga-0-r2 b/metadata/md5-cache/acct-user/quagga-0-r2
new file mode 100644
index 000000000000..1f81af06f9c4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/quagga-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: quagga
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/quagga
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c937127d3c5794650623abf4491ce14e
diff --git a/metadata/md5-cache/acct-user/quassel-0-r1 b/metadata/md5-cache/acct-user/quassel-0-r1
deleted file mode 100644
index 01a89e0d853a..000000000000
--- a/metadata/md5-cache/acct-user/quassel-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: quassel
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/quassel
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c9c91fee67d39fbfe72bd53c25d72ee4
diff --git a/metadata/md5-cache/acct-user/quassel-0-r2 b/metadata/md5-cache/acct-user/quassel-0-r2
new file mode 100644
index 000000000000..efce02ca6040
--- /dev/null
+++ b/metadata/md5-cache/acct-user/quassel-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: quassel
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/quassel
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3dfea65ed6052924f6e9eb4f8be9ac78
diff --git a/metadata/md5-cache/acct-user/rabbitmq-0 b/metadata/md5-cache/acct-user/rabbitmq-0
deleted file mode 100644
index 600a651e67af..000000000000
--- a/metadata/md5-cache/acct-user/rabbitmq-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-misc/rabbitmq-server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rabbitmq
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d467de7a64836dda882d58be82960873
diff --git a/metadata/md5-cache/acct-user/rabbitmq-0-r1 b/metadata/md5-cache/acct-user/rabbitmq-0-r1
new file mode 100644
index 000000000000..b9562019a08b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rabbitmq-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/rabbitmq-server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rabbitmq
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ddefc0a2e1fffc5b73239d1a9ff69b9e
diff --git a/metadata/md5-cache/acct-user/rabbitmq_exporter-0 b/metadata/md5-cache/acct-user/rabbitmq_exporter-0
deleted file mode 100644
index c6536fea13ba..000000000000
--- a/metadata/md5-cache/acct-user/rabbitmq_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/rabbitmq_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rabbitmq_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3b9bc67847c9e4979633ad93609cc9dc
diff --git a/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r1 b/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r1
new file mode 100644
index 000000000000..138a0734df9b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rabbitmq_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/rabbitmq_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rabbitmq_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e279ebf4253bedb07518a8261315bdcd
diff --git a/metadata/md5-cache/acct-user/radarr-0 b/metadata/md5-cache/acct-user/radarr-0
deleted file mode 100644
index c7a4882e8551..000000000000
--- a/metadata/md5-cache/acct-user/radarr-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for radarr
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/radarr
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=65bff9bf4d07a026f43e26e9734d6667
diff --git a/metadata/md5-cache/acct-user/radarr-0-r1 b/metadata/md5-cache/acct-user/radarr-0-r1
new file mode 100644
index 000000000000..7dcaf75e1132
--- /dev/null
+++ b/metadata/md5-cache/acct-user/radarr-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for radarr
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/radarr
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=248732067bbfcca4f93a2912bcb68f20
diff --git a/metadata/md5-cache/acct-user/radicale-0-r2 b/metadata/md5-cache/acct-user/radicale-0-r2
deleted file mode 100644
index a632f8babad0..000000000000
--- a/metadata/md5-cache/acct-user/radicale-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for www-apps/radicale
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/radicale
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5e9c3caee7d81e631e1fa334d98fac4e
diff --git a/metadata/md5-cache/acct-user/radicale-0-r3 b/metadata/md5-cache/acct-user/radicale-0-r3
new file mode 100644
index 000000000000..e6edc0f4d685
--- /dev/null
+++ b/metadata/md5-cache/acct-user/radicale-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-apps/radicale
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/radicale
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3bb7d569ffe623df1e80813c66718687
diff --git a/metadata/md5-cache/acct-user/radius-0-r1 b/metadata/md5-cache/acct-user/radius-0-r1
deleted file mode 100644
index 1a4e2ea21356..000000000000
--- a/metadata/md5-cache/acct-user/radius-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=FreeRadius program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/radius
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=896cffd69d0ad10a418a70ccbd812a5d
diff --git a/metadata/md5-cache/acct-user/radius-0-r2 b/metadata/md5-cache/acct-user/radius-0-r2
new file mode 100644
index 000000000000..00a4d4e87b77
--- /dev/null
+++ b/metadata/md5-cache/acct-user/radius-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=FreeRadius program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/radius
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ceb989efd234e0c02c6467b438467981
diff --git a/metadata/md5-cache/acct-user/radvd-0 b/metadata/md5-cache/acct-user/radvd-0
deleted file mode 100644
index ed99ab9f9bb5..000000000000
--- a/metadata/md5-cache/acct-user/radvd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the Router Advertisement Daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/radvd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5dcf65fccc425e4d20fe820abed9db62
diff --git a/metadata/md5-cache/acct-user/radvd-0-r1 b/metadata/md5-cache/acct-user/radvd-0-r1
new file mode 100644
index 000000000000..587865d4ffab
--- /dev/null
+++ b/metadata/md5-cache/acct-user/radvd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Router Advertisement Daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/radvd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d835c4dc93fac9ff284c6fc9ce1c8df7
diff --git a/metadata/md5-cache/acct-user/rbldns-0-r1 b/metadata/md5-cache/acct-user/rbldns-0-r1
deleted file mode 100644
index 978926f4d9bd..000000000000
--- a/metadata/md5-cache/acct-user/rbldns-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: rbldns
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rbldns
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=66c3cb3c3c849a76499fc70c3b4d6cbb
diff --git a/metadata/md5-cache/acct-user/rbldns-0-r2 b/metadata/md5-cache/acct-user/rbldns-0-r2
new file mode 100644
index 000000000000..4649d8c233af
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rbldns-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: rbldns
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rbldns
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5009e74672c06dd835b446b024ce71d7
diff --git a/metadata/md5-cache/acct-user/rbot-0 b/metadata/md5-cache/acct-user/rbot-0
deleted file mode 100644
index 0957529bba98..000000000000
--- a/metadata/md5-cache/acct-user/rbot-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-irc/rbot
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rbot
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=23149f84d3c38f70ad5235003d69a3ca
diff --git a/metadata/md5-cache/acct-user/rbot-0-r1 b/metadata/md5-cache/acct-user/rbot-0-r1
new file mode 100644
index 000000000000..89e155c8814a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rbot-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-irc/rbot
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rbot
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5102b57562fd16fcbb21159f22effe9d
diff --git a/metadata/md5-cache/acct-user/readarr-0 b/metadata/md5-cache/acct-user/readarr-0
deleted file mode 100644
index 7cf9418542fb..000000000000
--- a/metadata/md5-cache/acct-user/readarr-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for readarr
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/readarr
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=40c7f8dcf6d81b6cad8cb7584c6ef01e
diff --git a/metadata/md5-cache/acct-user/readarr-0-r1 b/metadata/md5-cache/acct-user/readarr-0-r1
new file mode 100644
index 000000000000..d754d4776b51
--- /dev/null
+++ b/metadata/md5-cache/acct-user/readarr-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for readarr
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/readarr
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9621ada4109d59c54cfad29412dfa626
diff --git a/metadata/md5-cache/acct-user/redis-0-r1 b/metadata/md5-cache/acct-user/redis-0-r1
deleted file mode 100644
index bf20e7f1c887..000000000000
--- a/metadata/md5-cache/acct-user/redis-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Redis program user
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/redis
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9c0f2629fac01abdd0715941f029268c
diff --git a/metadata/md5-cache/acct-user/redis-0-r2 b/metadata/md5-cache/acct-user/redis-0-r2
new file mode 100644
index 000000000000..9441316e2ed4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redis-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Redis program user
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/redis
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=967af0c2ad8481d526b6b11500720aec
diff --git a/metadata/md5-cache/acct-user/redis_exporter-0 b/metadata/md5-cache/acct-user/redis_exporter-0
deleted file mode 100644
index 258e8eaf5a2a..000000000000
--- a/metadata/md5-cache/acct-user/redis_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/redis_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/redis_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8e18b9ab8e5309bd8b477f4593d76b2c
diff --git a/metadata/md5-cache/acct-user/redis_exporter-0-r1 b/metadata/md5-cache/acct-user/redis_exporter-0-r1
new file mode 100644
index 000000000000..af21e5e380bd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redis_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/redis_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/redis_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=95b112dd79b5e31416c1dc08ac006e0c
diff --git a/metadata/md5-cache/acct-user/redmine-0-r1 b/metadata/md5-cache/acct-user/redmine-0-r1
deleted file mode 100644
index 95d3c33a4479..000000000000
--- a/metadata/md5-cache/acct-user/redmine-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Redmine application user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/redmine
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2633a51fa2d59ab28e73919b665ba9b2
diff --git a/metadata/md5-cache/acct-user/redmine-0-r2 b/metadata/md5-cache/acct-user/redmine-0-r2
new file mode 100644
index 000000000000..fa1584c2c017
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redmine-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Redmine application user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/redmine
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6f477fb88192634800413940208a341f
diff --git a/metadata/md5-cache/acct-user/redsocks-0-r1 b/metadata/md5-cache/acct-user/redsocks-0-r1
deleted file mode 100644
index 9d503b80d3b3..000000000000
--- a/metadata/md5-cache/acct-user/redsocks-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-proxy/redsocks
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/redsocks
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e3e374c71c79aa536ae22b49212576de
diff --git a/metadata/md5-cache/acct-user/redsocks-0-r2 b/metadata/md5-cache/acct-user/redsocks-0-r2
new file mode 100644
index 000000000000..219667a705ba
--- /dev/null
+++ b/metadata/md5-cache/acct-user/redsocks-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-proxy/redsocks
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/redsocks
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f6c8520af564be4a260f0b700a280aa8
diff --git a/metadata/md5-cache/acct-user/reg-0-r1 b/metadata/md5-cache/acct-user/reg-0-r1
deleted file mode 100644
index 733c6e4cf124..000000000000
--- a/metadata/md5-cache/acct-user/reg-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-containers/reg
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/reg
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=7347d0add6604a30918d43831ded64db
diff --git a/metadata/md5-cache/acct-user/reg-0-r2 b/metadata/md5-cache/acct-user/reg-0-r2
new file mode 100644
index 000000000000..4209bef56436
--- /dev/null
+++ b/metadata/md5-cache/acct-user/reg-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-containers/reg
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/reg
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6008057bd6e65aad3163581cf0099c49
diff --git a/metadata/md5-cache/acct-user/registry-0 b/metadata/md5-cache/acct-user/registry-0
deleted file mode 100644
index 6ec8d809532a..000000000000
--- a/metadata/md5-cache/acct-user/registry-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-containers/docker-registry
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/registry
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=86758fc0dd85cfea438f94b34465206c
diff --git a/metadata/md5-cache/acct-user/registry-0-r1 b/metadata/md5-cache/acct-user/registry-0-r1
new file mode 100644
index 000000000000..1ea2029222cb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/registry-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-containers/docker-registry
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/registry
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=603b0c0f3757405256ca40df9c89eb00
diff --git a/metadata/md5-cache/acct-user/root-0-r1 b/metadata/md5-cache/acct-user/root-0-r1
deleted file mode 100644
index c057b856d018..000000000000
--- a/metadata/md5-cache/acct-user/root-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: root
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/root
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=12faf3228ff097150292798c74c32291
diff --git a/metadata/md5-cache/acct-user/root-0-r2 b/metadata/md5-cache/acct-user/root-0-r2
new file mode 100644
index 000000000000..3ac0fbdb2bcf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/root-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: root
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/root
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=46cd14cc4c6ac52ce469ffd16b6793bf
diff --git a/metadata/md5-cache/acct-user/rplayd-0 b/metadata/md5-cache/acct-user/rplayd-0
deleted file mode 100644
index a7d6c4359166..000000000000
--- a/metadata/md5-cache/acct-user/rplayd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for media-sound/rplay
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rplayd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a97ed2fb7a50e381460a0f1b1787b52f
diff --git a/metadata/md5-cache/acct-user/rplayd-0-r1 b/metadata/md5-cache/acct-user/rplayd-0-r1
new file mode 100644
index 000000000000..774bdb047fe0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rplayd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/rplay
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rplayd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=38c826a7c550bce374da8ab621ab0400
diff --git a/metadata/md5-cache/acct-user/rrdcached-0 b/metadata/md5-cache/acct-user/rrdcached-0
deleted file mode 100644
index 01969495a974..000000000000
--- a/metadata/md5-cache/acct-user/rrdcached-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-analyzer/rrdtool
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rrdcached
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4aff801d80e782870e01f09a0bca66a6
diff --git a/metadata/md5-cache/acct-user/rrdcached-0-r1 b/metadata/md5-cache/acct-user/rrdcached-0-r1
new file mode 100644
index 000000000000..627313038f03
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rrdcached-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/rrdtool
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rrdcached
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0dbe63735fe12bd3ec9026a678aba790
diff --git a/metadata/md5-cache/acct-user/rslsync-0 b/metadata/md5-cache/acct-user/rslsync-0
deleted file mode 100644
index 3fe7da86d5d6..000000000000
--- a/metadata/md5-cache/acct-user/rslsync-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-p2p/resilio-sync
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rslsync
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c5cfb1bcc32d46e7f6165d6663783f3f
diff --git a/metadata/md5-cache/acct-user/rslsync-0-r1 b/metadata/md5-cache/acct-user/rslsync-0-r1
new file mode 100644
index 000000000000..ecf46510af9d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rslsync-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-p2p/resilio-sync
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rslsync
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4977e1c17be3ebeee18ce1f475e18902
diff --git a/metadata/md5-cache/acct-user/rspamd-0-r1 b/metadata/md5-cache/acct-user/rspamd-0-r1
deleted file mode 100644
index fb9a5ce5b18e..000000000000
--- a/metadata/md5-cache/acct-user/rspamd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for rspamd - Rapid spam filtering system
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rspamd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e6ef50957d8d8ab0c8e687094f6f7eb3
diff --git a/metadata/md5-cache/acct-user/rspamd-0-r2 b/metadata/md5-cache/acct-user/rspamd-0-r2
new file mode 100644
index 000000000000..6e0f22e31b42
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rspamd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for rspamd - Rapid spam filtering system
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rspamd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1b919ec023cf2a78f8c735e55869abca
diff --git a/metadata/md5-cache/acct-user/rstudio-server-0-r1 b/metadata/md5-cache/acct-user/rstudio-server-0-r1
deleted file mode 100644
index e38329d565a8..000000000000
--- a/metadata/md5-cache/acct-user/rstudio-server-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for sci-mathematics/rstudio
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rstudio-server
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=44b71968a9eb18296740f7ee6c07e727
diff --git a/metadata/md5-cache/acct-user/rstudio-server-0-r2 b/metadata/md5-cache/acct-user/rstudio-server-0-r2
new file mode 100644
index 000000000000..0b8ea03f43f1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rstudio-server-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for sci-mathematics/rstudio
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rstudio-server
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8ed3544c2fc24394559c23ef93bcc4a1
diff --git a/metadata/md5-cache/acct-user/rt-0 b/metadata/md5-cache/acct-user/rt-0
deleted file mode 100644
index 3731468d2a6f..000000000000
--- a/metadata/md5-cache/acct-user/rt-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for www-apps/rt
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rt
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=28c2a261015e2303a7a6eec66acd6089
diff --git a/metadata/md5-cache/acct-user/rt-0-r1 b/metadata/md5-cache/acct-user/rt-0-r1
new file mode 100644
index 000000000000..6f2ea910d089
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rt-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/rt
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rt
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4012cd461c3bd659e7ea527afb045cdf
diff --git a/metadata/md5-cache/acct-user/rtkit-0-r1 b/metadata/md5-cache/acct-user/rtkit-0-r1
deleted file mode 100644
index b9062e78c77e..000000000000
--- a/metadata/md5-cache/acct-user/rtkit-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the Realtime Policy and Watchdog Daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rtkit
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2572cb2a14397b36c841b0394bddf602
diff --git a/metadata/md5-cache/acct-user/rtkit-0-r2 b/metadata/md5-cache/acct-user/rtkit-0-r2
new file mode 100644
index 000000000000..bf9e472e08f5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rtkit-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the Realtime Policy and Watchdog Daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rtkit
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0cb0b7df70977c5762306900a6e3b589
diff --git a/metadata/md5-cache/acct-user/rundeck-0 b/metadata/md5-cache/acct-user/rundeck-0
deleted file mode 100644
index 5f8df2d365de..000000000000
--- a/metadata/md5-cache/acct-user/rundeck-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-misc/rundeck-bin
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rundeck
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f2e0eda740c73fa29cee27997f8526c0
diff --git a/metadata/md5-cache/acct-user/rundeck-0-r1 b/metadata/md5-cache/acct-user/rundeck-0-r1
new file mode 100644
index 000000000000..0ff9257354bd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rundeck-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-misc/rundeck-bin
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rundeck
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f70e1ffe264b7948f407ba6d9a3398b0
diff --git a/metadata/md5-cache/acct-user/rwhoisd-0 b/metadata/md5-cache/acct-user/rwhoisd-0
deleted file mode 100644
index f4a5621b9e14..000000000000
--- a/metadata/md5-cache/acct-user/rwhoisd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-misc/rwhoisd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/rwhoisd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=653f4cb4492e5f460053cdd970c427f6
diff --git a/metadata/md5-cache/acct-user/rwhoisd-0-r1 b/metadata/md5-cache/acct-user/rwhoisd-0-r1
new file mode 100644
index 000000000000..2037c850c8ed
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rwhoisd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/rwhoisd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/rwhoisd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b569f6ae35e31608e861d5afd5be0a66
diff --git a/metadata/md5-cache/acct-user/sabnzbd-0-r1 b/metadata/md5-cache/acct-user/sabnzbd-0-r1
deleted file mode 100644
index 7a03d2cf723e..000000000000
--- a/metadata/md5-cache/acct-user/sabnzbd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=SABnzbd program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sabnzbd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e342f7970b144b9cba099cff8e207542
diff --git a/metadata/md5-cache/acct-user/sabnzbd-0-r2 b/metadata/md5-cache/acct-user/sabnzbd-0-r2
new file mode 100644
index 000000000000..103bd4260240
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sabnzbd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=SABnzbd program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sabnzbd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=922c8b6d503583060113f82299fefda5
diff --git a/metadata/md5-cache/acct-user/sagan-0-r1 b/metadata/md5-cache/acct-user/sagan-0-r1
deleted file mode 100644
index a34839ed049d..000000000000
--- a/metadata/md5-cache/acct-user/sagan-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the Sagan log monitoring system
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sagan
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4de51a00a786a6a24f5ae2d22007088e
diff --git a/metadata/md5-cache/acct-user/sagan-0-r2 b/metadata/md5-cache/acct-user/sagan-0-r2
new file mode 100644
index 000000000000..0357e4ca7ea7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sagan-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the Sagan log monitoring system
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sagan
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aaf51f797c4fef703916b6c3f643d342
diff --git a/metadata/md5-cache/acct-user/samplicator-0 b/metadata/md5-cache/acct-user/samplicator-0
deleted file mode 100644
index f8e6f0efab68..000000000000
--- a/metadata/md5-cache/acct-user/samplicator-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-misc/samplicator
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/samplicator
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dfe3fdbf42de5ada6ed2e1bda8edf16d
diff --git a/metadata/md5-cache/acct-user/samplicator-0-r1 b/metadata/md5-cache/acct-user/samplicator-0-r1
new file mode 100644
index 000000000000..61fc13805346
--- /dev/null
+++ b/metadata/md5-cache/acct-user/samplicator-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/samplicator
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/samplicator
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5248a07d9bb788960d07a3b0b3bb0951
diff --git a/metadata/md5-cache/acct-user/sancp-0 b/metadata/md5-cache/acct-user/sancp-0
deleted file mode 100644
index 2173474696ab..000000000000
--- a/metadata/md5-cache/acct-user/sancp-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=uid for net-analyzer/sancp
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sancp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=970638a3db634c912f322298668e39bc
diff --git a/metadata/md5-cache/acct-user/sancp-0-r1 b/metadata/md5-cache/acct-user/sancp-0-r1
new file mode 100644
index 000000000000..29d631d2c003
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sancp-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-analyzer/sancp
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sancp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c886dbbf8c5fd08bf8033d394057a003
diff --git a/metadata/md5-cache/acct-user/saned-0 b/metadata/md5-cache/acct-user/saned-0
deleted file mode 100644
index 8b2fe69d541a..000000000000
--- a/metadata/md5-cache/acct-user/saned-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for media-gfx/sane-backends
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/scanner
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=78a68ec640b34ea66ace71f5953b9667
diff --git a/metadata/md5-cache/acct-user/saned-0-r1 b/metadata/md5-cache/acct-user/saned-0-r1
new file mode 100644
index 000000000000..861dda541459
--- /dev/null
+++ b/metadata/md5-cache/acct-user/saned-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for media-gfx/sane-backends
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/scanner
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=38b927afee1e1ea9e56c60bfcfbe614c
diff --git a/metadata/md5-cache/acct-user/sanlock-0-r1 b/metadata/md5-cache/acct-user/sanlock-0-r1
deleted file mode 100644
index adc7c34b5879..000000000000
--- a/metadata/md5-cache/acct-user/sanlock-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=shared storage lock manager
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sanlock acct-group/disk
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3f3283e030d2dc1202f03fd4a23ce820
diff --git a/metadata/md5-cache/acct-user/sanlock-0-r2 b/metadata/md5-cache/acct-user/sanlock-0-r2
new file mode 100644
index 000000000000..3e7109ba71c6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sanlock-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=shared storage lock manager
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sanlock acct-group/disk
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=421bacb4f699ceb9f166192ceff1f785
diff --git a/metadata/md5-cache/acct-user/sauerbraten-0-r1 b/metadata/md5-cache/acct-user/sauerbraten-0-r1
deleted file mode 100644
index 6a05577f14b7..000000000000
--- a/metadata/md5-cache/acct-user/sauerbraten-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Group for Sauerbraten (FOSS game engine (Cube 2))
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sauerbraten
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=00f3a0cd9853cef7878629be0ad7fb1d
diff --git a/metadata/md5-cache/acct-user/sauerbraten-0-r2 b/metadata/md5-cache/acct-user/sauerbraten-0-r2
new file mode 100644
index 000000000000..fc54ad38b293
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sauerbraten-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Group for Sauerbraten (FOSS game engine (Cube 2))
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sauerbraten
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f0abce63df484bc4d78581b637ffc519
diff --git a/metadata/md5-cache/acct-user/scanlogd-0 b/metadata/md5-cache/acct-user/scanlogd-0
deleted file mode 100644
index 696ef601321d..000000000000
--- a/metadata/md5-cache/acct-user/scanlogd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-analyzer/scanlogd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/scanlogd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4c5ea2120bde6a0c4c0553f3b658c592
diff --git a/metadata/md5-cache/acct-user/scanlogd-0-r1 b/metadata/md5-cache/acct-user/scanlogd-0-r1
new file mode 100644
index 000000000000..1764b1a96e49
--- /dev/null
+++ b/metadata/md5-cache/acct-user/scanlogd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/scanlogd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/scanlogd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c70aeffa3edb2785a2a0066227362e4d
diff --git a/metadata/md5-cache/acct-user/scponly-0-r1 b/metadata/md5-cache/acct-user/scponly-0-r1
deleted file mode 100644
index f7eca8834c3d..000000000000
--- a/metadata/md5-cache/acct-user/scponly-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for chrooted scponly
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/scponly
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ae6eea3d56d04ce6076e69d3291b24d4
diff --git a/metadata/md5-cache/acct-user/scponly-0-r2 b/metadata/md5-cache/acct-user/scponly-0-r2
new file mode 100644
index 000000000000..f74ecb746bf4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/scponly-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for chrooted scponly
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/scponly
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5669ab1302559c47ec86b3996c658ebd
diff --git a/metadata/md5-cache/acct-user/sddm-0 b/metadata/md5-cache/acct-user/sddm-0
deleted file mode 100644
index 783b3c5d97d7..000000000000
--- a/metadata/md5-cache/acct-user/sddm-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for x11-misc/sddm
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sddm acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f6f16857e90c524116a70c1f0f79c083
diff --git a/metadata/md5-cache/acct-user/sddm-0-r1 b/metadata/md5-cache/acct-user/sddm-0-r1
new file mode 100644
index 000000000000..17e16d6f501e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sddm-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for x11-misc/sddm
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sddm acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4a3a8b0504d108d97a15890053565289
diff --git a/metadata/md5-cache/acct-user/sendpage-0 b/metadata/md5-cache/acct-user/sendpage-0
deleted file mode 100644
index bb50e886791e..000000000000
--- a/metadata/md5-cache/acct-user/sendpage-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-dialup/sendpage
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sms
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a0431af4a7386d93deef423348a3a46c
diff --git a/metadata/md5-cache/acct-user/sendpage-0-r1 b/metadata/md5-cache/acct-user/sendpage-0-r1
new file mode 100644
index 000000000000..f7f5954f373c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sendpage-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-dialup/sendpage
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sms
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6456bbb257f3b012d17d9a14c419c9d1
diff --git a/metadata/md5-cache/acct-user/serf-0 b/metadata/md5-cache/acct-user/serf-0
deleted file mode 100644
index dd5afbd4dc44..000000000000
--- a/metadata/md5-cache/acct-user/serf-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-admin/serf
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/serf
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=427927b4f8286e6611d4051064af78c4
diff --git a/metadata/md5-cache/acct-user/serf-0-r1 b/metadata/md5-cache/acct-user/serf-0-r1
new file mode 100644
index 000000000000..d07c51c4087c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/serf-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-admin/serf
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/serf
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d11c203be362088060a9c80ee87c5939
diff --git a/metadata/md5-cache/acct-user/sguil-0 b/metadata/md5-cache/acct-user/sguil-0
deleted file mode 100644
index ca2567cb20fc..000000000000
--- a/metadata/md5-cache/acct-user/sguil-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-analyzer/sguil-sensor
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sguil
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0eaecdeb684fb191fedf9d692518b3e1
diff --git a/metadata/md5-cache/acct-user/sguil-0-r1 b/metadata/md5-cache/acct-user/sguil-0-r1
new file mode 100644
index 000000000000..3558154f8d10
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sguil-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/sguil-sensor
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sguil
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c2067395bdeb85a009eec3c258d11593
diff --git a/metadata/md5-cache/acct-user/sigh-0 b/metadata/md5-cache/acct-user/sigh-0
deleted file mode 100644
index b8ddefa7c145..000000000000
--- a/metadata/md5-cache/acct-user/sigh-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: sigh
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sigh
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c9c9f0f17f5db1df61184b38ef3d581a
diff --git a/metadata/md5-cache/acct-user/sigh-0-r1 b/metadata/md5-cache/acct-user/sigh-0-r1
new file mode 100644
index 000000000000..c02fcfc71ff2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sigh-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: sigh
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sigh
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=88436d4dca6cd43fad44ef0e41699ae2
diff --git a/metadata/md5-cache/acct-user/sks-0 b/metadata/md5-cache/acct-user/sks-0
deleted file mode 100644
index 617fc1d55906..000000000000
--- a/metadata/md5-cache/acct-user/sks-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the SKS OpenPGP keyserver
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sks
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=620f64bcae4bb42a2e74103ef824ff18
diff --git a/metadata/md5-cache/acct-user/sks-0-r1 b/metadata/md5-cache/acct-user/sks-0-r1
new file mode 100644
index 000000000000..48e12c29f15f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sks-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the SKS OpenPGP keyserver
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sks
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e7b6d244052f36ce4f7eeea472788638
diff --git a/metadata/md5-cache/acct-user/slurm-0-r1 b/metadata/md5-cache/acct-user/slurm-0-r1
deleted file mode 100644
index f056d6516efc..000000000000
--- a/metadata/md5-cache/acct-user/slurm-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the slurm - Highly Scalable Resource Manager
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/slurm
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cb0584b98342918ca5a7a3c8ebce358f
diff --git a/metadata/md5-cache/acct-user/slurm-0-r2 b/metadata/md5-cache/acct-user/slurm-0-r2
new file mode 100644
index 000000000000..2efbf93dfd79
--- /dev/null
+++ b/metadata/md5-cache/acct-user/slurm-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the slurm - Highly Scalable Resource Manager
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/slurm
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ad68b1c90126a55ab8ba625f36fb662f
diff --git a/metadata/md5-cache/acct-user/smmsp-0-r2 b/metadata/md5-cache/acct-user/smmsp-0-r2
deleted file mode 100644
index 47f33c58893d..000000000000
--- a/metadata/md5-cache/acct-user/smmsp-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for sendmail daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/smmsp
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f68a4d4897493e1ab259d155ef41423c
diff --git a/metadata/md5-cache/acct-user/smmsp-0-r3 b/metadata/md5-cache/acct-user/smmsp-0-r3
new file mode 100644
index 000000000000..98d63e0b8ec3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smmsp-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for sendmail daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/smmsp
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2125de4631fa62d0320ca8c2df527fb4
diff --git a/metadata/md5-cache/acct-user/smokeping-0 b/metadata/md5-cache/acct-user/smokeping-0
deleted file mode 100644
index edba1ca8a21a..000000000000
--- a/metadata/md5-cache/acct-user/smokeping-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-analyzer/smokeping
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/smokeping
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=b2136a2915e896dc5ca99944ffc63a4e
diff --git a/metadata/md5-cache/acct-user/smokeping-0-r1 b/metadata/md5-cache/acct-user/smokeping-0-r1
new file mode 100644
index 000000000000..0a7cfee270e8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smokeping-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-analyzer/smokeping
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/smokeping
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=31c877257944d89850b9d47c7532852e
diff --git a/metadata/md5-cache/acct-user/smsd-0 b/metadata/md5-cache/acct-user/smsd-0
deleted file mode 100644
index bdc67c72593a..000000000000
--- a/metadata/md5-cache/acct-user/smsd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: smsd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sms
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4c34cd72cf5083343e757f9583dbd201
diff --git a/metadata/md5-cache/acct-user/smsd-0-r1 b/metadata/md5-cache/acct-user/smsd-0-r1
new file mode 100644
index 000000000000..369cb822ef2b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smsd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: smsd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sms
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dab5787c1e2c053b3a1f58c291dda7ea
diff --git a/metadata/md5-cache/acct-user/smtpd-0-r1 b/metadata/md5-cache/acct-user/smtpd-0-r1
deleted file mode 100644
index 126c3b92d1ba..000000000000
--- a/metadata/md5-cache/acct-user/smtpd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=daemon user for smtpd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/smtpd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=120edf4c9f64015098547ab471d5b858
diff --git a/metadata/md5-cache/acct-user/smtpd-0-r2 b/metadata/md5-cache/acct-user/smtpd-0-r2
new file mode 100644
index 000000000000..277e50a81d0e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smtpd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=daemon user for smtpd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/smtpd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ba0a5c0a88bf22746212d76902ac733a
diff --git a/metadata/md5-cache/acct-user/smtpq-0-r1 b/metadata/md5-cache/acct-user/smtpq-0-r1
deleted file mode 100644
index 8c2013a782bb..000000000000
--- a/metadata/md5-cache/acct-user/smtpq-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=queue user for smtpd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/smtpq
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3057581131fe31493029dd09def448f6
diff --git a/metadata/md5-cache/acct-user/smtpq-0-r2 b/metadata/md5-cache/acct-user/smtpq-0-r2
new file mode 100644
index 000000000000..4f7b2165a677
--- /dev/null
+++ b/metadata/md5-cache/acct-user/smtpq-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=queue user for smtpd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/smtpq
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9013b2def6216a4aab066633de1c97e2
diff --git a/metadata/md5-cache/acct-user/snapclient-0 b/metadata/md5-cache/acct-user/snapclient-0
deleted file mode 100644
index 7e015527f68e..000000000000
--- a/metadata/md5-cache/acct-user/snapclient-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Client user for media-sound/snapcast
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/audio
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=eee1abc32ce85d514d7a13c6bc068b1b
diff --git a/metadata/md5-cache/acct-user/snapclient-0-r1 b/metadata/md5-cache/acct-user/snapclient-0-r1
new file mode 100644
index 000000000000..df89a2275839
--- /dev/null
+++ b/metadata/md5-cache/acct-user/snapclient-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Client user for media-sound/snapcast
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/audio
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=8987d588309a3894cd9d95bfec1c01d1
diff --git a/metadata/md5-cache/acct-user/snapserver-0 b/metadata/md5-cache/acct-user/snapserver-0
deleted file mode 100644
index aefa6fd76b4f..000000000000
--- a/metadata/md5-cache/acct-user/snapserver-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Server user for media-sound/snapcast
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/snapserver
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=57a823e748e2fc852feed70444b52bdc
diff --git a/metadata/md5-cache/acct-user/snapserver-0-r1 b/metadata/md5-cache/acct-user/snapserver-0-r1
new file mode 100644
index 000000000000..bf39c5e07c3b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/snapserver-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Server user for media-sound/snapcast
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/snapserver
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=57a823e748e2fc852feed70444b52bdc
diff --git a/metadata/md5-cache/acct-user/sndiod-0 b/metadata/md5-cache/acct-user/sndiod-0
deleted file mode 100644
index 5edf79182b42..000000000000
--- a/metadata/md5-cache/acct-user/sndiod-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Daemon user for sndio
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/audio
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=cdea6ad5c8f374598d232ebd7bfbedce
diff --git a/metadata/md5-cache/acct-user/sndiod-0-r1 b/metadata/md5-cache/acct-user/sndiod-0-r1
new file mode 100644
index 000000000000..a38db5af5023
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sndiod-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Daemon user for sndio
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/audio
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3c66d9ea389bcd096adeb45c602cb27f
diff --git a/metadata/md5-cache/acct-user/sniproxy-0 b/metadata/md5-cache/acct-user/sniproxy-0
deleted file mode 100644
index dca488980d26..000000000000
--- a/metadata/md5-cache/acct-user/sniproxy-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: sniproxy
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sniproxy
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=85ddff8dfe5293ccfd99344fcaabef8f
diff --git a/metadata/md5-cache/acct-user/sniproxy-0-r1 b/metadata/md5-cache/acct-user/sniproxy-0-r1
new file mode 100644
index 000000000000..baf58d59bb87
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sniproxy-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: sniproxy
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sniproxy
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9c429f00165f852ab05ef0d7d5c90e40
diff --git a/metadata/md5-cache/acct-user/snmp_exporter-0 b/metadata/md5-cache/acct-user/snmp_exporter-0
deleted file mode 100644
index 37c9fac10ed7..000000000000
--- a/metadata/md5-cache/acct-user/snmp_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/snmp_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/snmp_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=eb263a8ff5ab839779619c19f0369944
diff --git a/metadata/md5-cache/acct-user/snmp_exporter-0-r1 b/metadata/md5-cache/acct-user/snmp_exporter-0-r1
new file mode 100644
index 000000000000..818643cdef55
--- /dev/null
+++ b/metadata/md5-cache/acct-user/snmp_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/snmp_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/snmp_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=521f83022a7560720fb3c10ad9fff16d
diff --git a/metadata/md5-cache/acct-user/snort-0 b/metadata/md5-cache/acct-user/snort-0
deleted file mode 100644
index 29323a75a463..000000000000
--- a/metadata/md5-cache/acct-user/snort-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for snort
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/snort
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d97aefb2d0049905dc15c699db72ed5b
diff --git a/metadata/md5-cache/acct-user/snort-0-r1 b/metadata/md5-cache/acct-user/snort-0-r1
new file mode 100644
index 000000000000..94e017d28285
--- /dev/null
+++ b/metadata/md5-cache/acct-user/snort-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for snort
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/snort
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=13a035fa6e25740c892336d9cb8d44b9
diff --git a/metadata/md5-cache/acct-user/sobby-0 b/metadata/md5-cache/acct-user/sobby-0
deleted file mode 100644
index 2c5c7155bb9c..000000000000
--- a/metadata/md5-cache/acct-user/sobby-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for running sobby
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sobby
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f5eda0193b5f1ca4c52e5ef69e47db8a
diff --git a/metadata/md5-cache/acct-user/sobby-0-r1 b/metadata/md5-cache/acct-user/sobby-0-r1
new file mode 100644
index 000000000000..2230572eafd5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sobby-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running sobby
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sobby
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cc489f4cd245c56fb02292d8dc60244b
diff --git a/metadata/md5-cache/acct-user/sobexsrv-0 b/metadata/md5-cache/acct-user/sobexsrv-0
deleted file mode 100644
index 313ca703804c..000000000000
--- a/metadata/md5-cache/acct-user/sobexsrv-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sobexsrv: a secure OBEX server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sobexsrv
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=db829fbc208956411c949c4cfbe6a35c
diff --git a/metadata/md5-cache/acct-user/sobexsrv-0-r1 b/metadata/md5-cache/acct-user/sobexsrv-0-r1
new file mode 100644
index 000000000000..a9d2a86bc7bf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sobexsrv-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sobexsrv: a secure OBEX server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sobexsrv
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=224359ad7cb5966e02cbb7626a87b306
diff --git a/metadata/md5-cache/acct-user/sockd-0-r1 b/metadata/md5-cache/acct-user/sockd-0-r1
deleted file mode 100644
index 59c6745eaae6..000000000000
--- a/metadata/md5-cache/acct-user/sockd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-proxy/dante
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sockd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5e2216f11df2d0db950e39a6b891aac2
diff --git a/metadata/md5-cache/acct-user/sockd-0-r2 b/metadata/md5-cache/acct-user/sockd-0-r2
new file mode 100644
index 000000000000..e07a3acbda47
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sockd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-proxy/dante
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sockd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0a94c922edf0fef67c2767a03cf86796
diff --git a/metadata/md5-cache/acct-user/sogo-0-r1 b/metadata/md5-cache/acct-user/sogo-0-r1
deleted file mode 100644
index bf953b8ba669..000000000000
--- a/metadata/md5-cache/acct-user/sogo-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for gnustep-apps/sogo
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sogo
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=751896dcfdcdc50895e0d1c5f38ec714
diff --git a/metadata/md5-cache/acct-user/sogo-0-r2 b/metadata/md5-cache/acct-user/sogo-0-r2
new file mode 100644
index 000000000000..18655c72ed38
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sogo-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for gnustep-apps/sogo
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sogo
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5fc855241427994bc88043f3590d2971
diff --git a/metadata/md5-cache/acct-user/soju-0 b/metadata/md5-cache/acct-user/soju-0
deleted file mode 100644
index de7336e7d45a..000000000000
--- a/metadata/md5-cache/acct-user/soju-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the net-irc/soju IRC bouncer
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/soju
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5f02ced6afe94278c6eb6d01906c02c9
diff --git a/metadata/md5-cache/acct-user/soju-0-r1 b/metadata/md5-cache/acct-user/soju-0-r1
new file mode 100644
index 000000000000..e41a4e5b8c9b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/soju-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the net-irc/soju IRC bouncer
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/soju
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0fc2b914ff770273d39dbf278446655e
diff --git a/metadata/md5-cache/acct-user/sonarr-0 b/metadata/md5-cache/acct-user/sonarr-0
deleted file mode 100644
index 13d703fb393f..000000000000
--- a/metadata/md5-cache/acct-user/sonarr-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for sonarr
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sonarr
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c4aa8448a0b1d69df7c253e679d01314
diff --git a/metadata/md5-cache/acct-user/sonarr-0-r1 b/metadata/md5-cache/acct-user/sonarr-0-r1
new file mode 100644
index 000000000000..14d965f95245
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sonarr-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for sonarr
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sonarr
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=7231afd90740c8e2453841c9cf73cc4f
diff --git a/metadata/md5-cache/acct-user/spamd-0-r1 b/metadata/md5-cache/acct-user/spamd-0-r1
deleted file mode 100644
index a195527b8b5c..000000000000
--- a/metadata/md5-cache/acct-user/spamd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the SpamAssassin daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/spamd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6761450ff125fe6126b1e09cac528d9e
diff --git a/metadata/md5-cache/acct-user/spamd-0-r2 b/metadata/md5-cache/acct-user/spamd-0-r2
new file mode 100644
index 000000000000..cc25547e33af
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spamd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the SpamAssassin daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/spamd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dc0e60380f0213d82912e0dd49f7d8f4
diff --git a/metadata/md5-cache/acct-user/spectrum-0-r1 b/metadata/md5-cache/acct-user/spectrum-0-r1
deleted file mode 100644
index c033a15a5fa9..000000000000
--- a/metadata/md5-cache/acct-user/spectrum-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the Spectrum messaging transport
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/spectrum
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3cff1b3e4282819fdee5cafe43ca41e8
diff --git a/metadata/md5-cache/acct-user/spectrum-0-r2 b/metadata/md5-cache/acct-user/spectrum-0-r2
new file mode 100644
index 000000000000..a5f04fb3ec96
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spectrum-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the Spectrum messaging transport
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/spectrum
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1e04d4209109f2f32bbeeef78f24478f
diff --git a/metadata/md5-cache/acct-user/spire-0-r1 b/metadata/md5-cache/acct-user/spire-0-r1
deleted file mode 100644
index c90ee3f5ef4c..000000000000
--- a/metadata/md5-cache/acct-user/spire-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for spiffe runtime environment
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/spire
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0e122a5a840f0733fdb30ec5a3690b60
diff --git a/metadata/md5-cache/acct-user/spire-0-r2 b/metadata/md5-cache/acct-user/spire-0-r2
new file mode 100644
index 000000000000..bfb9c56fdaf5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spire-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for spiffe runtime environment
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/spire
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ed83a2b335b6cbfde753e7d849664260
diff --git a/metadata/md5-cache/acct-user/spread-0 b/metadata/md5-cache/acct-user/spread-0
deleted file mode 100644
index 9cfd7dae4927..000000000000
--- a/metadata/md5-cache/acct-user/spread-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-misc/spread
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/spread
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=be50511c7e8d750c5665e2492353926b
diff --git a/metadata/md5-cache/acct-user/spread-0-r1 b/metadata/md5-cache/acct-user/spread-0-r1
new file mode 100644
index 000000000000..40218539b3c2
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spread-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/spread
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/spread
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9ffb7f091ce8b6f517120093157f0f67
diff --git a/metadata/md5-cache/acct-user/sqlgrey-0-r1 b/metadata/md5-cache/acct-user/sqlgrey-0-r1
deleted file mode 100644
index 1a85c4884c48..000000000000
--- a/metadata/md5-cache/acct-user/sqlgrey-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for SQLGrey
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sqlgrey
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=16b30b0ccaa09372cc17389a7d8ce47f
diff --git a/metadata/md5-cache/acct-user/sqlgrey-0-r2 b/metadata/md5-cache/acct-user/sqlgrey-0-r2
new file mode 100644
index 000000000000..1878fdf6446c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sqlgrey-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for SQLGrey
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sqlgrey
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ace0580bdcfe588307ea6ef08849b0bd
diff --git a/metadata/md5-cache/acct-user/squid-0-r1 b/metadata/md5-cache/acct-user/squid-0-r1
deleted file mode 100644
index 1b8a32957943..000000000000
--- a/metadata/md5-cache/acct-user/squid-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for squid web proxy cache
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/squid
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a4c915cdf7ca96c4c14527bffee0ca76
diff --git a/metadata/md5-cache/acct-user/squid-0-r2 b/metadata/md5-cache/acct-user/squid-0-r2
new file mode 100644
index 000000000000..bc2e6a38ea34
--- /dev/null
+++ b/metadata/md5-cache/acct-user/squid-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for squid web proxy cache
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/squid
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=01b9fd1f9af07ff4e9eed0bd10f50939
diff --git a/metadata/md5-cache/acct-user/sshd-0-r1 b/metadata/md5-cache/acct-user/sshd-0-r1
deleted file mode 100644
index 1bd4ff05c646..000000000000
--- a/metadata/md5-cache/acct-user/sshd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for ssh
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sshd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c0e562c32c3c8bdc95c2071812b7eba3
diff --git a/metadata/md5-cache/acct-user/sshd-0-r2 b/metadata/md5-cache/acct-user/sshd-0-r2
new file mode 100644
index 000000000000..8505ebd96d66
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sshd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ssh
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sshd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=22655a7302a780f4afdb027779de689a
diff --git a/metadata/md5-cache/acct-user/sstpc-0 b/metadata/md5-cache/acct-user/sstpc-0
deleted file mode 100644
index e1367c7ac752..000000000000
--- a/metadata/md5-cache/acct-user/sstpc-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-misc/sstp-client
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/sstpc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=26ff0ba081be564856d064bb5a5dac30
diff --git a/metadata/md5-cache/acct-user/sstpc-0-r1 b/metadata/md5-cache/acct-user/sstpc-0-r1
new file mode 100644
index 000000000000..053f16a8ce6c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/sstpc-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/sstp-client
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/sstpc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d65b236c5d9b510334a4aaac3e8c0d39
diff --git a/metadata/md5-cache/acct-user/stdiscosrv-1 b/metadata/md5-cache/acct-user/stdiscosrv-1
deleted file mode 100644
index 5308073012de..000000000000
--- a/metadata/md5-cache/acct-user/stdiscosrv-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the Syncthing discovery server
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/syncthing
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9e7aea011b2fcf38ede0de57d684f1dd
diff --git a/metadata/md5-cache/acct-user/stdiscosrv-1-r1 b/metadata/md5-cache/acct-user/stdiscosrv-1-r1
new file mode 100644
index 000000000000..136d64d145ec
--- /dev/null
+++ b/metadata/md5-cache/acct-user/stdiscosrv-1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the Syncthing discovery server
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/syncthing
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ca4454e7647b62c783d64db86af70bb1
diff --git a/metadata/md5-cache/acct-user/steamcmd-0-r1 b/metadata/md5-cache/acct-user/steamcmd-0-r1
deleted file mode 100644
index 14e79b8f079a..000000000000
--- a/metadata/md5-cache/acct-user/steamcmd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the SteamCMD server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/steamcmd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=57c0b8da54f870ff2731178daf13e01c
diff --git a/metadata/md5-cache/acct-user/steamcmd-0-r2 b/metadata/md5-cache/acct-user/steamcmd-0-r2
new file mode 100644
index 000000000000..21b3c6b04224
--- /dev/null
+++ b/metadata/md5-cache/acct-user/steamcmd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the SteamCMD server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/steamcmd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3c54cb6e3b224418f16918b418753685
diff --git a/metadata/md5-cache/acct-user/stg-0 b/metadata/md5-cache/acct-user/stg-0
deleted file mode 100644
index d69a449ccc05..000000000000
--- a/metadata/md5-cache/acct-user/stg-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-misc/stargazer
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/stg
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5e938c6a32d35c1f2777fd9d68e2e8e5
diff --git a/metadata/md5-cache/acct-user/stg-0-r1 b/metadata/md5-cache/acct-user/stg-0-r1
new file mode 100644
index 000000000000..5d74e5e00fde
--- /dev/null
+++ b/metadata/md5-cache/acct-user/stg-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-misc/stargazer
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/stg
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=db7bb1cdf6a5a58b6de8ea3a1d42b50c
diff --git a/metadata/md5-cache/acct-user/strelaysrv-1 b/metadata/md5-cache/acct-user/strelaysrv-1
deleted file mode 100644
index 3f21e0fe998f..000000000000
--- a/metadata/md5-cache/acct-user/strelaysrv-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the Syncthing relay server
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/syncthing
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=5141e1ca02bbba20cb85b545797a786b
diff --git a/metadata/md5-cache/acct-user/strelaysrv-1-r1 b/metadata/md5-cache/acct-user/strelaysrv-1-r1
new file mode 100644
index 000000000000..f16a9303a5b1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/strelaysrv-1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the Syncthing relay server
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/syncthing
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=697124de028606f0fb7863cd61d24d7c
diff --git a/metadata/md5-cache/acct-user/stubby-0-r1 b/metadata/md5-cache/acct-user/stubby-0-r1
deleted file mode 100644
index 709eb34b5824..000000000000
--- a/metadata/md5-cache/acct-user/stubby-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Stubby program user (from net-dns/getdns)
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/stubby
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dad9418c5f8786f7742f67a99b33e494
diff --git a/metadata/md5-cache/acct-user/stubby-0-r2 b/metadata/md5-cache/acct-user/stubby-0-r2
new file mode 100644
index 000000000000..2a050d1e89d4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/stubby-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Stubby program user (from net-dns/getdns)
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/stubby
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ebe23ad900e57e1b231237ac0e3baa2a
diff --git a/metadata/md5-cache/acct-user/stunnel-0-r1 b/metadata/md5-cache/acct-user/stunnel-0-r1
deleted file mode 100644
index 1769e08d8f8a..000000000000
--- a/metadata/md5-cache/acct-user/stunnel-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for stunnel
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/stunnel
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=24e7df9ea1fb81de6677531a02dc3563
diff --git a/metadata/md5-cache/acct-user/stunnel-0-r2 b/metadata/md5-cache/acct-user/stunnel-0-r2
new file mode 100644
index 000000000000..d8a21a54f56b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/stunnel-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for stunnel
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/stunnel
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=88b1f27a4ee7f3fdb5e56a8ae15c81ef
diff --git a/metadata/md5-cache/acct-user/subsonic-0-r1 b/metadata/md5-cache/acct-user/subsonic-0-r1
deleted file mode 100644
index 9b7fcac07f7f..000000000000
--- a/metadata/md5-cache/acct-user/subsonic-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for media-sound/subsonic-bin
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/subsonic
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=947146c0ecdde24e07b429af11d5f154
diff --git a/metadata/md5-cache/acct-user/subsonic-0-r2 b/metadata/md5-cache/acct-user/subsonic-0-r2
new file mode 100644
index 000000000000..738c2dcc8aca
--- /dev/null
+++ b/metadata/md5-cache/acct-user/subsonic-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/subsonic-bin
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/subsonic
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=20dda63029ce2968c5b12f90324baf5f
diff --git a/metadata/md5-cache/acct-user/suricata-0-r1 b/metadata/md5-cache/acct-user/suricata-0-r1
deleted file mode 100644
index 25c07d0389d8..000000000000
--- a/metadata/md5-cache/acct-user/suricata-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for Suricata IDS
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/suricata
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=359e3b1d4fc42e4b54487427b2e77377
diff --git a/metadata/md5-cache/acct-user/suricata-0-r2 b/metadata/md5-cache/acct-user/suricata-0-r2
new file mode 100644
index 000000000000..ee760ccd9181
--- /dev/null
+++ b/metadata/md5-cache/acct-user/suricata-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Suricata IDS
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/suricata
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b82346e3c9d98b6efad67b42a1d49c81
diff --git a/metadata/md5-cache/acct-user/svn-0-r1 b/metadata/md5-cache/acct-user/svn-0-r1
deleted file mode 100644
index 3174dadeb7f7..000000000000
--- a/metadata/md5-cache/acct-user/svn-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: svn
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/svnusers
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9f09baed9f08f4094a310864690522bc
diff --git a/metadata/md5-cache/acct-user/svn-0-r2 b/metadata/md5-cache/acct-user/svn-0-r2
new file mode 100644
index 000000000000..b57405c7d2c7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/svn-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: svn
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/svnusers
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b5baf01ce08942ff0792666dd6a795f6
diff --git a/metadata/md5-cache/acct-user/svxlink-0 b/metadata/md5-cache/acct-user/svxlink-0
deleted file mode 100644
index cf4cd2be4efe..000000000000
--- a/metadata/md5-cache/acct-user/svxlink-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the svxlink server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/svxlink
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2541aaead3ea95a43a6ac9a09d31b355
diff --git a/metadata/md5-cache/acct-user/svxlink-0-r1 b/metadata/md5-cache/acct-user/svxlink-0-r1
new file mode 100644
index 000000000000..9201e7b8a1e8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/svxlink-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the svxlink server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/svxlink
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5feca89df572c1522c8b820133754a42
diff --git a/metadata/md5-cache/acct-user/swift-0-r1 b/metadata/md5-cache/acct-user/swift-0-r1
deleted file mode 100644
index 59d35eab931f..000000000000
--- a/metadata/md5-cache/acct-user/swift-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=USER for swift - Openstack object storage backend
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/swift
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=eefcf5a89122294a34b43f0e3588f15e
diff --git a/metadata/md5-cache/acct-user/swift-0-r2 b/metadata/md5-cache/acct-user/swift-0-r2
new file mode 100644
index 000000000000..6fafa42e494a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/swift-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=USER for swift - Openstack object storage backend
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/swift
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=941f76aaf43d2fc9fdd5c6c55e0e8745
diff --git a/metadata/md5-cache/acct-user/synapse-0 b/metadata/md5-cache/acct-user/synapse-0
deleted file mode 100644
index 42a1de0eccde..000000000000
--- a/metadata/md5-cache/acct-user/synapse-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for net-im/synapse
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/synapse
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=22766846034cf8f07928848c59804ac8
diff --git a/metadata/md5-cache/acct-user/synapse-0-r1 b/metadata/md5-cache/acct-user/synapse-0-r1
new file mode 100644
index 000000000000..98b43bd4c1bc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/synapse-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-im/synapse
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/synapse
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5e95b8b80497d3080d4d1bd74cc7d0b2
diff --git a/metadata/md5-cache/acct-user/syncthing-0-r1 b/metadata/md5-cache/acct-user/syncthing-0-r1
deleted file mode 100644
index 067f0ce6db90..000000000000
--- a/metadata/md5-cache/acct-user/syncthing-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the system-wide net-p2p/syncthing server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/syncthing
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8634d50ddbdeb3d40edff2e46bb7b46b
diff --git a/metadata/md5-cache/acct-user/syncthing-0-r2 b/metadata/md5-cache/acct-user/syncthing-0-r2
new file mode 100644
index 000000000000..03aea8598c04
--- /dev/null
+++ b/metadata/md5-cache/acct-user/syncthing-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the system-wide net-p2p/syncthing server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/syncthing
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=59cb5f9c512edd632e3a861968aa41a5
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0-r1 b/metadata/md5-cache/acct-user/systemd-coredump-0-r1
deleted file mode 100644
index 419039f83feb..000000000000
--- a/metadata/md5-cache/acct-user/systemd-coredump-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: systemd-coredump
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/systemd-coredump
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ff599e74e065a62323cb614ef7c46e62
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0-r2 b/metadata/md5-cache/acct-user/systemd-coredump-0-r2
new file mode 100644
index 000000000000..91c993e1665e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-coredump-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-coredump
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/systemd-coredump
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b14c716c71026ed3cd9e5824378f4b6d
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0-r1 b/metadata/md5-cache/acct-user/systemd-journal-remote-0-r1
deleted file mode 100644
index 8358eee64cbf..000000000000
--- a/metadata/md5-cache/acct-user/systemd-journal-remote-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: systemd-journal-remote
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/systemd-journal-remote
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2139455feae4d85cdc0875d45b2faf48
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0-r2 b/metadata/md5-cache/acct-user/systemd-journal-remote-0-r2
new file mode 100644
index 000000000000..7a6278d3853f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-journal-remote-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-journal-remote
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/systemd-journal-remote
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=d2520186e3ffce0dca975f7b2058f854
diff --git a/metadata/md5-cache/acct-user/systemd-network-0-r1 b/metadata/md5-cache/acct-user/systemd-network-0-r1
deleted file mode 100644
index 07eaa1d56357..000000000000
--- a/metadata/md5-cache/acct-user/systemd-network-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: systemd-network
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/systemd-network
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=35aa7c0223abe3242fba2e1a3d6e163f
diff --git a/metadata/md5-cache/acct-user/systemd-network-0-r2 b/metadata/md5-cache/acct-user/systemd-network-0-r2
new file mode 100644
index 000000000000..c1c1ef89eece
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-network-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-network
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/systemd-network
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9d46997e180c48b430a0749505923823
diff --git a/metadata/md5-cache/acct-user/systemd-oom-0 b/metadata/md5-cache/acct-user/systemd-oom-0
deleted file mode 100644
index 240e818fb4ba..000000000000
--- a/metadata/md5-cache/acct-user/systemd-oom-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: systemd-oom
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/systemd-oom
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=828e9d908c0b690438ddf7a91d15eeb8
diff --git a/metadata/md5-cache/acct-user/systemd-oom-0-r1 b/metadata/md5-cache/acct-user/systemd-oom-0-r1
new file mode 100644
index 000000000000..a7c240b56541
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-oom-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-oom
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/systemd-oom
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c5962b120acd016f0dbd4b862bb6e58a
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0-r1 b/metadata/md5-cache/acct-user/systemd-resolve-0-r1
deleted file mode 100644
index 4325ac4b96e6..000000000000
--- a/metadata/md5-cache/acct-user/systemd-resolve-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: systemd-resolve
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/systemd-resolve
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d4c6e591bedc130720420e0359894980
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0-r2 b/metadata/md5-cache/acct-user/systemd-resolve-0-r2
new file mode 100644
index 000000000000..65ad1f7d2082
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-resolve-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-resolve
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/systemd-resolve
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=83e17c212bb1752314cc8225956ca4ad
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0-r1 b/metadata/md5-cache/acct-user/systemd-timesync-0-r1
deleted file mode 100644
index d84c1f723734..000000000000
--- a/metadata/md5-cache/acct-user/systemd-timesync-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: systemd-timesync
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/systemd-timesync
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=675b0a6372a26f893ff19b558798b183
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0-r2 b/metadata/md5-cache/acct-user/systemd-timesync-0-r2
new file mode 100644
index 000000000000..9a6a5f7a5d23
--- /dev/null
+++ b/metadata/md5-cache/acct-user/systemd-timesync-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: systemd-timesync
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/systemd-timesync
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e931f2d239999cd545825aadc78cbdf3
diff --git a/metadata/md5-cache/acct-user/taskd-0 b/metadata/md5-cache/acct-user/taskd-0
deleted file mode 100644
index 188cf36781c3..000000000000
--- a/metadata/md5-cache/acct-user/taskd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-misc/taskd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/taskd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1d2e8518c73330103820b072845422be
diff --git a/metadata/md5-cache/acct-user/taskd-0-r1 b/metadata/md5-cache/acct-user/taskd-0-r1
new file mode 100644
index 000000000000..75364bf9d14b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/taskd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-misc/taskd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/taskd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=e1d98fa071bf90bbb9ff3e1521d69dc3
diff --git a/metadata/md5-cache/acct-user/teamspeak-0-r1 b/metadata/md5-cache/acct-user/teamspeak-0-r1
deleted file mode 100644
index baf31c20ae4e..000000000000
--- a/metadata/md5-cache/acct-user/teamspeak-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the TeamSpeak server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/teamspeak
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=30f3154ba85ed7a24924349205d9b5d6
diff --git a/metadata/md5-cache/acct-user/teamspeak-0-r2 b/metadata/md5-cache/acct-user/teamspeak-0-r2
new file mode 100644
index 000000000000..bd4cc3f4cabf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/teamspeak-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the TeamSpeak server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/teamspeak
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5536c7aa600645b03dccad773ca52ab3
diff --git a/metadata/md5-cache/acct-user/telegraf-0-r1 b/metadata/md5-cache/acct-user/telegraf-0-r1
deleted file mode 100644
index 631b0dafa808..000000000000
--- a/metadata/md5-cache/acct-user/telegraf-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for telegraf
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/telegraf
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ca11caddf344e5bf7ed334f2c28deea2
diff --git a/metadata/md5-cache/acct-user/telegraf-0-r2 b/metadata/md5-cache/acct-user/telegraf-0-r2
new file mode 100644
index 000000000000..16f8bce24c05
--- /dev/null
+++ b/metadata/md5-cache/acct-user/telegraf-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for telegraf
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/telegraf
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b6ab92558410af4e9631e2b86569ee57
diff --git a/metadata/md5-cache/acct-user/tenshi-0 b/metadata/md5-cache/acct-user/tenshi-0
deleted file mode 100644
index 2f9b845172b5..000000000000
--- a/metadata/md5-cache/acct-user/tenshi-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for app-admin/tenshi
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/tenshi
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f1f7ed3a0468567bb598926b45d5af6e
diff --git a/metadata/md5-cache/acct-user/tenshi-0-r1 b/metadata/md5-cache/acct-user/tenshi-0-r1
new file mode 100644
index 000000000000..ee197ca836c6
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tenshi-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for app-admin/tenshi
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/tenshi
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=50006eb69af26e8ce2f8bd01d0cd67ba
diff --git a/metadata/md5-cache/acct-user/thttpd-0 b/metadata/md5-cache/acct-user/thttpd-0
deleted file mode 100644
index b108230f8884..000000000000
--- a/metadata/md5-cache/acct-user/thttpd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for www-servers/thttpd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/thttpd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9c500ca5a145e084bac10369aeb83b26
diff --git a/metadata/md5-cache/acct-user/thttpd-0-r1 b/metadata/md5-cache/acct-user/thttpd-0-r1
new file mode 100644
index 000000000000..baf9270330c7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/thttpd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-servers/thttpd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/thttpd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=9c65fe4eadca1bb171ce53cc8f7d902c
diff --git a/metadata/md5-cache/acct-user/timidity-0 b/metadata/md5-cache/acct-user/timidity-0
deleted file mode 100644
index 8e0d2b964e0f..000000000000
--- a/metadata/md5-cache/acct-user/timidity-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for media-sound/timidity++
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nobody
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dc5b0fb040e298e0fb31721f23f9d59f
diff --git a/metadata/md5-cache/acct-user/timidity-0-r1 b/metadata/md5-cache/acct-user/timidity-0-r1
new file mode 100644
index 000000000000..3143560c3ada
--- /dev/null
+++ b/metadata/md5-cache/acct-user/timidity-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for media-sound/timidity++
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nobody
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6ce523f243bea3c99522901145ff7862
diff --git a/metadata/md5-cache/acct-user/tinydns-0 b/metadata/md5-cache/acct-user/tinydns-0
deleted file mode 100644
index 16c1af88f086..000000000000
--- a/metadata/md5-cache/acct-user/tinydns-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: tinydns
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6e22480e1629f7e0397ff6077070b8b3
diff --git a/metadata/md5-cache/acct-user/tinydns-0-r1 b/metadata/md5-cache/acct-user/tinydns-0-r1
new file mode 100644
index 000000000000..041b687378fb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tinydns-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: tinydns
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/nofiles
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=0c937e23d9a04f5d6d90bbb4a56f20d6
diff --git a/metadata/md5-cache/acct-user/tinyproxy-0 b/metadata/md5-cache/acct-user/tinyproxy-0
deleted file mode 100644
index 95ee4016882d..000000000000
--- a/metadata/md5-cache/acct-user/tinyproxy-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=uid for net-proxy/tinyproxy
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/tinyproxy
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f8a278d8d65befb0bdd747828e73181a
diff --git a/metadata/md5-cache/acct-user/tinyproxy-0-r1 b/metadata/md5-cache/acct-user/tinyproxy-0-r1
new file mode 100644
index 000000000000..c3f9d25ffe26
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tinyproxy-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-proxy/tinyproxy
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/tinyproxy
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=cf08585af6ed10ffe0f29a6a7fec883b
diff --git a/metadata/md5-cache/acct-user/tomcat-0 b/metadata/md5-cache/acct-user/tomcat-0
deleted file mode 100644
index cf5719432ef4..000000000000
--- a/metadata/md5-cache/acct-user/tomcat-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for Apache Tomcat
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/tomcat
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3da2a4090298f42182774d22aea7b669
diff --git a/metadata/md5-cache/acct-user/tomcat-0-r1 b/metadata/md5-cache/acct-user/tomcat-0-r1
new file mode 100644
index 000000000000..ddb188fac400
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tomcat-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Apache Tomcat
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/tomcat
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c03b970aa5e312ad053d9d7042bc9f81
diff --git a/metadata/md5-cache/acct-user/tor-0-r1 b/metadata/md5-cache/acct-user/tor-0-r1
deleted file mode 100644
index 302423c7c589..000000000000
--- a/metadata/md5-cache/acct-user/tor-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for tor daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/tor
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=874803105392accc58cdf0dc0e5fef9f
diff --git a/metadata/md5-cache/acct-user/tor-0-r2 b/metadata/md5-cache/acct-user/tor-0-r2
new file mode 100644
index 000000000000..7830e366fe6a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tor-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for tor daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/tor
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=763d5a4316de083c8a818331d4cd60ee
diff --git a/metadata/md5-cache/acct-user/tox-0-r1 b/metadata/md5-cache/acct-user/tox-0-r1
deleted file mode 100644
index 9eeb342de62f..000000000000
--- a/metadata/md5-cache/acct-user/tox-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for package net-libs/tox
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/tox
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d119a7fc2dbf482047d67275d5a6b119
diff --git a/metadata/md5-cache/acct-user/tox-0-r2 b/metadata/md5-cache/acct-user/tox-0-r2
new file mode 100644
index 000000000000..aba007618ecd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tox-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for package net-libs/tox
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/tox
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5a68c92369d8b35c1c0621dc3635dc27
diff --git a/metadata/md5-cache/acct-user/tpm-0 b/metadata/md5-cache/acct-user/tpm-0
deleted file mode 100644
index 88bb08ed2297..000000000000
--- a/metadata/md5-cache/acct-user/tpm-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: tpm
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/tpm
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e9be42621a97dac873fd3dc17730210a
diff --git a/metadata/md5-cache/acct-user/tpm-0-r1 b/metadata/md5-cache/acct-user/tpm-0-r1
new file mode 100644
index 000000000000..d5a0680acb30
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tpm-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: tpm
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/tpm
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4d56c00ac3812ab423dab273c9b8f966
diff --git a/metadata/md5-cache/acct-user/transmission-1-r1 b/metadata/md5-cache/acct-user/transmission-1-r1
deleted file mode 100644
index 871f6a72c253..000000000000
--- a/metadata/md5-cache/acct-user/transmission-1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: transmission
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/transmission
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9f6537f41d1a6d8e6ce5eed2b3900c21
diff --git a/metadata/md5-cache/acct-user/transmission-1-r2 b/metadata/md5-cache/acct-user/transmission-1-r2
new file mode 100644
index 000000000000..41873e324ab3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/transmission-1-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: transmission
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/transmission
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=71d5c89a0539229ebd2a56253cf8b9e1
diff --git a/metadata/md5-cache/acct-user/trickster-0 b/metadata/md5-cache/acct-user/trickster-0
deleted file mode 100644
index 0c285444ba3f..000000000000
--- a/metadata/md5-cache/acct-user/trickster-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for www-apps/trickster
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/trickster
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=66e34fa9cec2b5e6560f5714c0a10b14
diff --git a/metadata/md5-cache/acct-user/trickster-0-r1 b/metadata/md5-cache/acct-user/trickster-0-r1
new file mode 100644
index 000000000000..0a992e905ec9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/trickster-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/trickster
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/trickster
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ee08b086a58679311b139285ac4b95c2
diff --git a/metadata/md5-cache/acct-user/trojan-0 b/metadata/md5-cache/acct-user/trojan-0
deleted file mode 100644
index 29d75b743d0c..000000000000
--- a/metadata/md5-cache/acct-user/trojan-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-proxy/trojan
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/trojan
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=66569f052664a362c1e721776e81158a
diff --git a/metadata/md5-cache/acct-user/trojan-0-r1 b/metadata/md5-cache/acct-user/trojan-0-r1
new file mode 100644
index 000000000000..4262ab148072
--- /dev/null
+++ b/metadata/md5-cache/acct-user/trojan-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-proxy/trojan
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/trojan
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fcbc08bf02771f0fe33052802c6a946e
diff --git a/metadata/md5-cache/acct-user/tss-0-r1 b/metadata/md5-cache/acct-user/tss-0-r1
deleted file mode 100644
index 24e4e81e3a95..000000000000
--- a/metadata/md5-cache/acct-user/tss-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Trusted Software Stack for TPMs user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/tss
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1c306a517ff5660f2ee14e8b43aba2d6
diff --git a/metadata/md5-cache/acct-user/tss-0-r2 b/metadata/md5-cache/acct-user/tss-0-r2
new file mode 100644
index 000000000000..68fd74ee4c5d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tss-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=Trusted Software Stack for TPMs user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/tss
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a0da971d2c9378980e7c4f7afd9e952b
diff --git a/metadata/md5-cache/acct-user/ttrssd-0 b/metadata/md5-cache/acct-user/ttrssd-0
deleted file mode 100644
index 35fe157b6fe3..000000000000
--- a/metadata/md5-cache/acct-user/ttrssd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for www-apps/tt-rss
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ttrssd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e56ddbd6aa76e344a381b1080934e987
diff --git a/metadata/md5-cache/acct-user/ttrssd-0-r1 b/metadata/md5-cache/acct-user/ttrssd-0-r1
new file mode 100644
index 000000000000..3339e27a1ef5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ttrssd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-apps/tt-rss
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ttrssd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2afd8110b4c65a266a0e325be3e49d6f
diff --git a/metadata/md5-cache/acct-user/turnserver-0-r1 b/metadata/md5-cache/acct-user/turnserver-0-r1
deleted file mode 100644
index 4b1cb7ca5262..000000000000
--- a/metadata/md5-cache/acct-user/turnserver-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for a turn server like coturn
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/turnserver
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4013a7a3d0ccb561a03e9f7792891b50
diff --git a/metadata/md5-cache/acct-user/turnserver-0-r2 b/metadata/md5-cache/acct-user/turnserver-0-r2
new file mode 100644
index 000000000000..6182991b837f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/turnserver-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for a turn server like coturn
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/turnserver
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=aa6d3ef7d3dde357cc7a70f77ec000e5
diff --git a/metadata/md5-cache/acct-user/tvheadend-0-r1 b/metadata/md5-cache/acct-user/tvheadend-0-r1
deleted file mode 100644
index 6da0cd2fca72..000000000000
--- a/metadata/md5-cache/acct-user/tvheadend-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for tvheadend
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ccc406bad5028a0904cdf1f4f17031af
diff --git a/metadata/md5-cache/acct-user/tvheadend-0-r2 b/metadata/md5-cache/acct-user/tvheadend-0-r2
new file mode 100644
index 000000000000..cf9fef1fbd52
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tvheadend-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for tvheadend
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=af77e6dc96586845c76bed88cb78e39f
diff --git a/metadata/md5-cache/acct-user/ulogd-0 b/metadata/md5-cache/acct-user/ulogd-0
deleted file mode 100644
index 40fdaef11a6b..000000000000
--- a/metadata/md5-cache/acct-user/ulogd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for ulogd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ulogd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=3cad380b56f4afece28f72f9d6b80137
diff --git a/metadata/md5-cache/acct-user/ulogd-0-r1 b/metadata/md5-cache/acct-user/ulogd-0-r1
new file mode 100644
index 000000000000..0c90a3d644a4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ulogd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ulogd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ulogd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5a774143f06c26bc6d3b96f7c7351b09
diff --git a/metadata/md5-cache/acct-user/ultimaker-0-r1 b/metadata/md5-cache/acct-user/ultimaker-0-r1
deleted file mode 100644
index 79f1ac9c873a..000000000000
--- a/metadata/md5-cache/acct-user/ultimaker-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for ultimaker
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ultimaker
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=ffa93dc5bcb5d4062066bfaca928a80a
diff --git a/metadata/md5-cache/acct-user/ultimaker-0-r2 b/metadata/md5-cache/acct-user/ultimaker-0-r2
new file mode 100644
index 000000000000..84e39aa4afcf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ultimaker-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for ultimaker
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ultimaker
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6efdbae398bbeb62936fd4ba59feb071
diff --git a/metadata/md5-cache/acct-user/unbound-0-r1 b/metadata/md5-cache/acct-user/unbound-0-r1
deleted file mode 100644
index 8b17949816d7..000000000000
--- a/metadata/md5-cache/acct-user/unbound-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=unbound program user
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/unbound
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d63b390deeb7da3d5a9b59159b9366d7
diff --git a/metadata/md5-cache/acct-user/unbound-0-r2 b/metadata/md5-cache/acct-user/unbound-0-r2
new file mode 100644
index 000000000000..c94dd94ecf8a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unbound-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=unbound program user
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/unbound
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f29b20036f66bde4000d833bf0b712c6
diff --git a/metadata/md5-cache/acct-user/unbound-telemetry-1 b/metadata/md5-cache/acct-user/unbound-telemetry-1
deleted file mode 100644
index 4ce2c5a8ce0b..000000000000
--- a/metadata/md5-cache/acct-user/unbound-telemetry-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for unbound-telemetry
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/unbound-telemetry acct-group/unbound
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d753bdd3aabf6d287588a3a5fb3147c0
diff --git a/metadata/md5-cache/acct-user/unbound-telemetry-1-r1 b/metadata/md5-cache/acct-user/unbound-telemetry-1-r1
new file mode 100644
index 000000000000..22d86ea8dbbc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unbound-telemetry-1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for unbound-telemetry
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/unbound-telemetry acct-group/unbound
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f6d46b829efe849080dd4af0ef8a54f8
diff --git a/metadata/md5-cache/acct-user/unifi-0-r1 b/metadata/md5-cache/acct-user/unifi-0-r1
deleted file mode 100644
index 07e8479d6e7d..000000000000
--- a/metadata/md5-cache/acct-user/unifi-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for the UniFi Controller
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/unifi
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=140aee447d2e30b63cb43eb64449884b
diff --git a/metadata/md5-cache/acct-user/unifi-0-r2 b/metadata/md5-cache/acct-user/unifi-0-r2
new file mode 100644
index 000000000000..05c07c4eda83
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unifi-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for the UniFi Controller
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/unifi
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=140aee447d2e30b63cb43eb64449884b
diff --git a/metadata/md5-cache/acct-user/unifi-video-0 b/metadata/md5-cache/acct-user/unifi-video-0
deleted file mode 100644
index ccf37b14b241..000000000000
--- a/metadata/md5-cache/acct-user/unifi-video-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for Unifi Video
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/unifi-video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=58908b81961a3de83c7534bf5297a26e
diff --git a/metadata/md5-cache/acct-user/unifi-video-0-r1 b/metadata/md5-cache/acct-user/unifi-video-0-r1
new file mode 100644
index 000000000000..d7f568ae1f9a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unifi-video-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Unifi Video
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/unifi-video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=da1741c8634bb302c2ce34e0cb20ca32
diff --git a/metadata/md5-cache/acct-user/unrealircd-0-r1 b/metadata/md5-cache/acct-user/unrealircd-0-r1
deleted file mode 100644
index f1b81cd39753..000000000000
--- a/metadata/md5-cache/acct-user/unrealircd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: unrealircd
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/unrealircd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=0669f5ed12b3aa06e4cd27618f2a5af4
diff --git a/metadata/md5-cache/acct-user/unrealircd-0-r2 b/metadata/md5-cache/acct-user/unrealircd-0-r2
new file mode 100644
index 000000000000..60ffafa64d27
--- /dev/null
+++ b/metadata/md5-cache/acct-user/unrealircd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: unrealircd
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/unrealircd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=a73a2ff831a43d1492a97f954d278c79
diff --git a/metadata/md5-cache/acct-user/upmpdcli-0 b/metadata/md5-cache/acct-user/upmpdcli-0
deleted file mode 100644
index 20a8f07b7887..000000000000
--- a/metadata/md5-cache/acct-user/upmpdcli-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for upmpdcli
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/upmpdcli
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=e562ef7ddc0b50ebe55452aeeeae95d9
diff --git a/metadata/md5-cache/acct-user/upmpdcli-0-r1 b/metadata/md5-cache/acct-user/upmpdcli-0-r1
new file mode 100644
index 000000000000..b18e872305c1
--- /dev/null
+++ b/metadata/md5-cache/acct-user/upmpdcli-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for upmpdcli
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/upmpdcli
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c6a393235eb8362dbd52fb2e7652f54f
diff --git a/metadata/md5-cache/acct-user/uptimed-0-r2 b/metadata/md5-cache/acct-user/uptimed-0-r2
deleted file mode 100644
index 74cd42e56fc1..000000000000
--- a/metadata/md5-cache/acct-user/uptimed-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for uptime daemon
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/uptimed
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=13cb97901ad8e72e774c0297ea096614
diff --git a/metadata/md5-cache/acct-user/uptimed-0-r3 b/metadata/md5-cache/acct-user/uptimed-0-r3
new file mode 100644
index 000000000000..9c6dc14261bf
--- /dev/null
+++ b/metadata/md5-cache/acct-user/uptimed-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for uptime daemon
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/uptimed
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3063282fa511ffa39e3c9c7fde38c36a
diff --git a/metadata/md5-cache/acct-user/usbmux-0-r1 b/metadata/md5-cache/acct-user/usbmux-0-r1
deleted file mode 100644
index c4e442aa9f76..000000000000
--- a/metadata/md5-cache/acct-user/usbmux-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the usbmuxd daemon
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/usb acct-group/plugdev
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=1c3258ad673bb8f6303fc6f1e9014891
diff --git a/metadata/md5-cache/acct-user/usbmux-0-r2 b/metadata/md5-cache/acct-user/usbmux-0-r2
new file mode 100644
index 000000000000..d9de695fa72e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/usbmux-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the usbmuxd daemon
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/usb acct-group/plugdev
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=23247dfab740bfe8f1fc9906a471fa88
diff --git a/metadata/md5-cache/acct-user/ushare-0 b/metadata/md5-cache/acct-user/ushare-0
deleted file mode 100644
index adea857015b5..000000000000
--- a/metadata/md5-cache/acct-user/ushare-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for uShare
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ushare
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bb579492038eb6d399120fed664fdeac
diff --git a/metadata/md5-cache/acct-user/ushare-0-r1 b/metadata/md5-cache/acct-user/ushare-0-r1
new file mode 100644
index 000000000000..4734afd2ed2b
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ushare-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for uShare
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ushare
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=22da19d63f09c2ff740fb72f275609e7
diff --git a/metadata/md5-cache/acct-user/uwsgi_exporter-0 b/metadata/md5-cache/acct-user/uwsgi_exporter-0
deleted file mode 100644
index 7abc9fb73467..000000000000
--- a/metadata/md5-cache/acct-user/uwsgi_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/uwsgi_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/uwsgi_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=bce237357cc3aea7b4e44bfbdb78fc67
diff --git a/metadata/md5-cache/acct-user/uwsgi_exporter-0-r1 b/metadata/md5-cache/acct-user/uwsgi_exporter-0-r1
new file mode 100644
index 000000000000..5beca75438e8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/uwsgi_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/uwsgi_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/uwsgi_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=fb9e355333b0018d37d27eef81698c03
diff --git a/metadata/md5-cache/acct-user/vacation-0 b/metadata/md5-cache/acct-user/vacation-0
deleted file mode 100644
index 8a5d76b12302..000000000000
--- a/metadata/md5-cache/acct-user/vacation-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for www-apps/postfixadmin
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/vacation
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=93d1164c3c05d824a1e108903f829977
diff --git a/metadata/md5-cache/acct-user/vacation-0-r1 b/metadata/md5-cache/acct-user/vacation-0-r1
new file mode 100644
index 000000000000..952b0f7fe357
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vacation-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/postfixadmin
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/vacation
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=dcea25862e075f4690e7f90bc9f5cea5
diff --git a/metadata/md5-cache/acct-user/varnish-0-r1 b/metadata/md5-cache/acct-user/varnish-0-r1
deleted file mode 100644
index 308ef82a77ce..000000000000
--- a/metadata/md5-cache/acct-user/varnish-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for varnish
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/varnish
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=05fb013295a49761d6a3aaeff7e2c6a2
diff --git a/metadata/md5-cache/acct-user/varnish-0-r2 b/metadata/md5-cache/acct-user/varnish-0-r2
new file mode 100644
index 000000000000..96caaac3e734
--- /dev/null
+++ b/metadata/md5-cache/acct-user/varnish-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for varnish
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/varnish
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=5145b8674a7b955c85d5dec8e10ad474
diff --git a/metadata/md5-cache/acct-user/vault-0-r1 b/metadata/md5-cache/acct-user/vault-0-r1
deleted file mode 100644
index 5ba1b893dc5c..000000000000
--- a/metadata/md5-cache/acct-user/vault-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for vault
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/vault
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=2bdea5cbe607857e5b214dd095c630bc
diff --git a/metadata/md5-cache/acct-user/vault-0-r2 b/metadata/md5-cache/acct-user/vault-0-r2
new file mode 100644
index 000000000000..a8a066933ae4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vault-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for vault
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/vault
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=2f9661756b47baa0310680389c4420cd
diff --git a/metadata/md5-cache/acct-user/vault_exporter-0 b/metadata/md5-cache/acct-user/vault_exporter-0
deleted file mode 100644
index e94ab7217473..000000000000
--- a/metadata/md5-cache/acct-user/vault_exporter-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for app-metrics/vault_exporter
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/vault_exporter
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=79ada0a6e124706fee0f4f6bba09eb9a
diff --git a/metadata/md5-cache/acct-user/vault_exporter-0-r1 b/metadata/md5-cache/acct-user/vault_exporter-0-r1
new file mode 100644
index 000000000000..53ea9e897dd8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vault_exporter-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-metrics/vault_exporter
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/vault_exporter
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=052f4d5a9171f01205bfb9368e7d05fb
diff --git a/metadata/md5-cache/acct-user/vboxguest-0-r1 b/metadata/md5-cache/acct-user/vboxguest-0-r1
deleted file mode 100644
index 7c4a4e34dc1a..000000000000
--- a/metadata/md5-cache/acct-user/vboxguest-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for virtualbox-guest-additions
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/vboxguest
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=8d69f31321109c602783715929a10708
diff --git a/metadata/md5-cache/acct-user/vboxguest-0-r2 b/metadata/md5-cache/acct-user/vboxguest-0-r2
new file mode 100644
index 000000000000..c843156aeedc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vboxguest-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for virtualbox-guest-additions
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/vboxguest
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c13666a3cab89c6198a2b225352cb10f
diff --git a/metadata/md5-cache/acct-user/vdr-0-r1 b/metadata/md5-cache/acct-user/vdr-0-r1
deleted file mode 100644
index d13beb13bcdf..000000000000
--- a/metadata/md5-cache/acct-user/vdr-0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend setup
-DESCRIPTION=VDR (VideoDiskRecorder) service user
-EAPI=8
-INHERIT=acct-user user-info
-IUSE=graphlcd legacy-homedir remote serial systemd
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/vdr acct-group/audio acct-group/cdrom acct-group/video
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c478d32f07c2efcd5f2784ab9f88b0bc
diff --git a/metadata/md5-cache/acct-user/vdr-0-r2 b/metadata/md5-cache/acct-user/vdr-0-r2
new file mode 100644
index 000000000000..ff385aa1287f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vdr-0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend setup
+DESCRIPTION=VDR (VideoDiskRecorder) service user
+EAPI=8
+INHERIT=acct-user user-info
+IUSE=graphlcd legacy-homedir remote serial systemd
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/vdr acct-group/audio acct-group/cdrom acct-group/video
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=1c5da8a0a72bbdd38a83b879a5886bbc
diff --git a/metadata/md5-cache/acct-user/vdradmin-0-r1 b/metadata/md5-cache/acct-user/vdradmin-0-r1
deleted file mode 100644
index 78ac4363f151..000000000000
--- a/metadata/md5-cache/acct-user/vdradmin-0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DEPEND=acct-group/vdradmin
-DESCRIPTION=User for www-misc/vdradmin-am
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/vdradmin acct-group/vdradmin
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=004499dde41951d348d8001223830421
diff --git a/metadata/md5-cache/acct-user/vdradmin-0-r2 b/metadata/md5-cache/acct-user/vdradmin-0-r2
new file mode 100644
index 000000000000..ba78f09219c7
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vdradmin-0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DEPEND=acct-group/vdradmin
+DESCRIPTION=User for www-misc/vdradmin-am
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/vdradmin acct-group/vdradmin
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=3a173db2c9f6bf7fe2bf061aa7c307c2
diff --git a/metadata/md5-cache/acct-user/vnstat-0 b/metadata/md5-cache/acct-user/vnstat-0
deleted file mode 100644
index b7d83f880d95..000000000000
--- a/metadata/md5-cache/acct-user/vnstat-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for vnstat network monitoring
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/vnstat
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=4b60d79f793713ae54e494fc90987c4b
diff --git a/metadata/md5-cache/acct-user/vnstat-0-r1 b/metadata/md5-cache/acct-user/vnstat-0-r1
new file mode 100644
index 000000000000..2c72ce1990e8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vnstat-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for vnstat network monitoring
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/vnstat
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=31dd974458095badc658b37b84c6050e
diff --git a/metadata/md5-cache/acct-user/vpopmail-0-r1 b/metadata/md5-cache/acct-user/vpopmail-0-r1
deleted file mode 100644
index 798fca0d3545..000000000000
--- a/metadata/md5-cache/acct-user/vpopmail-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for vpopmail
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/vpopmail
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=74dc93285157ae710df15422176a657f
diff --git a/metadata/md5-cache/acct-user/vpopmail-0-r2 b/metadata/md5-cache/acct-user/vpopmail-0-r2
new file mode 100644
index 000000000000..f36b4ee65b72
--- /dev/null
+++ b/metadata/md5-cache/acct-user/vpopmail-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for vpopmail
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/vpopmail
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=ab7bd8975f8f5fc89a533389b3b54229
diff --git a/metadata/md5-cache/acct-user/wesnoth-0-r1 b/metadata/md5-cache/acct-user/wesnoth-0-r1
deleted file mode 100644
index 9f8fa9670e21..000000000000
--- a/metadata/md5-cache/acct-user/wesnoth-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=user for games-strategy/wesnoth
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/wesnoth
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=dc7474e38fed68604dd6e2b4cd0c88b8
diff --git a/metadata/md5-cache/acct-user/wesnoth-0-r2 b/metadata/md5-cache/acct-user/wesnoth-0-r2
new file mode 100644
index 000000000000..d01b60bdb838
--- /dev/null
+++ b/metadata/md5-cache/acct-user/wesnoth-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for games-strategy/wesnoth
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/wesnoth
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b63868288e6b308dd6e6fe4ea0e8dd70
diff --git a/metadata/md5-cache/acct-user/wwwoffle-0 b/metadata/md5-cache/acct-user/wwwoffle-0
deleted file mode 100644
index 3fcb0f6cef06..000000000000
--- a/metadata/md5-cache/acct-user/wwwoffle-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-proxy/wwwoffle
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/wwwoffle
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=45638756d1cd1930678802c45e229e67
diff --git a/metadata/md5-cache/acct-user/wwwoffle-0-r1 b/metadata/md5-cache/acct-user/wwwoffle-0-r1
new file mode 100644
index 000000000000..aea43303fe6c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/wwwoffle-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-proxy/wwwoffle
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/wwwoffle
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=b986db4854c770831eb3e97e2ed9355e
diff --git a/metadata/md5-cache/acct-user/x2goprint-0-r1 b/metadata/md5-cache/acct-user/x2goprint-0-r1
deleted file mode 100644
index fa9361e38db5..000000000000
--- a/metadata/md5-cache/acct-user/x2goprint-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-misc/x2goserver
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/x2goprint
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=46919a59e339a99732b698bd46596e85
diff --git a/metadata/md5-cache/acct-user/x2goprint-0-r2 b/metadata/md5-cache/acct-user/x2goprint-0-r2
new file mode 100644
index 000000000000..9023a835dae8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/x2goprint-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/x2goserver
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/x2goprint
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=4ee03528c03db56c230dd18226911063
diff --git a/metadata/md5-cache/acct-user/x2gouser-0-r1 b/metadata/md5-cache/acct-user/x2gouser-0-r1
deleted file mode 100644
index 85014badbd7c..000000000000
--- a/metadata/md5-cache/acct-user/x2gouser-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-misc/x2goserver
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/x2gouser
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=80ea0942cf5200396c8fb5924c67b95c
diff --git a/metadata/md5-cache/acct-user/x2gouser-0-r2 b/metadata/md5-cache/acct-user/x2gouser-0-r2
new file mode 100644
index 000000000000..48723cf204bc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/x2gouser-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-misc/x2goserver
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/x2gouser
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=33f25b080d070a2b8631d395f41168cc
diff --git a/metadata/md5-cache/acct-user/xrootd-0-r1 b/metadata/md5-cache/acct-user/xrootd-0-r1
deleted file mode 100644
index e6dc98ce6826..000000000000
--- a/metadata/md5-cache/acct-user/xrootd-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the XRootD server
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/xrootd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c77806ad7e73aa8624cec346f44db023
diff --git a/metadata/md5-cache/acct-user/xrootd-0-r2 b/metadata/md5-cache/acct-user/xrootd-0-r2
new file mode 100644
index 000000000000..cfc001e0ec06
--- /dev/null
+++ b/metadata/md5-cache/acct-user/xrootd-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the XRootD server
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/xrootd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=00171db0618e2d74ce7b3d22f0afe318
diff --git a/metadata/md5-cache/acct-user/yubihsm-connector-0 b/metadata/md5-cache/acct-user/yubihsm-connector-0
deleted file mode 100644
index 0201765bcd76..000000000000
--- a/metadata/md5-cache/acct-user/yubihsm-connector-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for the yubihsm-connector service
-EAPI=8
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/yubihsm-connector
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=f40511914cd3fd4ad0eeeb80bfc89b60
diff --git a/metadata/md5-cache/acct-user/yubihsm-connector-0-r1 b/metadata/md5-cache/acct-user/yubihsm-connector-0-r1
new file mode 100644
index 000000000000..f0fd96966f92
--- /dev/null
+++ b/metadata/md5-cache/acct-user/yubihsm-connector-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the yubihsm-connector service
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/yubihsm-connector
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=f40511914cd3fd4ad0eeeb80bfc89b60
diff --git a/metadata/md5-cache/acct-user/zabbix-0 b/metadata/md5-cache/acct-user/zabbix-0
deleted file mode 100644
index 52eb672848ea..000000000000
--- a/metadata/md5-cache/acct-user/zabbix-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for Zabbix
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/zabbix
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=267e3d4f50e7c0889b5a3dbc7887c0d4
diff --git a/metadata/md5-cache/acct-user/zabbix-0-r1 b/metadata/md5-cache/acct-user/zabbix-0-r1
new file mode 100644
index 000000000000..da0937f975a4
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zabbix-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Zabbix
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/zabbix
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=706d7c48795f2a49df5f30c1f8c89d40
diff --git a/metadata/md5-cache/acct-user/zeppelin-0-r1 b/metadata/md5-cache/acct-user/zeppelin-0-r1
deleted file mode 100644
index 32be5d44dc8b..000000000000
--- a/metadata/md5-cache/acct-user/zeppelin-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for system-wide www-apps/zeppelin-bin
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/zeppelin
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=475964f0f96b999b434a22b94bdc9f9f
diff --git a/metadata/md5-cache/acct-user/zeppelin-0-r2 b/metadata/md5-cache/acct-user/zeppelin-0-r2
new file mode 100644
index 000000000000..7704165081fd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zeppelin-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for system-wide www-apps/zeppelin-bin
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/zeppelin
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=90ad99b6fee751c9db82f5512ef53134
diff --git a/metadata/md5-cache/acct-user/zetcd-0 b/metadata/md5-cache/acct-user/zetcd-0
deleted file mode 100644
index 09f5c5a5a5a2..000000000000
--- a/metadata/md5-cache/acct-user/zetcd-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for sys-cluster/zetcd
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/zetcd
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=110d58422e4b9e9fb66d1030ccd55f02
diff --git a/metadata/md5-cache/acct-user/zetcd-0-r1 b/metadata/md5-cache/acct-user/zetcd-0-r1
new file mode 100644
index 000000000000..038fd8fdea96
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zetcd-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for sys-cluster/zetcd
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/zetcd
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=13dcf097e5a16623be7e14f59b6f2662
diff --git a/metadata/md5-cache/acct-user/ziproxy-0 b/metadata/md5-cache/acct-user/ziproxy-0
deleted file mode 100644
index 04c7420b49d8..000000000000
--- a/metadata/md5-cache/acct-user/ziproxy-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: ziproxy
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/ziproxy
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=a9eb5ded26a2797ecba61be37d1fbc09
diff --git a/metadata/md5-cache/acct-user/ziproxy-0-r1 b/metadata/md5-cache/acct-user/ziproxy-0-r1
new file mode 100644
index 000000000000..8637b19e687c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ziproxy-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: ziproxy
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/ziproxy
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=28698ec7166ce563f5465040dca3152f
diff --git a/metadata/md5-cache/acct-user/znc-0-r1 b/metadata/md5-cache/acct-user/znc-0-r1
deleted file mode 100644
index d903ca8c7f5c..000000000000
--- a/metadata/md5-cache/acct-user/znc-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for net-irc/znc
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/znc
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=c38432bb2a7740a6809d1346fe6394c9
diff --git a/metadata/md5-cache/acct-user/znc-0-r2 b/metadata/md5-cache/acct-user/znc-0-r2
new file mode 100644
index 000000000000..fc36fd8ad9e3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/znc-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-irc/znc
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/znc
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6a54bac3032ea6e364a898f029f839b7
diff --git a/metadata/md5-cache/acct-user/zookeeper-0 b/metadata/md5-cache/acct-user/zookeeper-0
deleted file mode 100644
index 8db8d7d5a65f..000000000000
--- a/metadata/md5-cache/acct-user/zookeeper-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=A user for sys-cluster/zookeeper-bin
-EAPI=7
-INHERIT=acct-user
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=acct-group/zookeeper
-SLOT=0
-_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=d91769cfaee8038ce2d08c149769633c
diff --git a/metadata/md5-cache/acct-user/zookeeper-0-r1 b/metadata/md5-cache/acct-user/zookeeper-0-r1
new file mode 100644
index 000000000000..cd1a0e49d230
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zookeeper-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-cluster/zookeeper-bin
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+RDEPEND=acct-group/zookeeper
+SLOT=0
+_eclasses_=acct-user	fd6725fcc11ecffded6fe9228b8e3448	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=c2106a0056784aee456fa63c2c99b1c2
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ce6168010cf1..6ee2812c8bcb 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/ansible-molecule-5.1.0 b/metadata/md5-cache/app-admin/ansible-molecule-5.1.0
index 579c29f325df..7aa12b4f0499 100644
--- a/metadata/md5-cache/app-admin/ansible-molecule-5.1.0
+++ b/metadata/md5-cache/app-admin/ansible-molecule-5.1.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/molecule/molecule-5.1.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e3774a44a3448848f11af0586a4eee21
+_md5_=9639ec89b62437de2b2ed754967af6a5
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 50900a932414..2d956048960d 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/btrbk-0.31.2-r1 b/metadata/md5-cache/app-backup/btrbk-0.31.2-r1
deleted file mode 100644
index b3f400c1a0ce..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.31.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) sys-fs/btrfs-progs
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.31.2.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=60674c32b941a8f2366263a2d5e8a74c
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.6-r1 b/metadata/md5-cache/app-backup/btrbk-0.32.6-r1
index 5e55742cde80..1688f5503483 100644
--- a/metadata/md5-cache/app-backup/btrbk-0.32.6-r1
+++ b/metadata/md5-cache/app-backup/btrbk-0.32.6-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-lang/perl virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 )
 SLOT=0
 SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.6.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=57b6983de70ea5038000cc7c25e33417
+_md5_=6e238f018c206b4f673ea3b88da77a3a
diff --git a/metadata/md5-cache/app-backup/btrbk-9999 b/metadata/md5-cache/app-backup/btrbk-9999
index 9e8d7ec339dd..73d58dbcee57 100644
--- a/metadata/md5-cache/app-backup/btrbk-9999
+++ b/metadata/md5-cache/app-backup/btrbk-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dev-lang/perl virtual/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d2c5ae19f1d0beddaa31622ea535914e
+_md5_=fd26bcefff18f454e0b3a044b9ca0f4e
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index a5aa3ac0a584..df262c692a1d 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/qca-2.3.5-r1 b/metadata/md5-cache/app-crypt/qca-2.3.5-r1
deleted file mode 100644
index eb7f03dbad8c..000000000000
--- a/metadata/md5-cache/app-crypt/qca-2.3.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] virtual/latex-base ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.14:5 botan? ( dev-libs/botan:2= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:= ) test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 )
-DESCRIPTION=Qt Cryptographic Architecture (QCA)
-EAPI=8
-HOMEPAGE=https://userbase.kde.org/QCA
-INHERIT=cmake kde.org qmake-utils
-IUSE=botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtcore-5.14:5 botan? ( dev-libs/botan:2= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:= )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://kde/stable/qca/2.3.5/qca-2.3.5.tar.xz
-_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=313629592b8e87d304cf9ebaa55d69b6
diff --git a/metadata/md5-cache/app-crypt/sequoia-sq-0.31.0 b/metadata/md5-cache/app-crypt/sequoia-sq-0.31.0
new file mode 100644
index 000000000000..3cf3c18bfb17
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/sequoia-sq-0.31.0
@@ -0,0 +1,15 @@
+BDEPEND=<sys-devel/clang-17 virtual/pkgconfig >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=dev-db/sqlite:3 dev-libs/gmp:= dev-libs/nettle:= dev-libs/openssl:= sys-devel/clang !!sys-devel/llvm:0
+DESCRIPTION=CLI of the Sequoia OpenPGP implementation
+EAPI=8
+HOMEPAGE=https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq
+INHERIT=bash-completion-r1 cargo llvm
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-2+ Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ LGPL-3+ MIT MIT-0 MPL-2.0 Unicode-DFS-2016 || ( GPL-2 GPL-3 LGPL-3 )
+RDEPEND=dev-db/sqlite:3 dev-libs/gmp:= dev-libs/nettle:= dev-libs/openssl:=
+SLOT=0
+SRC_URI=https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v0.31.0/sequoia-sq-v0.31.0.tar.bz2 https://crates.io/api/v1/crates/addr2line/0.20.0/download -> addr2line-0.20.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aead/0.5.2/download -> aead-0.5.2.crate https://crates.io/api/v1/crates/aes/0.8.3/download -> aes-0.8.3.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/aho-corasick/1.0.2/download -> aho-corasick-1.0.2.crate https://crates.io/api/v1/crates/aligned/0.4.1/download -> aligned-0.4.1.crate https://crates.io/api/v1/crates/android-tzdata/0.1.1/download -> android-tzdata-0.1.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anyhow/1.0.71/download -> anyhow-1.0.71.crate https://crates.io/api/v1/crates/as-slice/0.2.1/download -> as-slice-0.2.1.crate https://crates.io/api/v1/crates/ascii-canvas/3.0.0/download -> ascii-canvas-3.0.0.crate https://crates.io/api/v1/crates/assert_cmd/2.0.8/download -> assert_cmd-2.0.8.crate https://crates.io/api/v1/crates/async-trait/0.1.70/download -> async-trait-0.1.70.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.68/download -> backtrace-0.3.68.crate https://crates.io/api/v1/crates/base16ct/0.2.0/download -> base16ct-0.2.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/base64/0.21.2/download -> base64-0.21.2.crate https://crates.io/api/v1/crates/base64ct/1.6.0/download -> base64ct-1.6.0.crate https://crates.io/api/v1/crates/bindgen/0.63.0/download -> bindgen-0.63.0.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.3.3/download -> bitflags-2.3.3.crate https://crates.io/api/v1/crates/block-buffer/0.10.4/download -> block-buffer-0.10.4.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-padding/0.3.3/download -> block-padding-0.3.3.crate https://crates.io/api/v1/crates/blowfish/0.9.1/download -> blowfish-0.9.1.crate https://crates.io/api/v1/crates/botan-sys/0.10.3/download -> botan-sys-0.10.3.crate https://crates.io/api/v1/crates/botan/0.10.3/download -> botan-0.10.3.crate https://crates.io/api/v1/crates/bstr/1.5.0/download -> bstr-1.5.0.crate https://crates.io/api/v1/crates/buffered-reader/1.2.0/download -> buffered-reader-1.2.0.crate https://crates.io/api/v1/crates/bumpalo/3.13.0/download -> bumpalo-3.13.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/bzip2/0.4.4/download -> bzip2-0.4.4.crate https://crates.io/api/v1/crates/cast5/0.11.1/download -> cast5-0.11.1.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfb-mode/0.8.2/download -> cfb-mode-0.8.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.26/download -> chrono-0.4.26.crate https://crates.io/api/v1/crates/cipher/0.4.4/download -> cipher-0.4.4.crate https://crates.io/api/v1/crates/clang-sys/1.6.1/download -> clang-sys-1.6.1.crate https://crates.io/api/v1/crates/clap/4.0.32/download -> clap-4.0.32.crate https://crates.io/api/v1/crates/clap_complete/4.0.7/download -> clap_complete-4.0.7.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/clap_mangen/0.2.6/download -> clap_mangen-0.2.6.crate https://crates.io/api/v1/crates/cmac/0.7.2/download -> cmac-0.7.2.crate https://crates.io/api/v1/crates/const-oid/0.9.3/download -> const-oid-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.4/download -> core-foundation-sys-0.8.4.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.9/download -> cpufeatures-0.2.9.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.8/download -> crossbeam-channel-0.5.8.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.3/download -> crossbeam-deque-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.15/download -> crossbeam-epoch-0.9.15.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.8/download -> crossbeam-queue-0.3.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.16/download -> crossbeam-utils-0.8.16.crate https://crates.io/api/v1/crates/crossbeam/0.8.2/download -> crossbeam-0.8.2.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-bigint/0.5.2/download -> crypto-bigint-0.5.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/ctr/0.9.2/download -> ctr-0.9.2.crate https://crates.io/api/v1/crates/curve25519-dalek-ng/4.1.1/download -> curve25519-dalek-ng-4.1.1.crate https://crates.io/api/v1/crates/curve25519-dalek/3.2.0/download -> curve25519-dalek-3.2.0.crate https://crates.io/api/v1/crates/cvt/0.1.2/download -> cvt-0.1.2.crate https://crates.io/api/v1/crates/data-encoding/2.4.0/download -> data-encoding-2.4.0.crate https://crates.io/api/v1/crates/dbl/0.3.2/download -> dbl-0.3.2.crate https://crates.io/api/v1/crates/der/0.7.7/download -> der-0.7.7.crate https://crates.io/api/v1/crates/des/0.8.1/download -> des-0.8.1.crate https://crates.io/api/v1/crates/deunicode/0.4.3/download -> deunicode-0.4.3.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.10.7/download -> digest-0.10.7.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys/0.4.1/download -> dirs-sys-0.4.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs/5.0.1/download -> dirs-5.0.1.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dot-writer/0.1.3/download -> dot-writer-0.1.3.crate https://crates.io/api/v1/crates/dyn-clone/1.0.11/download -> dyn-clone-1.0.11.crate https://crates.io/api/v1/crates/eax/0.5.0/download -> eax-0.5.0.crate https://crates.io/api/v1/crates/ecb/0.1.1/download -> ecb-0.1.1.crate https://crates.io/api/v1/crates/ecdsa/0.16.7/download -> ecdsa-0.16.7.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.1/download -> ed25519-dalek-1.0.1.crate https://crates.io/api/v1/crates/ed25519/1.5.3/download -> ed25519-1.5.3.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/elliptic-curve/0.13.5/download -> elliptic-curve-0.13.5.crate https://crates.io/api/v1/crates/ena/0.14.2/download -> ena-0.14.2.crate https://crates.io/api/v1/crates/endian-type/0.1.2/download -> endian-type-0.1.2.crate https://crates.io/api/v1/crates/enum-as-inner/0.5.1/download -> enum-as-inner-0.5.1.crate https://crates.io/api/v1/crates/enumber/0.3.0/download -> enumber-0.3.0.crate https://crates.io/api/v1/crates/env_logger/0.10.0/download -> env_logger-0.10.0.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/errno/0.3.1/download -> errno-0.3.1.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/fd-lock/3.0.12/download -> fd-lock-3.0.12.crate https://crates.io/api/v1/crates/fehler-macros/1.0.0/download -> fehler-macros-1.0.0.crate https://crates.io/api/v1/crates/fehler/1.0.0/download -> fehler-1.0.0.crate https://crates.io/api/v1/crates/ff/0.13.0/download -> ff-0.13.0.crate https://crates.io/api/v1/crates/file_diff/1.0.0/download -> file_diff-1.0.0.crate https://crates.io/api/v1/crates/filetime/0.2.21/download -> filetime-0.2.21.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/flate2/1.0.26/download -> flate2-1.0.26.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.0/download -> form_urlencoded-1.2.0.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fs_at/0.1.8/download -> fs_at-0.1.8.crate https://crates.io/api/v1/crates/futures-channel/0.3.28/download -> futures-channel-0.3.28.crate https://crates.io/api/v1/crates/futures-core/0.3.28/download -> futures-core-0.3.28.crate https://crates.io/api/v1/crates/futures-io/0.3.28/download -> futures-io-0.3.28.crate https://crates.io/api/v1/crates/futures-macro/0.3.28/download -> futures-macro-0.3.28.crate https://crates.io/api/v1/crates/futures-sink/0.3.28/download -> futures-sink-0.3.28.crate https://crates.io/api/v1/crates/futures-task/0.3.28/download -> futures-task-0.3.28.crate https://crates.io/api/v1/crates/futures-util/0.3.28/download -> futures-util-0.3.28.crate https://crates.io/api/v1/crates/generator/0.7.5/download -> generator-0.7.5.crate https://crates.io/api/v1/crates/generic-array/0.14.7/download -> generic-array-0.14.7.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.10/download -> getrandom-0.2.10.crate https://crates.io/api/v1/crates/gimli/0.27.3/download -> gimli-0.27.3.crate https://crates.io/api/v1/crates/git-testament-derive/0.1.14/download -> git-testament-derive-0.1.14.crate https://crates.io/api/v1/crates/git-testament/0.2.4/download -> git-testament-0.2.4.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.10/download -> globset-0.4.10.crate https://crates.io/api/v1/crates/globwalk/0.8.1/download -> globwalk-0.8.1.crate https://crates.io/api/v1/crates/group/0.13.0/download -> group-0.13.0.crate https://crates.io/api/v1/crates/h2/0.3.20/download -> h2-0.3.20.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashlink/0.8.1/download -> hashlink-0.8.1.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.3.2/download -> hermit-abi-0.3.2.crate https://crates.io/api/v1/crates/hkdf/0.12.3/download -> hkdf-0.12.3.crate https://crates.io/api/v1/crates/hmac/0.12.1/download -> hmac-0.12.1.crate https://crates.io/api/v1/crates/hostname/0.3.1/download -> hostname-0.3.1.crate https://crates.io/api/v1/crates/html-escape/0.2.13/download -> html-escape-0.2.13.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/http/0.2.9/download -> http-0.2.9.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/humansize/2.1.3/download -> humansize-2.1.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/hyper/0.14.27/download -> hyper-0.14.27.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.2/download -> iana-time-zone-haiku-0.1.2.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.57/download -> iana-time-zone-0.1.57.crate https://crates.io/api/v1/crates/idea/0.5.1/download -> idea-0.5.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/idna/0.4.0/download -> idna-0.4.0.crate https://crates.io/api/v1/crates/ignore/0.4.20/download -> ignore-0.4.20.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/inout/0.1.3/download -> inout-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.11/download -> io-lifetimes-1.0.11.crate https://crates.io/api/v1/crates/ipconfig/0.3.2/download -> ipconfig-0.3.2.crate https://crates.io/api/v1/crates/ipnet/2.8.0/download -> ipnet-2.8.0.crate https://crates.io/api/v1/crates/is-terminal/0.4.7/download -> is-terminal-0.4.7.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.8/download -> itoa-1.0.8.crate https://crates.io/api/v1/crates/js-sys/0.3.64/download -> js-sys-0.3.64.crate https://crates.io/api/v1/crates/lalrpop-util/0.19.12/download -> lalrpop-util-0.19.12.crate https://crates.io/api/v1/crates/lalrpop/0.19.12/download -> lalrpop-0.19.12.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/libm/0.2.7/download -> libm-0.2.7.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.26.0/download -> libsqlite3-sys-0.26.0.crate https://crates.io/api/v1/crates/line-col/0.2.1/download -> line-col-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/linux-raw-sys/0.3.8/download -> linux-raw-sys-0.3.8.crate https://crates.io/api/v1/crates/lock_api/0.4.10/download -> lock_api-0.4.10.crate https://crates.io/api/v1/crates/log/0.4.19/download -> log-0.4.19.crate https://crates.io/api/v1/crates/loom/0.5.6/download -> loom-0.5.6.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/match_cfg/0.1.0/download -> match_cfg-0.1.0.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.10/download -> matches-0.1.10.crate https://crates.io/api/v1/crates/md-5/0.10.5/download -> md-5-0.10.5.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/memsec/0.6.3/download -> memsec-0.6.3.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.7.1/download -> miniz_oxide-0.7.1.crate https://crates.io/api/v1/crates/mio/0.8.8/download -> mio-0.8.8.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/nettle-sys/2.2.0/download -> nettle-sys-2.2.0.crate https://crates.io/api/v1/crates/nettle/7.3.0/download -> nettle-7.3.0.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nibble_vec/0.1.0/download -> nibble_vec-0.1.0.crate https://crates.io/api/v1/crates/nix/0.26.2/download -> nix-0.26.2.crate https://crates.io/api/v1/crates/no-std-compat/0.4.1/download -> no-std-compat-0.4.1.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/normpath/1.1.1/download -> normpath-1.1.1.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num-bigint-dig/0.8.4/download -> num-bigint-dig-0.8.4.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.16.0/download -> num_cpus-1.16.0.crate https://crates.io/api/v1/crates/object/0.31.1/download -> object-0.31.1.crate https://crates.io/api/v1/crates/once_cell/1.18.0/download -> once_cell-1.18.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openpgp-cert-d/0.1.0/download -> openpgp-cert-d-0.1.0.crate https://crates.io/api/v1/crates/openssl-macros/0.1.1/download -> openssl-macros-0.1.1.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.90/download -> openssl-sys-0.9.90.crate https://crates.io/api/v1/crates/openssl/0.10.55/download -> openssl-0.10.55.crate https://crates.io/api/v1/crates/option-ext/0.2.0/download -> option-ext-0.2.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.5.1/download -> os_str_bytes-6.5.1.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/p256/0.13.2/download -> p256-0.13.2.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.8/download -> parking_lot_core-0.9.8.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/pem-rfc7468/0.7.0/download -> pem-rfc7468-0.7.0.crate https://crates.io/api/v1/crates/percent-encoding/2.3.0/download -> percent-encoding-2.3.0.crate https://crates.io/api/v1/crates/pest/2.7.0/download -> pest-2.7.0.crate https://crates.io/api/v1/crates/pest_derive/2.7.0/download -> pest_derive-2.7.0.crate https://crates.io/api/v1/crates/pest_generator/2.7.0/download -> pest_generator-2.7.0.crate https://crates.io/api/v1/crates/pest_meta/2.7.0/download -> pest_meta-2.7.0.crate https://crates.io/api/v1/crates/petgraph/0.6.3/download -> petgraph-0.6.3.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pikchr/0.1.1/download -> pikchr-0.1.1.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.10/download -> pin-project-lite-0.2.10.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkcs1/0.7.5/download -> pkcs1-0.7.5.crate https://crates.io/api/v1/crates/pkcs8/0.10.2/download -> pkcs8-0.10.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.27/download -> pkg-config-0.3.27.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.5/download -> predicates-core-1.0.5.crate https://crates.io/api/v1/crates/predicates-tree/1.0.7/download -> predicates-tree-1.0.7.crate https://crates.io/api/v1/crates/predicates/2.1.5/download -> predicates-2.1.5.crate https://crates.io/api/v1/crates/primeorder/0.13.2/download -> primeorder-0.13.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.63/download -> proc-macro2-1.0.63.crate https://crates.io/api/v1/crates/pulldown-cmark/0.9.3/download -> pulldown-cmark-0.9.3.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.29/download -> quote-1.0.29.crate https://crates.io/api/v1/crates/radix_trie/0.2.1/download -> radix_trie-0.2.1.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rayon-core/1.11.0/download -> rayon-core-1.11.0.crate https://crates.io/api/v1/crates/rayon/1.7.0/download -> rayon-1.7.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_syscall/0.3.5/download -> redox_syscall-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/regex-syntax/0.7.2/download -> regex-syntax-0.7.2.crate https://crates.io/api/v1/crates/regex/1.8.4/download -> regex-1.8.4.crate https://crates.io/api/v1/crates/remove_dir_all/0.8.2/download -> remove_dir_all-0.8.2.crate https://crates.io/api/v1/crates/resolv-conf/0.7.0/download -> resolv-conf-0.7.0.crate https://crates.io/api/v1/crates/rfc6979/0.4.0/download -> rfc6979-0.4.0.crate https://crates.io/api/v1/crates/ripemd/0.1.3/download -> ripemd-0.1.3.crate https://crates.io/api/v1/crates/roadmap/0.5.0/download -> roadmap-0.5.0.crate https://crates.io/api/v1/crates/roff/0.2.1/download -> roff-0.2.1.crate https://crates.io/api/v1/crates/rpassword/7.2.0/download -> rpassword-7.2.0.crate https://crates.io/api/v1/crates/rsa/0.9.2/download -> rsa-0.9.2.crate https://crates.io/api/v1/crates/rtoolbox/0.0.1/download -> rtoolbox-0.0.1.crate https://crates.io/api/v1/crates/rusqlite/0.29.0/download -> rusqlite-0.29.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.23/download -> rustc-demangle-0.1.23.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustix/0.37.22/download -> rustix-0.37.22.crate https://crates.io/api/v1/crates/rustversion/1.0.13/download -> rustversion-1.0.13.crate https://crates.io/api/v1/crates/ryu/1.0.14/download -> ryu-1.0.14.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.22/download -> schannel-0.1.22.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sec1/0.7.2/download -> sec1-0.7.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.9.0/download -> security-framework-sys-2.9.0.crate https://crates.io/api/v1/crates/security-framework/2.9.1/download -> security-framework-2.9.1.crate https://crates.io/api/v1/crates/sequoia-autocrypt/0.25.1/download -> sequoia-autocrypt-0.25.1.crate https://crates.io/api/v1/crates/sequoia-cert-store/0.3.2/download -> sequoia-cert-store-0.3.2.crate https://crates.io/api/v1/crates/sequoia-net/0.27.0/download -> sequoia-net-0.27.0.crate https://crates.io/api/v1/crates/sequoia-openpgp/1.16.0/download -> sequoia-openpgp-1.16.0.crate https://crates.io/api/v1/crates/sequoia-policy-config/0.6.0/download -> sequoia-policy-config-0.6.0.crate https://crates.io/api/v1/crates/sequoia-wot/0.8.1/download -> sequoia-wot-0.8.1.crate https://crates.io/api/v1/crates/serde-aux/4.2.0/download -> serde-aux-4.2.0.crate https://crates.io/api/v1/crates/serde/1.0.166/download -> serde-1.0.166.crate https://crates.io/api/v1/crates/serde_derive/1.0.166/download -> serde_derive-1.0.166.crate https://crates.io/api/v1/crates/serde_json/1.0.100/download -> serde_json-1.0.100.crate https://crates.io/api/v1/crates/serde_yaml/0.8.26/download -> serde_yaml-0.8.26.crate https://crates.io/api/v1/crates/serde_yaml/0.9.21/download -> serde_yaml-0.9.21.crate https://crates.io/api/v1/crates/sha-1/0.10.1/download -> sha-1-0.10.1.crate https://crates.io/api/v1/crates/sha1collisiondetection/0.2.7/download -> sha1collisiondetection-0.2.7.crate https://crates.io/api/v1/crates/sha2/0.10.7/download -> sha2-0.10.7.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/signature/1.6.4/download -> signature-1.6.4.crate https://crates.io/api/v1/crates/signature/2.1.0/download -> signature-2.1.0.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.8/download -> slab-0.4.8.crate https://crates.io/api/v1/crates/slug/0.1.4/download -> slug-0.1.4.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.9/download -> socket2-0.4.9.crate https://crates.io/api/v1/crates/socket2/0.5.3/download -> socket2-0.5.3.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/spki/0.7.2/download -> spki-0.7.2.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/state/0.5.3/download -> state-0.5.3.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/string_cache/0.8.7/download -> string_cache-0.8.7.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subplot-build/0.7.1/download -> subplot-build-0.7.1.crate https://crates.io/api/v1/crates/subplot/0.7.1/download -> subplot-0.7.1.crate https://crates.io/api/v1/crates/subplotlib-derive/0.7.1/download -> subplotlib-derive-0.7.1.crate https://crates.io/api/v1/crates/subplotlib/0.7.1/download -> subplotlib-0.7.1.crate https://crates.io/api/v1/crates/subtle-ng/2.5.0/download -> subtle-ng-2.5.0.crate https://crates.io/api/v1/crates/subtle/2.5.0/download -> subtle-2.5.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.23/download -> syn-2.0.23.crate https://crates.io/api/v1/crates/tempfile-fast/0.3.4/download -> tempfile-fast-0.3.4.crate https://crates.io/api/v1/crates/tempfile/3.6.0/download -> tempfile-3.6.0.crate https://crates.io/api/v1/crates/tera/1.19.0/download -> tera-1.19.0.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminal_size/0.2.6/download -> terminal_size-0.2.6.crate https://crates.io/api/v1/crates/termtree/0.4.1/download -> termtree-0.4.1.crate https://crates.io/api/v1/crates/textwrap/0.15.2/download -> textwrap-0.15.2.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.41/download -> thiserror-impl-1.0.41.crate https://crates.io/api/v1/crates/thiserror/1.0.41/download -> thiserror-1.0.41.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.8/download -> time-macros-0.2.8.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/time/0.3.20/download -> time-0.3.20.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/tokio-macros/2.1.0/download -> tokio-macros-2.1.0.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.1/download -> tokio-native-tls-0.3.1.crate https://crates.io/api/v1/crates/tokio-util/0.7.8/download -> tokio-util-0.7.8.crate https://crates.io/api/v1/crates/tokio/1.29.1/download -> tokio-1.29.1.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.26/download -> tracing-attributes-0.1.26.crate https://crates.io/api/v1/crates/tracing-core/0.1.31/download -> tracing-core-0.1.31.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.17/download -> tracing-subscriber-0.3.17.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/trust-dns-client/0.22.0/download -> trust-dns-client-0.22.0.crate https://crates.io/api/v1/crates/trust-dns-proto/0.22.0/download -> trust-dns-proto-0.22.0.crate https://crates.io/api/v1/crates/trust-dns-resolver/0.22.0/download -> trust-dns-resolver-0.22.0.crate https://crates.io/api/v1/crates/try-lock/0.2.4/download -> try-lock-0.2.4.crate https://crates.io/api/v1/crates/twofish/0.7.1/download -> twofish-0.7.1.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.5/download -> ucd-trie-0.1.5.crate https://crates.io/api/v1/crates/unescape/0.1.0/download -> unescape-0.1.0.crate https://crates.io/api/v1/crates/unic-char-property/0.9.0/download -> unic-char-property-0.9.0.crate https://crates.io/api/v1/crates/unic-char-range/0.9.0/download -> unic-char-range-0.9.0.crate https://crates.io/api/v1/crates/unic-common/0.9.0/download -> unic-common-0.9.0.crate https://crates.io/api/v1/crates/unic-segment/0.9.0/download -> unic-segment-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-segment/0.9.0/download -> unic-ucd-segment-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-version/0.9.0/download -> unic-ucd-version-0.9.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.13/download -> unicode-bidi-0.3.13.crate https://crates.io/api/v1/crates/unicode-ident/1.0.10/download -> unicode-ident-1.0.10.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/unsafe-libyaml/0.2.8/download -> unsafe-libyaml-0.2.8.crate https://crates.io/api/v1/crates/url/2.4.0/download -> url-2.4.0.crate https://crates.io/api/v1/crates/utf8-width/0.1.6/download -> utf8-width-0.1.6.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.3/download -> walkdir-2.3.3.crate https://crates.io/api/v1/crates/want/0.3.1/download -> want-0.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.87/download -> wasm-bindgen-backend-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.87/download -> wasm-bindgen-macro-support-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.87/download -> wasm-bindgen-macro-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.87/download -> wasm-bindgen-shared-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.87/download -> wasm-bindgen-0.2.87.crate https://crates.io/api/v1/crates/widestring/1.0.2/download -> widestring-1.0.2.crate https://crates.io/api/v1/crates/win-crypto-ng/0.5.0/download -> win-crypto-ng-0.5.0.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows-targets/0.48.1/download -> windows-targets-0.48.1.crate https://crates.io/api/v1/crates/windows/0.48.0/download -> windows-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.0/download -> windows_aarch64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.0/download -> windows_aarch64_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.0/download -> windows_i686_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.0/download -> windows_i686_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.0/download -> windows_x86_64_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.0/download -> windows_x86_64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.0/download -> windows_x86_64_msvc-0.48.0.crate https://crates.io/api/v1/crates/winreg/0.50.0/download -> winreg-0.50.0.crate https://crates.io/api/v1/crates/x25519-dalek-ng/1.1.1/download -> x25519-dalek-ng-1.1.1.crate https://crates.io/api/v1/crates/xxhash-rust/0.8.6/download -> xxhash-rust-0.8.6.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/zbase32/0.1.2/download -> zbase32-0.1.2.crate https://crates.io/api/v1/crates/zeroize/1.6.0/download -> zeroize-1.6.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.4.2/download -> zeroize_derive-1.4.2.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	cddd4ee89517b7a52ddce3da8abf3109	llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=aae280f95d5778c10487f9c03fc74e13
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index dcc51337dd66..98ded34ed122 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/python-docs-3.10.10 b/metadata/md5-cache/app-doc/python-docs-3.10.10
deleted file mode 100644
index 08f194fb0226..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.10.10
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/doc/3.10.10/python-3.10.10-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.10.11 b/metadata/md5-cache/app-doc/python-docs-3.10.11
deleted file mode 100644
index 6d726cf56194..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.10.11
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/doc/3.10.11/python-3.10.11-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.10.12 b/metadata/md5-cache/app-doc/python-docs-3.10.12
index 15b387a35cf3..f129a71ea881 100644
--- a/metadata/md5-cache/app-doc/python-docs-3.10.12
+++ b/metadata/md5-cache/app-doc/python-docs-3.10.12
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/doc/3.10.12/python-3.10.12-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.11.2 b/metadata/md5-cache/app-doc/python-docs-3.11.2
deleted file mode 100644
index 3e57161cde00..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.11.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/doc/3.11.2/python-3.11.2-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.11.3 b/metadata/md5-cache/app-doc/python-docs-3.11.3
deleted file mode 100644
index 06a67f6f192e..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.11.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/doc/3.11.3/python-3.11.3-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.11.4 b/metadata/md5-cache/app-doc/python-docs-3.11.4
index 8a798dc998a6..7f6a8d86625e 100644
--- a/metadata/md5-cache/app-doc/python-docs-3.11.4
+++ b/metadata/md5-cache/app-doc/python-docs-3.11.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/doc/3.11.4/python-3.11.4-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.8.16 b/metadata/md5-cache/app-doc/python-docs-3.8.16
deleted file mode 100644
index cf501a2da171..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.8.16
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/doc/3.8.16/python-3.8.16-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.8.17 b/metadata/md5-cache/app-doc/python-docs-3.8.17
index a684b4870c07..3fd9a94112f3 100644
--- a/metadata/md5-cache/app-doc/python-docs-3.8.17
+++ b/metadata/md5-cache/app-doc/python-docs-3.8.17
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/doc/3.8.17/python-3.8.17-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.9.16 b/metadata/md5-cache/app-doc/python-docs-3.9.16
deleted file mode 100644
index c9806a42962a..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.9.16
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/doc/3.9.16/python-3.9.16-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.9.17 b/metadata/md5-cache/app-doc/python-docs-3.9.17
index 974108842d3b..b558b4826b64 100644
--- a/metadata/md5-cache/app-doc/python-docs-3.9.17
+++ b/metadata/md5-cache/app-doc/python-docs-3.9.17
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/doc/3.9.17/python-3.9.17-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 27a21e9c897e..a25244a635ac 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26-r4 b/metadata/md5-cache/app-emacs/pymacs-0.26-r4
new file mode 100644
index 000000000000..e3caab0d4840
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26-r4
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( >=dev-python/docutils-0.7 virtual/latex-base ) >=app-editors/emacs-25.3:* python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=A tool that allows both-side communication between Python and Emacs Lisp
+EAPI=8
+HOMEPAGE=https://www.emacswiki.org/emacs/PyMacs https://github.com/dgentry/Pymacs/
+INHERIT=elisp distutils-r1
+IUSE=doc python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-25.3:* python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	elisp	d5d9361b9698f474179a2ac3f8bf46e8	elisp-common	dde4f515dde15603a26a3755438e9c78	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=173d90d8c09f8cd77e1ce8052ecf12e1
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 405da613c307..3160018e8def 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.30.0-r1 b/metadata/md5-cache/app-emulation/diskimage-builder-3.30.0-r1
new file mode 100644
index 000000000000..2f4cf6a8f2f2
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.30.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Golden Disk Image builder
+EAPI=8
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/diskimage-builder/diskimage-builder-3.30.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=de61af0774447a13c94c5525d198f95c
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-9999 b/metadata/md5-cache/app-emulation/diskimage-builder-9999
index 8bfa6baada26..ce220b8fdd62 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-9999
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-9999
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Golden Disk Image builder
@@ -8,8 +8,8 @@ INHERIT=distutils-r1 git-r3
 IUSE=python_targets_python3_10 python_targets_python3_11
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-1.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=0bdbb963598b1bf0e1748ff66666ff6a
+_md5_=de61af0774447a13c94c5525d198f95c
diff --git a/metadata/md5-cache/app-emulation/virt-manager-4.1.0 b/metadata/md5-cache/app-emulation/virt-manager-4.1.0
index f15c22735fac..6fa28dbafe11 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-4.1.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-4.1.0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://virt-manager.org/download/sources/virt-manager/virt-manager-4.1.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2a347593689cd5138d77b329c4e3a66c
+_md5_=0641c309d00b08bf74d97bf718659a92
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 08c0819a47d8..51aedbbf152f 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b93353414019d085d0a0eecbe4edde34
+_md5_=df25f18721d886c78fa6a4634c237d47
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.12 b/metadata/md5-cache/app-emulation/wine-staging-8.12
new file mode 100644
index 000000000000..ded94d6c8db0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.12
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) || ( dev-vcs/git ( sys-apps/gawk sys-apps/util-linux ) ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=8
+HOMEPAGE=https://wiki.winehq.org/Wine-Staging https://gitlab.winehq.org/wine/wine-staging/
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools edo flag-o-matic multilib multilib-build python-any-r1 toolchain-funcs wrapper
+IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:8.0.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=8.12
+SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.12.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.12.tar.gz -> wine-staging-8.12.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=545b8ec491fd8c9455e3b31036136413
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.7 b/metadata/md5-cache/app-emulation/wine-staging-8.7
deleted file mode 100644
index faaa542e5ba1..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-8.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) || ( dev-vcs/git ( sys-apps/gawk sys-apps/util-linux ) ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=8
-HOMEPAGE=https://wiki.winehq.org/Wine-Staging https://gitlab.winehq.org/wine/wine-staging/
-IDEPEND=>=app-eselect/eselect-wine-2
-INHERIT=autotools edo flag-o-matic multilib multilib-build python-any-r1 toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=8.7
-SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.7.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.7.tar.gz -> wine-staging-8.7.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a24f80e8b82b25a306a017ad0b69cb24
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.8 b/metadata/md5-cache/app-emulation/wine-staging-8.8
deleted file mode 100644
index 90ff28ee5573..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-8.8
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) || ( dev-vcs/git ( sys-apps/gawk sys-apps/util-linux ) ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=8
-HOMEPAGE=https://wiki.winehq.org/Wine-Staging https://gitlab.winehq.org/wine/wine-staging/
-IDEPEND=>=app-eselect/eselect-wine-2
-INHERIT=autotools edo flag-o-matic multilib multilib-build python-any-r1 toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=8.8
-SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.8.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.8.tar.gz -> wine-staging-8.8.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e6e88ed93542db48b204f225191f8a35
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index a719b5fddb8c..df90dab93563 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0-r1 b/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0-r1
deleted file mode 100644
index 39017d5ab9ef..000000000000
--- a/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/po4a dev-lang/perl
-DEFINED_PHASES=configure prepare
-DESCRIPTION=A somewhat comprehensive collection of man page translations
-EAPI=7
-HOMEPAGE=https://manpages-l10n-team.pages.debian.net/manpages-l10n/
-IUSE=l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=virtual/man l10n_de? ( !app-i18n/man-pages-de ) l10n_fr? ( !app-i18n/man-pages-fr ) l10n_it? ( !app-i18n/man-pages-it ) l10n_nl? ( !app-i18n/man-pages-nl ) l10n_pl? ( !app-i18n/man-pages-pl ) l10n_ru? ( !app-i18n/man-pages-ru )
-REQUIRED_USE=|| ( l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sr l10n_sv l10n_uk l10n_vi )
-SLOT=0
-SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/4.17.0/manpages-l10n-4.17.0.tar.bz2
-_md5_=50811f0aed9c767cf9b6f533380fe7b7
diff --git a/metadata/md5-cache/app-i18n/man-pages-l10n-4.19.0 b/metadata/md5-cache/app-i18n/man-pages-l10n-4.19.0
new file mode 100644
index 000000000000..cb02ea5881a8
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-l10n-4.19.0
@@ -0,0 +1,13 @@
+BDEPEND=app-text/po4a dev-lang/perl
+DEFINED_PHASES=configure prepare
+DESCRIPTION=A somewhat comprehensive collection of man page translations
+EAPI=8
+HOMEPAGE=https://manpages-l10n-team.pages.debian.net/manpages-l10n/
+IUSE=l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sr l10n_sv l10n_uk l10n_vi
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=virtual/man l10n_it? ( !app-i18n/man-pages-it ) l10n_ru? ( !app-i18n/man-pages-ru )
+REQUIRED_USE=|| ( l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sr l10n_sv l10n_uk l10n_vi )
+SLOT=0
+SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/4.19.0/manpages-l10n-4.19.0.tar.bz2
+_md5_=15aa884cbe9b2ba5a78c592307e2d343
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 512706d1b588..fd2de1653276 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/broot-1.23.0 b/metadata/md5-cache/app-misc/broot-1.23.0
new file mode 100644
index 000000000000..6eb4d8447ec3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/broot-1.23.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.65 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libgit2:= sys-libs/zlib X? ( x11-libs/libxcb:= )
+DESCRIPTION=A new way to see and navigate directory trees
+EAPI=8
+HOMEPAGE=https://dystroy.org/broot/ https://github.com/Canop/broot
+INHERIT=bash-completion-r1 cargo
+IUSE=X debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB
+RDEPEND=dev-libs/libgit2:= sys-libs/zlib X? ( x11-libs/libxcb:= )
+SLOT=0
+SRC_URI=https://github.com/Canop/broot/archive/v1.23.0.tar.gz -> broot-1.23.0.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.8.3/download -> ahash-0.8.3.crate https://crates.io/api/v1/crates/aho-corasick/1.0.1/download -> aho-corasick-1.0.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/ansi_colours/1.2.1/download -> ansi_colours-1.2.1.crate https://crates.io/api/v1/crates/anyhow/1.0.71/download -> anyhow-1.0.71.crate https://crates.io/api/v1/crates/argh/0.1.10/download -> argh-0.1.10.crate https://crates.io/api/v1/crates/argh_derive/0.1.10/download -> argh_derive-0.1.10.crate https://crates.io/api/v1/crates/argh_shared/0.1.10/download -> argh_shared-0.1.10.crate https://crates.io/api/v1/crates/arrayref/0.3.7/download -> arrayref-0.3.7.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/base64/0.21.0/download -> base64-0.21.0.crate https://crates.io/api/v1/crates/bet/1.0.2/download -> bet-1.0.2.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bit_field/0.10.2/download -> bit_field-0.10.2.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bstr/1.4.0/download -> bstr-1.4.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.2/download -> bumpalo-3.12.2.crate https://crates.io/api/v1/crates/bytemuck/1.13.1/download -> bytemuck-1.13.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.1/download -> char_reader-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.24/download -> chrono-0.4.24.crate https://crates.io/api/v1/crates/clap/3.2.25/download -> clap-3.2.25.crate https://crates.io/api/v1/crates/clap_complete/3.2.5/download -> clap_complete-3.2.5.crate https://crates.io/api/v1/crates/clap_derive/3.2.25/download -> clap_derive-3.2.25.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.5.0/download -> clipboard-win-4.5.0.crate https://crates.io/api/v1/crates/clipboard_macos/0.1.0/download -> clipboard_macos-0.1.0.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/coolor/0.5.0/download -> coolor-0.5.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.4/download -> core-foundation-sys-0.8.4.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crokey/0.4.3/download -> crokey-0.4.3.crate https://crates.io/api/v1/crates/crokey-proc_macros/0.4.0/download -> crokey-proc_macros-0.4.0.crate https://crates.io/api/v1/crates/crossbeam/0.8.0/download -> crossbeam-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.8/download -> crossbeam-channel-0.5.8.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.3/download -> crossbeam-deque-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.14/download -> crossbeam-epoch-0.9.14.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.8/download -> crossbeam-queue-0.3.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.15/download -> crossbeam-utils-0.8.15.crate https://crates.io/api/v1/crates/crossterm/0.23.2/download -> crossterm-0.23.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/csv/1.2.1/download -> csv-1.2.1.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.9/download -> csv2svg-0.1.9.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/data-url/0.2.0/download -> data-url-0.2.0.crate https://crates.io/api/v1/crates/deser-hjson/1.2.0/download -> deser-hjson-1.2.0.crate https://crates.io/api/v1/crates/directories/4.0.1/download -> directories-4.0.1.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/errno/0.3.1/download -> errno-0.3.1.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/error-code/2.3.1/download -> error-code-2.3.1.crate https://crates.io/api/v1/crates/exr/1.6.3/download -> exr-1.6.3.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.26/download -> flate2-1.0.26.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/flume/0.10.14/download -> flume-0.10.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fontconfig-parser/0.5.2/download -> fontconfig-parser-0.5.2.crate https://crates.io/api/v1/crates/fontdb/0.14.1/download -> fontdb-0.14.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/futures-core/0.3.28/download -> futures-core-0.3.28.crate https://crates.io/api/v1/crates/futures-sink/0.3.28/download -> futures-sink-0.3.28.crate https://crates.io/api/v1/crates/getrandom/0.2.9/download -> getrandom-0.2.9.crate https://crates.io/api/v1/crates/gif/0.12.0/download -> gif-0.12.0.crate https://crates.io/api/v1/crates/git2/0.14.4/download -> git2-0.14.4.crate https://crates.io/api/v1/crates/glassbench/0.3.5/download -> glassbench-0.3.5.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/half/2.2.1/download -> half-2.2.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hermit-abi/0.3.1/download -> hermit-abi-0.3.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.56/download -> iana-time-zone-0.1.56.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.2/download -> iana-time-zone-haiku-0.1.2.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/image/0.24.6/download -> image-0.24.6.crate https://crates.io/api/v1/crates/imagesize/0.12.0/download -> imagesize-0.12.0.crate https://crates.io/api/v1/crates/include_dir/0.7.3/download -> include_dir-0.7.3.crate https://crates.io/api/v1/crates/include_dir_macros/0.7.3/download -> include_dir_macros-0.7.3.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.10/download -> io-lifetimes-1.0.10.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itoa/1.0.6/download -> itoa-1.0.6.crate https://crates.io/api/v1/crates/jobserver/0.1.26/download -> jobserver-0.1.26.crate https://crates.io/api/v1/crates/jpeg-decoder/0.3.0/download -> jpeg-decoder-0.3.0.crate https://crates.io/api/v1/crates/js-sys/0.3.63/download -> js-sys-0.3.63.crate https://crates.io/api/v1/crates/kurbo/0.9.5/download -> kurbo-0.9.5.crate https://crates.io/api/v1/crates/lazy-regex/2.5.0/download -> lazy-regex-2.5.0.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.4.1/download -> lazy-regex-proc_macros-2.4.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lebe/0.5.2/download -> lebe-0.5.2.crate https://crates.io/api/v1/crates/lfs-core/0.11.1/download -> lfs-core-0.11.1.crate https://crates.io/api/v1/crates/libc/0.2.144/download -> libc-0.2.144.crate https://crates.io/api/v1/crates/libgit2-sys/0.13.5+1.4.5/download -> libgit2-sys-0.13.5+1.4.5.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.9/download -> libz-sys-1.1.9.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/linux-raw-sys/0.3.7/download -> linux-raw-sys-0.3.7.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.6.1/download -> memmap2-0.6.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/minimad/0.9.1/download -> minimad-0.9.1.crate https://crates.io/api/v1/crates/minimad/0.12.0/download -> minimad-0.12.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.4/download -> miniz_oxide-0.5.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/miniz_oxide/0.7.1/download -> miniz_oxide-0.7.1.crate https://crates.io/api/v1/crates/mio/0.8.6/download -> mio-0.8.6.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/onig/6.4.0/download -> onig-6.4.0.crate https://crates.io/api/v1/crates/onig_sys/69.8.1/download -> onig_sys-69.8.1.crate https://crates.io/api/v1/crates/open/1.7.1/download -> open-1.7.1.crate https://crates.io/api/v1/crates/opener/0.5.2/download -> opener-0.5.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.5.0/download -> os_str_bytes-6.5.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_macros/0.10.0/download -> phf_macros-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pico-args/0.5.0/download -> pico-args-0.5.0.crate https://crates.io/api/v1/crates/pin-project/1.1.0/download -> pin-project-1.1.0.crate https://crates.io/api/v1/crates/pin-project-internal/1.1.0/download -> pin-project-internal-1.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.27/download -> pkg-config-0.3.27.crate https://crates.io/api/v1/crates/plist/1.4.3/download -> plist-1.4.3.crate https://crates.io/api/v1/crates/png/0.17.6/download -> png-0.17.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.58/download -> proc-macro2-1.0.58.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/qoi/0.4.1/download -> qoi-0.4.1.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quick-xml/0.28.2/download -> quick-xml-0.28.2.crate https://crates.io/api/v1/crates/quote/1.0.27/download -> quote-1.0.27.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.7.0/download -> rayon-1.7.0.crate https://crates.io/api/v1/crates/rayon-core/1.11.0/download -> rayon-core-1.11.0.crate https://crates.io/api/v1/crates/rctree/0.5.0/download -> rctree-0.5.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_syscall/0.3.5/download -> redox_syscall-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.8.1/download -> regex-1.8.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/regex-syntax/0.7.1/download -> regex-syntax-0.7.1.crate https://crates.io/api/v1/crates/resvg/0.33.0/download -> resvg-0.33.0.crate https://crates.io/api/v1/crates/rgb/0.8.36/download -> rgb-0.8.36.crate https://crates.io/api/v1/crates/rosvgtree/0.3.0/download -> rosvgtree-0.3.0.crate https://crates.io/api/v1/crates/roxmltree/0.18.0/download -> roxmltree-0.18.0.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/rustix/0.37.19/download -> rustix-0.37.19.crate https://crates.io/api/v1/crates/rustybuzz/0.7.0/download -> rustybuzz-0.7.0.crate https://crates.io/api/v1/crates/ryu/1.0.13/download -> ryu-1.0.13.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/secular/1.0.1/download -> secular-1.0.1.crate https://crates.io/api/v1/crates/serde/1.0.163/download -> serde-1.0.163.crate https://crates.io/api/v1/crates/serde_derive/1.0.163/download -> serde_derive-1.0.163.crate https://crates.io/api/v1/crates/serde_json/1.0.96/download -> serde_json-1.0.96.crate https://crates.io/api/v1/crates/signal-hook/0.3.15/download -> signal-hook-0.3.15.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.1/download -> signal-hook-registry-1.4.1.crate https://crates.io/api/v1/crates/simd-adler32/0.3.5/download -> simd-adler32-0.3.5.crate https://crates.io/api/v1/crates/simplecss/0.2.1/download -> simplecss-0.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slotmap/1.0.6/download -> slotmap-1.0.6.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/snafu/0.7.4/download -> snafu-0.7.4.crate https://crates.io/api/v1/crates/snafu-derive/0.7.4/download -> snafu-derive-0.7.4.crate https://crates.io/api/v1/crates/spin/0.9.8/download -> spin-0.9.8.crate https://crates.io/api/v1/crates/splitty/1.0.1/download -> splitty-1.0.1.crate https://crates.io/api/v1/crates/str-buf/1.0.6/download -> str-buf-1.0.6.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strict-num/0.1.0/download -> strict-num-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/svg/0.13.1/download -> svg-0.13.1.crate https://crates.io/api/v1/crates/svgfilters/0.4.0/download -> svgfilters-0.4.0.crate https://crates.io/api/v1/crates/svgtypes/0.11.0/download -> svgtypes-0.11.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.16/download -> syn-2.0.16.crate https://crates.io/api/v1/crates/syntect-no-panic/4.6.1/download -> syntect-no-panic-4.6.1.crate https://crates.io/api/v1/crates/tempfile/3.5.0/download -> tempfile-3.5.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/termimad/0.20.6/download -> termimad-0.20.6.crate https://crates.io/api/v1/crates/termimad/0.23.1/download -> termimad-0.23.1.crate https://crates.io/api/v1/crates/terminal-clipboard/0.4.0/download -> terminal-clipboard-0.4.0.crate https://crates.io/api/v1/crates/terminal-light/1.1.1/download -> terminal-light-1.1.1.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.1.0.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.40/download -> thiserror-1.0.40.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.40/download -> thiserror-impl-1.0.40.crate https://crates.io/api/v1/crates/tiff/0.8.1/download -> tiff-0.8.1.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/time/0.3.21/download -> time-0.3.21.crate https://crates.io/api/v1/crates/time-core/0.1.1/download -> time-core-0.1.1.crate https://crates.io/api/v1/crates/time-macros/0.2.9/download -> time-macros-0.2.9.crate https://crates.io/api/v1/crates/tiny-skia/0.9.1/download -> tiny-skia-0.9.1.crate https://crates.io/api/v1/crates/tiny-skia-path/0.9.0/download -> tiny-skia-path-0.9.0.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/ttf-parser/0.18.1/download -> ttf-parser-0.18.1.crate https://crates.io/api/v1/crates/ttf-parser/0.19.0/download -> ttf-parser-0.19.0.crate https://crates.io/api/v1/crates/umask/2.1.0/download -> umask-2.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.13/download -> unicode-bidi-0.3.13.crate https://crates.io/api/v1/crates/unicode-bidi-mirroring/0.1.0/download -> unicode-bidi-mirroring-0.1.0.crate https://crates.io/api/v1/crates/unicode-ccc/0.1.2/download -> unicode-ccc-0.1.2.crate https://crates.io/api/v1/crates/unicode-general-category/0.6.0/download -> unicode-general-category-0.6.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.8/download -> unicode-ident-1.0.8.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-script/0.5.5/download -> unicode-script-0.5.5.crate https://crates.io/api/v1/crates/unicode-vo/0.1.0/download -> unicode-vo-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/usvg/0.33.0/download -> usvg-0.33.0.crate https://crates.io/api/v1/crates/usvg-parser/0.33.0/download -> usvg-parser-0.33.0.crate https://crates.io/api/v1/crates/usvg-text-layout/0.33.0/download -> usvg-text-layout-0.33.0.crate https://crates.io/api/v1/crates/usvg-tree/0.33.0/download -> usvg-tree-0.33.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.3/download -> walkdir-2.3.3.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.86/download -> wasm-bindgen-0.2.86.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.86/download -> wasm-bindgen-backend-0.2.86.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.86/download -> wasm-bindgen-macro-0.2.86.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.86/download -> wasm-bindgen-macro-support-0.2.86.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.86/download -> wasm-bindgen-shared-0.2.86.crate https://crates.io/api/v1/crates/weezl/0.1.7/download -> weezl-0.1.7.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.48.0/download -> windows-0.48.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows-targets/0.48.0/download -> windows-targets-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.0/download -> windows_aarch64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.0/download -> windows_aarch64_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.0/download -> windows_i686_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.0/download -> windows_i686_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.0/download -> windows_x86_64_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.0/download -> windows_x86_64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.0/download -> windows_x86_64_msvc-0.48.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.3/download -> x11-clipboard-0.5.3.crate https://crates.io/api/v1/crates/xcb/0.10.1/download -> xcb-0.10.1.crate https://crates.io/api/v1/crates/xmlparser/0.13.5/download -> xmlparser-0.13.5.crate https://crates.io/api/v1/crates/xmlwriter/0.1.0/download -> xmlwriter-0.1.0.crate https://crates.io/api/v1/crates/xterm-query/0.1.0/download -> xterm-query-0.1.0.crate https://crates.io/api/v1/crates/xterm-query/0.2.0/download -> xterm-query-0.2.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/zune-inflate/0.2.54/download -> zune-inflate-0.2.54.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	cddd4ee89517b7a52ddce3da8abf3109	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=e2f8b892479bc5479df9c5db9f470a21
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.6 b/metadata/md5-cache/app-misc/gramps-5.1.6
new file mode 100644
index 000000000000..a9b767278bcf
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-5.1.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Community genealogy program aiming to be both intuitive and feature-complete
+EAPI=8
+HOMEPAGE=https://gramps-project.org/
+INHERIT=distutils-r1 xdg-utils
+IUSE=exif geo postscript +rcs +reports spell test test python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.6.tar.gz -> gramps-5.1.6.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5c937d1c8f2e63772113727b7c5fdd9d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c22c2217a94f..12dda9f650d4 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/mandoc-1.14.6 b/metadata/md5-cache/app-text/mandoc-1.14.6
index 43848f73fbd3..f26984a211a5 100644
--- a/metadata/md5-cache/app-text/mandoc-1.14.6
+++ b/metadata/md5-cache/app-text/mandoc-1.14.6
@@ -1,15 +1,16 @@
-BDEPEND=cgi? ( app-text/highlight )
-DEFINED_PHASES=compile install postinst prepare pretend
+BDEPEND=cgi? ( app-text/highlight ) test? ( dev-lang/perl )
+DEFINED_PHASES=compile install postinst prepare pretend test
 DEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db ) cgi? ( sys-libs/zlib[static-libs] )
 DESCRIPTION=Suite of tools compiling mdoc and man
 EAPI=7
 HOMEPAGE=https://mdocml.bsd.lv/
 INHERIT=toolchain-funcs
-IUSE=cgi selinux system-man
+IUSE=cgi selinux system-man test
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=ISC
 RDEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db ) selinux? ( sec-policy/selinux-makewhatis )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mdocml.bsd.lv/snapshots/mandoc-1.14.6.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=2dbdb972a87ac920154437c02cf8b2d9
+_md5_=07d98c0bac5f5aa77d406e42e76cc2f6
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 1fca7826e8b8..520851a55439 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.3 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.3
index 0ac40a1a8ffc..019ec195d9d3 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.3
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.12
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.12.3.tar.gz -> cpp-httplib-0.12.3.tar.gz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f99bec6a4c28d961a89bad146171fc6
+_md5_=b7795b3b7d6ee5086e0b95c160002861
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.6 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.6
index 2fc4e546f02c..925d7f692def 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.6
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.12
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.12.6.tar.gz -> cpp-httplib-0.12.6.tar.gz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=560ec2aa9b89c45a5b4e1b63556279b7
+_md5_=a43d4f1376a8252987501356e06a5440
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5b0168be7b36..b424226e54c8 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/ruby-3.1.4-r4 b/metadata/md5-cache/dev-lang/ruby-3.1.4-r4
new file mode 100644
index 000000000000..85ca2a7daa05
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-3.1.4-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225 valgrind? ( dev-util/valgrind )
+DESCRIPTION=An object-oriented scripting language
+EAPI=8
+HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=autotools flag-o-matic multiprocessing
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31(-)] >=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31(-)] >=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby31(-)] >=dev-ruby/rbs-2.1.0[ruby_targets_ruby31(-)] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby31(-)] >=dev-ruby/rss-0.2.9[ruby_targets_ruby31(-)] >=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31(-)] >=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31(-)] virtual/rubygems[ruby_targets_ruby31(-)] >=dev-ruby/bundler-2.3.3[ruby_targets_ruby31(-)] >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31(-)] >=dev-ruby/json-2.6.1[ruby_targets_ruby31(-)] >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31(-)] xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
+SLOT=3.1
+SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=69e130aa28a94b4e1bd5ac6bbf434bf7
diff --git a/metadata/md5-cache/dev-lang/ruby-3.2.2-r4 b/metadata/md5-cache/dev-lang/ruby-3.2.2-r4
new file mode 100644
index 000000000000..6d47af0c9868
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-3.2.2-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( >=virtual/rust-1.58.1 ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20221225 valgrind? ( dev-util/valgrind )
+DESCRIPTION=An object-oriented scripting language
+EAPI=8
+HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=autotools flag-o-matic multiprocessing
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/debug-1.7.1[ruby_targets_ruby32(-)] >=dev-ruby/matrix-0.4.2[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.16.3[ruby_targets_ruby32(-)] >=dev-ruby/net-ftp-0.2.0[ruby_targets_ruby32(-)] >=dev-ruby/net-imap-0.3.4[ruby_targets_ruby32(-)] >=dev-ruby/net-pop-0.1.2[ruby_targets_ruby32(-)] >=dev-ruby/net-smtp-0.3.3[ruby_targets_ruby32(-)] >=dev-ruby/power_assert-2.0.3[ruby_targets_ruby32(-)] >=dev-ruby/prime-0.1.2[ruby_targets_ruby32(-)] >=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby32(-)] >=dev-ruby/rbs-2.8.2[ruby_targets_ruby32(-)] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby32(-)] >=dev-ruby/rss-0.2.9[ruby_targets_ruby32(-)] >=dev-ruby/test-unit-3.5.7[ruby_targets_ruby32(-)] >=dev-ruby/typeprof-0.21.3[ruby_targets_ruby32(-)] virtual/rubygems[ruby_targets_ruby32(-)] >=dev-ruby/bundler-2.3.3[ruby_targets_ruby32(-)] >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby32(-)] >=dev-ruby/json-2.6.1[ruby_targets_ruby32(-)] >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby32(-)] xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( >=virtual/rust-1.58.1 ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20221225
+SLOT=3.2
+SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=3a8e23cadeec14f099851d3e23220179
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-102.13.0 b/metadata/md5-cache/dev-lang/spidermonkey-102.13.0
new file mode 100644
index 000000000000..3d23de92e4ab
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/spidermonkey-102.13.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.4:3.11[ssl,xml(+)] >=dev-lang/python-3.10.12:3.10[ssl,xml(+)] ) || ( ( sys-devel/llvm:15 clang? ( sys-devel/clang:15 virtual/rust:0/llvm-15 lto? ( sys-devel/lld:15 ) ) ) ( sys-devel/llvm:14 clang? ( sys-devel/clang:14 virtual/rust:0/llvm-14 lto? ( sys-devel/lld:14 ) ) ) ) !clang? ( virtual/rust ) virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.4:3.11[ssl,xml(+)] dev-python/six[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10[ssl,xml(+)] dev-python/six[python_targets_python3_10(-)] ) ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.13-r7:2.1 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib !!sys-devel/llvm:0
+DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
+EAPI=8
+HOMEPAGE=https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html
+INHERIT=autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+IUSE=clang cpu_flags_arm_neon debug +jit lto test
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=102
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.13.0esr/source/firefox-102.13.0esr.source.tar.xz -> firefox-102.13.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-10j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-10j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-102-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-102-patches-05j.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=8f7a6555e050ebd4b2755b306afbf289
diff --git a/metadata/md5-cache/dev-lang/zig-0.10.1-r2 b/metadata/md5-cache/dev-lang/zig-0.10.1-r2
deleted file mode 100644
index 5ee33e892edc..000000000000
--- a/metadata/md5-cache/dev-lang/zig-0.10.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !!sys-devel/llvm:0
-DESCRIPTION=A robust, optimal, and maintainable programming language
-EAPI=8
-HOMEPAGE=https://ziglang.org/
-IDEPEND=app-eselect/eselect-zig
-INHERIT=edo cmake llvm check-reqs toolchain-funcs
-IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+
-RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd]
-SLOT=0.10
-SRC_URI=https://ziglang.org/download/0.10.1/zig-0.10.1.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	6c921d868d090cc18e142a396f66f74a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=95b2ec82c0177ac1c02d970989058bfe
diff --git a/metadata/md5-cache/dev-lang/zig-0.10.1-r3 b/metadata/md5-cache/dev-lang/zig-0.10.1-r3
new file mode 100644
index 000000000000..97ecc4aa0f80
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/zig-0.10.1-r3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !!sys-devel/llvm:0
+DESCRIPTION=A robust, optimal, and maintainable programming language
+EAPI=8
+HOMEPAGE=https://ziglang.org/
+IDEPEND=app-eselect/eselect-zig
+INHERIT=edo cmake llvm check-reqs toolchain-funcs
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+
+RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd]
+SLOT=0.10
+SRC_URI=https://ziglang.org/download/0.10.1/zig-0.10.1.tar.xz
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	6c921d868d090cc18e142a396f66f74a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ce1c1157e904d1d7320347bbad2cf8c3
diff --git a/metadata/md5-cache/dev-lang/zig-bin-0.10.1-r2 b/metadata/md5-cache/dev-lang/zig-bin-0.10.1-r2
deleted file mode 100644
index 0adf5c1a2c4f..000000000000
--- a/metadata/md5-cache/dev-lang/zig-bin-0.10.1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DESCRIPTION=A robust, optimal, and maintainable programming language
-EAPI=8
-HOMEPAGE=https://ziglang.org/
-IDEPEND=app-eselect/eselect-zig
-IUSE=doc
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+
-SLOT=0.10
-SRC_URI=amd64? ( https://ziglang.org/download/0.10.1/zig-linux-x86_64-0.10.1.tar.xz ) arm? ( https://ziglang.org/download/0.10.1/zig-linux-armv7a-0.10.1.tar.xz ) arm64? ( https://ziglang.org/download/0.10.1/zig-linux-aarch64-0.10.1.tar.xz ) riscv? ( https://ziglang.org/download/0.10.1/zig-linux-riscv64-0.10.1.tar.xz ) x86? ( https://ziglang.org/download/0.10.1/zig-linux-i386-0.10.1.tar.xz )
-_md5_=970d55a04ca933687df6658f425bd2d4
diff --git a/metadata/md5-cache/dev-lang/zig-bin-0.10.1-r3 b/metadata/md5-cache/dev-lang/zig-bin-0.10.1-r3
new file mode 100644
index 000000000000..819823ee6b35
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/zig-bin-0.10.1-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm unpack
+DESCRIPTION=A robust, optimal, and maintainable programming language
+EAPI=8
+HOMEPAGE=https://ziglang.org/
+IDEPEND=app-eselect/eselect-zig
+IUSE=doc
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+
+SLOT=0.10
+SRC_URI=amd64? ( https://ziglang.org/download/0.10.1/zig-linux-x86_64-0.10.1.tar.xz ) arm? ( https://ziglang.org/download/0.10.1/zig-linux-armv7a-0.10.1.tar.xz ) arm64? ( https://ziglang.org/download/0.10.1/zig-linux-aarch64-0.10.1.tar.xz ) riscv? ( https://ziglang.org/download/0.10.1/zig-linux-riscv64-0.10.1.tar.xz ) x86? ( https://ziglang.org/download/0.10.1/zig-linux-i386-0.10.1.tar.xz )
+_md5_=4bb5cc8e5d31da86989b9d359116cf71
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a694f4fa6379..0b33b2ae5c74 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/apache-arrow-12.0.1 b/metadata/md5-cache/dev-libs/apache-arrow-12.0.1
new file mode 100644
index 000000000000..966ff9c7a185
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apache-arrow-12.0.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) compute? ( dev-libs/libutf8proc ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ssl? ( dev-libs/openssl ) ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-cpp/xsimd >=dev-libs/boost-1.81.0 json? ( dev-libs/rapidjson ) test? ( dev-cpp/gflags dev-cpp/gtest )
+DESCRIPTION=A cross-language development platform for in-memory data.
+EAPI=8
+HOMEPAGE=https://arrow.apache.org/
+INHERIT=cmake
+IUSE=brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) compute? ( dev-libs/libutf8proc ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ssl? ( dev-libs/openssl ) ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
+REQUIRED_USE=test? ( json parquet? ( zstd ) ) ssl? ( json )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/arrow/arrow-12.0.1/apache-arrow-12.0.1.tar.gz test? ( https://github.com/apache/parquet-testing/archive/b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz -> apache-arrow-parquet-data-12.0.1.tar.gz https://github.com/apache/arrow-testing/archive/d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz -> apache-arrow-arrow-data-12.0.1.tar.gz )
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5193745c50fd6ccf802872a8b044e1e9
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.11.4 b/metadata/md5-cache/dev-libs/libxml2-2.11.4
index 50aba620bc47..aa605003fd2f 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.11.4
+++ b/metadata/md5-cache/dev-libs/libxml2-2.11.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home
 INHERIT=flag-o-matic python-r1 multilib-minimal gnome.org libtool
 IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=virtual/libiconv >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[xml(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[xml(+)] ) ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libxml2/2.11/libxml2-2.11.4.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	gnome.org	6b39404f1491c60a2d32e3c693a683fe	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=155fba93c0926bdb3beb831ee3aa701e
+_md5_=e13e845083deddb930d95014a54db56f
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.38 b/metadata/md5-cache/dev-libs/libxslt-1.1.38
index e3bbf91bff0f..f6de4dabf68f 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.38
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.38
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libxslt
 INHERIT=flag-o-matic python-r1 multilib-minimal libtool gnome.org
 IUSE=crypt debug examples python static-libs python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libxslt/1.1/libxslt-1.1.38.tar.xz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	gnome.org	6b39404f1491c60a2d32e3c693a683fe	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b37e67611a6bf1efa61361fd8b11253a
+_md5_=42f42db6a75980e8f0bbcacf3a85ccc6
diff --git a/metadata/md5-cache/dev-libs/opensc-0.23.0-r1 b/metadata/md5-cache/dev-libs/opensc-0.23.0-r1
index a6421c204b45..69bd4c3e1e72 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.23.0-r1
+++ b/metadata/md5-cache/dev-libs/opensc-0.23.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/OpenSC/OpenSC/wiki
 INHERIT=bash-completion-r1 libtool
 IUSE=ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib
-KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) openct? ( >=dev-libs/openct-0.5.0 ) pace? ( dev-libs/openpace:= ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2 )
 REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.23.0/opensc-0.23.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=cda7e99034d98c30d4d28505d194d444
+_md5_=183306c84cc0bcbb271905e36b5b6626
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.13.2 b/metadata/md5-cache/dev-libs/qtkeychain-0.13.2
deleted file mode 100644
index 2bd703938b25..000000000000
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 keyring? ( app-crypt/libsecret dev-libs/glib:2 )
-DESCRIPTION=Qt API for storing passwords securely
-EAPI=8
-HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
-INHERIT=cmake
-IUSE=keyring
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=BSD-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 keyring? ( app-crypt/libsecret dev-libs/glib:2 )
-SLOT=0/1
-SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.13.2.tar.gz -> qtkeychain-0.13.2.tar.gz
-_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=75d6472e773e622627bbbe06adca1fbf
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r4 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r4
new file mode 100644
index 000000000000..e5a52dd7ce17
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r4
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Small event-driven (SAX-style) JSON parser
+EAPI=8
+HOMEPAGE=https://lloyd.github.io/yajl/
+INHERIT=cmake-multilib multibuild
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=ISC
+SLOT=0/2
+SRC_URI=https://github.com/lloyd/yajl/archive/2.1.0.tar.gz -> yajl-2.1.0.tar.gz
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=35c898b7d6534c54dc97cbbebce99ed5
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index f423596d048d..ee485f36b41c 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/reason-3.9.0 b/metadata/md5-cache/dev-ml/reason-3.9.0
deleted file mode 100644
index 34ba316fae56..000000000000
--- a/metadata/md5-cache/dev-ml/reason-3.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/fix:= dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/ppxlib:= dev-ml/utop:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Simple, fast & type safe language that leverages JavaScript and OCaml
-EAPI=8
-HOMEPAGE=https://reasonml.github.io/ https://github.com/reasonml/reason/
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-ml/fix:= dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/ppxlib:= dev-ml/utop:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/3.9.0
-SRC_URI=https://github.com/reasonml/reason/archive/3.9.0.tar.gz -> reason-3.9.0.tar.gz
-_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=43a46d2ecd38462d9ab1daebdf8581f2
diff --git a/metadata/md5-cache/dev-ml/reason-3.9.0-r1 b/metadata/md5-cache/dev-ml/reason-3.9.0-r1
new file mode 100644
index 000000000000..e6bc66e1a8a1
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/reason-3.9.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/dune-build-info:= dev-ml/fix:= dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/ppxlib:= dev-ml/utop:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Simple, fast & type safe language that leverages JavaScript and OCaml
+EAPI=8
+HOMEPAGE=https://reasonml.github.io/ https://github.com/reasonml/reason/
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/dune-build-info:= dev-ml/fix:= dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/ppxlib:= dev-ml/utop:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/3.9.0
+SRC_URI=https://github.com/reasonml/reason/archive/3.9.0.tar.gz -> reason-3.9.0.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=46582890cdb16013bc53d83b9a351d62
diff --git a/metadata/md5-cache/dev-ml/timezone-0.16.0 b/metadata/md5-cache/dev-ml/timezone-0.16.0
deleted file mode 100644
index 091f570f27ed..000000000000
--- a/metadata/md5-cache/dev-ml/timezone-0.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Time-zone handling for OCaml
-EAPI=8
-HOMEPAGE=https://github.com/janestreet/timezone
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/0.16
-SRC_URI=https://github.com/janestreet/timezone/archive/v0.16.0.tar.gz -> timezone-0.16.0.tar.gz
-_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=75ad01e07c6ddf2ddd0b7b39d92aefc4
diff --git a/metadata/md5-cache/dev-ml/timezone-0.16.0-r1 b/metadata/md5-cache/dev-ml/timezone-0.16.0-r1
new file mode 100644
index 000000000000..6bf91ec6cf0d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/timezone-0.16.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.14 dev-ml/core:0/0.16 dev-ml/ppx_jane:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Time-zone handling for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/janestreet/timezone
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.14 dev-ml/core:0/0.16 dev-ml/ppx_jane:0/0.16 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.16
+SRC_URI=https://github.com/janestreet/timezone/archive/v0.16.0.tar.gz -> timezone-0.16.0.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=52ab664cdb51af7f7e0a93627b300c3f
diff --git a/metadata/md5-cache/dev-perl/Config-General-2.650.0 b/metadata/md5-cache/dev-perl/Config-General-2.650.0
index 39f28a2b6fd9..81a2793a01d9 100644
--- a/metadata/md5-cache/dev-perl/Config-General-2.650.0
+++ b/metadata/md5-cache/dev-perl/Config-General-2.650.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Config-General
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.65.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=cd04060f4de73c2614f2bf8acaed5577
+_md5_=cf8c97ae38c07a4ff905667971f01ed3
diff --git a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.110.0 b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.110.0
new file mode 100644
index 000000000000..cf1e736a21cf
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.110.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-perl/IO-Socket-SSL-1.970.0 >=dev-perl/libwww-perl-6.60.0 >=dev-perl/Net-HTTP-6 virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Test-Needs-0.2.10 virtual/perl-Test-Simple dev-perl/Test-RequiresInternet ) dev-lang/perl test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Provide https support for LWP::UserAgent
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/LWP-Protocol-https
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/IO-Socket-SSL-1.970.0 >=dev-perl/libwww-perl-6.60.0 >=dev-perl/Net-HTTP-6 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.11.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=e6a693f63ded3634d97ccc7a8f302545
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index b7559ca69521..a9559c70d19e 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/PerlIO-eol-0.190.0 b/metadata/md5-cache/dev-perl/PerlIO-eol-0.190.0
new file mode 100644
index 000000000000..d72687223c86
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-eol-0.190.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-File-Temp-0.190.0 virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=PerlIO layer for normalizing line endings
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PerlIO-eol
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.19.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0c19c75ae2ae492c7acbc0f9e9c047e7
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 0926abca0fe6..6d1233f20ed2 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/recaptcha-1.2.1 b/metadata/md5-cache/dev-php/recaptcha-1.2.1
deleted file mode 100644
index 9dc1a46f13d4..000000000000
--- a/metadata/md5-cache/dev-php/recaptcha-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=test? ( dev-lang/php <dev-php/phpunit-6 )
-DEFINED_PHASES=install postinst test
-DESCRIPTION=PHP client library for Google's reCAPTCHA service
-EAPI=7
-HOMEPAGE=https://github.com/google/recaptcha
-IUSE=examples test
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-lang/php
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/recaptcha/archive/1.2.1.tar.gz -> recaptcha-1.2.1.tar.gz
-_md5_=26e1fb7c66929bb019cd367430c2994b
diff --git a/metadata/md5-cache/dev-php/recaptcha-1.2.4 b/metadata/md5-cache/dev-php/recaptcha-1.2.4
index 2c99b8af04ef..fd8f5406082a 100644
--- a/metadata/md5-cache/dev-php/recaptcha-1.2.4
+++ b/metadata/md5-cache/dev-php/recaptcha-1.2.4
@@ -4,10 +4,10 @@ DESCRIPTION=PHP client library for Google's reCAPTCHA service
 EAPI=8
 HOMEPAGE=https://github.com/google/recaptcha
 IUSE=examples test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-lang/php
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/recaptcha/archive/1.2.4.tar.gz -> recaptcha-1.2.4.tar.gz
-_md5_=c76f8cb06bf61644f9aabebc1a2c0255
+_md5_=179a7927da35adb637dfdc6cd3a1197e
diff --git a/metadata/md5-cache/dev-python/Arpeggio-2.0.2 b/metadata/md5-cache/dev-python/Arpeggio-2.0.2
new file mode 100644
index 000000000000..bd6c50b52316
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Arpeggio-2.0.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/memory_profiler[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Parser interpreter based on PEG grammars
+EAPI=8
+HOMEPAGE=https://pypi.org/project/Arpeggio/ https://github.com/textX/Arpeggio/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/A/Arpeggio/Arpeggio-2.0.2.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=db592e96d3e01fb372e27ad026ca12ab
diff --git a/metadata/md5-cache/dev-python/Faker-18.10.1 b/metadata/md5-cache/dev-python/Faker-18.10.1
deleted file mode 100644
index 663bc78a4016..000000000000
--- a/metadata/md5-cache/dev-python/Faker-18.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,tiff] dev-python/validators[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-18.10.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3de00ea4776057a98096e728ea00c155
diff --git a/metadata/md5-cache/dev-python/Faker-18.11.1 b/metadata/md5-cache/dev-python/Faker-18.11.1
deleted file mode 100644
index 95e27d2c8058..000000000000
--- a/metadata/md5-cache/dev-python/Faker-18.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,tiff] dev-python/validators[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-18.11.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3de00ea4776057a98096e728ea00c155
diff --git a/metadata/md5-cache/dev-python/Faker-18.11.2 b/metadata/md5-cache/dev-python/Faker-18.11.2
index 70c0709e72f9..69c1b3a308a9 100644
--- a/metadata/md5-cache/dev-python/Faker-18.11.2
+++ b/metadata/md5-cache/dev-python/Faker-18.11.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-18.11.2.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3de00ea4776057a98096e728ea00c155
+_md5_=bce6716865489b6ad3bd68fe33cab5cd
diff --git a/metadata/md5-cache/dev-python/Faker-18.9.0 b/metadata/md5-cache/dev-python/Faker-18.9.0
deleted file mode 100644
index 79b15732cec4..000000000000
--- a/metadata/md5-cache/dev-python/Faker-18.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,tiff] dev-python/validators[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-ruby/faker python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-18.9.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=bce6716865489b6ad3bd68fe33cab5cd
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 65de378240d6..812afbd69008 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/Nuitka-1.7.2 b/metadata/md5-cache/dev-python/Nuitka-1.7.2
new file mode 100644
index 000000000000..fe980995428c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Nuitka-1.7.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-util/ccache ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
+INHERIT=distutils-r1 flag-o-matic optfeature pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-1.7.2.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=8cf4127b8da219de3d0ae035e5ea0295
diff --git a/metadata/md5-cache/dev-python/Nuitka-1.7.3 b/metadata/md5-cache/dev-python/Nuitka-1.7.3
new file mode 100644
index 000000000000..e4a64e5bd01d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Nuitka-1.7.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-util/ccache ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
+INHERIT=distutils-r1 flag-o-matic optfeature pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-1.7.3.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=8cf4127b8da219de3d0ae035e5ea0295
diff --git a/metadata/md5-cache/dev-python/PyQt-builder-1.15.0 b/metadata/md5-cache/dev-python/PyQt-builder-1.15.0
deleted file mode 100644
index 0835414189ba..000000000000
--- a/metadata/md5-cache/dev-python/PyQt-builder-1.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The PEP 517 compliant PyQt build system
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/
-INHERIT=distutils-r1 pypi
-IUSE=doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-1.15.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c8b94fb933473b3bbe53f5b717cada49
diff --git a/metadata/md5-cache/dev-python/PyQt-builder-1.15.1 b/metadata/md5-cache/dev-python/PyQt-builder-1.15.1
index 13002c7fed63..531fe1e41c3b 100644
--- a/metadata/md5-cache/dev-python/PyQt-builder-1.15.1
+++ b/metadata/md5-cache/dev-python/PyQt-builder-1.15.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/
 INHERIT=distutils-r1 pypi
 IUSE=doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-1.15.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=0ebbf81dc0b01c50958f7ff7e6592cb2
+_md5_=c8b94fb933473b3bbe53f5b717cada49
diff --git a/metadata/md5-cache/dev-python/allpairspy-2.5.1 b/metadata/md5-cache/dev-python/allpairspy-2.5.1
new file mode 100644
index 000000000000..e20af0702b95
--- /dev/null
+++ b/metadata/md5-cache/dev-python/allpairspy-2.5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pairwise test combinations generator
+EAPI=8
+HOMEPAGE=https://github.com/thombashi/allpairspy/ https://pypi.org/project/allpairspy/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/allpairspy/allpairspy-2.5.1.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=3c8bd89f23524e576de1c3eedae6844c
diff --git a/metadata/md5-cache/dev-python/arrow-1.2.3 b/metadata/md5-cache/dev-python/arrow-1.2.3
index 4263855e1d9b..d2a7b18d213c 100644
--- a/metadata/md5-cache/dev-python/arrow-1.2.3
+++ b/metadata/md5-cache/dev-python/arrow-1.2.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/arrow-py/arrow/ https://pypi.org/project/arrow/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/arrow/arrow-1.2.3.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f97900608baeb4b7e9080f0f31fdcbad
+_md5_=ad9bfd8927c8f1e8f5c9fb4525e05c3c
diff --git a/metadata/md5-cache/dev-python/astroid-2.15.6 b/metadata/md5-cache/dev-python/astroid-2.15.6
new file mode 100644
index 000000000000..589b49561b47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.15.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-python/typing-extensions-4.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/pylint-dev/astroid/ https://pypi.org/project/astroid/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-python/typing-extensions-4.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pylint-dev/astroid/archive/v2.15.6.tar.gz -> astroid-2.15.6.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=df87a0c6b7fd2ecba84e2d278eb13943
diff --git a/metadata/md5-cache/dev-python/attrs-23.1.0 b/metadata/md5-cache/dev-python/attrs-23.1.0
index 816513c6c048..3fdfb17a1387 100644
--- a/metadata/md5-cache/dev-python/attrs-23.1.0
+++ b/metadata/md5-cache/dev-python/attrs-23.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-attrs/attrs/ https://attrs.readthedocs.io/ https://pypi.org/project/attrs/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/attrs/attrs-23.1.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f6c36bdd4c525b58e542a5d10ce21d45
+_md5_=3dede012ea69d703744f3e45885f7ac0
diff --git a/metadata/md5-cache/dev-python/cffi-1.15.1-r2 b/metadata/md5-cache/dev-python/cffi-1.15.1-r2
deleted file mode 100644
index dbda432dce59..000000000000
--- a/metadata/md5-cache/dev-python/cffi-1.15.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-libs/libffi-3.4.4-r1:= dev-python/pycparser[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) test? ( >=dev-libs/libffi-3.4.4-r1:= dev-python/pycparser[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libffi-3.4.4-r1:= python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-DESCRIPTION=Foreign Function Interface for Python calling C code
-EAPI=7
-HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
-INHERIT=distutils-r1 toolchain-funcs pypi
-IUSE=doc test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/libffi-3.4.4-r1:= dev-python/pycparser[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/1.15.1
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-python/cffi/cffi-1.15.1-drop-deprecated-py.patch.xz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d01e5c6c36974003c8dafdbf6ef05aa5
diff --git a/metadata/md5-cache/dev-python/cffi-1.15.1-r3 b/metadata/md5-cache/dev-python/cffi-1.15.1-r3
index fc0e5b90e58d..44474bf91516 100644
--- a/metadata/md5-cache/dev-python/cffi-1.15.1-r3
+++ b/metadata/md5-cache/dev-python/cffi-1.15.1-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 INHERIT=distutils-r1 toolchain-funcs pypi
 IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libffi-3.4.4-r1:= dev-python/pycparser[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.15.1
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-python/cffi/cffi-1.15.1-drop-deprecated-py.patch.xz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=dd8a00267f87f3dae3a650171cd5d4d9
+_md5_=f8b5030a77c2eccdccd4804b83c3bc8a
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.10 b/metadata/md5-cache/dev-python/cfn-lint-0.77.10
index d46981b1ac8e..cbf1cc993ba1 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.77.10
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.77.10
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.10.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=210ba815496a2deaa792bb4ff6d921bc
+_md5_=e8f9fe6150d06c6c67341d46e8847aac
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.6 b/metadata/md5-cache/dev-python/cfn-lint-0.77.6
deleted file mode 100644
index c12c46eefc67..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.77.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.6.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e8f9fe6150d06c6c67341d46e8847aac
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.7 b/metadata/md5-cache/dev-python/cfn-lint-0.77.7
deleted file mode 100644
index e9ce172272bb..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.77.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.7.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=210ba815496a2deaa792bb4ff6d921bc
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.8 b/metadata/md5-cache/dev-python/cfn-lint-0.77.8
deleted file mode 100644
index 07804107246a..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.77.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.8.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=210ba815496a2deaa792bb4ff6d921bc
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.9 b/metadata/md5-cache/dev-python/cfn-lint-0.77.9
deleted file mode 100644
index 7af301405163..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.77.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.68.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.9.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=210ba815496a2deaa792bb4ff6d921bc
diff --git a/metadata/md5-cache/dev-python/cryptography-40.0.2-r1 b/metadata/md5-cache/dev-python/cryptography-40.0.2-r1
deleted file mode 100644
index 867bdc170575..000000000000
--- a/metadata/md5-cache/dev-python/cryptography-40.0.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/hypothesis-1.11.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iso8601[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-subtests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
-DESCRIPTION=Library providing cryptographic recipes and primitives
-EAPI=8
-HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
-INHERIT=cargo distutils-r1 multiprocessing pypi
-IUSE=test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT Unicode-DFS-2016
-RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-40.0.2.tar.gz https://dev.gentoo.org/~mgorny/dist/cryptography-40.0.2-pyo3-0.18.patch.bz2 https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/asn1/0.13.0/download -> asn1-0.13.0.crate https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -> asn1_derive-0.13.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.24/download -> chrono-0.4.24.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cxx/1.0.86/download -> cxx-1.0.86.crate https://crates.io/api/v1/crates/cxx-build/1.0.86/download -> cxx-build-1.0.86.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.86/download -> cxxbridge-flags-1.0.86.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.86/download -> cxxbridge-macro-1.0.86.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.54/download -> iana-time-zone-0.1.54.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/libc/0.2.140/download -> libc-0.2.140.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/openssl/0.10.50/download -> openssl-0.10.50.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-sys/0.9.85/download -> openssl-sys-0.9.85.crate https://crates.io/api/v1/crates/ouroboros/0.15.6/download -> ouroboros-0.15.6.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.6/download -> ouroboros_macro-0.15.6.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/pem/1.1.1/download -> pem-1.1.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.53/download -> proc-macro2-1.0.53.crate https://crates.io/api/v1/crates/pyo3/0.18.3/download -> pyo3-0.18.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.3/download -> pyo3-build-config-0.18.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.3/download -> pyo3-ffi-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.3/download -> pyo3-macros-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.3/download -> pyo3-macros-backend-0.18.3.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.5/download -> scratch-1.0.5.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.8/download -> unicode-ident-1.0.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.46.0/download -> windows-0.46.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate test? ( https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-40.0.2.tar.gz )
-_eclasses_=cargo	cddd4ee89517b7a52ddce3da8abf3109	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=215875d7de2abc76b4f953e5253473dd
diff --git a/metadata/md5-cache/dev-python/cryptography-40.0.2-r2 b/metadata/md5-cache/dev-python/cryptography-40.0.2-r2
new file mode 100644
index 000000000000..bf697bcf7e23
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-40.0.2-r2
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/hypothesis-1.11.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iso8601[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-subtests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=8
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
+INHERIT=cargo distutils-r1 flag-o-matic multiprocessing pypi
+IUSE=test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT Unicode-DFS-2016
+RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-40.0.2.tar.gz https://dev.gentoo.org/~mgorny/dist/cryptography-40.0.2-pyo3-0.18.patch.bz2 https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/asn1/0.13.0/download -> asn1-0.13.0.crate https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -> asn1_derive-0.13.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.24/download -> chrono-0.4.24.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cxx/1.0.86/download -> cxx-1.0.86.crate https://crates.io/api/v1/crates/cxx-build/1.0.86/download -> cxx-build-1.0.86.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.86/download -> cxxbridge-flags-1.0.86.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.86/download -> cxxbridge-macro-1.0.86.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.54/download -> iana-time-zone-0.1.54.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/libc/0.2.140/download -> libc-0.2.140.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/openssl/0.10.50/download -> openssl-0.10.50.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-sys/0.9.85/download -> openssl-sys-0.9.85.crate https://crates.io/api/v1/crates/ouroboros/0.15.6/download -> ouroboros-0.15.6.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.6/download -> ouroboros_macro-0.15.6.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/pem/1.1.1/download -> pem-1.1.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.53/download -> proc-macro2-1.0.53.crate https://crates.io/api/v1/crates/pyo3/0.18.3/download -> pyo3-0.18.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.3/download -> pyo3-build-config-0.18.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.3/download -> pyo3-ffi-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.3/download -> pyo3-macros-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.3/download -> pyo3-macros-backend-0.18.3.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.5/download -> scratch-1.0.5.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.8/download -> unicode-ident-1.0.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.46.0/download -> windows-0.46.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate test? ( https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-40.0.2.tar.gz )
+_eclasses_=cargo	cddd4ee89517b7a52ddce3da8abf3109	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=f1859e30d590e9fdb4bdc344142f4614
diff --git a/metadata/md5-cache/dev-python/cryptography-41.0.1 b/metadata/md5-cache/dev-python/cryptography-41.0.1
deleted file mode 100644
index 67a28816cb1f..000000000000
--- a/metadata/md5-cache/dev-python/cryptography-41.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/hypothesis-1.11.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iso8601[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-subtests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
-DESCRIPTION=Library providing cryptographic recipes and primitives
-EAPI=8
-HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
-INHERIT=cargo distutils-r1 multiprocessing pypi
-IUSE=test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT Unicode-DFS-2016
-RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-41.0.1.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/asn1/0.15.2/download -> asn1-0.15.2.crate https://crates.io/api/v1/crates/asn1_derive/0.15.2/download -> asn1_derive-0.15.2.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/indoc/1.0.9/download -> indoc-1.0.9.crate https://crates.io/api/v1/crates/libc/0.2.144/download -> libc-0.2.144.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/once_cell/1.17.2/download -> once_cell-1.17.2.crate https://crates.io/api/v1/crates/openssl-macros/0.1.1/download -> openssl-macros-0.1.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.88/download -> openssl-sys-0.9.88.crate https://crates.io/api/v1/crates/openssl/0.10.54/download -> openssl-0.10.54.crate https://crates.io/api/v1/crates/ouroboros/0.15.6/download -> ouroboros-0.15.6.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.6/download -> ouroboros_macro-0.15.6.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/pem/1.1.1/download -> pem-1.1.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.27/download -> pkg-config-0.3.27.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.59/download -> proc-macro2-1.0.59.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.3/download -> pyo3-build-config-0.18.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.3/download -> pyo3-ffi-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.3/download -> pyo3-macros-backend-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.3/download -> pyo3-macros-0.18.3.crate https://crates.io/api/v1/crates/pyo3/0.18.3/download -> pyo3-0.18.3.crate https://crates.io/api/v1/crates/quote/1.0.28/download -> quote-1.0.28.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.18/download -> syn-2.0.18.crate https://crates.io/api/v1/crates/target-lexicon/0.12.7/download -> target-lexicon-0.12.7.crate https://crates.io/api/v1/crates/unicode-ident/1.0.9/download -> unicode-ident-1.0.9.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate test? ( https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-41.0.1.tar.gz )
-_eclasses_=cargo	cddd4ee89517b7a52ddce3da8abf3109	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=4491a1e22150087b3d498a7f5bc1efbe
diff --git a/metadata/md5-cache/dev-python/cryptography-41.0.1-r1 b/metadata/md5-cache/dev-python/cryptography-41.0.1-r1
new file mode 100644
index 000000000000..44543aa01e5d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-41.0.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/hypothesis-1.11.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/iso8601[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-subtests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=8
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
+INHERIT=cargo distutils-r1 flag-o-matic multiprocessing pypi
+IUSE=test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT Unicode-DFS-2016
+RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-41.0.1.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/asn1/0.15.2/download -> asn1-0.15.2.crate https://crates.io/api/v1/crates/asn1_derive/0.15.2/download -> asn1_derive-0.15.2.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/indoc/1.0.9/download -> indoc-1.0.9.crate https://crates.io/api/v1/crates/libc/0.2.144/download -> libc-0.2.144.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/once_cell/1.17.2/download -> once_cell-1.17.2.crate https://crates.io/api/v1/crates/openssl-macros/0.1.1/download -> openssl-macros-0.1.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.88/download -> openssl-sys-0.9.88.crate https://crates.io/api/v1/crates/openssl/0.10.54/download -> openssl-0.10.54.crate https://crates.io/api/v1/crates/ouroboros/0.15.6/download -> ouroboros-0.15.6.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.6/download -> ouroboros_macro-0.15.6.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/pem/1.1.1/download -> pem-1.1.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.27/download -> pkg-config-0.3.27.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.59/download -> proc-macro2-1.0.59.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.3/download -> pyo3-build-config-0.18.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.3/download -> pyo3-ffi-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.3/download -> pyo3-macros-backend-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.3/download -> pyo3-macros-0.18.3.crate https://crates.io/api/v1/crates/pyo3/0.18.3/download -> pyo3-0.18.3.crate https://crates.io/api/v1/crates/quote/1.0.28/download -> quote-1.0.28.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.18/download -> syn-2.0.18.crate https://crates.io/api/v1/crates/target-lexicon/0.12.7/download -> target-lexicon-0.12.7.crate https://crates.io/api/v1/crates/unicode-ident/1.0.9/download -> unicode-ident-1.0.9.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate test? ( https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-41.0.1.tar.gz )
+_eclasses_=cargo	cddd4ee89517b7a52ddce3da8abf3109	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=f1d357620432831e74046d9e09fa66dc
diff --git a/metadata/md5-cache/dev-python/denonavr-0.11.3 b/metadata/md5-cache/dev-python/denonavr-0.11.3
new file mode 100644
index 000000000000..b26115726407
--- /dev/null
+++ b/metadata/md5-cache/dev-python/denonavr-0.11.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/asyncstdlib-3.10.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/attrs-21.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/defusedxml-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netifaces-0.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-4.0.2[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[xml(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[xml(+)] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automation Library for Denon AVR receivers
+EAPI=8
+HOMEPAGE=https://github.com/ol-iver/denonavr/ https://pypi.org/project/denonavr/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/asyncstdlib-3.10.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/attrs-21.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/defusedxml-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netifaces-0.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-4.0.2[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[xml(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/denonavr/denonavr-0.11.3.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=77188b87898cd9de5b2ccd6745c72d4c
diff --git a/metadata/md5-cache/dev-python/deprecation-2.1.0 b/metadata/md5-cache/dev-python/deprecation-2.1.0
deleted file mode 100644
index e344ca67ba6d..000000000000
--- a/metadata/md5-cache/dev-python/deprecation-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library to handle automated deprecations
-EAPI=8
-HOMEPAGE=https://deprecation.readthedocs.io/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/d/deprecation/deprecation-2.1.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5a96e454dd96878c387a5a1a04b2efe6
diff --git a/metadata/md5-cache/dev-python/deprecation-2.1.0-r1 b/metadata/md5-cache/dev-python/deprecation-2.1.0-r1
index 0c563a101b5b..b5a46cf6c950 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.1.0-r1
+++ b/metadata/md5-cache/dev-python/deprecation-2.1.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://deprecation.readthedocs.io/ https://github.com/briancurtin/deprecation/ https://pypi.org/project/deprecation/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/d/deprecation/deprecation-2.1.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=1d1681475340a89207dfbcaa2265df20
+_md5_=7b714e6d9108fb3658e55092712aa64d
diff --git a/metadata/md5-cache/dev-python/docker-6.1.2 b/metadata/md5-cache/dev-python/docker-6.1.2
deleted file mode 100644
index 1ea621bf82c7..000000000000
--- a/metadata/md5-cache/dev-python/docker-6.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/paramiko-2.4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/packaging-14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python client for Docker
-EAPI=8
-HOMEPAGE=https://github.com/docker/docker-py/ https://pypi.org/project/docker/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/packaging-14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/docker/docker-py/archive/6.1.2.tar.gz -> docker-py-6.1.2.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c63d53f937b07d4fe7e93fa13559d75b
diff --git a/metadata/md5-cache/dev-python/docker-6.1.3 b/metadata/md5-cache/dev-python/docker-6.1.3
index b67162ee485e..eac7156297ac 100644
--- a/metadata/md5-cache/dev-python/docker-6.1.3
+++ b/metadata/md5-cache/dev-python/docker-6.1.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/docker/docker-py/ https://pypi.org/project/docker/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/packaging-14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/6.1.3.tar.gz -> docker-py-6.1.3.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=a24aeb77f92d593aa37c60c8ff39d9b0
+_md5_=b99a2c70be48b47521d43e141956cfbd
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.2.2 b/metadata/md5-cache/dev-python/dogpile-cache-1.2.2
new file mode 100644
index 000000000000..956fabb5fae3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.2.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/decorator-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/typing-extensions-4.0.1[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A locking API for expiring values while a single thread generates a new value
+EAPI=8
+HOMEPAGE=https://github.com/sqlalchemy/dogpile.cache/ https://pypi.org/project/dogpile.cache/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/decorator-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/typing-extensions-4.0.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/dogpile.cache/dogpile.cache-1.2.2.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=ab795ebf2f242f00c4c9adfaabb6bd95
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-8.8.2 b/metadata/md5-cache/dev-python/elasticsearch-py-8.8.2
new file mode 100644
index 000000000000..aa27887798af
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-8.8.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aiohttp-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiohttp-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/elastic-transport-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/elastic-transport-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/requests-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mapbox-vector-tile[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unasync[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/aiohttp-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiohttp-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/elastic-transport-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/elastic-transport-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/requests-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Official Elasticsearch client library for Python
+EAPI=8
+HOMEPAGE=https://ela.st/es-python https://github.com/elastic/elasticsearch-py https://pypi.org/project/elasticsearch/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aiohttp-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiohttp-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/elastic-transport-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/elastic-transport-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/requests-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!amd64? ( test ) !elibc_glibc? ( test ) !test? ( test ) !test? ( test )
+SLOT=0/8
+SRC_URI=https://github.com/elastic/elasticsearch-py/archive/refs/tags/v8.8.2.tar.gz -> elasticsearch-py-8.8.2.gh.tar.gz test? ( amd64? ( elibc_glibc? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.8.2-linux-x86_64.tar.gz ) ) )
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=dcb580de488d3bcde18858ec5f0242e3
diff --git a/metadata/md5-cache/dev-python/eradicate-2.2.0 b/metadata/md5-cache/dev-python/eradicate-2.2.0
deleted file mode 100644
index f6b0dffb51be..000000000000
--- a/metadata/md5-cache/dev-python/eradicate-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Removes commented-out code from Python files
-EAPI=8
-HOMEPAGE=https://github.com/wemake-services/eradicate/ https://pypi.org/project/eradicate/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/wemake-services/eradicate/archive/2.2.0.tar.gz -> eradicate-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7a6701c8d1af8c6cf4a3c58d2ee1bdd4
diff --git a/metadata/md5-cache/dev-python/eradicate-2.3.0 b/metadata/md5-cache/dev-python/eradicate-2.3.0
index 49845a7aee72..6496e9ea0878 100644
--- a/metadata/md5-cache/dev-python/eradicate-2.3.0
+++ b/metadata/md5-cache/dev-python/eradicate-2.3.0
@@ -2,15 +2,15 @@ BDEPEND=test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targe
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Removes commented-out code from Python files
 EAPI=8
-HOMEPAGE=https://github.com/wemake-services/eradicate/ https://pypi.org/project/eradicate/
+HOMEPAGE=https://github.com/PyCQA/eradicate/ https://pypi.org/project/eradicate/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/wemake-services/eradicate/archive/2.3.0.tar.gz -> eradicate-2.3.0.gh.tar.gz
+SRC_URI=https://github.com/PyCQA/eradicate/archive/2.3.0.tar.gz -> eradicate-2.3.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e554042afaf085c2d484fa3f69ce29b8
+_md5_=8717dff30d9358eb6fba5bc457ee9244
diff --git a/metadata/md5-cache/dev-python/execnet-2.0.1 b/metadata/md5-cache/dev-python/execnet-2.0.1
new file mode 100644
index 000000000000..fd466c92fbb7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/execnet-2.0.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] doc? ( || ( ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Rapid multi-Python deployment
+EAPI=8
+HOMEPAGE=https://codespeak.net/execnet/ https://github.com/pytest-dev/execnet/ https://pypi.org/project/execnet/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/e/execnet/execnet-2.0.1.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=e91040f6956b9d499233eee2b0213393
diff --git a/metadata/md5-cache/dev-python/execnet-2.0.2 b/metadata/md5-cache/dev-python/execnet-2.0.2
new file mode 100644
index 000000000000..7ee1c42a36e4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/execnet-2.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] doc? ( || ( ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Rapid multi-Python deployment
+EAPI=8
+HOMEPAGE=https://codespeak.net/execnet/ https://github.com/pytest-dev/execnet/ https://pypi.org/project/execnet/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/e/execnet/execnet-2.0.2.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=e91040f6956b9d499233eee2b0213393
diff --git a/metadata/md5-cache/dev-python/filelock-3.12.2 b/metadata/md5-cache/dev-python/filelock-3.12.2
index abf131a2f01b..67b950408af6 100644
--- a/metadata/md5-cache/dev-python/filelock-3.12.2
+++ b/metadata/md5-cache/dev-python/filelock-3.12.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Unlicense
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/f/filelock/filelock-3.12.2.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=837ad93fa0e5ad9c5b78eca103bd1234
+_md5_=5b4f1477e89cbcf69d3b151dfdb819a3
diff --git a/metadata/md5-cache/dev-python/fqdn-1.5.1-r2 b/metadata/md5-cache/dev-python/fqdn-1.5.1-r2
index ff43c7f31fbc..da9f6c646a23 100644
--- a/metadata/md5-cache/dev-python/fqdn-1.5.1-r2
+++ b/metadata/md5-cache/dev-python/fqdn-1.5.1-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ypcrts/fqdn/ https://pypi.org/project/fqdn/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MPL-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ypcrts/fqdn/archive/v1.5.1.tar.gz -> fqdn-1.5.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=a252a9c16b2b1fd822f160f737703688
+_md5_=ebcf7cdf3d67d465f24fc565d755f46b
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.12.2 b/metadata/md5-cache/dev-python/fritzconnection-1.12.2
new file mode 100644
index 000000000000..3fa713f9a693
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fritzconnection-1.12.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/requests-2.22[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP
+EAPI=8
+HOMEPAGE=https://github.com/kbr/fritzconnection/ https://pypi.org/project/fritzconnection/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.22[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kbr/fritzconnection/archive/1.12.2.tar.gz -> fritzconnection-1.12.2.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=615a0beb51faaf3308c256fa2413a173
diff --git a/metadata/md5-cache/dev-python/h5py-3.9.0 b/metadata/md5-cache/dev-python/h5py-3.9.0
index 57166a9f02f4..02eb8137154a 100644
--- a/metadata/md5-cache/dev-python/h5py-3.9.0
+++ b/metadata/md5-cache/dev-python/h5py-3.9.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.h5py.org/ https://github.com/h5py/h5py/ https://pypi.org/project/h5py/
 INHERIT=distutils-r1 pypi
 IUSE=examples test doc python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[hl(+)] >=dev-python/numpy-1.17.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/h/h5py/h5py-3.9.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=df6a66a3298572f223a7dc8e0fa658ee
+_md5_=4bec09d717cbfa27eba1bfad95713ed7
diff --git a/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-23.1.0 b/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-23.1.0
index 8284cbe8fd4f..d3e01a0ca2a2 100644
--- a/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-23.1.0
+++ b/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-23.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/hatch-fancy-pypi-readme/ https://github.com/hynek/hatch-fancy-pypi-readme/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/hatchling[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hynek/hatch-fancy-pypi-readme/archive/23.1.0.tar.gz -> hatch-fancy-pypi-readme-23.1.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b8cfd8ec03a28bb3ece4b48bce6770c4
+_md5_=100a91d2d2f83285b51d34c290d7f2bc
diff --git a/metadata/md5-cache/dev-python/hatch-vcs-0.3.0 b/metadata/md5-cache/dev-python/hatch-vcs-0.3.0
index 6fcda828d762..0e46b66b4149 100644
--- a/metadata/md5-cache/dev-python/hatch-vcs-0.3.0
+++ b/metadata/md5-cache/dev-python/hatch-vcs-0.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/hatch-vcs/ https://github.com/ofek/hatch-vcs/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/setuptools-scm-6.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ofek/hatch-vcs/archive/v0.3.0.tar.gz -> hatch-vcs-0.3.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6e0cd3052972b6ae127114b5d7c51aa7
+_md5_=b5c6febd64733f6bbf0121bc04fc6fa1
diff --git a/metadata/md5-cache/dev-python/hypercorn-0.14.4 b/metadata/md5-cache/dev-python/hypercorn-0.14.4
new file mode 100644
index 000000000000..6dc0ea08a998
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypercorn-0.14.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/trio-0.22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/h11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h2-3.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/priority[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/wsproto-0.14.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A ASGI Server based on Hyper libraries and inspired by Gunicorn
+EAPI=8
+HOMEPAGE=https://github.com/pgjones/hypercorn/ https://pypi.org/project/hypercorn/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/h11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h2-3.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/priority[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/wsproto-0.14.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pgjones/hypercorn/archive/0.14.4.tar.gz -> hypercorn-0.14.4.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=672dcaae73c6dbefe0180ae5d9d7e75c
diff --git a/metadata/md5-cache/dev-python/idna-3.4 b/metadata/md5-cache/dev-python/idna-3.4
index e5360264f122..adb6da4ba159 100644
--- a/metadata/md5-cache/dev-python/idna-3.4
+++ b/metadata/md5-cache/dev-python/idna-3.4
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/kjd/idna/ https://pypi.org/project/idna/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/i/idna/idna-3.4.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=43e2dc11aab06800d85068dad72c0056
+_md5_=4164b8837eae89696bb77d093e2c9691
diff --git a/metadata/md5-cache/dev-python/ipython-8.13.2 b/metadata/md5-cache/dev-python/ipython-8.13.2
deleted file mode 100644
index 8f59bb260114..000000000000
--- a/metadata/md5-cache/dev-python/ipython-8.13.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/backcall[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.38[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[readline,sqlite,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=8
-HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/ https://pypi.org/project/ipython/
-INHERIT=distutils-r1 optfeature pypi virtualx
-IUSE=doc examples notebook nbconvert qt5 +smp test test python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/widgetsnbextension[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-RDEPEND=dev-python/backcall[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.38[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] nbconvert? ( dev-python/nbconvert[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[readline,sqlite,threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/i/ipython/ipython-8.13.2.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=7e959e43619e17dd88f713ad637456c7
diff --git a/metadata/md5-cache/dev-python/ipython-8.14.0 b/metadata/md5-cache/dev-python/ipython-8.14.0
index bd74999b725f..6f007815c251 100644
--- a/metadata/md5-cache/dev-python/ipython-8.14.0
+++ b/metadata/md5-cache/dev-python/ipython-8.14.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/ https://pypi.org/project/ipython/
 INHERIT=distutils-r1 optfeature pypi virtualx
 IUSE=doc examples notebook nbconvert qt5 +smp test test python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/widgetsnbextension[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 RDEPEND=dev-python/backcall[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.38[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] nbconvert? ( dev-python/nbconvert[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[readline,sqlite,threads(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/i/ipython/ipython-8.14.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=cabf982a8bd4da33c77a15cdc477b83f
+_md5_=87c34b6dfd9e2272003f5f3a1b2fe87e
diff --git a/metadata/md5-cache/dev-python/iso8601-1.1.0 b/metadata/md5-cache/dev-python/iso8601-1.1.0
deleted file mode 100644
index 97d92988eef9..000000000000
--- a/metadata/md5-cache/dev-python/iso8601-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple module to parse ISO 8601 dates
-EAPI=8
-HOMEPAGE=https://github.com/micktwomey/pyiso8601/ https://pypi.org/project/iso8601/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/i/iso8601/iso8601-1.1.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3f53e7893831a534fcf6f4c73c624c54
diff --git a/metadata/md5-cache/dev-python/iso8601-2.0.0 b/metadata/md5-cache/dev-python/iso8601-2.0.0
index 53acc6d19f59..4295db825476 100644
--- a/metadata/md5-cache/dev-python/iso8601-2.0.0
+++ b/metadata/md5-cache/dev-python/iso8601-2.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/micktwomey/pyiso8601/ https://pypi.org/project/iso8601/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/i/iso8601/iso8601-2.0.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f0c8eea90598fc1e435cbe0b05063f8b
+_md5_=3f53e7893831a534fcf6f4c73c624c54
diff --git a/metadata/md5-cache/dev-python/isoduration-20.11.0-r1 b/metadata/md5-cache/dev-python/isoduration-20.11.0-r1
index fde6bfd8d8cd..b8c467d587e7 100644
--- a/metadata/md5-cache/dev-python/isoduration-20.11.0-r1
+++ b/metadata/md5-cache/dev-python/isoduration-20.11.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/isoduration/ https://github.com/bolsote/isoduration/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=ISC
 RDEPEND=>=dev-python/arrow-0.15.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bolsote/isoduration/archive/20.11.0.tar.gz -> isoduration-20.11.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b44b304f267dd0330be1a74fbe79a6b2
+_md5_=183d07ecb44c70972695ce82df1a93f2
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-3.3.0 b/metadata/md5-cache/dev-python/jaraco-classes-3.3.0
new file mode 100644
index 000000000000..d28359fade89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-classes-3.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Classes used by other projects by developer jaraco
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/jaraco.classes/ https://pypi.org/project/jaraco.classes/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jaraco.classes/jaraco.classes-3.3.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=8e9e6989bbf17e719a68301d4b03cbc0
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.4 b/metadata/md5-cache/dev-python/jsonpointer-2.4
index 0521fff8b1d8..0ce1ea06afd5 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.4
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/stefankoegl/python-json-pointer/ https://pypi.org/project/jsonpointer/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jsonpointer/jsonpointer-2.4.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6fc3f7c872f4bc50e74c5193b959f2b7
+_md5_=7da49e19583230d4575847b6bd470e9f
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.17.3 b/metadata/md5-cache/dev-python/jsonschema-4.17.3
index 1839f5ac7c3f..56ba83b52b63 100644
--- a/metadata/md5-cache/dev-python/jsonschema-4.17.3
+++ b/metadata/md5-cache/dev-python/jsonschema-4.17.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/python-jsonschema/jsonschema/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/webcolors-1.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jsonschema/jsonschema-4.17.3.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=158a9f45011a959e6f928c9f1ccbef20
+_md5_=85c0679c90a324cc357d122d1c2557c9
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.18.0 b/metadata/md5-cache/dev-python/jsonschema-4.18.0
index abbdf268c912..2de5febfb6db 100644
--- a/metadata/md5-cache/dev-python/jsonschema-4.18.0
+++ b/metadata/md5-cache/dev-python/jsonschema-4.18.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/python-jsonschema/jsonschema/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~riscv
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-specifications-2023.03.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/referencing-0.28.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rpds-py-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/webcolors-1.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jsonschema/jsonschema-4.18.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e26a2dc9a4b6452515048f1988406c67
+_md5_=1188f9cb42b3c22409f37233a887a7ec
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.1.4 b/metadata/md5-cache/dev-python/jsonschema-spec-0.1.4
deleted file mode 100644
index dccd62486275..000000000000
--- a/metadata/md5-cache/dev-python/jsonschema-spec-0.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( <dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JSONSchema Spec with object-oriented paths
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.1.4.tar.gz -> jsonschema-spec-0.1.4.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b4c28755e8fec0b108605d0f2c7d8bcd
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.1.5 b/metadata/md5-cache/dev-python/jsonschema-spec-0.1.5
deleted file mode 100644
index 4c212d47a257..000000000000
--- a/metadata/md5-cache/dev-python/jsonschema-spec-0.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( <dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JSONSchema Spec with object-oriented paths
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.1.5.tar.gz -> jsonschema-spec-0.1.5.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=153e11ebb434f91fe0002bb97bd5c460
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.1.6 b/metadata/md5-cache/dev-python/jsonschema-spec-0.1.6
index 2b547cd84906..a2275e4182f7 100644
--- a/metadata/md5-cache/dev-python/jsonschema-spec-0.1.6
+++ b/metadata/md5-cache/dev-python/jsonschema-spec-0.1.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.1.6.tar.gz -> jsonschema-spec-0.1.6.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=45df11ed5d6bfb1e0b2818a8d0de2417
+_md5_=9e17cf7af6d590ff3c0ed4bd6980cfbf
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.2.0 b/metadata/md5-cache/dev-python/jsonschema-spec-0.2.0
deleted file mode 100644
index 091963896457..000000000000
--- a/metadata/md5-cache/dev-python/jsonschema-spec-0.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/referencing-0.24.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-specifications-2023.3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JSONSchema Spec with object-oriented paths
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/referencing-0.24.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-specifications-2023.3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.2.0.tar.gz -> jsonschema-spec-0.2.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b961422be11af3294a70bd36df9e3c1a
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.2.1 b/metadata/md5-cache/dev-python/jsonschema-spec-0.2.1
deleted file mode 100644
index 646763344bd1..000000000000
--- a/metadata/md5-cache/dev-python/jsonschema-spec-0.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-specifications-2023.3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JSONSchema Spec with object-oriented paths
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-specifications-2023.3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.2.1.tar.gz -> jsonschema-spec-0.2.1.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6167e2e9219eb22bfe81da9fe130b47d
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.2.2 b/metadata/md5-cache/dev-python/jsonschema-spec-0.2.2
deleted file mode 100644
index 02e5e69e7cbb..000000000000
--- a/metadata/md5-cache/dev-python/jsonschema-spec-0.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JSONSchema Spec with object-oriented paths
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.2.2.tar.gz -> jsonschema-spec-0.2.2.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c52d9744777756f16ad6d6b5a4df08e9
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.2.3 b/metadata/md5-cache/dev-python/jsonschema-spec-0.2.3
new file mode 100644
index 000000000000..a1ebfbd47e4e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-spec-0.2.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JSONSchema Spec with object-oriented paths
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.2.3.tar.gz -> jsonschema-spec-0.2.3.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=c52d9744777756f16ad6d6b5a4df08e9
diff --git a/metadata/md5-cache/dev-python/jsonschema-specifications-2023.6.1 b/metadata/md5-cache/dev-python/jsonschema-specifications-2023.6.1
index 1dabf1bca9fa..330dc1ca8fd8 100644
--- a/metadata/md5-cache/dev-python/jsonschema-specifications-2023.6.1
+++ b/metadata/md5-cache/dev-python/jsonschema-specifications-2023.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-jsonschema/jsonschema-specifications/ https://pypi.org/project/jsonschema-specifications/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~riscv
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/referencing-0.28.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jsonschema-specifications/jsonschema_specifications-2023.6.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d6c53643150b36069d7ac3bcf81fd784
+_md5_=2c7b26d43af511741811a77594fb494a
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12-r2 b/metadata/md5-cache/dev-python/kaptan-0.5.12-r2
deleted file mode 100644
index 82f58a5c2c1e..000000000000
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pyyaml-3.13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Configuration manager in your pocket
-EAPI=8
-HOMEPAGE=https://github.com/emre/kaptan
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/pyyaml-3.13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/k/kaptan/kaptan-0.5.12.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=03e4350d725137e3b0d799e13a4fec0d
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12-r4 b/metadata/md5-cache/dev-python/kaptan-0.5.12-r4
index 49dbe24f71c3..466d2788bbd4 100644
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12-r4
+++ b/metadata/md5-cache/dev-python/kaptan-0.5.12-r4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/emre/kaptan/ https://pypi.org/project/kaptan/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pyyaml-3.13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/k/kaptan/kaptan-0.5.12.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=9a4afd169539706bc2de98c96151c811
+_md5_=004973b3b6437022996495dc66319db7
diff --git a/metadata/md5-cache/dev-python/lark-1.1.5 b/metadata/md5-cache/dev-python/lark-1.1.5
index e242a713296d..88f1416f6732 100644
--- a/metadata/md5-cache/dev-python/lark-1.1.5
+++ b/metadata/md5-cache/dev-python/lark-1.1.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/lark-parser/lark/ https://pypi.org/project/lark/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/l/lark/lark-1.1.5.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=258def2fa5158840a31d5cfdf72e75e2
+_md5_=72c21acc5b455e2101b690d4f536021e
diff --git a/metadata/md5-cache/dev-python/markdown-exec-1.6.0 b/metadata/md5-cache/dev-python/markdown-exec-1.6.0
index 93b9d704bff7..e904f7e3d307 100644
--- a/metadata/md5-cache/dev-python/markdown-exec-1.6.0
+++ b/metadata/md5-cache/dev-python/markdown-exec-1.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pawamoy.github.io/markdown-exec/ https://pypi.org/project/markdown-exec/
 INHERIT=distutils-r1 pypi
 IUSE=ansi test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=ISC
 RDEPEND=>=dev-python/pymdown-extensions-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ansi? ( dev-python/pygments-ansi-color[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/markdown-exec/markdown_exec-1.6.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=827ac65973a2d7622778fa50d6fe6a71
+_md5_=95e6dd1aaf170c4b03fd150c9f8ad874
diff --git a/metadata/md5-cache/dev-python/markdown-include-0.8.1 b/metadata/md5-cache/dev-python/markdown-include-0.8.1
index 621bd1953a06..addbd54b1e7a 100644
--- a/metadata/md5-cache/dev-python/markdown-include-0.8.1
+++ b/metadata/md5-cache/dev-python/markdown-include-0.8.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cmacmackin/markdown-include https://pypi.org/project/markdown-include/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=GPL-3+
 RDEPEND=>=dev-python/markdown-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/markdown-include/markdown-include-0.8.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6adbae7f5ff903d940f1c102ed60d116
+_md5_=10f28a0875b2af41527e483ef0b79765
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.7.2 b/metadata/md5-cache/dev-python/matplotlib-3.7.2
new file mode 100644
index 000000000000..a3e71a1a5642
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-3.7.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/certifi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pyparsing-3.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_10(-)?] ) ) >=dev-python/setuptools-scm-7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pyparsing-3.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk?,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk?,threads(+)] )
+DESCRIPTION=Pure python plotting library with matlab like syntax
+EAPI=8
+HOMEPAGE=https://matplotlib.org/ https://github.com/matplotlib/matplotlib/ https://pypi.org/project/matplotlib/
+INHERIT=distutils-r1 flag-o-matic multiprocessing prefix pypi toolchain-funcs virtualx
+IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_10 python_targets_python3_11 debug test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
+RDEPEND=dev-python/certifi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pyparsing-3.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_10(-)?] ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-3.7.2.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=7c36743eaa18135d9335ff58f46de432
diff --git a/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.5 b/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.5
deleted file mode 100644
index 63cf4119fd58..000000000000
--- a/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of plugins for markdown-it-py
-EAPI=8
-HOMEPAGE=https://pypi.org/project/mdit-py-plugins/ https://github.com/executablebooks/mdit-py-plugins/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/executablebooks/mdit-py-plugins/archive/v0.3.5.tar.gz -> mdit-py-plugins-0.3.5.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d92c5c7c4a6f0abd1e204b6457e7da10
diff --git a/metadata/md5-cache/dev-python/mdit-py-plugins-0.4.0 b/metadata/md5-cache/dev-python/mdit-py-plugins-0.4.0
index 78328ceafe94..608fc69ff8c5 100644
--- a/metadata/md5-cache/dev-python/mdit-py-plugins-0.4.0
+++ b/metadata/md5-cache/dev-python/mdit-py-plugins-0.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/mdit-py-plugins/ https://github.com/executablebooks/mdit-py-plugins/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=<dev-python/markdown-it-py-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/mdit-py-plugins/archive/v0.4.0.tar.gz -> mdit-py-plugins-0.4.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=598ed64dac56b4c2505e40b727c5c5fa
+_md5_=4b0305f460087ac2c5dd92de5b920944
diff --git a/metadata/md5-cache/dev-python/mergedeep-1.3.4 b/metadata/md5-cache/dev-python/mergedeep-1.3.4
deleted file mode 100644
index 70c62c632ae6..000000000000
--- a/metadata/md5-cache/dev-python/mergedeep-1.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] dev-python/recommonmark[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A deep merge tool for Python
-EAPI=7
-HOMEPAGE=https://github.com/clarketm/mergedeep/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/clarketm/mergedeep/archive/refs/tags/v1.3.4.tar.gz -> mergedeep-1.3.4.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=de11278198088931ae64d733c64b7826
diff --git a/metadata/md5-cache/dev-python/mergedeep-1.3.4-r1 b/metadata/md5-cache/dev-python/mergedeep-1.3.4-r1
index ae398361d579..6ec012497a91 100644
--- a/metadata/md5-cache/dev-python/mergedeep-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/mergedeep-1.3.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/clarketm/mergedeep/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clarketm/mergedeep/archive/refs/tags/v1.3.4.tar.gz -> mergedeep-1.3.4.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=4da05764074ec82db443a16b08ded24f
+_md5_=7e385c4b9a08411fffe155de677232e5
diff --git a/metadata/md5-cache/dev-python/mkdocs-gen-files-0.5.0 b/metadata/md5-cache/dev-python/mkdocs-gen-files-0.5.0
index 05a5215c39f0..3a7913257fda 100644
--- a/metadata/md5-cache/dev-python/mkdocs-gen-files-0.5.0
+++ b/metadata/md5-cache/dev-python/mkdocs-gen-files-0.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://oprypin.github.io/mkdocs-gen-files/ https://pypi.org/project/mkdocs-gen-files/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-1.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-gen-files/mkdocs_gen_files-0.5.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c91a587511aceaf3c838ef9d8e30269b
+_md5_=1fc00caa29f0cd4ce673d990444cd0aa
diff --git a/metadata/md5-cache/dev-python/mkdocs-htmlproofer-plugin-0.13.1 b/metadata/md5-cache/dev-python/mkdocs-htmlproofer-plugin-0.13.1
index 2b4d222f2c55..262816126a4c 100644
--- a/metadata/md5-cache/dev-python/mkdocs-htmlproofer-plugin-0.13.1
+++ b/metadata/md5-cache/dev-python/mkdocs-htmlproofer-plugin-0.13.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/manuzhang/mkdocs-htmlproofer-plugin/ https://pypi.org/project/mkdocs-htmlproofer-plugin/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=dev-python/beautifulsoup4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-0.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/manuzhang/mkdocs-htmlproofer-plugin/archive/refs/tags/v0.13.1.tar.gz -> mkdocs-htmlproofer-plugin-0.13.1.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e38065b0327d34440cc0f603ea434f4c
+_md5_=c83074b2653a97618d00a0dad360a9a4
diff --git a/metadata/md5-cache/dev-python/mkdocs-monorepo-plugin-1.0.5 b/metadata/md5-cache/dev-python/mkdocs-monorepo-plugin-1.0.5
index 170057757e8b..c08ba929812f 100644
--- a/metadata/md5-cache/dev-python/mkdocs-monorepo-plugin-1.0.5
+++ b/metadata/md5-cache/dev-python/mkdocs-monorepo-plugin-1.0.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://backstage.github.io/mkdocs-monorepo-plugin/ https://pypi.org/project/mkdocs-monorepo-plugin/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-slugify-4.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=edd0dd23f1a131c3ec37dd12c25999c1
+_md5_=cdd05f30a99efcb5ad3061ea595df2a8
diff --git a/metadata/md5-cache/dev-python/moto-4.1.12 b/metadata/md5-cache/dev-python/moto-4.1.12
index 6ea7269e8781..d5e37abfdd92 100644
--- a/metadata/md5-cache/dev-python/moto-4.1.12
+++ b/metadata/md5-cache/dev-python/moto-4.1.12
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/getmoto/moto/ https://pypi.org/project/moto/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aws-xray-sdk-0.93[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cfn-lint-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cookies[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/botocore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-cors[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-jose[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-sshpubkeys[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/responses-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zipp[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/moto/moto-4.1.12.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7e0eaa2ae0fa7aec1e41d567e090a7ab
+_md5_=6d8141cfbfd76b9817ba07dd8649264e
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r2 b/metadata/md5-cache/dev-python/munch-2.5.0-r2
deleted file mode 100644
index 2da081c1556c..000000000000
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A dot-accessible dictionary (a la JavaScript objects)
-EAPI=8
-HOMEPAGE=https://github.com/Infinidat/munch/ https://pypi.org/project/munch/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/m/munch/munch-2.5.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e8e7a138f4317ffd3a99717008f75e9a
diff --git a/metadata/md5-cache/dev-python/munch-3.0.0 b/metadata/md5-cache/dev-python/munch-3.0.0
index 7345f1b632fa..e6bed284edf9 100644
--- a/metadata/md5-cache/dev-python/munch-3.0.0
+++ b/metadata/md5-cache/dev-python/munch-3.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Infinidat/munch/ https://pypi.org/project/munch/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/munch/munch-3.0.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=4c03f1d82557ea5642e695cc551d7edc
+_md5_=3d587436096665149ee1e5ff0ab76ecf
diff --git a/metadata/md5-cache/dev-python/nbformat-5.8.0 b/metadata/md5-cache/dev-python/nbformat-5.8.0
deleted file mode 100644
index 6b2b84aaae57..000000000000
--- a/metadata/md5-cache/dev-python/nbformat-5.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/testpath[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/numpydoc[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/pydata-sphinx-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/numpydoc[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/pydata-sphinx-theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/fastjsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Reference implementation of the Jupyter Notebook format
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbformat/ https://pypi.org/project/nbformat/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/fastjsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/n/nbformat/nbformat-5.8.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=0ec2439851660a647a3aaf9a0e421da9
diff --git a/metadata/md5-cache/dev-python/nbformat-5.9.0 b/metadata/md5-cache/dev-python/nbformat-5.9.0
index 23e177c907c7..f4c60ebc8869 100644
--- a/metadata/md5-cache/dev-python/nbformat-5.9.0
+++ b/metadata/md5-cache/dev-python/nbformat-5.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbformat/ https://pypi.org/project/nbformat/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/fastjsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbformat/nbformat-5.9.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3a8bdf503894cfd004ead20646b0ec6a
+_md5_=8ff72a63863f4129e44ef792760df9fb
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.7.0 b/metadata/md5-cache/dev-python/nodeenv-1.7.0
deleted file mode 100644
index 7f2c2c4f12df..000000000000
--- a/metadata/md5-cache/dev-python/nodeenv-1.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Node.js virtual environment builder
-EAPI=8
-HOMEPAGE=https://github.com/ekalinin/nodeenv
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 x86
-LICENSE=BSD
-PROPERTIES=test_network
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.7.0.tar.gz -> nodeenv-1.7.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=80eabf43ffa06704fa83a7be05888484
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.8.0 b/metadata/md5-cache/dev-python/nodeenv-1.8.0
index f52e1542a5dd..5bc594c94905 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.8.0
+++ b/metadata/md5-cache/dev-python/nodeenv-1.8.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ekalinin/nodeenv/ https://pypi.org/project/nodeenv/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=BSD
 PROPERTIES=test_network
 RDEPEND=sys-apps/which python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.8.0.tar.gz -> nodeenv-1.8.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f26708057cde76834f388147dfe787d6
+_md5_=717ce505a6674200a5634d7f5efd51ba
diff --git a/metadata/md5-cache/dev-python/numpy-1.24.4-r1 b/metadata/md5-cache/dev-python/numpy-1.24.4-r1
index 7ba2a965c480..a9bb72ee4223 100644
--- a/metadata/md5-cache/dev-python/numpy-1.24.4-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.24.4-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
 INHERIT=distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
 IUSE=lapack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512dq cpu_flags_x86_avx512f cpu_flags_x86_avx512vl cpu_flags_x86_f16c cpu_flags_x86_fma4 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 cpu_flags_x86_xop test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/numpy/numpy-1.24.4.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6c9c102d9f28667101bb5de181eec996
+_md5_=d26ce8177a66c55841d1cd592cc2d98f
diff --git a/metadata/md5-cache/dev-python/numpy-1.25.1 b/metadata/md5-cache/dev-python/numpy-1.25.1
new file mode 100644
index 000000000000..651da421d29c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.25.1
@@ -0,0 +1,17 @@
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-util/meson-1.1.0 <dev-python/cython-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-0.29.30[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] lapack? ( virtual/pkgconfig ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/charset-normalizer[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-5.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2019.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/meson-python-0.13.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] lapack? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] ) lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=8
+HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
+INHERIT=distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
+IUSE=lapack test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] ) lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/numpy/numpy-1.25.1.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=cadc308291fee1f7656a1cf586945efe
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.6.0 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.6.0
new file mode 100644
index 000000000000..4371df1d50a5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openapi-schema-validator-0.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/jsonschema-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-specifications-2023.5.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenAPI schema validation for Python
+EAPI=8
+HOMEPAGE=https://github.com/python-openapi/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=BSD
+RDEPEND=<dev-python/jsonschema-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-specifications-2023.5.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/o/openapi-schema-validator/openapi_schema_validator-0.6.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=b01abd199e9bd64e4c4eac3a2ffc67fd
diff --git a/metadata/md5-cache/dev-python/oslo-utils-6.2.0 b/metadata/md5-cache/dev-python/oslo-utils-6.2.0
deleted file mode 100644
index 2de3647f5cad..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-6.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2013.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Oslo Utility library
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/oslo.utils/ https://github.com/openstack/oslo.utils/ https://pypi.org/project/oslo.utils/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2013.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/o/oslo.utils/oslo.utils-6.2.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=0a3ee13585e884faf24d833c62dc6c19
diff --git a/metadata/md5-cache/dev-python/oslo-utils-6.2.0-r1 b/metadata/md5-cache/dev-python/oslo-utils-6.2.0-r1
new file mode 100644
index 000000000000..5315ff32c567
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-utils-6.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pbr-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2013.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Oslo Utility library
+EAPI=8
+HOMEPAGE=https://opendev.org/openstack/oslo.utils/ https://github.com/openstack/oslo.utils/ https://pypi.org/project/oslo.utils/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2013.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/o/oslo.utils/oslo.utils-6.2.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=ebd04960e943701e914a885a4c21aca6
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.1.0 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.1.0
deleted file mode 100644
index 77cdba6d90a8..000000000000
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx themes for Pallets and related projects
-EAPI=8
-HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes/ https://pypi.org/project/Pallets-Sphinx-Themes/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/P/Pallets-Sphinx-Themes/Pallets-Sphinx-Themes-2.1.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6dd9521529dd9fb8db6a618116700220
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.1.1 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.1.1
index 2dd5fa2fbb51..61ee0ea2fffc 100644
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.1.1
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.1.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes/ https://pypi.org/project/Pallets-Sphinx-Themes/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/Pallets-Sphinx-Themes/Pallets-Sphinx-Themes-2.1.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7449d8b1d9e6ddcb19d47b3eab314f1c
+_md5_=34d1829ce71d809e9c6792d2b8318f48
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.13.11 b/metadata/md5-cache/dev-python/phonenumbers-8.13.11
deleted file mode 100644
index 516d4dac39d0..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.13.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=8
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.13.11.tar.gz -> python-phonenumbers-8.13.11.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=915df4fff674fd95d9ed903b1241e9a0
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.13.13 b/metadata/md5-cache/dev-python/phonenumbers-8.13.13
deleted file mode 100644
index 251afb339397..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.13.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=8
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.13.13.tar.gz -> python-phonenumbers-8.13.13.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=cd823fce911338889ca577cd3d430880
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.13.14 b/metadata/md5-cache/dev-python/phonenumbers-8.13.14
deleted file mode 100644
index ff1b3c43c7db..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.13.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of Google's libphonenumber
-EAPI=8
-HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.13.14.tar.gz -> python-phonenumbers-8.13.14.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=cd823fce911338889ca577cd3d430880
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.13.15 b/metadata/md5-cache/dev-python/phonenumbers-8.13.15
index b7b834cd3869..e9673e3745e3 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.13.15
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.13.15
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.13.15.tar.gz -> python-phonenumbers-8.13.15.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=cd823fce911338889ca577cd3d430880
+_md5_=b76ed7c0100f0f9ce2af3275ed20e84c
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.5.5-r1 b/metadata/md5-cache/dev-python/pkgconfig-1.5.5-r1
index f579f6c63330..7c9556d427e3 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.5.5-r1
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.5.5-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/matze/pkgconfig/ https://pypi.org/project/pkgconfig/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matze/pkgconfig/archive/v1.5.5.tar.gz -> pkgconfig-1.5.5.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c85c8ab402aae50f6764e4c27b74dfe5
+_md5_=875ebb7ca816acd098aa7f1df94d2256
diff --git a/metadata/md5-cache/dev-python/poetry-core-1.6.1 b/metadata/md5-cache/dev-python/poetry-core-1.6.1
index dcbb92fe7273..55b349160478 100644
--- a/metadata/md5-cache/dev-python/poetry-core-1.6.1
+++ b/metadata/md5-cache/dev-python/poetry-core-1.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-poetry/poetry-core/ https://pypi.org/project/poetry-core/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lark[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-poetry/poetry-core/archive/1.6.1.tar.gz -> poetry-core-1.6.1.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=66a32df1440c7a068c8cd40cb6363617
+_md5_=116126c9d46cb1f15d48e283b961a6f5
diff --git a/metadata/md5-cache/dev-python/pygments-ansi-color-0.3.0 b/metadata/md5-cache/dev-python/pygments-ansi-color-0.3.0
index 0a9676616431..ba283fb1899d 100644
--- a/metadata/md5-cache/dev-python/pygments-ansi-color-0.3.0
+++ b/metadata/md5-cache/dev-python/pygments-ansi-color-0.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pygments-ansi-color/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/chriskuehl/pygments-ansi-color/archive/refs/tags/v0.3.0.tar.gz -> pygments-ansi-color-0.3.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=76db71d2b4db62f1bc3a91ad4b955f9d
+_md5_=6c20f639653a3c04ddc0e61ca5262df9
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.11 b/metadata/md5-cache/dev-python/pygraphviz-1.11
index c5541cde5919..6258520bc0b7 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.11
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.11
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pygraphviz.github.io/ https://github.com/pygraphviz/pygraphviz/ https://pypi.org/project/pygraphviz/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=media-gfx/graphviz python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pygraphviz/pygraphviz-1.11.zip
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=09c538246e9fd37a98c526b5c463d4f0
+_md5_=d734c2c8364a20667bf4aa48954d0a6a
diff --git a/metadata/md5-cache/dev-python/pylast-5.1.0 b/metadata/md5-cache/dev-python/pylast-5.1.0
deleted file mode 100644
index 66c9679801eb..000000000000
--- a/metadata/md5-cache/dev-python/pylast-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to last.fm and other api-compatible websites
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pylast/ https://github.com/pylast/pylast/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pylast/pylast/archive/5.1.0.tar.gz -> pylast-5.1.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=19691de035d6e49c7092dd52158d75d8
diff --git a/metadata/md5-cache/dev-python/pylast-5.2.0 b/metadata/md5-cache/dev-python/pylast-5.2.0
index 2b5629f50af5..1b997f735f5c 100644
--- a/metadata/md5-cache/dev-python/pylast-5.2.0
+++ b/metadata/md5-cache/dev-python/pylast-5.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pylast/ https://github.com/pylast/pylast/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pylast/pylast-5.2.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7e0f2f7021594943e36c0603905f4b2c
+_md5_=8ae7c98c59c599582b46c727edffe0b7
diff --git a/metadata/md5-cache/dev-python/pyopenssl-23.2.0 b/metadata/md5-cache/dev-python/pyopenssl-23.2.0
index d4ec82b2bfd5..9186b70b415a 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-23.2.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-23.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.pyopenssl.org/ https://github.com/pyca/pyopenssl/ https://pypi.org/project/pyOpenSSL/
 INHERIT=distutils-r1 toolchain-funcs pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/cryptography-42[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cryptography-40.0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-23.2.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=33d6836346ccafdaaa219d4057ca8f28
+_md5_=9ae78b408895474fe60aa3c0646b5004
diff --git a/metadata/md5-cache/dev-python/pypdf-3.12.1 b/metadata/md5-cache/dev-python/pypdf-3.12.1
new file mode 100644
index 000000000000..8409ae4de10c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypdf-3.12.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pillow[jpeg,jpeg2k,tiff,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pycryptodome[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/pypdf/archive/3.12.1.tar.gz -> pypdf-3.12.1.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/2cf1e75af7bcb9c097deae6fb112c715d4721744.tar.gz -> pypdf-sample-files-2cf1e75af7bcb9c097deae6fb112c715d4721744.gh.tar.gz )
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=c44c08b675ee89ff76993d50513bbe25
diff --git a/metadata/md5-cache/dev-python/pyproject-api-1.5.3 b/metadata/md5-cache/dev-python/pyproject-api-1.5.3
index 90697fc49c7e..05bf660ffa65 100644
--- a/metadata/md5-cache/dev-python/pyproject-api-1.5.3
+++ b/metadata/md5-cache/dev-python/pyproject-api-1.5.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-api/ https://pypi.org/project/pyproject-api/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/packaging-23.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyproject-api/pyproject_api-1.5.3.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3320accb787f8fb939c37cb57afe657c
+_md5_=39dfe63508ddaf3a693b6a1f79908ea6
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.7.8 b/metadata/md5-cache/dev-python/pyroute2-0.7.8
deleted file mode 100644
index d37ed9cf6743..000000000000
--- a/metadata/md5-cache/dev-python/pyroute2-0.7.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure Python netlink and Linux network configuration library
-EAPI=8
-HOMEPAGE=https://github.com/svinota/pyroute2 https://pypi.org/project/pyroute2/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=|| ( GPL-2+ Apache-2.0 )
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pyroute2/pyroute2-0.7.8.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=380f2ef6a92786311ff03330d3ebaf5c
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.7.9 b/metadata/md5-cache/dev-python/pyroute2-0.7.9
index bc363704fee5..519b070b05e2 100644
--- a/metadata/md5-cache/dev-python/pyroute2-0.7.9
+++ b/metadata/md5-cache/dev-python/pyroute2-0.7.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/svinota/pyroute2 https://pypi.org/project/pyroute2/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( GPL-2+ Apache-2.0 )
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyroute2/pyroute2-0.7.9.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=81086943e1e6ca34fd7c40fcab62a43b
+_md5_=380f2ef6a92786311ff03330d3ebaf5c
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.19.3 b/metadata/md5-cache/dev-python/pyrsistent-0.19.3
index 6efb6b019746..ff36903c4521 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.19.3
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.19.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyrsistent/pyrsistent-0.19.3.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=95fd1af7b4b57bb2e56bd227a7a828e7
+_md5_=c47e3c9fb148487e0e51e228348b3c26
diff --git a/metadata/md5-cache/dev-python/pytest-check-2.1.4 b/metadata/md5-cache/dev-python/pytest-check-2.1.4
deleted file mode 100644
index a0c1ed1caad9..000000000000
--- a/metadata/md5-cache/dev-python/pytest-check-2.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/colorama-0.4.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin that allows multiple failures per test
-EAPI=8
-HOMEPAGE=https://github.com/okken/pytest-check/ https://pypi.org/project/pytest-check/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/colorama-0.4.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-check/pytest-check-2.1.4.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5ccb546f75f5be3afdfef24900ef6020
diff --git a/metadata/md5-cache/dev-python/pytest-check-2.1.5 b/metadata/md5-cache/dev-python/pytest-check-2.1.5
index 249b6ec930fe..54ed2fd10c27 100644
--- a/metadata/md5-cache/dev-python/pytest-check-2.1.5
+++ b/metadata/md5-cache/dev-python/pytest-check-2.1.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/okken/pytest-check/ https://pypi.org/project/pytest-check/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/colorama-0.4.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-check/pytest_check-2.1.5.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=1d90442ee32ca1201373bf5b71f98ba3
+_md5_=1f88a8722f819c42de19323c0d6ebb28
diff --git a/metadata/md5-cache/dev-python/pytest-golden-0.2.2 b/metadata/md5-cache/dev-python/pytest-golden-0.2.2
index 1d5343d3a2c5..9a51e62eaa35 100644
--- a/metadata/md5-cache/dev-python/pytest-golden-0.2.2
+++ b/metadata/md5-cache/dev-python/pytest-golden-0.2.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/oprypin/pytest-golden https://pypi.org/project/pytest-golden/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=>=dev-python/atomicwrites-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.16.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ruamel-yaml-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testfixtures-6.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oprypin/pytest-golden/archive/refs/tags/v0.2.2.tar.gz -> pytest-golden-0.2.2.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=fcf327eda31db2f90cda8283909f437c
+_md5_=b4e040ebe9b1fcbfe994e772d57d8326
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.10.0 b/metadata/md5-cache/dev-python/pytest-mock-3.10.0
deleted file mode 100644
index 307dfc95bf14..000000000000
--- a/metadata/md5-cache/dev-python/pytest-mock-3.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) test? ( >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-mock/ https://pypi.org/project/pytest-mock/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-mock/pytest-mock-3.10.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b973bc7c25ca022d1d0654d2b580214a
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.11.1 b/metadata/md5-cache/dev-python/pytest-mock-3.11.1
index 4aa067206ea2..461ac99a47ed 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-3.11.1
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.11.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/ https://pypi.org/project/pytest-mock/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-mock/pytest-mock-3.11.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c845738146475437dfcc0006d3308aac
+_md5_=c50a8c5786d6e2e0e6aa515c5c9e89a7
diff --git a/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0-r1
new file mode 100644
index 000000000000..ca6e3a4f206f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-git[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/coverage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=More descriptive parametrized-test IDs for py.test
+EAPI=8
+HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-verbose-parametrize/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=e1109ad219ee18a61202b864ed05c458
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1
index c17c537ee1bf..a2abe63b4248 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://dateutil.readthedocs.io/ https://pypi.org/project/python-dateutil/ https://github.com/dateutil/dateutil/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-libs/timezone-data python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/python-dateutil/python-dateutil-2.8.2.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c47a0a6d579498d9a5c429c969678530
+_md5_=abc5b2a2a270d6f99732b050673314a6
diff --git a/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0-r1 b/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0-r1
new file mode 100644
index 000000000000..3bc0f28acad9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pycodestyle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyflakes[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ujson-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JSON RPC 2.0 server library
+EAPI=8
+HOMEPAGE=https://github.com/python-lsp/python-lsp-jsonrpc
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/ujson-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=aba04bcecb39a6d925e3eade3f55740b
diff --git a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3 b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
deleted file mode 100644
index 0b8125982190..000000000000
--- a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Basic functions for handling mime-types in python
-EAPI=7
-HOMEPAGE=https://github.com/dbtsai/python-mimeparse
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/python-mimeparse/python-mimeparse-1.6.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=558d3d43f9c5b942c2430682c39f036b
diff --git a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r4 b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r4
index 342b50d70e18..5ccb6f06e803 100644
--- a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r4
+++ b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/falconry/python-mimeparse/ https://pypi.org/project/python-mimeparse/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/python-mimeparse/python-mimeparse-1.6.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=2c9404854eca77bbbd925525c290b3d2
+_md5_=32c3b7bbcc557800221116cdf858b34e
diff --git a/metadata/md5-cache/dev-python/python-utils-3.5.2 b/metadata/md5-cache/dev-python/python-utils-3.5.2
deleted file mode 100644
index 792b8e43f0fb..000000000000
--- a/metadata/md5-cache/dev-python/python-utils-3.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of small Python functions & classes
-EAPI=8
-HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/python-utils/python-utils-3.5.2.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=1e80855bb638055740826f0f1c7ea896
diff --git a/metadata/md5-cache/dev-python/python-utils-3.6.0 b/metadata/md5-cache/dev-python/python-utils-3.6.0
deleted file mode 100644
index 366353615711..000000000000
--- a/metadata/md5-cache/dev-python/python-utils-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of small Python functions & classes
-EAPI=8
-HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/python-utils/python-utils-3.6.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b738758585ff6a2df16655b4b0759cdb
diff --git a/metadata/md5-cache/dev-python/python-utils-3.6.1 b/metadata/md5-cache/dev-python/python-utils-3.6.1
deleted file mode 100644
index e85cef763857..000000000000
--- a/metadata/md5-cache/dev-python/python-utils-3.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of small Python functions & classes
-EAPI=8
-HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/python-utils/python-utils-3.6.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b738758585ff6a2df16655b4b0759cdb
diff --git a/metadata/md5-cache/dev-python/python-utils-3.7.0 b/metadata/md5-cache/dev-python/python-utils-3.7.0
index 19f429361c9b..6647a97a79d3 100644
--- a/metadata/md5-cache/dev-python/python-utils-3.7.0
+++ b/metadata/md5-cache/dev-python/python-utils-3.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/python-utils/python-utils-3.7.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b738758585ff6a2df16655b4b0759cdb
+_md5_=1b110b116e775f489cda926a09387f38
diff --git a/metadata/md5-cache/dev-python/pyupgrade-3.9.0 b/metadata/md5-cache/dev-python/pyupgrade-3.9.0
new file mode 100644
index 000000000000..15515553eac1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyupgrade-3.9.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/tokenize-rt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool + pre-commit hook to automatically upgrade syntax for newer Pythons
+EAPI=8
+HOMEPAGE=https://github.com/asottile/pyupgrade/ https://pypi.org/project/pyupgrade/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=dev-python/tokenize-rt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/asottile/pyupgrade/archive/v3.9.0.tar.gz -> pyupgrade-3.9.0.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=8874a580bc2c8ce29f65e2056525b234
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0
deleted file mode 100644
index aa249191411f..000000000000
--- a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code specific for Read the Docs and Sphinx
-EAPI=8
-HOMEPAGE=https://github.com/readthedocs/readthedocs-sphinx-ext/ https://pypi.org/project/readthedocs-sphinx-ext/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=24122172b0ea508a6d2cdfc703954df2
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.1 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.1
deleted file mode 100644
index de777634abfe..000000000000
--- a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code specific for Read the Docs and Sphinx
-EAPI=8
-HOMEPAGE=https://github.com/readthedocs/readthedocs-sphinx-ext/ https://pypi.org/project/readthedocs-sphinx-ext/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b6d8b8e5c43cdfd4cd09cf4cb2874568
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.2 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.2
index eb6d1d61eec2..f2f3425d68fc 100644
--- a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.2
+++ b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/readthedocs/readthedocs-sphinx-ext/ https://pypi.org/project/readthedocs-sphinx-ext/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.2.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b6d8b8e5c43cdfd4cd09cf4cb2874568
+_md5_=24122172b0ea508a6d2cdfc703954df2
diff --git a/metadata/md5-cache/dev-python/referencing-0.29.1 b/metadata/md5-cache/dev-python/referencing-0.29.1
index 00d6fa1656bd..5f3bd6f9bbd0 100644
--- a/metadata/md5-cache/dev-python/referencing-0.29.1
+++ b/metadata/md5-cache/dev-python/referencing-0.29.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-jsonschema/referencing/ https://pypi.org/project/referencing/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~riscv
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rpds-py-0.7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/referencing/referencing-0.29.1.tar.gz test? ( https://github.com/python-jsonschema/referencing-suite/archive/f6fa54deec2ba3ae7326e6c292b2d7c4c20e9eb4.tar.gz -> referencing-suite-f6fa54deec2ba3ae7326e6c292b2d7c4c20e9eb4.gh.tar.gz )
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=297ba17aef2b11ba21dc6f787c52b94a
+_md5_=eeb7e1754e580665dbaa04ab8eb2836a
diff --git a/metadata/md5-cache/dev-python/regex-2023.6.3 b/metadata/md5-cache/dev-python/regex-2023.6.3
index 107db0f02340..488215ad0ce1 100644
--- a/metadata/md5-cache/dev-python/regex-2023.6.3
+++ b/metadata/md5-cache/dev-python/regex-2023.6.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/regex/regex-2023.6.3.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=19115b7bb54781988f1d825571f52af7
+_md5_=7c487e735f316c76d45a5f3f47d76e11
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.10.0-r1 b/metadata/md5-cache/dev-python/requests-mock-1.10.0-r1
deleted file mode 100644
index 546b833f4cbc..000000000000
--- a/metadata/md5-cache/dev-python/requests-mock-1.10.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-futures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/urllib3-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock out responses from the requests package
-EAPI=8
-HOMEPAGE=https://github.com/jamielennox/requests-mock/ https://pypi.org/project/requests-mock/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/urllib3-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/requests-mock/requests-mock-1.10.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=567972af41b70a81c429bad94076ab7f
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.11.0 b/metadata/md5-cache/dev-python/requests-mock-1.11.0
index a011160feab6..e26ace1d04ed 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.11.0
+++ b/metadata/md5-cache/dev-python/requests-mock-1.11.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jamielennox/requests-mock/ https://pypi.org/project/requests-mock/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/requests-mock/requests-mock-1.11.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=06b254237c3c1edffc652de2b91a5f96
+_md5_=93c4752a4b8c54a99b582fd56f348492
diff --git a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.4-r1 b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.4-r1
index 42738ef45254..5634068ceba7 100644
--- a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/naimetti/rfc3339-validator/ https://pypi.org/project/rfc3339-validator/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naimetti/rfc3339-validator/archive/v0.1.4.tar.gz -> rfc3339-validator-0.1.4.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ed718b0bc40fea2f47cb12dc58eaa97a
+_md5_=58f0927817f05554705b16ba48de6818
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
index be646505c280..6d982ac614df 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/rfc3986-validator/ https://github.com/naimetti/rfc3986-validator
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/rfc3986-validator/rfc3986_validator-0.1.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=92e022468f920547da8b0d743fb65d82
+_md5_=e67e0b9e2a33f2ac324ceab68a4105a8
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r2 b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r2
index 2d0d3bf34583..e734c90e5f1f 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r2
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/dgerber/rfc3987/ https://pypi.org/project/rfc3987/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/rfc3987/rfc3987-1.3.8.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=342831eaab7ddc040f89b5c332b34002
+_md5_=79de045782dcc26ff1144099906a4ddb
diff --git a/metadata/md5-cache/dev-python/rpds-py-0.8.10 b/metadata/md5-cache/dev-python/rpds-py-0.8.10
new file mode 100644
index 000000000000..0c4737f40357
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rpds-py-0.8.10
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-util/maturin-1.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+DESCRIPTION=Python bindings to Rust's persistent data structures (rpds)
+EAPI=8
+HOMEPAGE=https://github.com/crate-py/rpds/ https://pypi.org/project/rpds-py/
+INHERIT=cargo distutils-r1 pypi
+IUSE=test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/r/rpds-py/rpds_py-0.8.10.tar.gz https://crates.io/api/v1/crates/archery/0.5.0/download -> archery-0.5.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/indoc/1.0.9/download -> indoc-1.0.9.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pyo3-build-config/0.19.1/download -> pyo3-build-config-0.19.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.19.1/download -> pyo3-ffi-0.19.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.19.1/download -> pyo3-macros-backend-0.19.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.19.1/download -> pyo3-macros-0.19.1.crate https://crates.io/api/v1/crates/pyo3/0.19.1/download -> pyo3-0.19.1.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/rpds/0.13.0/download -> rpds-0.13.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/target-lexicon/0.12.6/download -> target-lexicon-0.12.6.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate
+_eclasses_=cargo	cddd4ee89517b7a52ddce3da8abf3109	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=303d20ad4b5e9cdaf1f2a32b3d21f6b0
diff --git a/metadata/md5-cache/dev-python/selenium-4.10.0 b/metadata/md5-cache/dev-python/selenium-4.10.0
index 0ed46dba895f..098468acc2ad 100644
--- a/metadata/md5-cache/dev-python/selenium-4.10.0
+++ b/metadata/md5-cache/dev-python/selenium-4.10.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.seleniumhq.org/ https://github.com/SeleniumHQ/selenium/tree/trunk/py/ https://pypi.org/project/selenium/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2021.10.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/trio-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/trio-websocket-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-websocket-0.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/selenium/selenium-4.10.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-4.10.0.tar.gz -> selenium-selenium-4.10.0.gh.tar.gz )
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=bf21cda0c4cb9ccc8a9fb77dd4b8af6c
+_md5_=039a172d861bd28048f129f6047234ca
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.24.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.24.0
deleted file mode 100644
index a3fed38b984f..000000000000
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/asttokens[python_targets_python3_11(-)?] dev-python/django[python_targets_python3_11(-)?] dev-python/executing[python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_11(-)?] dev-python/flask-login[python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_11(-)?] dev-python/pyrsistent[python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_11(-)?] dev-python/zope-event[python_targets_python3_11(-)?] ) test? ( dev-python/urllib3[python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python client for Sentry
-EAPI=8
-HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=PSF-2
-RDEPEND=dev-python/urllib3[python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_11(-)?] python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/getsentry/sentry-python/archive/1.24.0.tar.gz -> sentry-python-1.24.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c44a58031b7f2402c40e5c0b2c2ae5a6
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.25.1 b/metadata/md5-cache/dev-python/sentry-sdk-1.25.1
deleted file mode 100644
index 94e5d3bc648c..000000000000
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.25.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/asttokens[python_targets_python3_11(-)?] dev-python/django[python_targets_python3_11(-)?] dev-python/executing[python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_11(-)?] dev-python/flask-login[python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_11(-)?] dev-python/pyrsistent[python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_11(-)?] dev-python/zope-event[python_targets_python3_11(-)?] ) test? ( dev-python/urllib3[python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python client for Sentry
-EAPI=8
-HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=dev-python/urllib3[python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_11(-)?] python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/getsentry/sentry-python/archive/1.25.1.tar.gz -> sentry-python-1.25.1.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=4962d267d5ba7782cfee866c46132355
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.26.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.26.0
index e8e94a63b8a8..7f0b0c86a74a 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.26.0
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.26.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=PSF-2
 RDEPEND=dev-python/urllib3[python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_11(-)?] python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/sentry-python/archive/1.26.0.tar.gz -> sentry-python-1.26.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f9cb56c56a07bb767cfdd4f7984eacf4
+_md5_=39964978703076aa794e02ad48b0b965
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.27.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.27.0
deleted file mode 100644
index 8bc00e46101e..000000000000
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.27.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/asttokens[python_targets_python3_11(-)?] dev-python/django[python_targets_python3_11(-)?] dev-python/executing[python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_11(-)?] dev-python/flask-login[python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_11(-)?] dev-python/pyrsistent[python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_11(-)?] dev-python/python-socks[python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_11(-)?] dev-python/zope-event[python_targets_python3_11(-)?] ) test? ( dev-python/urllib3[python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python client for Sentry
-EAPI=8
-HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=dev-python/urllib3[python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_11(-)?] python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/getsentry/sentry-python/archive/1.27.0.tar.gz -> sentry-python-1.27.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f9cb56c56a07bb767cfdd4f7984eacf4
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.8 b/metadata/md5-cache/dev-python/simplebayes-1.5.8
deleted file mode 100644
index ba47d8d3b0e6..000000000000
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=memory-based, optional-persistence naive bayesian text classifier
-EAPI=8
-HOMEPAGE=https://github.com/hickeroar/simplebayes
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/simplebayes/simplebayes-1.5.8.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5b62f634c509b252e863bd50231268da
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.8-r1 b/metadata/md5-cache/dev-python/simplebayes-1.5.8-r1
new file mode 100644
index 000000000000..60ead1a5a4bb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplebayes-1.5.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=memory-based, optional-persistence naive bayesian text classifier
+EAPI=8
+HOMEPAGE=https://github.com/hickeroar/simplebayes
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/simplebayes/simplebayes-1.5.8.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=2dbdd7c5eda5d4b58565934648c9ee8b
diff --git a/metadata/md5-cache/dev-python/six-1.16.0-r1 b/metadata/md5-cache/dev-python/six-1.16.0-r1
index 16f1b78c38f0..74b75c18adb5 100644
--- a/metadata/md5-cache/dev-python/six-1.16.0-r1
+++ b/metadata/md5-cache/dev-python/six-1.16.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/benjaminp/six/ https://pypi.org/project/six/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/six/six-1.16.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6514c5b1edf751ead1192fce9ae52baf
+_md5_=de84cec5ed1a496ad90b49b39380fa43
diff --git a/metadata/md5-cache/dev-python/smmap-5.0.0 b/metadata/md5-cache/dev-python/smmap-5.0.0
deleted file mode 100644
index 9c1a8872b66b..000000000000
--- a/metadata/md5-cache/dev-python/smmap-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure Python implementation of a sliding window memory map manager
-EAPI=8
-HOMEPAGE=https://pypi.org/project/smmap/ https://github.com/gitpython-developers/smmap/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/smmap/smmap-5.0.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=315dbc27d220e00efc6c9b4128dd8095
diff --git a/metadata/md5-cache/dev-python/smmap-5.0.0-r1 b/metadata/md5-cache/dev-python/smmap-5.0.0-r1
index e04376c87a28..cc50bd3ee40c 100644
--- a/metadata/md5-cache/dev-python/smmap-5.0.0-r1
+++ b/metadata/md5-cache/dev-python/smmap-5.0.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/smmap/ https://github.com/gitpython-developers/smmap/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/smmap/smmap-5.0.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6e79eceed9d3b207f56fe64b01a1b218
+_md5_=b4f9130785b67eb5d368ed12bab1d40f
diff --git a/metadata/md5-cache/dev-python/sphinx-basic-ng-1.0.0_beta2 b/metadata/md5-cache/dev-python/sphinx-basic-ng-1.0.0_beta2
new file mode 100644
index 000000000000..e5c5c22aa1ce
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-basic-ng-1.0.0_beta2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/myst-parser[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A modern skeleton for Sphinx themes
+EAPI=8
+HOMEPAGE=https://github.com/pradyunsg/sphinx-basic-ng/ https://pypi.org/project/sphinx-basic-ng/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pradyunsg/sphinx-basic-ng/archive/1.0.0.beta2.tar.gz -> sphinx-basic-ng-1.0.0.beta2.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=5fd3900bae1c8b984634e78209f6a118
diff --git a/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4-r1 b/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4-r1
new file mode 100644
index 000000000000..a8ae6d841d90
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/alabaster[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/sphinx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DESCRIPTION=Add support for multiple versions to sphinx
+EAPI=8
+HOMEPAGE=https://github.com/Holzhaus/sphinx-multiversion
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Holzhaus/sphinx-multiversion/archive/v0.2.4.tar.gz -> sphinx-multiversion-0.2.4.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=83f05260f9dfd6b7e8a842e62bb5d588
diff --git a/metadata/md5-cache/dev-python/sphinx-panels-0.6.0-r1 b/metadata/md5-cache/dev-python/sphinx-panels-0.6.0-r1
new file mode 100644
index 000000000000..04b518ae7d80
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-panels-0.6.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A sphinx extension for creating panels in a grid layout
+EAPI=8
+HOMEPAGE=https://github.com/executablebooks/sphinx-panels
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/executablebooks/sphinx-panels/archive/v0.6.0.tar.gz -> sphinx-panels-0.6.0.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=7757e2d33669ae9ba2a3b245a5ca7ecd
diff --git a/metadata/md5-cache/dev-python/sphinx-pytest-0.0.5 b/metadata/md5-cache/dev-python/sphinx-pytest-0.0.5
deleted file mode 100644
index 60c48bfe968a..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-pytest-0.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Helpful pytest fixtures for Sphinx extensions
-EAPI=8
-HOMEPAGE=https://github.com/chrisjsewell/sphinx-pytest/ https://pypi.org/project/sphinx_pytest/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/chrisjsewell/sphinx-pytest/archive/v0.0.5.tar.gz -> sphinx-pytest-0.0.5.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=dc1e4a25d6a89a10692765e7627d28ad
diff --git a/metadata/md5-cache/dev-python/sphinx-pytest-0.1.1 b/metadata/md5-cache/dev-python/sphinx-pytest-0.1.1
index 1e3d7c0cec8a..f64e7f531b4f 100644
--- a/metadata/md5-cache/dev-python/sphinx-pytest-0.1.1
+++ b/metadata/md5-cache/dev-python/sphinx-pytest-0.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sphinx-extensions2/sphinx-pytest/ https://pypi.org/project/sphinx_pytest/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-extensions2/sphinx-pytest/archive/v0.1.1.tar.gz -> sphinx-pytest-0.1.1.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e6ed763a9e12bf8af6056404a3fb9414
+_md5_=8d31dcd4be88d0cf4340bab4e8652ae5
diff --git a/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.0 b/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.0
deleted file mode 100644
index 0627dd691819..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/readthedocs-sphinx-ext[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-jquery-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=ReadTheDocs.org theme for Sphinx
-EAPI=8
-HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme/ https://pypi.org/project/sphinx-rtd-theme/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-jquery-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-rtd-theme/sphinx_rtd_theme-1.2.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=93f97bf84688b6a08a60ebad18ac81b1
diff --git a/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.1 b/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.1
deleted file mode 100644
index 2edb81c7b896..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/readthedocs-sphinx-ext[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-1.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinxcontrib-jquery-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=ReadTheDocs.org theme for Sphinx
-EAPI=8
-HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme/ https://pypi.org/project/sphinx-rtd-theme/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-1.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinxcontrib-jquery-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-rtd-theme/sphinx_rtd_theme-1.2.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e88eb0baf0e0095315800e0c8fdc783e
diff --git a/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.2-r1 b/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.2-r1
index d66a00480944..1578fed680ec 100644
--- a/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme/ https://pypi.org/project/sphinx-rtd-theme/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-1.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinxcontrib-jquery-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-rtd-theme/sphinx_rtd_theme-1.2.2.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=35eda6304f867d2a4110929b6b44c358
+_md5_=b08663226b98cade89d8e0f6f8a3342d
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2
deleted file mode 100644
index e735b69167e4..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx extension which renders display math in HTML via JavaScript
-EAPI=8
-HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-jsmath/ https://pypi.org/project/sphinxcontrib-jsmath/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=17429c4cdea7edd4c4d67fe83e2e475e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r3 b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r3
index f97faf3f18fd..72acd4da934a 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-jsmath/ https://pypi.org/project/sphinxcontrib-jsmath/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
 PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=28a78980c4ce1d9f3d4cce6c6e242221
+_md5_=131d71bd613cc2dfbe7836b551024700
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r1
deleted file mode 100644
index cc4edae1a2d0..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx extension which outputs QtHelp documents
-EAPI=8
-HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-qthelp/ https://pypi.org/project/sphinxcontrib-qthelp/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=56fa26692cc566f7758d6a601afc195f
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r2
index 719ee0e8607f..dccbaec5461e 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-qthelp/ https://pypi.org/project/sphinxcontrib-qthelp/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
 PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3a126386fd3b5377b68f527af229e733
+_md5_=6fe6bcfbab395ea4f5405116cc95dda2
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2-r1
new file mode 100644
index 000000000000..17db48696672
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/async_generator[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cssselect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/sphinx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Make Sphinx better at documenting Python functions and methods
+EAPI=8
+HOMEPAGE=https://github.com/python-trio/sphinxcontrib-trio https://pypi.org/project/sphinxcontrib-trio/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Apache-2.0 MIT )
+RDEPEND=dev-python/sphinx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=cae13e2801f1caa7ad99bb94e42f15ae
diff --git a/metadata/md5-cache/dev-python/starlette-0.27.0 b/metadata/md5-cache/dev-python/starlette-0.27.0
deleted file mode 100644
index c040dd0362fd..000000000000
--- a/metadata/md5-cache/dev-python/starlette-0.27.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The little ASGI framework that shines
-EAPI=8
-HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=<dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/starlette/archive/0.27.0.tar.gz -> starlette-0.27.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=164258389bf9a443b01bbd89691ce341
diff --git a/metadata/md5-cache/dev-python/starlette-0.28.0 b/metadata/md5-cache/dev-python/starlette-0.28.0
index 5f92879f0dc3..d0962653e46a 100644
--- a/metadata/md5-cache/dev-python/starlette-0.28.0
+++ b/metadata/md5-cache/dev-python/starlette-0.28.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=<dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/starlette/archive/0.28.0.tar.gz -> starlette-0.28.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e4a8249dcddb940840615df960cf408c
+_md5_=164258389bf9a443b01bbd89691ce341
diff --git a/metadata/md5-cache/dev-python/stdio-mgr-1.0.1 b/metadata/md5-cache/dev-python/stdio-mgr-1.0.1
deleted file mode 100644
index 281a6897c9f0..000000000000
--- a/metadata/md5-cache/dev-python/stdio-mgr-1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-17.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Context manager for mocking/wrapping stdin/stdout/stderr
-EAPI=7
-HOMEPAGE=https://github.com/bskinn/stdio-mgr/ https://pypi.org/project/stdio-mgr/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-17.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bskinn/stdio-mgr/archive/v1.0.1.tar.gz -> stdio-mgr-1.0.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5dbce058c67b67b45a0500bebd8559e3
diff --git a/metadata/md5-cache/dev-python/stdio-mgr-1.0.1-r1 b/metadata/md5-cache/dev-python/stdio-mgr-1.0.1-r1
index 042a1501314e..1385f4006443 100644
--- a/metadata/md5-cache/dev-python/stdio-mgr-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/stdio-mgr-1.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/bskinn/stdio-mgr/ https://pypi.org/project/stdio-mgr/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bskinn/stdio-mgr/archive/v1.0.1.tar.gz -> stdio-mgr-1.0.1.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=2d0d6b389b614e10515a12649fc388f7
+_md5_=aebdd5d876912d31c03b9379c18b93b6
diff --git a/metadata/md5-cache/dev-python/stevedore-5.0.0 b/metadata/md5-cache/dev-python/stevedore-5.0.0
deleted file mode 100644
index 6c7f23eac8dc..000000000000
--- a/metadata/md5-cache/dev-python/stevedore-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/sphinx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testtools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_11(-)] >=dev-python/reno-2.5.0[python_targets_python3_11(-)] >=dev-python/sphinx-2.0.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_10(-)] >=dev-python/reno-2.5.0[python_targets_python3_10(-)] >=dev-python/sphinx-2.0.0[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manage dynamic plugins for Python applications
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/stevedore/ https://github.com/openstack/stevedore/ https://pypi.org/project/stevedore/
-INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/stevedore/stevedore-5.0.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6fde90214640645eb149f0660245dd8c
diff --git a/metadata/md5-cache/dev-python/stevedore-5.1.0 b/metadata/md5-cache/dev-python/stevedore-5.1.0
index c0023a4aaad4..602a1698787c 100644
--- a/metadata/md5-cache/dev-python/stevedore-5.1.0
+++ b/metadata/md5-cache/dev-python/stevedore-5.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/stevedore/ https://github.com/openstack/stevedore/ https://pypi.org/project/stevedore/
 INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/stevedore/stevedore-5.1.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=aacc52529120aa96f784f6d577e3880b
+_md5_=2768d1f832096233d8a0662a556852af
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r2 b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r2
index 0c60e921e509..8029a1632e2a 100644
--- a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r2
+++ b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/strict-rfc3339/ https://github.com/danielrichman/strict-rfc3339
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danielrichman/strict-rfc3339/archive/version-0.7.tar.gz -> strict-rfc3339-version-0.7.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=824c9a4fb48a509e9d4a811e1c1178bf
+_md5_=b601920d2671c5b876fb929cf4f93501
diff --git a/metadata/md5-cache/dev-python/tavern-2.0.7 b/metadata/md5-cache/dev-python/tavern-2.0.7
deleted file mode 100644
index 9a106a9b295d..000000000000
--- a/metadata/md5-cache/dev-python/tavern-2.0.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/Faker[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paho-mqtt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pykwalify[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tool, library, and Pytest plugin for testing RESTful APIs
-EAPI=8
-HOMEPAGE=https://github.com/taverntesting/tavern/ https://pypi.org/project/tavern/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paho-mqtt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pykwalify[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/taverntesting/tavern/archive/2.0.7.tar.gz -> tavern-2.0.7.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ed25ab0a6609f5956fd55d3f9c8d9c0c
diff --git a/metadata/md5-cache/dev-python/tavern-2.1.0 b/metadata/md5-cache/dev-python/tavern-2.1.0
deleted file mode 100644
index f4de38951d47..000000000000
--- a/metadata/md5-cache/dev-python/tavern-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/Faker[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paho-mqtt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pykwalify[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tool, library, and Pytest plugin for testing RESTful APIs
-EAPI=8
-HOMEPAGE=https://github.com/taverntesting/tavern/ https://pypi.org/project/tavern/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paho-mqtt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pykwalify[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/taverntesting/tavern/archive/2.1.0.tar.gz -> tavern-2.1.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=33dc288d840886eea28ab474af03a7fb
diff --git a/metadata/md5-cache/dev-python/tavern-2.2.0 b/metadata/md5-cache/dev-python/tavern-2.2.0
index 7db05e90cf52..0aebf20e852a 100644
--- a/metadata/md5-cache/dev-python/tavern-2.2.0
+++ b/metadata/md5-cache/dev-python/tavern-2.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/taverntesting/tavern/ https://pypi.org/project/tavern/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-python/jmespath[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paho-mqtt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pykwalify[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taverntesting/tavern/archive/2.2.0.tar.gz -> tavern-2.2.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=33dc288d840886eea28ab474af03a7fb
+_md5_=0c42ab34cdafac7b3e8a0490f2f01e2a
diff --git a/metadata/md5-cache/dev-python/tempest-34.2.0 b/metadata/md5-cache/dev-python/tempest-34.2.0
deleted file mode 100644
index 0a0fbae8d841..000000000000
--- a/metadata/md5-cache/dev-python/tempest-34.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stestr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cliff-2.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/defusedxml-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=OpenStack Integration Testing
-EAPI=8
-HOMEPAGE=https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/ https://launchpad.net/tempest/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cliff-2.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/defusedxml-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/tempest/tempest-34.2.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=b3472a7e64a9de57718f90438f3fb77f
diff --git a/metadata/md5-cache/dev-python/tempest-35.0.0 b/metadata/md5-cache/dev-python/tempest-35.0.0
index cc5bc54a1f89..6e1afd3a77e9 100644
--- a/metadata/md5-cache/dev-python/tempest-35.0.0
+++ b/metadata/md5-cache/dev-python/tempest-35.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/ https://launchpad.net/tempest/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cliff-2.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/defusedxml-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/tempest/tempest-35.0.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e8f66308084c419dd09ccc92a44e168c
+_md5_=ad4677f75ed58ac5e3d0092d43a7e3b5
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1-r2 b/metadata/md5-cache/dev-python/testresources-2.0.1-r2
deleted file mode 100644
index b5e613a12bcc..000000000000
--- a/metadata/md5-cache/dev-python/testresources-2.0.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pbr[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pyunit extension for managing expensive test resources
-EAPI=8
-HOMEPAGE=https://launchpad.net/testresources/ https://github.com/testing-cabal/testresources/ https://pypi.org/project/testresources/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pbr[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/testresources/testresources-2.0.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e84f4f6affa76ecf266443a31ef66a9d
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1-r3 b/metadata/md5-cache/dev-python/testresources-2.0.1-r3
index ffd37ae0f208..6f3d66a515d5 100644
--- a/metadata/md5-cache/dev-python/testresources-2.0.1-r3
+++ b/metadata/md5-cache/dev-python/testresources-2.0.1-r3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/testresources/ https://github.com/testing-cabal/testresources/ https://pypi.org/project/testresources/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pbr[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/testresources/testresources-2.0.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=546133b3927bec5f6b0388f80d8c2bf7
+_md5_=74e2c0333fa736194322db4a8c9dbc79
diff --git a/metadata/md5-cache/dev-python/testtools-2.6.0 b/metadata/md5-cache/dev-python/testtools-2.6.0
deleted file mode 100644
index 6d143dfa84fd..000000000000
--- a/metadata/md5-cache/dev-python/testtools-2.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/fixtures-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testscenarios[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensions to the Python standard library unit testing framework
-EAPI=8
-HOMEPAGE=https://github.com/testing-cabal/testtools/ https://pypi.org/project/testtools/
-INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-PDEPEND=>=dev-python/fixtures-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=dev-python/python-mimeparse[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrsistent[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/testtools/testtools-2.6.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=07001872b154d6b791438cca4d53ae57
diff --git a/metadata/md5-cache/dev-python/testtools-2.6.0-r1 b/metadata/md5-cache/dev-python/testtools-2.6.0-r1
index 077f1a195221..775526655452 100644
--- a/metadata/md5-cache/dev-python/testtools-2.6.0-r1
+++ b/metadata/md5-cache/dev-python/testtools-2.6.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/testing-cabal/testtools/ https://pypi.org/project/testtools/
 INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 PDEPEND=>=dev-python/fixtures-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 RDEPEND=>=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/testtools/testtools-2.6.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=478b08f40049106a3991a7f41b823670
+_md5_=3037c50e06cc3b1613d775bda57f416a
diff --git a/metadata/md5-cache/dev-python/three-merge-0.1.1 b/metadata/md5-cache/dev-python/three-merge-0.1.1
deleted file mode 100644
index 45de1dfc2ff4..000000000000
--- a/metadata/md5-cache/dev-python/three-merge-0.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/diff-match-patch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple Python library to perform a 3-way merge between strings
-EAPI=7
-HOMEPAGE=https://github.com/spyder-ide/three-merge https://pypi.org/project/three-merge/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/diff-match-patch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/three-merge/archive/v0.1.1.tar.gz -> three-merge-0.1.1-gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=911fe16598c3c0cec14649d8862440ed
diff --git a/metadata/md5-cache/dev-python/three-merge-0.1.1-r1 b/metadata/md5-cache/dev-python/three-merge-0.1.1-r1
index aa04fc8e60ec..e52a7a10772d 100644
--- a/metadata/md5-cache/dev-python/three-merge-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/three-merge-0.1.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/spyder-ide/three-merge/ https://pypi.org/project/three-merge/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/diff-match-patch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/three-merge/archive/v0.1.1.tar.gz -> three-merge-0.1.1.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=34468f2ffbd8f9327b1bc8acd1b2169f
+_md5_=ba104f2b322fd1a88fb39dec03d0f6de
diff --git a/metadata/md5-cache/dev-python/time-machine-2.10.0 b/metadata/md5-cache/dev-python/time-machine-2.10.0
index a7e909dbbd68..475b9953ac11 100644
--- a/metadata/md5-cache/dev-python/time-machine-2.10.0
+++ b/metadata/md5-cache/dev-python/time-machine-2.10.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/adamchainz/time-machine/ https://pypi.org/project/time-machine/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/adamchainz/time-machine/archive/2.10.0.tar.gz -> time-machine-2.10.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7de76a80da2bddd2f7b98f2934a5bef1
+_md5_=9c9bc770fe8d8b13cb745d4d906130e0
diff --git a/metadata/md5-cache/dev-python/tiny-proxy-0.1.1 b/metadata/md5-cache/dev-python/tiny-proxy-0.1.1
deleted file mode 100644
index 14e879528c1d..000000000000
--- a/metadata/md5-cache/dev-python/tiny-proxy-0.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aiohttp-3.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.23.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-socks-0.7.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple proxy server (SOCKS4(a), SOCKS5(h), HTTP tunnel)
-EAPI=8
-HOMEPAGE=https://github.com/romis2012/tiny-proxy/ https://pypi.org/project/tiny-proxy/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/anyio-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/romis2012/tiny-proxy/archive/v0.1.1.tar.gz -> tiny-proxy-0.1.1.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e7b6783113299442da4368dede9fe2b0
diff --git a/metadata/md5-cache/dev-python/tiny-proxy-0.2.0 b/metadata/md5-cache/dev-python/tiny-proxy-0.2.0
index 4d12ab780dbd..e571269a58b8 100644
--- a/metadata/md5-cache/dev-python/tiny-proxy-0.2.0
+++ b/metadata/md5-cache/dev-python/tiny-proxy-0.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/romis2012/tiny-proxy/ https://pypi.org/project/tiny-proxy/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/anyio-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/anyio-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/romis2012/tiny-proxy/archive/v0.2.0.tar.gz -> tiny-proxy-0.2.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=90c0a4fefb0d87c18500c13e4d856ca5
+_md5_=4bc49fed0226023647c15be5625ff686
diff --git a/metadata/md5-cache/dev-python/tornado-6.3.2-r1 b/metadata/md5-cache/dev-python/tornado-6.3.2-r1
index 6ff8d6c290fa..d52d08fee892 100644
--- a/metadata/md5-cache/dev-python/tornado-6.3.2-r1
+++ b/metadata/md5-cache/dev-python/tornado-6.3.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.tornadoweb.org/ https://github.com/tornadoweb/tornado/ https://pypi.org/project/tornado/
 INHERIT=distutils-r1 pypi
 IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/twisted-16.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/tornado/tornado-6.3.2.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ef57b58e701f169f1ef7782cadefd64f
+_md5_=3018f946d6a8af7a6cd1219250a6e88d
diff --git a/metadata/md5-cache/dev-python/towncrier-22.12.0 b/metadata/md5-cache/dev-python/towncrier-22.12.0
deleted file mode 100644
index e961e3b99b1e..000000000000
--- a/metadata/md5-cache/dev-python/towncrier-22.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/incremental[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-vcs/git dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-16.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Building newsfiles for your project
-EAPI=8
-HOMEPAGE=https://github.com/twisted/towncrier/ https://pypi.org/project/towncrier/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click-default-group[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/incremental[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/twisted/towncrier/archive/22.12.0.tar.gz -> towncrier-22.12.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5bd08e728a9bae683e7723fa4f4b31e8
diff --git a/metadata/md5-cache/dev-python/towncrier-23.6.0 b/metadata/md5-cache/dev-python/towncrier-23.6.0
index 10c9b7ec27ac..53dcf14abc4c 100644
--- a/metadata/md5-cache/dev-python/towncrier-23.6.0
+++ b/metadata/md5-cache/dev-python/towncrier-23.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/twisted/towncrier/ https://pypi.org/project/towncrier/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click-default-group[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/incremental[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/towncrier/archive/23.6.0.tar.gz -> towncrier-23.6.0.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=cbde173de66b988c4d8c6d9d3f341a0c
+_md5_=729ee0d22913c99cbf36cf2e8fa652d4
diff --git a/metadata/md5-cache/dev-python/trio-0.22.0-r1 b/metadata/md5-cache/dev-python/trio-0.22.0-r1
deleted file mode 100644
index cb363b22d2f3..000000000000
--- a/metadata/md5-cache/dev-python/trio-0.22.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/astor-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/immutables-0.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/async_generator-1.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/exceptiongroup-1.0.0_rc9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/outcome[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sortedcontainers[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/immutables[python_targets_python3_11(-)] dev-python/sphinxcontrib-trio[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/towncrier[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/immutables[python_targets_python3_10(-)] dev-python/sphinxcontrib-trio[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/towncrier[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/immutables[python_targets_pypy3(-)] dev-python/sphinxcontrib-trio[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] dev-python/towncrier[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for async concurrency and I/O
-EAPI=8
-HOMEPAGE=https://github.com/python-trio/trio/ https://pypi.org/project/trio/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( Apache-2.0 MIT )
-RDEPEND=>=dev-python/async_generator-1.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/exceptiongroup-1.0.0_rc9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/outcome[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sortedcontainers[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-trio/trio/archive/v0.22.0.tar.gz -> trio-0.22.0.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=44106c107a78f8a8dceae40fd66da56c
diff --git a/metadata/md5-cache/dev-python/trio-0.22.0_p20230530-r1 b/metadata/md5-cache/dev-python/trio-0.22.0_p20230530-r1
index 05661260f586..23de51c894b6 100644
--- a/metadata/md5-cache/dev-python/trio-0.22.0_p20230530-r1
+++ b/metadata/md5-cache/dev-python/trio-0.22.0_p20230530-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-trio/trio/ https://pypi.org/project/trio/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=>=dev-python/attrs-20.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc9[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc9[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/outcome[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sortedcontainers[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/trio/archive/93c1d96a535cca565e1b1ba552cb9c4798b3f852.tar.gz -> trio-93c1d96a535cca565e1b1ba552cb9c4798b3f852.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d853f4d6af4ed9aa14b3afdb0e9c23a3
+_md5_=91946c7ef80a80952c9abd85d4744922
diff --git a/metadata/md5-cache/dev-python/trio-websocket-0.10.2 b/metadata/md5-cache/dev-python/trio-websocket-0.10.2
deleted file mode 100644
index c8fdb8cf5f06..000000000000
--- a/metadata/md5-cache/dev-python/trio-websocket-0.10.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-trio-0.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/exceptiongroup[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wsproto-0.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client and server implementation for Python Trio
-EAPI=8
-HOMEPAGE=https://github.com/HyperionGray/trio-websocket/ https://pypi.org/project/trio-websocket/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/exceptiongroup[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wsproto-0.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HyperionGray/trio-websocket/archive/0.10.2.tar.gz -> trio-websocket-0.10.2.gh.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=4989a133d7d9f39d197b75096f90aecb
diff --git a/metadata/md5-cache/dev-python/trio-websocket-0.10.3 b/metadata/md5-cache/dev-python/trio-websocket-0.10.3
index 211d12e05373..a1aa457653a9 100644
--- a/metadata/md5-cache/dev-python/trio-websocket-0.10.3
+++ b/metadata/md5-cache/dev-python/trio-websocket-0.10.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/HyperionGray/trio-websocket/ https://pypi.org/project/trio-websocket/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/exceptiongroup[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wsproto-0.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HyperionGray/trio-websocket/archive/0.10.3.tar.gz -> trio-websocket-0.10.3.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=677a41d8e78a4dfa95b476d62f56433d
+_md5_=d67ab58b0614d4ccd1fa6a301dc16193
diff --git a/metadata/md5-cache/dev-python/uri_template-1.3.0 b/metadata/md5-cache/dev-python/uri_template-1.3.0
index ecfef54e2e34..0a142eb270a4 100644
--- a/metadata/md5-cache/dev-python/uri_template-1.3.0
+++ b/metadata/md5-cache/dev-python/uri_template-1.3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.linss.com/open-source/python/uri-template/ https://pypi.org/project/uri-template/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://gitlab.linss.com/open-source/python/uri-template/-/archive/v1.3.0/uri-template-v1.3.0.tar.bz2
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=703676210c5fddff66409a1f3b6507b6
+_md5_=1dca8b09273b7ccb07faf9017f69fac1
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.21.0 b/metadata/md5-cache/dev-python/virtualenv-20.21.0
deleted file mode 100644
index c0cbea24957a..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.21.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.21.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=fcdd10c31f532ee54c1150bbbc4192dd
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.22.0 b/metadata/md5-cache/dev-python/virtualenv-20.22.0
deleted file mode 100644
index 141441baca6a..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.22.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_pypy3? ( !!<dev-python/virtualenv-20.22[python_targets_pypy3(-)?] ) ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.22.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=651eb36829f73e748f368c4dba2ceece
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.23.0 b/metadata/md5-cache/dev-python/virtualenv-20.23.0
deleted file mode 100644
index a2a7ea06c9b5..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.23.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?] ) >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_pypy3? ( !!<dev-python/virtualenv-20.22[python_targets_pypy3(-)?] ) ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.23.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3c5ab19f8acd83ad067c81c142c5415c
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.23.1 b/metadata/md5-cache/dev-python/virtualenv-20.23.1
index c2238060bc1d..4ee47a87c8c1 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.23.1
+++ b/metadata/md5-cache/dev-python/virtualenv-20.23.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.23.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=27cfbdb48f2858222c568116c774e9b5
+_md5_=8b40a84072d1536cb7f8672a52bb3d96
diff --git a/metadata/md5-cache/dev-python/webcolors-1.13 b/metadata/md5-cache/dev-python/webcolors-1.13
index 8bb2e3753e3e..d0ec8ca7c4e9 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.13
+++ b/metadata/md5-cache/dev-python/webcolors-1.13
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ubernostrum/webcolors/ https://pypi.org/project/webcolors/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/w/webcolors/webcolors-1.13.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=18c2f9b800363f6f126a6d6966af3a0c
+_md5_=20f3df76684378efc4167e97a5b61ee9
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.5.1 b/metadata/md5-cache/dev-python/websocket-client-1.5.1
deleted file mode 100644
index 9ff5831a3ddb..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-1.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client for python with hybi13 support
-EAPI=8
-HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
-INHERIT=distutils-r1 pypi
-IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/w/websocket-client/websocket-client-1.5.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=33396aff8fd1faaeaf8c555890c8ef92
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.5.2 b/metadata/md5-cache/dev-python/websocket-client-1.5.2
deleted file mode 100644
index 6af15e0140b1..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-1.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client for python with hybi13 support
-EAPI=8
-HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
-INHERIT=distutils-r1 pypi
-IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/w/websocket-client/websocket-client-1.5.2.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e928d0aeb7ab43cc9b164d650a5336c2
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.5.3 b/metadata/md5-cache/dev-python/websocket-client-1.5.3
deleted file mode 100644
index f52ec6f697ed..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-1.5.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client for python with hybi13 support
-EAPI=8
-HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
-INHERIT=distutils-r1 pypi
-IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/w/websocket-client/websocket-client-1.5.3.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e928d0aeb7ab43cc9b164d650a5336c2
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.6.0 b/metadata/md5-cache/dev-python/websocket-client-1.6.0
deleted file mode 100644
index 6972ab339a5a..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client for python with hybi13 support
-EAPI=8
-HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
-INHERIT=distutils-r1 pypi
-IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/w/websocket-client/websocket-client-1.6.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e928d0aeb7ab43cc9b164d650a5336c2
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.6.1 b/metadata/md5-cache/dev-python/websocket-client-1.6.1
index 2e96e3eacf0a..065efb152758 100644
--- a/metadata/md5-cache/dev-python/websocket-client-1.6.1
+++ b/metadata/md5-cache/dev-python/websocket-client-1.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
 INHERIT=distutils-r1 pypi
 IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/w/websocket-client/websocket-client-1.6.1.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e928d0aeb7ab43cc9b164d650a5336c2
+_md5_=86cd16cbf7994bdd39ebda85b4e1419a
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.3.6 b/metadata/md5-cache/dev-python/werkzeug-2.3.6
index e63332e52902..d85f2edca034 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.3.6
+++ b/metadata/md5-cache/dev-python/werkzeug-2.3.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
 INHERIT=distutils-r1
 IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/2.3.6.tar.gz -> werkzeug-2.3.6.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=81bbc87c77aa933863e68d841c1a496b
+_md5_=ef699e54f279c113274a64bb7cf38505
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.62.0 b/metadata/md5-cache/dev-python/zeroconf-0.62.0
deleted file mode 100644
index 84b7ccc1bae9..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.62.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.62.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e333b4c15fa6306b2951f901f0741de0
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.63.0 b/metadata/md5-cache/dev-python/zeroconf-0.63.0
deleted file mode 100644
index 78ce50c37d53..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.63.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.63.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=440223ab8b25f443d76083ad68c77a65
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.64.0 b/metadata/md5-cache/dev-python/zeroconf-0.64.0
deleted file mode 100644
index 2f813f69345c..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.64.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.64.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=72336f8d2c7d67781071192e37cc696d
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.64.1 b/metadata/md5-cache/dev-python/zeroconf-0.64.1
deleted file mode 100644
index 13f17302fbf2..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.64.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=<dev-python/cython-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-0.29.32[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.64.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=8b22aa52f8a84592b130bf85aae206b8
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.66.0 b/metadata/md5-cache/dev-python/zeroconf-0.66.0
deleted file mode 100644
index eb7b3d17dc11..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.66.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=<dev-python/cython-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-0.29.32[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.66.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=8b22aa52f8a84592b130bf85aae206b8
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.68.0 b/metadata/md5-cache/dev-python/zeroconf-0.68.0
deleted file mode 100644
index a7d445d7a9ea..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.68.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=<dev-python/cython-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-0.29.32[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.68.0.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=8b22aa52f8a84592b130bf85aae206b8
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.69.0 b/metadata/md5-cache/dev-python/zeroconf-0.69.0
index de6437e7abb8..3d98218225e9 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.69.0
+++ b/metadata/md5-cache/dev-python/zeroconf-0.69.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.69.0.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=30c195a5e5dde9fa6d8d0a1c0ad39fbb
+_md5_=b406259ec954c0f4ae81b8a1a409a170
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.71.0 b/metadata/md5-cache/dev-python/zeroconf-0.71.0
new file mode 100644
index 000000000000..bbf4d8acaf01
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.71.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.71.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=30c195a5e5dde9fa6d8d0a1c0ad39fbb
diff --git a/metadata/md5-cache/dev-python/zipp-3.16.0 b/metadata/md5-cache/dev-python/zipp-3.16.0
new file mode 100644
index 000000000000..5f9a85e11259
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zipp-3.16.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-itertools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/zipp/ https://pypi.org/project/zipp/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zipp/zipp-3.16.0.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=d544e5003f09ab6b2b7fb05ba24901ae
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 12eaac49e591..a0d646d3ea0f 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.10 b/metadata/md5-cache/dev-qt/assistant-5.15.10
index 498987660aa6..4fe9b3fcc7b5 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.10
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*[png] =dev-qt/qthelp-5.15.10* =dev-qt/qtnetwork-5.15.10* =dev-qt/qtprintsupport-5.15.10* =dev-qt/qtsql-5.15.10*[sqlite] =dev-qt/qtwidgets-5.15.10* !dev-qt/assistant:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d86d59781ecde6260d0df5c5a174e499
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=667cfd572f1120452c161434d206b273
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.9 b/metadata/md5-cache/dev-qt/assistant-5.15.9
index 61837b7226bd..ebfe00b7e2c1 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.9
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*[png] =dev-qt/qthelp-5.15
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=667cfd572f1120452c161434d206b273
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.10 b/metadata/md5-cache/dev-qt/designer-5.15.10
index c0e19ddbd7af..15ac1f6c2bf2 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.10
+++ b/metadata/md5-cache/dev-qt/designer-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=desktop qt5-build xdg-utils
 IUSE=declarative debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5=[png] =dev-qt/qtnetwork-5.15.10* =dev-qt/qtprintsupport-5.15.10* =dev-qt/qtwidgets-5.15.10* =dev-qt/qtxml-5.15.10* declarative? ( =dev-qt/qtdeclarative-5.15.10*[widgets] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e9c0714ef5111adba2e08a851720497d
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=011ada4deba068d17b48ecf2e99329bc
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.9 b/metadata/md5-cache/dev-qt/designer-5.15.9
index 086806da93d5..278720b0f623 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.9
+++ b/metadata/md5-cache/dev-qt/designer-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*:5=[png] =dev-qt/qtnetwor
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a7bba5baa3d6d69511872c9762a78331
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.10 b/metadata/md5-cache/dev-qt/linguist-5.15.10
index 7854772368cf..2d6304486085 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.10
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/designer-5.15.10* =dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5=[png] =dev-qt/qtprintsupport-5.15.10* =dev-qt/qtwidgets-5.15.10* =dev-qt/qtxml-5.15.10* !dev-qt/linguist:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8a740edd19bd1529042ea172de9a56ad
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5a1b9c7aeb3e89cfd1532d7ca8257638
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.9 b/metadata/md5-cache/dev-qt/linguist-5.15.9
index 1c08a5890a05..9a9f9cc6b71a 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.9
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/designer-5.15.9* =dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5a1b9c7aeb3e89cfd1532d7ca8257638
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.10 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.10
index f1c5a4d0de67..cddc957df7e1 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.10
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtxml-5.15.10* qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=39a5ecddc35cf9c89c10ddc1b2e4d081
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=e19a9272093df368ee6c15e54fb09cd4
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.9 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.9
index bda33803a7ab..9a89efae44a6 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.9
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtxml-5.15.9* qml? ( =dev-qt/qtdeclara
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=9f007ba3809bbd7753f5cb27ca27261a
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.10 b/metadata/md5-cache/dev-qt/pixeltool-5.15.10
index b34dd51c2884..b53c2cced2ad 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.10
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5=[png] =dev-qt/qtwidgets-5.15.10* !dev-qt/pixeltool:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=8f91f400ac394370a035b4afbed9a2f2
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=00e7d23318afffaad3704f219def6fc1
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.9 b/metadata/md5-cache/dev-qt/pixeltool-5.15.9
index 7d8ed5cfc022..1cf87bea38a9 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.9
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*:5=[png] =dev-qt/qtwidget
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=00e7d23318afffaad3704f219def6fc1
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.10 b/metadata/md5-cache/dev-qt/qdbus-5.15.10
index d7135c316174..a37777507331 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.10
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdbus-5.15.10* =dev-qt/qtxml-5.15.10* !dev-qt/qdbus:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=c01d997ae1086c07425cf18cbcfefe0a
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=22206e844dd151f4a5668d9ac8cd7e5a
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.9 b/metadata/md5-cache/dev-qt/qdbus-5.15.9
index 40aa55ebf37d..5828f6b43938 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.9
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdbus-5.15.9* =dev-qt/qtxml-5.15.9* !dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=623b02773f6327175ae2cb42c4d18be9
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10
index 191c304bb0bd..f80d696fa08e 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdbus-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtwidgets-5.15.10* =dev-qt/qtxml-5.15.10* !dev-qt/qdbusviewer:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=399b0af45014373a4edc78b925c11ca3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a388ac309dfd8d2d8c48598305960887
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.9 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.9
index 3c5458105b81..7aa61a6cc2ba 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.9
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdbus-5.15.9* =dev-qt/qtgui-5.15.9* =dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a388ac309dfd8d2d8c48598305960887
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.10 b/metadata/md5-cache/dev-qt/qdoc-5.15.10
index 0a342d0048b7..d3f98662cb20 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.10
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=572bc2b9a4aefc9a3f9c3175eb936fd7
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=847236a2fca9f6a6277cf671fb1162c5
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.9 b/metadata/md5-cache/dev-qt/qdoc-5.15.9
index fa8f270cc002..74acefcd9b0c 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.9
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=67b30b4d326737ef54cc5879d069c5c5
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.10 b/metadata/md5-cache/dev-qt/qt3d-5.15.10
index 166a12daca3c..b137c20e62af 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.10
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=gamepad gles2-only qml vulkan debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtconcurrent-5.15.10* =dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*:5=[vulkan=] =dev-qt/qtnetwork-5.15.10* >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-5.15.10* ) qml? ( =dev-qt/qtdeclarative-5.15.10*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qt3d-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=190840849ee66cc159c793053980d3e0
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=cf54b389cfbd20675c1694cc0033eae4
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.9 b/metadata/md5-cache/dev-qt/qt3d-5.15.9
index 4e30df236e34..1c3c04166173 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.9
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.9* =dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qt3d-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=cf54b389cfbd20675c1694cc0033eae4
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.10 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.10
index 761a361acc35..ef096c1cf5e3 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtconnectivity https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtconcurrent-5.15.10* =dev-qt/qtcore-5.15.10*:5= =dev-qt/qtdbus-5.15.10* =dev-qt/qtnetwork-5.15.10* >=net-wireless/bluez-5:= qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtconnectivity-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtconnectivity-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=c65b7419d350a02219e526e59ec0ee9b
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=a1276afe67db5cb677b8475a1c6a4c5c
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.9 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.9
index 7f14018f1831..e16eb36242a8 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.9* =dev-qt/qtcore-5.15.9*:5= =dev-qt/qtdbus-5.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtconnectivity-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtconnectivity-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=85a00d95c2a7ea0a003155fb68de6027
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.10 b/metadata/md5-cache/dev-qt/qtcharts-5.15.10
index 92f0810e94a8..57e5963391dd 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtwidgets-5.15.10* qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtcharts-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=8e1ac51b99f084dd9e70a6d8a3674025
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=14a9252918136c30f0ecbc479fcc877d
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.9 b/metadata/md5-cache/dev-qt/qtcharts-5.15.9
index fc31142f0a5d..5293105b0824 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9* =dev-qt/qtwidgets-5.15.9* q
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtcharts-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=5ae4dd718da86d96ede6324da0ef6cbe
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10
index c75af266a30c..515d2a42a242 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=1256adb2e70cda66e60a9bdf4c4d44ef
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=b22e0e0bad533c98183d2cc93b2deb0a
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.9 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.9
index ae1e63e0bf76..036788a7cdb0 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=97cb5cce52eb17bd1b931a3eb8bb00dd
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.10 b/metadata/md5-cache/dev-qt/qtcore-5.15.10
index 6056125f165f..0920ddd18d8f 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info flag-o-matic qt5-build
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=72ac1345c2bd2315362a8c5ec2a2cd73
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=3c0928b569f09f350e7a04de9fdf90e8
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.9 b/metadata/md5-cache/dev-qt/qtcore-5.15.9
index 3bec204e26d7..0c34b0123146 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.9
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.15.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=0ff89fbdb7d9f33123a4641831b3835e
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10
index 3b32614c2513..ae08f6f4a9a2 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=gles2-only qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*[gles2-only=] qml? ( =dev-qt/qtdeclarative-5.15.10*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtdatavis3d-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=ee74276a815bde9922938e6141d9aa5c
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=79f3f575f5e5a8b9f42c3107b3fb57c3
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.9 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.9
index 703f58eac7a8..ecaab84c449a 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9*[gles2-only=] qml? ( =dev-qt
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtdatavis3d-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=79f3f575f5e5a8b9f42c3107b3fb57c3
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.10 b/metadata/md5-cache/dev-qt/qtdbus-5.15.10
index 86d16d8f97a2..3f59136e8117 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=db32f12594938ad50e2ecb6214c6accf
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=48b1b64070f0fa29db4df0e5939fc7b6
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.9 b/metadata/md5-cache/dev-qt/qtdbus-5.15.9
index 2dfa0983da97..4cbc99d7bace 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6a6f3d70ce776e57e71d1d143c553f28
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r1
index de263931d1ae..c53d832e9898 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r1
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*:5=[gles2-only=,vulkan=] =
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.10-gentoo-kde-2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=f48d08d929429c13ad8d625fb9ec965b
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r2
index b1be5674cbf0..2dc2e1bf1b54 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r2
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtdeclarative https://community.kde.org/Qt5PatchCollection
 INHERIT=flag-o-matic python-any-r1 qt5-build
 IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.10* =dev-qt/qttest-5.15.10* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.10* ) widgets? ( =dev-qt/qtwidgets-5.15.10*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.10-gentoo-kde-3.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=a12804bf309496d46498747f42c93ace
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=6ca8bbb1ad48d9ad819361127360b335
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.9 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.9
index 5807239a4155..3fc748df9c75 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9*:5=[gles2-only=,vulkan=] =de
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=2603bb8aeea1c5cb4cf71ac94d12828e
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.10 b/metadata/md5-cache/dev-qt/qtdiag-5.15.10
index c8a2c020b689..8dd8f72264fc 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=+network +widgets debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5= network? ( =dev-qt/qtnetwork-5.15.10*[ssl] ) widgets? ( =dev-qt/qtwidgets-5.15.10* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=f34dbb783c562db1e61e61c28e7b9943
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=1bd63c5a627e252ec7114c7bb3f872f6
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.9 b/metadata/md5-cache/dev-qt/qtdiag-5.15.9
index 6c2d28894453..af9f3596ae89 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*:5= network? ( =dev-qt/qt
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=1bd63c5a627e252ec7114c7bb3f872f6
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.10 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.10
index 5904cfff4d79..875664546430 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=evdev qml sdl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*[evdev?] evdev? ( virtual/libudev:= ) qml? ( =dev-qt/qtdeclarative-5.15.10* ) sdl? ( media-libs/libsdl2 )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtgamepad-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=6751c280375e61f0988de2f9fa74b630
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=19fcb846857d5b258f373329381bf9e4
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.9 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.9
index f7b26d10e750..2e6a3ebe3ecc 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9*[evdev?] evdev? ( virtual/li
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtgamepad-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=19fcb846857d5b258f373329381bf9e4
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.10 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.10
index 320025e0d053..766d527a296e 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10*
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=e76a27c74205a621daf2051ac93d1fe4
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=ec050b1e58cdf22ae73dbaf36ae9f1a1
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.9 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.9
index e01b7bd68caf..316f195a3d1e 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6dbaff199c1043ab625676d375c0d648
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.10 b/metadata/md5-cache/dev-qt/qtgui-5.15.10
index fc3a20e0f2b4..0183a5fcb25f 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.10* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.10*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.10* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.10* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.10* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl )
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=d8bbcf5b6f33128ae5caf1e2f48106cf
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=376f3678c856859f610b2b901329ee49
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.9 b/metadata/md5-cache/dev-qt/qtgui-5.15.9
index c9c4378d084d..fb50538621ef 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.9
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl )
 RESTRICT=test
 SLOT=5/5.15.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=0d811fd0bc7cf44dcf412ec17efab50b
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.9-r1 b/metadata/md5-cache/dev-qt/qtgui-5.15.9-r1
index 29a50543eb6f..026feb1d4847 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.9-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.9-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl )
 RESTRICT=test
 SLOT=5/5.15.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e469ffaea9148aaa476b7c2dd2d923ea
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.10 b/metadata/md5-cache/dev-qt/qthelp-5.15.10
index 11662b2a0c96..d0586054e808 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.10
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10* =dev-qt/qtsql-5.15.10*[sqlite] =dev-qt/qtwidgets-5.15.10*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=ce1e8c1a7a1f78982d0ec62bd28873ec
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=10fe6268d73c0ea4549dd6a12eb965b8
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.9 b/metadata/md5-cache/dev-qt/qthelp-5.15.9
index 14f02f62a992..6eb0a2433741 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.9
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9* =dev-qt/qtsql-5.15.9*[sq
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=ff85e31c7b037ef6cb8a99d44c37b651
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.10 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.10
index ec8412035bed..6d93e7741f35 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=mng debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtimageformats-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=93d2e234d374a017bfcc45375c11522b
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=0e341f796ad9748dea8df76be8af3f34
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.9 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.9
index eed61c9a7561..36c20394ee11 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9* media-libs/libwebp:= media-
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtimageformats-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=0e341f796ad9748dea8df76be8af3f34
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.10 b/metadata/md5-cache/dev-qt/qtlocation-5.15.10
index cf241e908bef..cc38a8d3b350 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtlocation https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtnetwork-5.15.10* =dev-qt/qtpositioning-5.15.10*[qml] =dev-qt/qtsql-5.15.10* sys-libs/zlib
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtlocation-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.10-gentoo-kde-1.tar.xz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/5a07e1967dcc925d9def47accadae991436b9686/qtlocation-mapboxgl-5a07e1967dcc925d9def47accadae991436b9686.tar.gz -> qtlocation-mapboxgl-5.15.10-5a07e196.tar.gz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=31f0e6ca816705dc13355ecf06606abc
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=7fa92ef6a25245abcb11ceb2a3c1c9dc
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.9 b/metadata/md5-cache/dev-qt/qtlocation-5.15.9
index 486f89a69ae9..3bc5971a3a5d 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.9
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtlocation-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.9-gentoo-kde-1.tar.xz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/5a07e1967dcc925d9def47accadae991436b9686/qtlocation-mapboxgl-5a07e1967dcc925d9def47accadae991436b9686.tar.gz -> qtlocation-mapboxgl-5.15.9-5a07e196.tar.gz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=30f23a7e3b346e0bb965e5cadba66624
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10
index b658f266ce3d..d792bc5e96aa 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtmultimedia https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*[gles2-only=] =dev-qt/qtnetwork-5.15.10* alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( =dev-qt/qtdeclarative-5.15.10* gles2-only? ( =dev-qt/qtgui-5.15.10*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtwidgets-5.15.10*[gles2-only=] media-libs/libglvnd )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtmultimedia-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtmultimedia-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=0c49bd2ad9668e1477123376c3e31c65
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=806fad83c23afc2a5c1e024e105f3379
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.9 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.9
index 9e3a20f1a891..ddec9c85599e 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9*[gles2-only=] =dev-qt/qtnetw
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtmultimedia-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=b82b2f15fd1bc869252a0726d46e1d84
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.10 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.10
index f9399dc9082e..9f121beb9da3 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=fa82d0c9ed1b34138d9d8f227b726cec
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r2 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r2
index dbbf8f8897f5..5ef0a1b996cd 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r2
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=gssapi libproxy sctp +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= sys-libs/zlib:= gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=de98f964cff98de00605151daa4fd0bd
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=b878feecc606e805793cd999f3cbecd3
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.9 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.9
index b1d874d86b84..8190be7358c7 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6ec2ebeb8a05548e587d552579b01127
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.9-r2 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.9-r2
index 77f3719b2cec..aaf518b322cc 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.9-r2
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.9-r2
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=7b7e76949145d12eee24ad52723c5ad1
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.9-r3 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.9-r3
index 2367e687d6a4..2a9c7e92718c 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.9-r3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.9-r3
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=54d3a837b235db4fbcf25b21c3a2b4a0
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10
index 6d8f799b27fe..85ed2fc22d45 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtnetwork-5.15.10*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtnetworkauth-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=27840167f3f78313f0b2fdf1721da3f7
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=059c2da7e9eb7b087d853194044d874c
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.9 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.9
index 22fd17188238..23744c48d461 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtnetwork-5.15.9*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtnetworkauth-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=059c2da7e9eb7b087d853194044d874c
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.10 b/metadata/md5-cache/dev-qt/qtopengl-5.15.10
index 8645923ce047..43c8a24b399c 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=gles2-only test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*[gles2-only=] =dev-qt/qtwidgets-5.15.10*[gles2-only=]
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=03efc5503e6d6fcb0646e60198e7ccaf
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=928f02b82d5ee3ad8dd7e3ad3d0cda0f
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.9 b/metadata/md5-cache/dev-qt/qtopengl-5.15.9
index 43d4f7cc9d26..4580836fe688 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*[gles2-only=] =dev-qt/qtw
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a504a2265bbf0824152c5710f37d03aa
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.10 b/metadata/md5-cache/dev-qt/qtpaths-5.15.10
index 796dcffa738a..86eb0009e5f4 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=98422e486f780febee0fe34f27f81586
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=0a5552d1c15cbd0dabcaf87cd1370d2f
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.9 b/metadata/md5-cache/dev-qt/qtpaths-5.15.9
index a71b5c1beb8b..b4beaa70d318 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=bb04c76023070e74edeacd9bd911013f
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.10 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.10
index 5469ff24d954..13ffec42518e 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=48c62f96da35af69b9a5ee52b9506f0f
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.9 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.9
index ffa500590c42..4454c0e009e1 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=48c62f96da35af69b9a5ee52b9506f0f
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.10 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
index e38902e582fb..64c332a1d3d6 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=geoclue +qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
 RDEPEND==dev-qt/qtcore-5.15.10* geoclue? ( =dev-qt/qtdbus-5.15.10* ) qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtlocation-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=07552b6ef2b4e5a1d17a86cb85195547
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=d5c821bc3568e357c2d1ed00cfbb084f
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.9 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.9
index daa272eca594..4f86c77f103f 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.9
@@ -13,5 +13,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* geoclue? ( =dev-qt/qtdbus-5.15.9* ) qml? ( =dev-q
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtlocation-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=682971f3f24dc14a5bd855a41f2e93e3
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10
index c2634e273fb6..20f813ced389 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=cups gles2-only test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*[gles2-only=] =dev-qt/qtwidgets-5.15.10*[gles2-only=] cups? ( net-print/cups )
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=4199c357e4b46c1a7f33d63fad5e8a8c
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=b04d3cb066a9e03ec0d94fa345019111
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.9 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.9
index 0f8c982dab34..fe8406c30589 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*[gles2-only=] =dev-qt/qtw
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=c69d6fed55dcea554359dbd0ac3108af
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10
index 60da2be6f4e1..a5f9d7e9a800 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=+widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10* widgets? ( =dev-qt/qtwidgets-5.15.10* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtquickcontrols-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=3bc465c2529424d4526c24dcb583dc78
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=ffad4ed63b3add334b197eefcda2b9d5
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.9 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.9
index cc081826bca8..aaf899ec0765 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtquickcontrols-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=7bedc5969b2323d43b4a6f4b813f2f52
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10
index ebbc5a1883ea..fd769940feaf 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtquickcontrols2 https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10* widgets? ( =dev-qt/qtwidgets-5.15.10* ) =dev-qt/qtgraphicaleffects-5.15.10*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtquickcontrols2-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=cbfcafc19a75713cc0ee97e254a0234f
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=67cf7102d72001b377b8364054c88962
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.9 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.9
index ac4eca28b578..df100bf5ef25 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtquickcontrols2-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=67cf7102d72001b377b8364054c88962
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.10 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.10
index ae6f68053f87..c948601f6b0b 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtquicktimeline-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=5b77b5eb477968ead1bc6c0eb622ea38
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.9 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.9
index 7c9f8b9f3e8e..bcfcdc8d0e79 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtquicktimeline-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=5b77b5eb477968ead1bc6c0eb622ea38
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.10 b/metadata/md5-cache/dev-qt/qtscript-5.15.10
index 26fb997b59fb..3204c8effaab 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=+jit scripttools debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* scripttools? ( =dev-qt/qtgui-5.15.10* =dev-qt/qtwidgets-5.15.10* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtscript-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=3dc7bdd0bf3478c7cd58f72626fc2f58
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=09cc9bcf79055c165d198fc7eafcc32c
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.9 b/metadata/md5-cache/dev-qt/qtscript-5.15.9
index 5291948b6b22..e7a7def7d8fd 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* scripttools? ( =dev-qt/qtgui-5.15.9* =dev-qt/qtwi
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtscript-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=775aff96333c9c4dab816bb5ca4aa691
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.10 b/metadata/md5-cache/dev-qt/qtscxml-5.15.10
index 7b88eef267af..69de5bc788f0 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtscxml-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=baf1853ae6e9c77a5103860c8de90be0
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=e5d1cc9fdfe62cf3acf86417a8b8dc88
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.9 b/metadata/md5-cache/dev-qt/qtscxml-5.15.9
index a1459c2eaaad..426e80f3491a 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtscxml-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e5d1cc9fdfe62cf3acf86417a8b8dc88
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.10 b/metadata/md5-cache/dev-qt/qtsensors-5.15.10
index 15499e39bf9f..993dba114bee 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdbus-5.15.10* qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtsensors-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=335fa425c647d7a0d19ef3140726de99
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=8fc4069e55ce4e77aefa35974da6cbba
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.9 b/metadata/md5-cache/dev-qt/qtsensors-5.15.9
index cec8e1a39fc4..005da78e4844 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdbus-5.15.9* qml? ( =dev-qt/qtdeclarati
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtsensors-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a45a647cd8072864f8915aadd41f58a4
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.10 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.10
index 58a1d1c6bf81..d78b7763569b 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtnetwork-5.15.10* =dev-qt/qtserialport-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtserialbus-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3d2c6d9047b96a29f57dc2b0a59f1b64
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.9 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.9
index 1cb9b3c1a163..e8b2c2e3bb6c 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtnetwork-5.15.9* =dev-qt/qtserialport-5.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtserialbus-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3d2c6d9047b96a29f57dc2b0a59f1b64
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.10 b/metadata/md5-cache/dev-qt/qtserialport-5.15.10
index 3467604c0d8d..0ddb5d072ff2 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtserialport-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=30b1bd81318884ff99ab6ebc33964c34
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=15dd667d57a59844148a752d22f5cb4c
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.9 b/metadata/md5-cache/dev-qt/qtserialport-5.15.9
index 7c382bf5c5de..53b94f14335f 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtserialport-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a73dcc531bbd1d6f61429fd8b3737015
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.10 b/metadata/md5-cache/dev-qt/qtspeech-5.15.10
index f6b7bde3cfa2..8c6981d1280f 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtspeech https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=alsa flite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.10* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.10*[alsa?] alsa? ( media-libs/alsa-lib ) )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtspeech-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=087aac1d05feb20413bc0ae9301decbf
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=cc63202e32b0a95e7d26035a2e22a10a
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.9 b/metadata/md5-cache/dev-qt/qtspeech-5.15.9
index dcc4f03f0c52..250b41dc73e6 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.9
@@ -12,5 +12,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.9* flite
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtspeech-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a2dc98eb7c0835c71f16acfb7347e941
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.10 b/metadata/md5-cache/dev-qt/qtsql-5.15.10
index d138027a7ba8..f20744c69442 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.10
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=98b047dfc3640fdbbab311e3176996f9
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=e639af51c148570448757a72fe90dd47
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.9 b/metadata/md5-cache/dev-qt/qtsql-5.15.9
index c2c296bace12..8f5bfde3094d 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.15.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=db60a2578343b23f551598b6709ba469
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.10 b/metadata/md5-cache/dev-qt/qtsvg-5.15.10
index dfbad87b3e15..6dfb5312ec40 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtsvg https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtwidgets-5.15.10* sys-libs/zlib:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtsvg-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=25290ed7a5b8c3897aae1f0aa27082e8
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=8f3a0a40f827753cd2fa593eedc1382d
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.9-r1 b/metadata/md5-cache/dev-qt/qtsvg-5.15.9-r1
index 6a33688e4f7f..cbe34d11a17e 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.9-r1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.9-r1
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9* =dev-qt/qtwidgets-5.15.9* s
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtsvg-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=0a074e4ee081c250adde57e57ccc4829
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.10 b/metadata/md5-cache/dev-qt/qttest-5.15.10
index d3ce907dec29..6da9cc069148 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.10
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=33997db537d70022334652757a336712
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=ebe2a196f51bbbf825b29b5557c06585
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.9 b/metadata/md5-cache/dev-qt/qttest-5.15.9
index 9f494fdaa7be..daef9cd748f7 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.9
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=973370e0ab430b748b93a6b49fc07264
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.10 b/metadata/md5-cache/dev-qt/qttranslations-5.15.10
index e18bbfd2b2c9..8dea1cf8b7d3 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.10
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttranslations-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=67497341c3a6007941c424a5042e96c0
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=454a9c5991008e49b2426cf0df640123
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.9 b/metadata/md5-cache/dev-qt/qttranslations-5.15.9
index 2c40b1225fbf..ae3af4e2462f 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.9
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.9
@@ -11,5 +11,5 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttranslations-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=8828e3df3c3e1dc5f1d130b9bcae1e2b
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10
index 4799e8d8f417..771f93ea4600 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=handwriting +spell +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtsvg-5.15.10* spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=6650804b3bc0cb0b3cdc15fa4234f516
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=a5d9c4b0a73fcbdbb82c369b7c9cfc9a
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.9 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.9
index e60b3e910fd8..a34fb6f51372 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a5d9c4b0a73fcbdbb82c369b7c9cfc9a
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.10 b/metadata/md5-cache/dev-qt/qtwayland-5.15.10
index 18cf29dbbf0b..b0dd895aeb45 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=vulkan X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.10*:5= =dev-qt/qtdeclarative-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.10*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwayland-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=54b48e014dc1c4bf4bd61df54eea2c9f
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=e73990c924ea1ed8b8c3d04e56f8ade0
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.9 b/metadata/md5-cache/dev-qt/qtwayland-5.15.9
index cbab357b35b2..51ec2d595e70 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.9
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.9*:5= =dev-qt/qtdeclarative-5.15.9*
 RESTRICT=test
 SLOT=5/5.15.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwayland-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=35349b9703552173aac72518f3623960
diff --git a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10 b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10
index 30727b78cea7..f136b7bfd53f 100644
--- a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= !<dev-qt/qtwayland-5.15.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwayland-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=bec03d88137ad4526df2dff4e7f8aa6a
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=759ff9590db719c9209ef86211f5664c
diff --git a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.9 b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.9
index 2cff0478f140..fa78e7748913 100644
--- a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5= !<dev-qt/qtwayland-5.15.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwayland-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e106c5d257a7ab2d592d548fe2d03ad6
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10
index 782c1d0a5f6a..154ae891835b 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebchannel https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwebchannel-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebchannel-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=0d1f69d6336ee2584f048d11b4344496
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=a4fcdd75d99a785197cd14f1c8ce4ee3
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.9 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.9
index f71e965a1405..01a82e33d246 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* qml? ( =dev-qt/qtdeclarative-5.15.9* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebchannel-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebchannel-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=7f4192d6370abf7e24f6a0e98c01c916
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230505 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230505
index 1a2c9e13305a..44f29aef73c6 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230505
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230505
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.9_p20230505.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.8_p20230313-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e479ee26ed17151a5a8330dc50506f75
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230623 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230623
index 47093188f2a6..21e8f856ac86 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230623
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230623
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
 IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtnetwork-5.15.10* =dev-qt/qtprintsupport-5.15.10* =dev-qt/qtwebchannel-5.15.10*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.10* ) geolocation? ( =dev-qt/qtpositioning-5.15.10* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.10*[widgets] =dev-qt/qtwidgets-5.15.10* )
 REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.10_p20230623.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.8_p20230313-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=fd23b3d5859639ba673bbe8d1dba7d6d
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=44196bab9b8bc74cf2c15fe84cbbee25
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.9_p20230505 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.9_p20230505
index eda4e50fd3a8..53f9ef39294b 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.9_p20230505
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.9_p20230505
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.9_p20230505.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.8_p20230313-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=44196bab9b8bc74cf2c15fe84cbbee25
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.10 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.10
index 017490825dbe..b0ba3f57328f 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebsockets https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtnetwork-5.15.10*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwebsockets-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebsockets-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=196474422fcb4b6f77d9aa07c4f32541
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=099897f7b2d577f7b8af095fc3b20fa0
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
index 984562e57f5b..1498f9db68e3 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtnetwork-5.15.9*[ssl=] qml? ( =dev-qt/qt
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebsockets-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebsockets-5.15.9-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=fff8ee3ba86f6940fcd8930a3f0ef5a4
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.10 b/metadata/md5-cache/dev-qt/qtwebview-5.15.10
index 2fd802809bd6..b88c40d3b107 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtwebengine-5.15.10*:5
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwebview-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=fe2de0641f096b7243b3a935d65e1991
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=697a2d24a8b7a27212c32c795c97f6c6
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.9 b/metadata/md5-cache/dev-qt/qtwebview-5.15.9
index c9ab497d57d2..c380fe54f05d 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebview-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=697a2d24a8b7a27212c32c795c97f6c6
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r1
index be1cd01cbb80..a239578834b9 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r1
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.10* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.10*:5=[dbus] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=d742ee379f79ad2497e479f931acc3e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=eaca4436983393762e05cc78a5767d53
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.9 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.9
index 17670edef50e..23b0a71adbb1 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.9
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a9cc0fb524c5d85cbebfd02992c31b9f
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.10 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.10
index 7615450bdcc3..6fab9bf5f58f 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtx11extras-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=f8cec7bd99d1ee62de62605a3795ffb3
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=0c90e8b5eca510c45f0cecff7b04f2a3
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.9 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.9
index 80439f4e6616..064171d95234 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9*[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtx11extras-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=13f708fa0fac97b6ee11db2403c6f907
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.10 b/metadata/md5-cache/dev-qt/qtxml-5.15.10
index f1fb69db2b61..ae34151d8479 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=7662d102d163b38f29d83604e7ac3ae5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=592ed6b2d504245488616a158f3777e2
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.9 b/metadata/md5-cache/dev-qt/qtxml-5.15.9
index 491c16030792..e17d9f24d1b5 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=653342e75b2a47fab6b62f2200a4f223
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10
index 601026203824..3f50aaeb95f0 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtnetwork-5.15.10* qml? ( =dev-qt/qtdeclarative-5.15.10* ) !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=1fb9ef71166de47d7347d15a43ae11f9
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_md5_=9c39006e26a7917831b494698f960bb8
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.9 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.9
index 573f10e5ce4c..21c8e4107377 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.9
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtnetwork-5.15.9* qml? ( =dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.9.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	35e70ed4fd0bbad5d5fbc93e3349d3bc	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
 _md5_=cf709308ab1f9c28ea0abc8a55e02aa1
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index fb78d431d9ab..10fdf37d1ed5 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.7.4-r1 b/metadata/md5-cache/dev-ruby/actiontext-6.1.7.4-r1
new file mode 100644
index 000000000000..a190f030df76
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.7.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.4[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.4[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.4[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.4[ruby_targets_ruby31(-)] ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby31(-)] ~dev-ruby/activestorage-6.1.7.4[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-6.1.7.4[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( ~dev-ruby/actionpack-6.1.7.4[ruby_targets_ruby32(-)] ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby32(-)] ~dev-ruby/activestorage-6.1.7.4[ruby_targets_ruby32(-)] ~dev-ruby/activesupport-6.1.7.4[ruby_targets_ruby32(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby30(-),sqlite] dev-ruby/bundler[ruby_targets_ruby30(-)] =dev-ruby/minitest-5.15*:*[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby31(-),sqlite] dev-ruby/bundler[ruby_targets_ruby31(-)] =dev-ruby/minitest-5.15*:*[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby32(-),sqlite] dev-ruby/bundler[ruby_targets_ruby32(-)] =dev-ruby/minitest-5.15*:*[ruby_targets_ruby32(-)] dev-ruby/mocha[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Edit and display rich text in Rails applications
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.4[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.4[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.4[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.4[ruby_targets_ruby31(-)] ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby31(-)] ~dev-ruby/activestorage-6.1.7.4[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-6.1.7.4[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( ~dev-ruby/actionpack-6.1.7.4[ruby_targets_ruby32(-)] ~dev-ruby/activerecord-6.1.7.4[ruby_targets_ruby32(-)] ~dev-ruby/activestorage-6.1.7.4[ruby_targets_ruby32(-)] ~dev-ruby/activesupport-6.1.7.4[ruby_targets_ruby32(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.4.tar.gz -> rails-6.1.7.4.tgz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=e44ab7791ed5fdf0f04fccaa1879b6da
diff --git a/metadata/md5-cache/dev-ruby/io-console-0.6.0 b/metadata/md5-cache/dev-ruby/io-console-0.6.0
deleted file mode 100644
index 8cbfa097171d..000000000000
--- a/metadata/md5-cache/dev-ruby/io-console-0.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=add console capabilities to IO instances
-EAPI=8
-HOMEPAGE=https://github.com/ruby/io-console
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/io-console/archive/v0.6.0.tar.gz -> io-console-0.6.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=bef4cfe05a6aafa763de7208417e586d
diff --git a/metadata/md5-cache/dev-ruby/io-console-0.6.0-r1 b/metadata/md5-cache/dev-ruby/io-console-0.6.0-r1
new file mode 100644
index 000000000000..0959448c7cd8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/io-console-0.6.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=add console capabilities to IO instances
+EAPI=8
+HOMEPAGE=https://github.com/ruby/io-console
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/io-console/archive/v0.6.0.tar.gz -> io-console-0.6.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=b70b94c7d224ea5db1904da0966f6974
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.6-r2 b/metadata/md5-cache/dev-ruby/rake-13.0.6-r2
index 91a63270195a..2d29676ba41e 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.6-r2
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.6-r2
@@ -1,6 +1,6 @@
-BDEPEND=ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby32(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+BDEPEND=app-alternatives/gzip ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby32(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Make-like scripting in Ruby
 EAPI=8
 HOMEPAGE=https://github.com/ruby/rake
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.6.tar.gz -> rake-13.0.6.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=68180671e323317b85bb94a2c3c6edbc
+_md5_=cb29b1aa588e66f157c3189f309a54eb
diff --git a/metadata/md5-cache/dev-ruby/reline-0.3.6 b/metadata/md5-cache/dev-ruby/reline-0.3.6
new file mode 100644
index 000000000000..93d9433e2d21
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/reline-0.3.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/io-console-0.5.0:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/io-console-0.5.0:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/io-console-0.5.0:0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Alternative readline implementation in pure Ruby
+EAPI=8
+HOMEPAGE=https://github.com/ruby/reline
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/io-console-0.5.0:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/io-console-0.5.0:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/io-console-0.5.0:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/reline/archive/v0.3.6.tar.gz -> reline-0.3.6.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=162cc39c439a278961d5215e29472423
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.4 b/metadata/md5-cache/dev-ruby/stringio-3.0.4
deleted file mode 100644
index a63981f276d6..000000000000
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=Pseudo IO class from/to String.
-EAPI=8
-HOMEPAGE=https://github.com/ruby/stringio
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/stringio/archive/v3.0.4.tar.gz -> stringio-3.0.4.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=094b360fa169981abbe3fa37b40cf58b
diff --git a/metadata/md5-cache/dev-ruby/sus-0.15.2 b/metadata/md5-cache/dev-ruby/sus-0.15.2
deleted file mode 100644
index dbda63d4310a..000000000000
--- a/metadata/md5-cache/dev-ruby/sus-0.15.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A fast and scalable test runner
-EAPI=8
-HOMEPAGE=https://github.com/ioquatix/sus
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/v0.15.2.tar.gz -> sus-0.15.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d3498f05ed0096b71e6b5f61e3a64f81
diff --git a/metadata/md5-cache/dev-ruby/sus-0.16.0 b/metadata/md5-cache/dev-ruby/sus-0.16.0
deleted file mode 100644
index 4f9918e67699..000000000000
--- a/metadata/md5-cache/dev-ruby/sus-0.16.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A fast and scalable test runner
-EAPI=8
-HOMEPAGE=https://github.com/ioquatix/sus
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/v0.16.0.tar.gz -> sus-0.16.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=bea243292a54cca139631ab2f0ea2092
diff --git a/metadata/md5-cache/dev-ruby/sus-0.18.0 b/metadata/md5-cache/dev-ruby/sus-0.18.0
deleted file mode 100644
index 049b183ff479..000000000000
--- a/metadata/md5-cache/dev-ruby/sus-0.18.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A fast and scalable test runner
-EAPI=8
-HOMEPAGE=https://github.com/ioquatix/sus
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/v0.18.0.tar.gz -> sus-0.18.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=bea243292a54cca139631ab2f0ea2092
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r2 b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r2
index bcb092ab5df2..8ee108bba5d7 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r2
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r2
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/activejob[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/activejob[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/activejob[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/activejob[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/activejob[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Drop-in replacement for the standard Logger, that logs to the syslog
 EAPI=8
 HOMEPAGE=https://github.com/crohr/syslogger
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/syslogger-1.6.6.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=fb1f692e723f1a6b30e93c1809c66d31
+_md5_=8ad5bf19dddf27332c1d7b0a323fc5e9
diff --git a/metadata/md5-cache/dev-ruby/temple-0.9.1 b/metadata/md5-cache/dev-ruby/temple-0.9.1
deleted file mode 100644
index 57f1a3c9195d..000000000000
--- a/metadata/md5-cache/dev-ruby/temple-0.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/erubi[ruby_targets_ruby30(-)] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/erubi[ruby_targets_ruby31(-)] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby
-EAPI=8
-HOMEPAGE=https://github.com/judofyr/temple
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0.7
-SRC_URI=https://rubygems.org/gems/temple-0.9.1.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=995c72a8c02b48b7a82dbbfaa1a2724a
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.2.0 b/metadata/md5-cache/dev-ruby/tilt-2.2.0
new file mode 100644
index 000000000000..f3b969c8da49
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tilt-2.2.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/erubi[ruby_targets_ruby30(-)] dev-ruby/nokogiri[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/erubi[ruby_targets_ruby31(-)] dev-ruby/nokogiri[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/erubi[ruby_targets_ruby32(-)] dev-ruby/nokogiri[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Thin interface over template engines to make their usage as generic as possible
+EAPI=8
+HOMEPAGE=https://github.com/jeremyevans/tilt
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/jeremyevans/tilt/archive/v2.2.0.tar.gz -> tilt-2.2.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=f64aefa11030edade1a7f8bf70a98db5
diff --git a/metadata/md5-cache/dev-ruby/twitter-8.0.0 b/metadata/md5-cache/dev-ruby/twitter-8.0.0
new file mode 100644
index 000000000000..cd5eb33a13dd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/twitter-8.0.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby30(-)] =dev-ruby/buftok-0.3.0*[ruby_targets_ruby30(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby30(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby30(-)] >=dev-ruby/http-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/http-form_data-2.3:2[ruby_targets_ruby30(-)] =dev-ruby/llhttp-ffi-0.4*[ruby_targets_ruby30(-)] =dev-ruby/memoizable-0.4*[ruby_targets_ruby30(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby30(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby30(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby31(-)] =dev-ruby/buftok-0.3.0*[ruby_targets_ruby31(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby31(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby31(-)] >=dev-ruby/http-5.1:5[ruby_targets_ruby31(-)] >=dev-ruby/http-form_data-2.3:2[ruby_targets_ruby31(-)] =dev-ruby/llhttp-ffi-0.4*[ruby_targets_ruby31(-)] =dev-ruby/memoizable-0.4*[ruby_targets_ruby31(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby31(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby31(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/webmock:3[ruby_targets_ruby30(-)] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] dev-ruby/webmock:3[ruby_targets_ruby31(-)] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Ruby wrapper around the Twitter API
+EAPI=8
+HOMEPAGE=https://github.com/sferik/twitter/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby30(-)] =dev-ruby/buftok-0.3.0*[ruby_targets_ruby30(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby30(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby30(-)] >=dev-ruby/http-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/http-form_data-2.3:2[ruby_targets_ruby30(-)] =dev-ruby/llhttp-ffi-0.4*[ruby_targets_ruby30(-)] =dev-ruby/memoizable-0.4*[ruby_targets_ruby30(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby30(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby30(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby31(-)] =dev-ruby/buftok-0.3.0*[ruby_targets_ruby31(-)] >=dev-ruby/equalizer-0.0.11[ruby_targets_ruby31(-)] =dev-ruby/equalizer-0.0*[ruby_targets_ruby31(-)] >=dev-ruby/http-5.1:5[ruby_targets_ruby31(-)] >=dev-ruby/http-form_data-2.3:2[ruby_targets_ruby31(-)] =dev-ruby/llhttp-ffi-0.4*[ruby_targets_ruby31(-)] =dev-ruby/memoizable-0.4*[ruby_targets_ruby31(-)] =dev-ruby/multipart-post-2*[ruby_targets_ruby31(-)] >=dev-ruby/naught-1.1[ruby_targets_ruby31(-)] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=8
+SRC_URI=https://github.com/sferik/twitter/archive/v8.0.0.tar.gz -> twitter-8.0.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=9e5b17cecbde70a887f6acb17d92204f
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.21.3 b/metadata/md5-cache/dev-ruby/typeprof-0.21.3
deleted file mode 100644
index 5a158330850b..000000000000
--- a/metadata/md5-cache/dev-ruby/typeprof-0.21.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=Performs a type analysis of non-annotated Ruby code
-EAPI=8
-HOMEPAGE=https://github.com/ruby/typeprof
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/typeprof/archive/v0.21.3.tar.gz -> typeprof-0.21.3.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3e1a588714dab7925d972905725464e7
diff --git a/metadata/md5-cache/dev-ruby/version_gem-1.1.2 b/metadata/md5-cache/dev-ruby/version_gem-1.1.2
deleted file mode 100644
index 9349fe3d4355..000000000000
--- a/metadata/md5-cache/dev-ruby/version_gem-1.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=Enhance that VERSION! Sugar for boring Version modules
-EAPI=8
-HOMEPAGE=https://gitlab.com/oauth-xx/version_gem
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://gitlab.com/oauth-xx/version_gem/-/archive/v1.1.2/version_gem-v1.1.2.tar.bz2 -> version_gem-1.1.2.tar.bz2
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e10e4f68fd033cb2cef1e11e3b1fe2e5
diff --git a/metadata/md5-cache/dev-ruby/web-console-4.2.0 b/metadata/md5-cache/dev-ruby/web-console-4.2.0
index 7eb2b257993f..f2961841ed8f 100644
--- a/metadata/md5-cache/dev-ruby/web-console-4.2.0
+++ b/metadata/md5-cache/dev-ruby/web-console-4.2.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby30(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/sqlite3[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] www-servers/puma[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby30(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby32(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby32(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby32(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/sqlite3[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] www-servers/puma[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby32(-)] dev-ruby/rack[ruby_targets_ruby32(-)] dev-ruby/sqlite3[ruby_targets_ruby32(-)] dev-ruby/mocha[ruby_targets_ruby32(-)] www-servers/puma[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A debugging tool for your Ruby on Rails applications
 EAPI=8
 HOMEPAGE=https://github.com/rails/web-console
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby30(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby30(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby32(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby32(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby32(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/web-console/archive/v4.2.0.tar.gz -> web-console-4.2.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=804431c5545400dd99e049d969a7ef69
+_md5_=c808d3e5a863babc7d8391f426b5aef2
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5 b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
deleted file mode 100644
index 50b5ea19d9cb..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A complete implementation of the WebSocket protocols
-EAPI=7
-HOMEPAGE=https://github.com/faye/websocket-driver-ruby
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0.7
-SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.7.5.tar.gz -> websocket-driver-0.7.5.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=4b0f58d4f9854d40faa662467653b04c
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-4.0.0 b/metadata/md5-cache/dev-ruby/will_paginate-4.0.0
new file mode 100644
index 000000000000..357e78d374ae
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/will_paginate-4.0.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/rails[ruby_targets_ruby30(-)] dev-ruby/activerecord[ruby_targets_ruby30(-),sqlite] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rails[ruby_targets_ruby31(-)] dev-ruby/activerecord[ruby_targets_ruby31(-),sqlite] dev-ruby/mocha[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rails[ruby_targets_ruby32(-)] dev-ruby/activerecord[ruby_targets_ruby32(-),sqlite] dev-ruby/mocha[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Most awesome pagination solution for Ruby
+EAPI=8
+HOMEPAGE=https://github.com/mislav/will_paginate/
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://github.com/mislav/will_paginate/archive/refs/tags/v4.0.0.tar.gz -> will_paginate-4.0.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=3eb1ed440d2bb43aaceb84c17270845f
diff --git a/metadata/md5-cache/dev-ruby/xdr-3.0.3 b/metadata/md5-cache/dev-ruby/xdr-3.0.3
index c78a80852e6f..81ff52e74dc0 100644
--- a/metadata/md5-cache/dev-ruby/xdr-3.0.3
+++ b/metadata/md5-cache/dev-ruby/xdr-3.0.3
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby32(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Read/write XDR encoded data structures
 EAPI=8
 HOMEPAGE=https://github.com/astroband/ruby-xdr
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activemodel-5.2.0:*[ruby_targets_ruby32(-)] >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/astroband/ruby-xdr/archive/v3.0.3.tar.gz -> xdr-3.0.3.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=dc9a7548c75a8bd2becb6c2bdf05cdc0
+_md5_=701f0e7a49bb7898558091e80a5e6e28
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 291c136da5ec..db068ad1ead6 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/bigloo-4.4c_p4-r5 b/metadata/md5-cache/dev-scheme/bigloo-4.4c_p4-r5
index f438aa43700a..704521adb263 100644
--- a/metadata/md5-cache/dev-scheme/bigloo-4.4c_p4-r5
+++ b/metadata/md5-cache/dev-scheme/bigloo-4.4c_p4-r5
@@ -13,4 +13,4 @@ REQUIRED_USE=flac? ( alsa ) mp3? ( alsa )
 SLOT=0
 SRC_URI=ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-4.4c-4.tar.gz
 _eclasses_=elisp-common	dde4f515dde15603a26a3755438e9c78	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7567a28ec5660e99edab8f106700261e
+_md5_=64fd57a7c99bbfa87701b88d6d02880a
diff --git a/metadata/md5-cache/dev-scheme/fibers-1.2.0 b/metadata/md5-cache/dev-scheme/fibers-1.2.0
deleted file mode 100644
index 9f29a45b8629..000000000000
--- a/metadata/md5-cache/dev-scheme/fibers-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-scheme/guile-2.1.7:=
-DESCRIPTION=Lightweight concurrency facility for Guile Scheme
-EAPI=8
-HOMEPAGE=https://github.com/wingo/fibers/ https://github.com/wingo/fibers/wiki/Manual/
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-scheme/guile-2.1.7:=
-SLOT=0
-SRC_URI=https://github.com/wingo/fibers/archive/v1.2.0.tar.gz -> fibers-1.2.0.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d83f856682d3b1505b4e35ec65bc0e34
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index ca9aa8cde211..8ef6853803be 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/clazy-1.11-r2 b/metadata/md5-cache/dev-util/clazy-1.11-r2
deleted file mode 100644
index 16e7f3caffba..000000000000
--- a/metadata/md5-cache/dev-util/clazy-1.11-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( || ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=<sys-devel/clang-16:= !!sys-devel/llvm:0
-DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
-EAPI=8
-HOMEPAGE=https://apps.kde.org/clazy
-INHERIT=cmake llvm python-any-r1
-IUSE=test
-KEYWORDS=amd64 arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=<sys-devel/clang-16:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://kde/stable/clazy/1.11/src/clazy-1.11.tar.xz
-_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b3fc872d8995b8f39a862aa193862c40
diff --git a/metadata/md5-cache/dev-util/fq-0.7.0 b/metadata/md5-cache/dev-util/fq-0.7.0
new file mode 100644
index 000000000000..1e4fd89a7c33
--- /dev/null
+++ b/metadata/md5-cache/dev-util/fq-0.7.0
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect ) >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=Tool for working with binary data (app-misc/jq for binary formats)
+EAPI=8
+HOMEPAGE=https://github.com/wader/fq
+INHERIT=go-module
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=MIT BSD-2
+RESTRICT=!test? ( test ) strip
+SLOT=0
+SRC_URI=https://github.com/wader/fq/archive/v0.7.0.tar.gz -> fq-0.7.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-util/fq/fq-0.7.0-deps.tar.xz
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=c6020108d890b7dd8dd694cbce1e9ade
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.401.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.401.2
index 6cb8a6abd5aa..f96db5b3db88 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.401.2
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.401.2
@@ -1,7 +1,7 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install
 DEPEND=acct-group/jenkins acct-user/jenkins
-DESCRIPTION=Extensible continuous integration server
+DESCRIPTION=The leading ope source automation server
 EAPI=8
 HOMEPAGE=https://jenkins.io/
 INHERIT=systemd
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 || ( virtual/jre:17 virtual/jre:11 )
 SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.401.2/jenkins.war -> jenkins-bin-2.401.2.war
+SRC_URI=https://get.jenkins.io/war-stable/2.401.2/jenkins.war -> jenkins-bin-2.401.2.war
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=59019707a09d919ea3c5070d521282e8
+_md5_=1f653a587fb782cc0a46510c02e33c02
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.410 b/metadata/md5-cache/dev-util/jenkins-bin-2.410
index 6d9aab51f707..a9101cf7e0c2 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.410
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.410
@@ -1,7 +1,7 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install
 DEPEND=acct-group/jenkins acct-user/jenkins
-DESCRIPTION=Extensible continuous integration server
+DESCRIPTION=The leading open source automation server
 EAPI=8
 HOMEPAGE=https://jenkins.io/
 INHERIT=systemd
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts || ( virtual/jre:17 virtual/jre:11 )
 SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/2.410/jenkins.war -> jenkins-bin-2.410.war
+SRC_URI=https://get.jenkins.io/war/2.410/jenkins.war -> jenkins-bin-2.410.war
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5c98fc35958a4881917c6fa22730316e
+_md5_=1423dcea28984ea8d83b9178d0c21931
diff --git a/metadata/md5-cache/dev-util/ostree-2023.5 b/metadata/md5-cache/dev-util/ostree-2023.5
new file mode 100644
index 000000000000..06b4a0c850f2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ostree-2023.5
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-arch/xz-utils dev-libs/glib:2 sys-fs/fuse:3 sys-libs/zlib archive? ( app-arch/libarchive:= ) curl? ( net-misc/curl ) dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme:= dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) soup? ( net-libs/libsoup:3.0 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 )
+DESCRIPTION=Operating system and container binary deployment and upgrades
+EAPI=8
+HOMEPAGE=https://ostreedev.github.io/ostree/
+INHERIT=autotools systemd tmpfiles
+IUSE=archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=app-arch/xz-utils dev-libs/glib:2 sys-fs/fuse:3 sys-libs/zlib archive? ( app-arch/libarchive:= ) curl? ( net-misc/curl ) dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme:= dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) soup? ( net-libs/libsoup:3.0 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) virtual/tmpfiles
+REQUIRED_USE=dracut? ( systemd ) http2? ( curl ) httpd? ( || ( curl soup ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2023.5/libostree-2023.5.tar.xz -> ostree-2023.5.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=48bc94e6794c950e4785b3b4e6292743
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 6030f42dd734..7d669707b0be 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/pysolfc-2.20.1-r1 b/metadata/md5-cache/games-board/pysolfc-2.20.1-r1
new file mode 100644
index 000000000000..f649735a5423
--- /dev/null
+++ b/metadata/md5-cache/games-board/pysolfc-2.20.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_10? ( dev-python/attrs[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/pysol_cards[python_targets_python3_10(-)] dev-python/random2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] sound? ( dev-python/pygame[python_targets_python3_10(-)] ) !minimal? ( dev-python/pillow[jpeg,tk,python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/attrs[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/pysol_cards[python_targets_python3_11(-)] dev-python/random2[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] sound? ( dev-python/pygame[python_targets_python3_11(-)] ) !minimal? ( dev-python/pillow[jpeg,tk,python_targets_python3_11(-)] ) ) !minimal? ( dev-tcltk/tktable ) python_single_target_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)] >=dev-python/wheel-0.40.0[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=Exciting collection of more than 1000 solitaire card games
+EAPI=8
+HOMEPAGE=https://pysolfc.sourceforge.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=distutils-r1 xdg
+IUSE=extra-cardsets minimal +sound test python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+
+RDEPEND=python_single_target_python3_10? ( dev-python/attrs[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/pysol_cards[python_targets_python3_10(-)] dev-python/random2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] sound? ( dev-python/pygame[python_targets_python3_10(-)] ) !minimal? ( dev-python/pillow[jpeg,tk,python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/attrs[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/pysol_cards[python_targets_python3_11(-)] dev-python/random2[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] sound? ( dev-python/pygame[python_targets_python3_11(-)] ) !minimal? ( dev-python/pillow[jpeg,tk,python_targets_python3_11(-)] ) ) !minimal? ( dev-tcltk/tktable ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/pysolfc/PySolFC-2.20.1.tar.xz extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets-2.2.tar.bz2 ) !extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets--Minimal-2.2.0.tar.xz )
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2798765a53ef214f8259515c3d65a338
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 930668187b32..e0f5f727a414 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.13.0 b/metadata/md5-cache/mail-client/thunderbird-102.13.0
index 01a1e116ec35..46125df7f320 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.13.0
+++ b/metadata/md5-cache/mail-client/thunderbird-102.13.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.thunderbird.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.2 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/source/thunderbird-102.13.0.source.tar.xz -> thunderbird-102.13.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-10tb.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-10tb.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-10tb.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/af.xpi -> thunderbird-102.13.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ar.xpi -> thunderbird-102.13.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ast.xpi -> thunderbird-102.13.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/be.xpi -> thunderbird-102.13.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/bg.xpi -> thunderbird-102.13.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/br.xpi -> thunderbird-102.13.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ca.xpi -> thunderbird-102.13.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/cak.xpi -> thunderbird-102.13.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/cs.xpi -> thunderbird-102.13.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/cy.xpi -> thunderbird-102.13.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/da.xpi -> thunderbird-102.13.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/de.xpi -> thunderbird-102.13.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.13.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/el.xpi -> thunderbird-102.13.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.13.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.13.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.13.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.13.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.13.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/et.xpi -> thunderbird-102.13.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/eu.xpi -> thunderbird-102.13.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/fi.xpi -> thunderbird-102.13.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/fr.xpi -> thunderbird-102.13.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.13.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.13.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/gd.xpi -> thunderbird-102.13.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/gl.xpi -> thunderbird-102.13.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/he.xpi -> thunderbird-102.13.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/hr.xpi -> thunderbird-102.13.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.13.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/hu.xpi -> thunderbird-102.13.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/id.xpi -> thunderbird-102.13.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/is.xpi -> thunderbird-102.13.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/it.xpi -> thunderbird-102.13.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ja.xpi -> thunderbird-102.13.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ka.xpi -> thunderbird-102.13.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/kab.xpi -> thunderbird-102.13.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/kk.xpi -> thunderbird-102.13.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ko.xpi -> thunderbird-102.13.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/lt.xpi -> thunderbird-102.13.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/lv.xpi -> thunderbird-102.13.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ms.xpi -> thunderbird-102.13.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.13.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/nl.xpi -> thunderbird-102.13.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.13.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.13.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/pl.xpi -> thunderbird-102.13.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.13.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.13.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/rm.xpi -> thunderbird-102.13.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ro.xpi -> thunderbird-102.13.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ru.xpi -> thunderbird-102.13.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sk.xpi -> thunderbird-102.13.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sl.xpi -> thunderbird-102.13.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sq.xpi -> thunderbird-102.13.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sr.xpi -> thunderbird-102.13.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.13.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/th.xpi -> thunderbird-102.13.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/tr.xpi -> thunderbird-102.13.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/uk.xpi -> thunderbird-102.13.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/uz.xpi -> thunderbird-102.13.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/vi.xpi -> thunderbird-102.13.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.13.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.13.0-zh-TW.xpi )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dd1621ed7e85733cd65bccbb67cf80ef
+_md5_=b38606d47548b109293517b94f510ed6
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-102.12.0 b/metadata/md5-cache/mail-client/thunderbird-bin-102.12.0
deleted file mode 100644
index 5c0dc1b08c5e..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-102.12.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
-DESCRIPTION=Thunderbird Mail Client
-EAPI=8
-HOMEPAGE=https://www.thunderbird.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop optfeature pax-utils xdg
-IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-thunderbird )
-RESTRICT=strip
-SLOT=0/102
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/en-US/thunderbird-102.12.0.tar.bz2 -> thunderbird-bin_x86_64-102.12.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-i686/en-US/thunderbird-102.12.0.tar.bz2 -> thunderbird-bin_i686-102.12.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/af.xpi -> thunderbird-102.12.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ar.xpi -> thunderbird-102.12.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ast.xpi -> thunderbird-102.12.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/be.xpi -> thunderbird-102.12.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/bg.xpi -> thunderbird-102.12.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/br.xpi -> thunderbird-102.12.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ca.xpi -> thunderbird-102.12.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/cak.xpi -> thunderbird-102.12.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/cs.xpi -> thunderbird-102.12.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/cy.xpi -> thunderbird-102.12.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/da.xpi -> thunderbird-102.12.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/de.xpi -> thunderbird-102.12.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.12.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/el.xpi -> thunderbird-102.12.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.12.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.12.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.12.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.12.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.12.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/et.xpi -> thunderbird-102.12.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/eu.xpi -> thunderbird-102.12.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/fi.xpi -> thunderbird-102.12.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/fr.xpi -> thunderbird-102.12.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.12.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.12.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/gd.xpi -> thunderbird-102.12.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/gl.xpi -> thunderbird-102.12.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/he.xpi -> thunderbird-102.12.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/hr.xpi -> thunderbird-102.12.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.12.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/hu.xpi -> thunderbird-102.12.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/id.xpi -> thunderbird-102.12.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/is.xpi -> thunderbird-102.12.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/it.xpi -> thunderbird-102.12.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ja.xpi -> thunderbird-102.12.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ka.xpi -> thunderbird-102.12.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/kab.xpi -> thunderbird-102.12.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/kk.xpi -> thunderbird-102.12.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ko.xpi -> thunderbird-102.12.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/lt.xpi -> thunderbird-102.12.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/lv.xpi -> thunderbird-102.12.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ms.xpi -> thunderbird-102.12.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.12.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/nl.xpi -> thunderbird-102.12.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.12.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.12.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/pl.xpi -> thunderbird-102.12.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.12.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.12.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/rm.xpi -> thunderbird-102.12.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ro.xpi -> thunderbird-102.12.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/ru.xpi -> thunderbird-102.12.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/sk.xpi -> thunderbird-102.12.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/sl.xpi -> thunderbird-102.12.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/sq.xpi -> thunderbird-102.12.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/sr.xpi -> thunderbird-102.12.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.12.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/th.xpi -> thunderbird-102.12.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/tr.xpi -> thunderbird-102.12.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/uk.xpi -> thunderbird-102.12.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/uz.xpi -> thunderbird-102.12.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/vi.xpi -> thunderbird-102.12.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.12.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.12.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.12.0-zh-TW.xpi )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3df9037cc65980dc74700303a66b3553
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-102.13.0 b/metadata/md5-cache/mail-client/thunderbird-bin-102.13.0
new file mode 100644
index 000000000000..f6a316a72ff3
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-102.13.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
+DESCRIPTION=Thunderbird Mail Client
+EAPI=8
+HOMEPAGE=https://www.thunderbird.net/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop optfeature pax-utils xdg
+IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip
+SLOT=0/102
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/en-US/thunderbird-102.13.0.tar.bz2 -> thunderbird-bin_x86_64-102.13.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-i686/en-US/thunderbird-102.13.0.tar.bz2 -> thunderbird-bin_i686-102.13.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/af.xpi -> thunderbird-102.13.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ar.xpi -> thunderbird-102.13.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ast.xpi -> thunderbird-102.13.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/be.xpi -> thunderbird-102.13.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/bg.xpi -> thunderbird-102.13.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/br.xpi -> thunderbird-102.13.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ca.xpi -> thunderbird-102.13.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/cak.xpi -> thunderbird-102.13.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/cs.xpi -> thunderbird-102.13.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/cy.xpi -> thunderbird-102.13.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/da.xpi -> thunderbird-102.13.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/de.xpi -> thunderbird-102.13.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.13.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/el.xpi -> thunderbird-102.13.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.13.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.13.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.13.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.13.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.13.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/et.xpi -> thunderbird-102.13.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/eu.xpi -> thunderbird-102.13.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/fi.xpi -> thunderbird-102.13.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/fr.xpi -> thunderbird-102.13.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.13.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.13.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/gd.xpi -> thunderbird-102.13.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/gl.xpi -> thunderbird-102.13.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/he.xpi -> thunderbird-102.13.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/hr.xpi -> thunderbird-102.13.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.13.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/hu.xpi -> thunderbird-102.13.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/id.xpi -> thunderbird-102.13.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/is.xpi -> thunderbird-102.13.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/it.xpi -> thunderbird-102.13.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ja.xpi -> thunderbird-102.13.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ka.xpi -> thunderbird-102.13.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/kab.xpi -> thunderbird-102.13.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/kk.xpi -> thunderbird-102.13.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ko.xpi -> thunderbird-102.13.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/lt.xpi -> thunderbird-102.13.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/lv.xpi -> thunderbird-102.13.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ms.xpi -> thunderbird-102.13.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.13.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/nl.xpi -> thunderbird-102.13.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.13.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.13.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/pl.xpi -> thunderbird-102.13.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.13.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.13.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/rm.xpi -> thunderbird-102.13.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ro.xpi -> thunderbird-102.13.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/ru.xpi -> thunderbird-102.13.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sk.xpi -> thunderbird-102.13.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sl.xpi -> thunderbird-102.13.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sq.xpi -> thunderbird-102.13.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sr.xpi -> thunderbird-102.13.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.13.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/th.xpi -> thunderbird-102.13.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/tr.xpi -> thunderbird-102.13.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/uk.xpi -> thunderbird-102.13.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/uz.xpi -> thunderbird-102.13.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/vi.xpi -> thunderbird-102.13.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.13.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.13.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.13.0-zh-TW.xpi )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=3df9037cc65980dc74700303a66b3553
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 0e1afd731ea1..cd7614bbe1ff 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/graphviz-8.1.0 b/metadata/md5-cache/media-gfx/graphviz-8.1.0
new file mode 100644
index 000000000000..42aee0183ea1
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/graphviz-8.1.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/flex sys-devel/libtool virtual/pkgconfig doc? ( app-text/ghostscript-gpl sys-apps/groff ) guile? ( dev-lang/swig dev-scheme/guile ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig )
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_single_target_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Open Source Graph Visualization Software
+EAPI=8
+HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
+INHERIT=python-single-r1
+IUSE=+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=CPL-1.0
+RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_single_target_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 )
+REQUIRED_USE=!cairo? ( !X !gtk2 !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/8.1.0/graphviz-8.1.0.tar.xz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=a5aceca5f9ee005689bcbb9b8320c353
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 15826247d3f5..c4ba8a4ef8f7 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/dav1d-1.2.1 b/metadata/md5-cache/media-libs/dav1d-1.2.1
index 5a2652db57fb..b7d66f6617f3 100644
--- a/metadata/md5-cache/media-libs/dav1d-1.2.1
+++ b/metadata/md5-cache/media-libs/dav1d-1.2.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://code.videolan.org/videolan/dav1d
 INHERIT=meson-multilib
 IUSE=+8bit +10bit +asm test xxhash abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://downloads.videolan.org/pub/videolan/dav1d/1.2.1/dav1d-1.2.1.tar.xz
 _eclasses_=meson	18d046bdb14e1bdb22cce6e5d953e364	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=02d1e75375fd4e46f087fd65911813f9
+_md5_=c8708a18ff89631e25e2b325262af1fc
diff --git a/metadata/md5-cache/media-libs/harfbuzz-8.0.0 b/metadata/md5-cache/media-libs/harfbuzz-8.0.0
new file mode 100644
index 000000000000..dd36fd85b887
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-8.0.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
+DESCRIPTION=An OpenType text shaping engine
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
+IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/6.0.0
+SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/8.0.0/harfbuzz-8.0.0.tar.xz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	18d046bdb14e1bdb22cce6e5d953e364	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1620a95947d4b06999ca1c016b0f6f1e
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index 32f536494c4a..b16fea906a66 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=cairo? ( x11-libs/cairo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
 DESCRIPTION=An OpenType text shaping engine
@@ -13,4 +13,4 @@ REQUIRED_USE=introspection? ( glib )
 RESTRICT=!test? ( test )
 SLOT=0/6.0.0
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	meson	18d046bdb14e1bdb22cce6e5d953e364	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8e86d23b99367507551ff4115ba5aef9
+_md5_=1620a95947d4b06999ca1c016b0f6f1e
diff --git a/metadata/md5-cache/media-libs/libjxl-0.8.2-r1 b/metadata/md5-cache/media-libs/libjxl-0.8.2-r1
new file mode 100644
index 000000000000..cc09dcc602f2
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjxl-0.8.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= ) test? ( dev-cpp/gtest )
+DESCRIPTION=JPEG XL image format reference implementation
+EAPI=8
+HOMEPAGE=https://github.com/libjxl/libjxl
+INHERIT=cmake-multilib flag-o-matic
+IUSE=openexr test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= ) test? ( dev-cpp/gtest )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libjxl/libjxl/archive/refs/tags/v0.8.2.tar.gz -> libjxl-0.8.2.tar.gz test? ( https://github.com/libjxl/testdata/archive/d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz -> libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz )
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f38ef3fd344c4c292e261c3852f890dd
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.3.2-r1 b/metadata/md5-cache/media-libs/libopenshot-0.3.2-r1
index fb74086a1928..53d18c82d54e 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.3.2-r1
+++ b/metadata/md5-cache/media-libs/libopenshot-0.3.2-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/21
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.3.2.tar.gz -> libopenshot-0.3.2.tar.gz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2203d4bfa9b8ea0ba1c0339d60f81570
+_md5_=10ac42fda25c51c6fbb7567cfdcedd95
diff --git a/metadata/md5-cache/media-libs/libshumate-1.0.4 b/metadata/md5-cache/media-libs/libshumate-1.0.4
new file mode 100644
index 000000000000..59d560420929
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libshumate-1.0.4
@@ -0,0 +1,17 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+DESCRIPTION=Shumate is a GTK toolkit providing widgets for embedded maps
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate
+INHERIT=gnome.org meson vala virtualx
+IUSE=gtk-doc +introspection vala test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+REQUIRED_USE=gtk-doc? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=1.0/1
+SRC_URI=mirror://gnome/sources/libshumate/1.0/libshumate-1.0.4.tar.xz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	vala	db97951caa799e73a831a5f48e717da8	virtualx	817571665ee28575da44ee08135089e5
+_md5_=d50a1d8f5c6e6e9a3eee0c7cbd8f4cd7
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 11887ee7ce61..18ad8137dded 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
index 55c1e5f35038..bdd93346f095 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ public-domain
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v0.9.8.tar.gz -> vdr-osdteletext-0.9.8.tar.gz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664	vdr-plugin-2	1460873f84280120ddfeecbc2459b6db
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	1460873f84280120ddfeecbc2459b6db
 _md5_=c88e4c08aeada3209253a38076395ebe
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
index c1fa99a29c9f..4993ccaeca3e 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ public-domain
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v2.2.1.tar.gz -> vdr-osdteletext-2.2.1.tar.gz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664	vdr-plugin-2	1460873f84280120ddfeecbc2459b6db
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	1460873f84280120ddfeecbc2459b6db
 _md5_=730a1ba2bc3d78cdf5e43e9a5fec7f32
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
index c046b1b96651..9d3d18091059 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ public-domain
 RDEPEND=acct-group/vdr acct-user/vdr media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v2.3.1.tar.gz -> vdr-osdteletext-2.3.1.tar.gz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664	vdr-plugin-2	1460873f84280120ddfeecbc2459b6db
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	vdr-plugin-2	1460873f84280120ddfeecbc2459b6db
 _md5_=952a6eaf423af21cfa1635a9e4908bfe
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 84dbc38da2bc..60f392a98f6b 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.2.1-r1 b/metadata/md5-cache/media-sound/hydrogen-1.2.1-r1
index 8fa8b5ef10db..a2f3782f4f55 100644
--- a/metadata/md5-cache/media-sound/hydrogen-1.2.1-r1
+++ b/metadata/md5-cache/media-sound/hydrogen-1.2.1-r1
@@ -7,11 +7,11 @@ HOMEPAGE=http://hydrogen-music.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg
 IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
-KEYWORDS=~amd64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-2 ZLIB
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/libsndfile alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-libs/libpulse )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.2.1.tar.gz -> hydrogen-1.2.1.tar.gz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d680bf115b65158be4885636b2c62368
+_md5_=782bd9a4c5029ca34e55e3b9d6a1eb80
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.5-r1 b/metadata/md5-cache/media-sound/mixxx-2.3.5-r1
index c6a3060aa094..ef25af037d3a 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.3.5-r1
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.5-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://mixxx.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg udev
 IUSE=aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack l10n_ca l10n_cs l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_gl l10n_id l10n_it l10n_ja l10n_kn l10n_nl l10n_pl l10n_pt l10n_ro l10n_ru l10n_sl l10n_sq l10n_sr l10n_tr l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/refs/tags/2.3.5.tar.gz -> mixxx-2.3.5.tar.gz l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4848030fffdf6faef42543933c25bcb4
+_md5_=48e6bdd431dbf43e957a0bdf0e547678
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 8b2ae701efce..e1b123a4027c 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/gentoo-vdr-scripts-3.0_rc2-r1 b/metadata/md5-cache/media-tv/gentoo-vdr-scripts-3.0_rc2-r1
index 77e91231abc1..821d349a2d99 100644
--- a/metadata/md5-cache/media-tv/gentoo-vdr-scripts-3.0_rc2-r1
+++ b/metadata/md5-cache/media-tv/gentoo-vdr-scripts-3.0_rc2-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/vdr acct-user/vdr app-admin/sudo sys-process/wait_on_pid virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/madmartin/gentoo-vdr-scripts/archive/refs/tags/gentoo-vdr-scripts-3.0_rc2.tar.gz
-_eclasses_=tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=f5766c727d65fc68a8591aeb6a06f4e8
diff --git a/metadata/md5-cache/media-tv/mythtv-32.0-r4 b/metadata/md5-cache/media-tv/mythtv-32.0-r4
index c757d60ed532..dc2dbc766d81 100644
--- a/metadata/md5-cache/media-tv/mythtv-32.0-r4
+++ b/metadata/md5-cache/media-tv/mythtv-32.0-r4
@@ -12,5 +12,5 @@ RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-libs/libzip:= dev-qt/q
 REQUIRED_USE=cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v32.0.tar.gz -> mythtv-32.0.tar.gz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=78f1580b9cfd78938e43197ad9e59016
diff --git a/metadata/md5-cache/media-tv/mythtv-33.1 b/metadata/md5-cache/media-tv/mythtv-33.1
index 5144e343c995..2e5099cc607a 100644
--- a/metadata/md5-cache/media-tv/mythtv-33.1
+++ b/metadata/md5-cache/media-tv/mythtv-33.1
@@ -12,5 +12,5 @@ RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-libs/libzip:= dev-qt/q
 REQUIRED_USE=cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v33.1.tar.gz -> mythtv-33.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=11d5c1a5f1d5f66bfde91d2d4dd301b6
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 8e61a682ccee..5ff7b35db3e3 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/devedeng-4.17.0 b/metadata/md5-cache/media-video/devedeng-4.17.0
deleted file mode 100644
index c0ba2e488da9..000000000000
--- a/metadata/md5-cache/media-video/devedeng-4.17.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 )
-DESCRIPTION=DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)
-EAPI=8
-HOMEPAGE=https://www.rastersoft.com/programas/devede.html
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 xdg
-IUSE=python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-cdr/cdrtools dev-python/pycairo[python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) media-video/ffmpeg media-video/dvdauthor media-video/vcdimager || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.17.0/devedeng-4.17.0.tar.bz2
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fae9b259df90833ddcc058d49d127bd8
diff --git a/metadata/md5-cache/media-video/devedeng-4.17.0-r1 b/metadata/md5-cache/media-video/devedeng-4.17.0-r1
deleted file mode 100644
index bf497e08c2f5..000000000000
--- a/metadata/md5-cache/media-video/devedeng-4.17.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-DESCRIPTION=DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)
-EAPI=8
-HOMEPAGE=https://www.rastersoft.com/programas/devede.html
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 xdg
-IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-cdr/cdrtools dev-python/pycairo[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) media-video/ffmpeg media-video/dvdauthor media-video/vcdimager || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.17.0/devedeng-4.17.0.tar.bz2
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4f5d2c4edc88451a5b92b59383c728a5
diff --git a/metadata/md5-cache/media-video/devedeng-4.17.0-r2 b/metadata/md5-cache/media-video/devedeng-4.17.0-r2
new file mode 100644
index 000000000000..18dffe6f628d
--- /dev/null
+++ b/metadata/md5-cache/media-video/devedeng-4.17.0-r2
@@ -0,0 +1,18 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+DESCRIPTION=DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)
+EAPI=8
+HOMEPAGE=https://www.rastersoft.com/programas/devede.html
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=distutils-r1 xdg
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-cdr/cdrtools dev-python/pycairo[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) media-video/ffmpeg media-video/dvdauthor media-video/vcdimager || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.17.0/devedeng-4.17.0.tar.bz2
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=099b0e960a327d680e792735e697a952
diff --git a/metadata/md5-cache/media-video/vdr-2.6.3 b/metadata/md5-cache/media-video/vdr-2.6.3
index bb14825578c9..b0edcf6ab768 100644
--- a/metadata/md5-cache/media-video/vdr-2.6.3
+++ b/metadata/md5-cache/media-video/vdr-2.6.3
@@ -12,5 +12,5 @@ RDEPEND=acct-group/vdr acct-user/vdr media-libs/fontconfig media-libs/freetype m
 REQUIRED_USE=permashift? ( !naludump !pinplugin )
 SLOT=0
 SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.6.3;sf=tbz2 -> vdr-2.6.3.tbz2 menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff ) ttxtsubs? ( https://md11.it.cx/download/vdr/vdr-2.6.1_ttxtsubs_v2.patch )
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=cdfac9930019ec387d4838c468af4d6e
diff --git a/metadata/md5-cache/media-video/vdr-2.6.4 b/metadata/md5-cache/media-video/vdr-2.6.4
index 55b87ce21251..4c52996bbfd3 100644
--- a/metadata/md5-cache/media-video/vdr-2.6.4
+++ b/metadata/md5-cache/media-video/vdr-2.6.4
@@ -12,5 +12,5 @@ RDEPEND=acct-group/vdr acct-user/vdr media-libs/fontconfig media-libs/freetype m
 REQUIRED_USE=permashift? ( !naludump !pinplugin )
 SLOT=0
 SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.6.4;sf=tbz2 -> vdr-2.6.4.tbz2 menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff ) ttxtsubs? ( https://md11.it.cx/download/vdr/vdr-2.6.4_ttxtsubs_v2.patch )
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=f784777e4d149358dd29657de4a7bfbb
diff --git a/metadata/md5-cache/media-video/vlc-3.0.18-r3 b/metadata/md5-cache/media-video/vlc-3.0.18-r3
index 875d7b6ff884..e65f8f4bf99e 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.18-r3
+++ b/metadata/md5-cache/media-video/vlc-3.0.18-r3
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.videolan.org/vlc/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv -sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:= >=media-libs/libdvdread-6.1.2:= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac:= media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-libs/libpulse ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6(+)] ) v4l? ( media-libs/libv4l:= ) vaapi? ( <media-video/ffmpeg-5 media-libs/libva:=[drm(+),wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.18/vlc-3.0.18.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d4bc93c1858ffdba2b91f40bdb2126d1
+_md5_=5295d741a0f7d387dbe6df9731f89284
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ba3e41ebb4e9..4b75794bede9 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/munin-2.0.73 b/metadata/md5-cache/net-analyzer/munin-2.0.73
new file mode 100644
index 000000000000..66455db2d856
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.73
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] dev-perl/TimeDate virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=8
+HOMEPAGE=https://munin-monitoring.org/
+INHERIT=java-pkg-opt-2 systemd tmpfiles
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 java
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] dev-perl/TimeDate virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.73.tar.gz -> munin-2.0.73.tar.gz
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=30be5968a05fe7688178f0fece05057c
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.73-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.73-r1
new file mode 100644
index 000000000000..cf7d2a845a23
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.73-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] dev-perl/TimeDate virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=8
+HOMEPAGE=https://munin-monitoring.org/
+INHERIT=java-pkg-opt-2 systemd tmpfiles
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 java
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] dev-perl/TimeDate virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.73.tar.gz -> munin-2.0.73.tar.gz
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=c08f02d2ac7c0fe97bc75c42b9468343
diff --git a/metadata/md5-cache/net-analyzer/tcpreplay-4.4.4 b/metadata/md5-cache/net-analyzer/tcpreplay-4.4.4
index f0c985878fa4..8c8e430f9155 100644
--- a/metadata/md5-cache/net-analyzer/tcpreplay-4.4.4
+++ b/metadata/md5-cache/net-analyzer/tcpreplay-4.4.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay
 INHERIT=autotools flag-o-matic
 IUSE=debug pcapnav +tcpdump
-KEYWORDS=~amd64 ~arm ~sparc ~x86
+KEYWORDS=amd64 ~arm ~sparc x86
 LICENSE=BSD GPL-3
 RDEPEND=dev-libs/libdnet >=net-libs/libpcap-0.9 elibc_musl? ( sys-libs/fts-standalone ) pcapnav? ( net-libs/libpcapnav ) tcpdump? ( net-analyzer/tcpdump )
 SLOT=0
 SRC_URI=https://github.com/appneta/tcpreplay/releases/download/v4.4.4/tcpreplay-4.4.4.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f8f0602e9ee4c25d718ce4d561ddd0a6
+_md5_=08c6f4cb451645a7898cc9222fcf7232
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.44 b/metadata/md5-cache/net-analyzer/zabbix-4.0.44
index e60cc5a59fa3..406cc180e940 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.44
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.44
@@ -12,5 +12,5 @@ RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual
 REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.44.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=c8d22dfd70c8f35f19b29211fffb51d1
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.46 b/metadata/md5-cache/net-analyzer/zabbix-4.0.46
index 80703d6e79a2..938643b3ac88 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.46
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.46
@@ -12,5 +12,5 @@ RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual
 REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.46.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=7e21e872ad2a459de09859ed4559176f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.47 b/metadata/md5-cache/net-analyzer/zabbix-4.0.47
index 37e7c90a6582..464a4480dc61 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.47
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.47
@@ -12,5 +12,5 @@ RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual
 REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.47.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=dc18229cdca9d1312377797840ac7a1d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.32 b/metadata/md5-cache/net-analyzer/zabbix-5.0.32
index 20ff65e15d70..7790c716f68b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.32
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.32
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.32.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.32-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=298122298ca64ce54e030cd444d5a26d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.35 b/metadata/md5-cache/net-analyzer/zabbix-5.0.35
index 83331f40c9e6..6efaf6ec50bf 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.35
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.35
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.35.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.35-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=6bbadf219b30db3d922fa9304cdacb6c
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.36 b/metadata/md5-cache/net-analyzer/zabbix-5.0.36
index bbb478998b99..fb131d68458a 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.36
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.36
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.36.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.36-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=e89b6dd257277f892a8f8562343b792c
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.14-r1 b/metadata/md5-cache/net-analyzer/zabbix-6.0.14-r1
index 070cee999c46..6480aa87706a 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.14-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.14-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.14.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.14-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=f038b0dcecf73464ec3bb806df22c5a2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.18 b/metadata/md5-cache/net-analyzer/zabbix-6.0.18
index 56a1eb003008..e342a8f32d8b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.18
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.18.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.18-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=dd8f906fe3e2eb0bf9fbefe770201df7
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.19 b/metadata/md5-cache/net-analyzer/zabbix-6.0.19
index ffb141db04e3..f92ce70f12e7 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.19
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.19
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.19.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.19-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=807e53768757712518b7288e093f07d0
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.0-r1 b/metadata/md5-cache/net-analyzer/zabbix-6.4.0-r1
index 9023f388cfd9..1e96c354d739 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.0-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.0.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.0-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=ed6801e5d04ccfd18c063f7701e73245
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.3 b/metadata/md5-cache/net-analyzer/zabbix-6.4.3
index e455bfc61bff..8e2728a6bdc8 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.3
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.3.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.3-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=1a5fa447f55eb0954ed7c820883be340
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.4 b/metadata/md5-cache/net-analyzer/zabbix-6.4.4
index ef3a9d8def44..e9a5255cd8d9 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.4
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) pro
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.4.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.4-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=1ee70fce2c8064b23262116cc7930737
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 24078d34971b..2aa6028650dd 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/pdns-4.8.1 b/metadata/md5-cache/net-dns/pdns-4.8.1
new file mode 100644
index 000000000000..66af9d3bd9a6
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-4.8.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] )
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= dev-libs/boost:= lmdb? ( >=dev-db/lmdb-0.9.29 ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) odbc? ( dev-db/unixODBC ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) )
+DESCRIPTION=The PowerDNS Daemon
+EAPI=8
+HOMEPAGE=https://www.powerdns.com/
+INHERIT=flag-o-matic lua-single python-any-r1
+IUSE=debug doc geoip ldap lmdb lua-records mysql odbc postgres remote sodium sqlite systemd tools tinydns test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= dev-libs/boost:= lmdb? ( >=dev-db/lmdb-0.9.29 ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) odbc? ( dev-db/unixODBC ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) ) acct-user/pdns acct-group/pdns
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-4.8.1.tar.bz2
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=23b3bf966ddf52f77209c8848ae1174d
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 24d6cff9a7bc..3d89c70a36d1 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20210609 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20210609
new file mode 100644
index 000000000000..3122e7172509
--- /dev/null
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20210609
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby31(-)] dev-ruby/rake[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby30? ( dev-ruby/tokyocabinet[ruby_targets_ruby30(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby30(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby30(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby30(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/tokyocabinet[ruby_targets_ruby31(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby31(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby31(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby31(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby31(-)] ) ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=acct-group/rbot acct-user/rbot ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+DESCRIPTION=A ruby IRC bot
+EAPI=8
+HOMEPAGE=https://ruby-rbot.org/
+INHERIT=ruby-ng strip-linguas
+IUSE=spell aspell timezone translator nls figlet fortune cal host sqlite toilet test ruby_targets_ruby30 ruby_targets_ruby31
+KEYWORDS=~amd64
+LICENSE=|| ( feh GPL-2 )
+RDEPEND=acct-group/rbot acct-user/rbot spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) sqlite? ( dev-ruby/sqlite3 ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( sys-apps/util-linux ) host? ( net-dns/bind-tools ) ruby_targets_ruby30? ( dev-ruby/tokyocabinet[ruby_targets_ruby30(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby30(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby30(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby30(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/tokyocabinet[ruby_targets_ruby31(-)] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby31(-)] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby31(-)] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby31(-)] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby-rbot/rbot/archive/3ace72d5642284665fce2c33c99dfeb1b931b2c6.tar.gz -> rbot-0.9.15_p20210609.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=51787d52b272aa6bc05e6a8ef71025f7
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index a322af72b29a..4cc7f3ed6906 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libproxy-0.5.3 b/metadata/md5-cache/net-libs/libproxy-0.5.3
new file mode 100644
index 000000000000..bac0529064dc
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libproxy-0.5.3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gi-docgen ) vala? ( || ( dev-lang/vala:0.56 ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.71.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) duktape? ( dev-lang/duktape:= net-misc/curl ) introspection? ( dev-libs/gobject-introspection )
+DESCRIPTION=Library for automatic proxy configuration management
+EAPI=8
+HOMEPAGE=https://github.com/libproxy/libproxy
+INHERIT=meson-multilib vala
+IUSE=duktape gnome gtk-doc +introspection kde test vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.71.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) duktape? ( dev-lang/duktape:= net-misc/curl ) introspection? ( dev-libs/gobject-introspection ) kde? ( kde-frameworks/kconfig:5 )
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libproxy/libproxy/archive/refs/tags/0.5.3.tar.gz -> libproxy-0.5.3.tar.gz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	18d046bdb14e1bdb22cce6e5d953e364	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	vala	db97951caa799e73a831a5f48e717da8
+_md5_=e4bc03fe6ec50834318a40dba9b15aed
diff --git a/metadata/md5-cache/net-libs/udns-0.4-r1 b/metadata/md5-cache/net-libs/udns-0.4-r1
deleted file mode 100644
index a21f2f3e8142..000000000000
--- a/metadata/md5-cache/net-libs/udns-0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Async-capable DNS stub resolver library
-EAPI=8
-HOMEPAGE=http://www.corpit.ru/mjt/udns.html
-INHERIT=edo toolchain-funcs
-IUSE=ipv6 static +tools
-KEYWORDS=amd64 ~hppa ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.corpit.ru/mjt/udns/udns-0.4.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e98b538185f0df984c780d44d65b00e0
diff --git a/metadata/md5-cache/net-libs/udns-0.4-r2 b/metadata/md5-cache/net-libs/udns-0.4-r2
new file mode 100644
index 000000000000..03c246108e1f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/udns-0.4-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Async-capable DNS stub resolver library
+EAPI=8
+HOMEPAGE=http://www.corpit.ru/mjt/udns.html
+INHERIT=edo toolchain-funcs
+IUSE=ipv6 static +tools
+KEYWORDS=amd64 ~hppa ppc ~ppc64 sparc x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://www.corpit.ru/mjt/udns/udns-0.4.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=c916fff02d06d671dfb322d916488af4
diff --git a/metadata/md5-cache/net-libs/xdp-tools-1.4.0 b/metadata/md5-cache/net-libs/xdp-tools-1.4.0
new file mode 100644
index 000000000000..9e756aa1f554
--- /dev/null
+++ b/metadata/md5-cache/net-libs/xdp-tools-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/grep[pcre] >=sys-devel/clang-11.0.0
+DEFINED_PHASES=configure install postinst test
+DEPEND=dev-libs/libbpf:= dev-util/bpftool net-libs/libpcap sys-libs/zlib virtual/libelf
+DESCRIPTION=The libxdp library and various tools for use with XDP
+EAPI=8
+HOMEPAGE=https://github.com/xdp-project/xdp-tools
+INHERIT=flag-o-matic
+IUSE=+tools
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1 BSD-2
+RDEPEND=dev-libs/libbpf:= dev-util/bpftool net-libs/libpcap sys-libs/zlib virtual/libelf
+SLOT=0
+SRC_URI=https://github.com/xdp-project/xdp-tools/archive/refs/tags/v1.4.0.tar.gz -> xdp-tools-1.4.0.tar.gz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=14d1eb39323089f629ebadd20b707383
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 85e144f0dc0f..fb585ead28e4 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/mailgraph-1.14-r3 b/metadata/md5-cache/net-mail/mailgraph-1.14-r3
index b2d32c3af7b1..9b7060fa7126 100644
--- a/metadata/md5-cache/net-mail/mailgraph-1.14-r3
+++ b/metadata/md5-cache/net-mail/mailgraph-1.14-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/mgraph acct-user/mgraph dev-lang/perl dev-perl/File-Tail >=net-analyzer/rrdtool-1.2.2[graph,perl]
 SLOT=1.14
 SRC_URI=http://mailgraph.schweikert.ch//pub/mailgraph-1.14.tar.gz
-_eclasses_=user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=324c027c825360444240902338ab22de
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e872e2b4fa10..a4080c06e23c 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/iperf-3.12 b/metadata/md5-cache/net-misc/iperf-3.12
deleted file mode 100644
index 910e81769bc5..000000000000
--- a/metadata/md5-cache/net-misc/iperf-3.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/cJSON-1.7.15 dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
-DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
-EAPI=8
-HOMEPAGE=https://github.com/esnet/iperf
-INHERIT=autotools systemd
-IUSE=sctp
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/cJSON-1.7.15 dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
-SLOT=3
-SRC_URI=https://github.com/esnet/iperf/archive/3.12.tar.gz -> iperf-3.12.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=4552fd008a8c749789a7a4271ea2614d
diff --git a/metadata/md5-cache/net-misc/iperf-3.14 b/metadata/md5-cache/net-misc/iperf-3.14
new file mode 100644
index 000000000000..f589b78e5b42
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iperf-3.14
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/cJSON-1.7.15 dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
+DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
+EAPI=8
+HOMEPAGE=https://github.com/esnet/iperf
+INHERIT=autotools systemd
+IUSE=sctp
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/cJSON-1.7.15 dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
+SLOT=3
+SRC_URI=https://github.com/esnet/iperf/archive/3.14.tar.gz -> iperf-3.14.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=3300c8715a1be48778cdab0ada69b120
diff --git a/metadata/md5-cache/net-misc/lyricwikia-0.1.11-r2 b/metadata/md5-cache/net-misc/lyricwikia-0.1.11-r2
new file mode 100644
index 000000000000..f071026fd4f5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/lyricwikia-0.1.11-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
+DESCRIPTION=Python API to get song lyrics from LyricWikia
+EAPI=8
+HOMEPAGE=https://github.com/enricobacis/lyricwikia
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/enricobacis/lyricwikia/archive/0.1.11.tar.gz -> lyricwikia-0.1.11.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=dee56d97ab2cc753a44fdd43f38c0f23
diff --git a/metadata/md5-cache/net-misc/openssh-9.3_p1-r1 b/metadata/md5-cache/net-misc/openssh-9.3_p1-r1
index 72d0e606755d..bb29cd3139de 100644
--- a/metadata/md5-cache/net-misc/openssh-9.3_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-9.3_p1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) xmss? ( s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.3p1.tar.gz verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.3p1.tar.gz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=2174ad3ca80f33b6dafe014f16d6b45d
diff --git a/metadata/md5-cache/net-misc/openssh-contrib-9.3_p1 b/metadata/md5-cache/net-misc/openssh-contrib-9.3_p1
index 665cb5f8bbe4..88491a0e813d 100644
--- a/metadata/md5-cache/net-misc/openssh-contrib-9.3_p1
+++ b/metadata/md5-cache/net-misc/openssh-contrib-9.3_p1
@@ -13,5 +13,5 @@ REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pa
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.3p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.1.1/openssh-9.3p1+x509-14.1.1.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-X509-glue-14.1.1.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-hpn-15.2-X509-14.1.1-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.3p1.tar.gz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=335fac1ff19ad861277067b86eeaaa56
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 8a63e8f95648..568a47bf092c 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-2.4.6 b/metadata/md5-cache/net-print/cups-2.4.6
index 49fb2e93e387..38a2e795ee27 100644
--- a/metadata/md5-cache/net-print/cups-2.4.6
+++ b/metadata/md5-cache/net-print/cups-2.4.6
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
 IUSE=acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.6/cups-2.4.6-source.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	4efe951aa8ce2c16288d7c915196fe29	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0291426fb89f04d9e347e07c425da7bc
+_md5_=d5ca3675073a36cb8f40c9db1fcbfd4d
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index e402a5fbb3e6..defdab3a5e19 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/kismet-2022.08.1-r1 b/metadata/md5-cache/net-wireless/kismet-2022.08.1-r1
deleted file mode 100644
index 982de380a56d..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2022.08.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) acct-user/kismet acct-group/kismet networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd:= net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_10? ( dev-python/protobuf-python[python_targets_python3_10(-)] dev-python/websockets[python_targets_python3_10(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) dev-libs/boost <dev-libs/libfmt-9
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer
-EAPI=8
-HOMEPAGE=https://www.kismetwireless.net
-INHERIT=autotools python-single-r1 udev systemd
-IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev +python_single_target_python3_10
-KEYWORDS=amd64 arm ~arm64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) acct-user/kismet acct-group/kismet networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd:= net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_10? ( dev-python/protobuf-python[python_targets_python3_10(-)] dev-python/websockets[python_targets_python3_10(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) python_single_target_python3_10? ( dev-python/pyserial[python_targets_python3_10(-)] ) rtlsdr? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) net-wireless/rtl-sdr ) selinux? ( sec-policy/selinux-kismet )
-REQUIRED_USE=^^ ( python_single_target_python3_10 )
-SLOT=0/2022.08.1
-SRC_URI=https://www.kismetwireless.net/code/kismet-2022-08-R1.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=5fffdf5a0d0caa52f92faf5f64409a00
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index aa2f2958ec71..1e26a942ebf0 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1
deleted file mode 100644
index 8aa7c1d8e2e1..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( <sys-apps/hwloc-2:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=7
-HOMEPAGE=https://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=X blas cuda +doc double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( <sys-apps/hwloc-2:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
-RESTRICT=!test? ( test )
-SLOT=0/2018.8
-SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2018.8.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2018.8.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2018.8.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d1024169557acd1d466f4203307714a2
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r2 b/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r2
new file mode 100644
index 000000000000..cc7c85189f5d
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r2
@@ -0,0 +1,16 @@
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( <sys-apps/hwloc-2:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=7
+HOMEPAGE=https://www.gromacs.org/
+INHERIT=bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
+IUSE=X blas cuda +doc double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
+KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( <sys-apps/hwloc-2:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
+RESTRICT=!test? ( test )
+SLOT=0/2018.8
+SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2018.8.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2018.8.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2018.8.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=eebba6ce2c506eec80d783ae317e494e
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2
deleted file mode 100644
index 9e2e2d08cdd4..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=7
-HOMEPAGE=https://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=X blas cuda +doc double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
-RESTRICT=!test? ( test )
-SLOT=0/2019.6
-SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2019.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2019.6.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2019.6.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=989410f43b83d0d3bb6503023ea92da7
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r3 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r3
new file mode 100644
index 000000000000..767ec996fc49
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r3
@@ -0,0 +1,16 @@
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:= ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=7
+HOMEPAGE=https://www.gromacs.org/
+INHERIT=bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
+IUSE=X blas cuda +doc double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
+KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:= ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
+RESTRICT=!test? ( test )
+SLOT=0/2019.6
+SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2019.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2019.6.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2019.6.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2aad6d9630e5747e9eb159b5bf6e6a0e
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.7 b/metadata/md5-cache/sci-chemistry/gromacs-2020.7
deleted file mode 100644
index 4e23d5f1dfc3..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=8
-HOMEPAGE=https://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2020.7
-SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2020.7.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.7.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2020.7.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=44d0fe02d172240b18842d996f015209
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.7-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2020.7-r1
new file mode 100644
index 000000000000..bcaa32b562d9
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:= ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=8
+HOMEPAGE=https://www.gromacs.org/
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:= ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/2020.7
+SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2020.7.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.7.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2020.7.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=931df6c30cadb7ae598880b2ea5e4709
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.7 b/metadata/md5-cache/sci-chemistry/gromacs-2021.7
deleted file mode 100644
index 63c654eac33b..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=8
-HOMEPAGE=https://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2021.7
-SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2021.7.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.7.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2021.7.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=203c8a818d29e3b33e468c6d1d631767
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.7-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2021.7-r1
new file mode 100644
index 000000000000..fbb3f3aa2a29
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=8
+HOMEPAGE=https://www.gromacs.org/
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/2021.7
+SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2021.7.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.7.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2021.7.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=20fb1fb6826100ef76f561171610f5aa
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.4 b/metadata/md5-cache/sci-chemistry/gromacs-2022.4
deleted file mode 100644
index ce993fb71868..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=8
-HOMEPAGE=https://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) <sci-chemistry/dssp-4
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2022.4
-SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2022.4.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2022.4.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2022.4.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cdd826a94c74837171c33e5212e21e04
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.5 b/metadata/md5-cache/sci-chemistry/gromacs-2022.5
deleted file mode 100644
index 25dfa9918b2e..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=8
-HOMEPAGE=https://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) <sci-chemistry/dssp-4
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2022.5
-SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2022.5.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2022.5.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2022.5.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cdd826a94c74837171c33e5212e21e04
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.5-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2022.5-r1
new file mode 100644
index 000000000000..f668e1a1d41d
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2022.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=8
+HOMEPAGE=https://www.gromacs.org/
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) <sci-chemistry/dssp-4
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/2022.5
+SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2022.5.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2022.5.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2022.5.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9b89cd13d693a24c35ab21d8550f657e
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
index 0773a622ee8f..cfcf3f999101 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
@@ -1,4 +1,4 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) <sci-chemistry/dssp-4
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) <sci-chemistry/dssp-4
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2022.9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cdd826a94c74837171c33e5212e21e04
+_md5_=9b89cd13d693a24c35ab21d8550f657e
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2023 b/metadata/md5-cache/sci-chemistry/gromacs-2023
deleted file mode 100644
index 6991ef4c141d..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2023
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-copybutton[python_targets_python3_10(-)] dev-python/sphinx-inline-tabs[python_targets_python3_10(-)] dev-python/sphinx-argparse[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-copybutton[python_targets_python3_11(-)] dev-python/sphinx-inline-tabs[python_targets_python3_11(-)] dev-python/sphinx-argparse[python_targets_python3_11(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=8
-HOMEPAGE=https://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2023
-SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2023.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2023.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2023.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a0ca2c6aec7a376dc8e95b32e49d1b74
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2023.1 b/metadata/md5-cache/sci-chemistry/gromacs-2023.1
deleted file mode 100644
index de641b14da17..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2023.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-copybutton[python_targets_python3_10(-)] dev-python/sphinx-inline-tabs[python_targets_python3_10(-)] dev-python/sphinx-argparse[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-copybutton[python_targets_python3_11(-)] dev-python/sphinx-inline-tabs[python_targets_python3_11(-)] dev-python/sphinx-argparse[python_targets_python3_11(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=8
-HOMEPAGE=https://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2023.1
-SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2023.1.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2023.1.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2023.1.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a0ca2c6aec7a376dc8e95b32e49d1b74
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2023.1-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2023.1-r1
new file mode 100644
index 000000000000..8b2bce3d0e45
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2023.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-copybutton[python_targets_python3_10(-)] dev-python/sphinx-inline-tabs[python_targets_python3_10(-)] dev-python/sphinx-argparse[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-copybutton[python_targets_python3_11(-)] dev-python/sphinx-inline-tabs[python_targets_python3_11(-)] dev-python/sphinx-argparse[python_targets_python3_11(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=8
+HOMEPAGE=https://www.gromacs.org/
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/2023.1
+SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2023.1.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2023.1.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2023.1.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9e2b7831a5ea678eef3b09609c78ce39
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2023.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2023.9999
index fdcac134ead5..96c9f9bb214d 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2023.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2023.9999
@@ -1,4 +1,4 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-copybutton[python_targets_python3_10(-)] dev-python/sphinx-inline-tabs[python_targets_python3_10(-)] dev-python/sphinx-argparse[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-copybutton[python_targets_python3_11(-)] dev-python/sphinx-inline-tabs[python_targets_python3_11(-)] dev-python/sphinx-argparse[python_targets_python3_11(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-copybutton[python_targets_python3_10(-)] dev-python/sphinx-inline-tabs[python_targets_python3_10(-)] dev-python/sphinx-argparse[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-copybutton[python_targets_python3_11(-)] dev-python/sphinx-inline-tabs[python_targets_python3_11(-)] dev-python/sphinx-argparse[python_targets_python3_11(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2023.9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a0ca2c6aec7a376dc8e95b32e49d1b74
+_md5_=9e2b7831a5ea678eef3b09609c78ce39
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 6987c2e7858f..6d5ecbe706fa 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -1,4 +1,4 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-copybutton[python_targets_python3_10(-)] dev-python/sphinx-inline-tabs[python_targets_python3_10(-)] dev-python/sphinx-argparse[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-copybutton[python_targets_python3_11(-)] dev-python/sphinx-inline-tabs[python_targets_python3_11(-)] dev-python/sphinx-argparse[python_targets_python3_11(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-copybutton[python_targets_python3_10(-)] dev-python/sphinx-inline-tabs[python_targets_python3_10(-)] dev-python/sphinx-argparse[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-copybutton[python_targets_python3_11(-)] dev-python/sphinx-inline-tabs[python_targets_python3_11(-)] dev-python/sphinx-argparse[python_targets_python3_11(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	6c921d868d090cc18e142a396f66f74a	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a0ca2c6aec7a376dc8e95b32e49d1b74
+_md5_=9e2b7831a5ea678eef3b09609c78ce39
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index bf547961509d..3a959818113b 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.28.2 b/metadata/md5-cache/sci-geosciences/qgis-3.28.2
deleted file mode 100644
index fe5088986ef1..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.28.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) dev-qt/linguist-tools:5 sys-devel/bison sys-devel/flex doc? ( app-doc/doxygen ) test? ( python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-),testlib] dev-python/nose2[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[python_targets_python3_11(-),testlib] dev-python/nose2[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain[qt5(+)] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) >=sci-libs/gdal-2.2.3[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/owslib[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/jinja[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/owslib[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_11(-)] dev-python/sip:=[python_targets_python3_11(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) serial? ( dev-qt/qtserialport:5 ) dev-qt/qttest:5
-DESCRIPTION=User friendly Geographic Information System
-EAPI=8
-HOMEPAGE=https://www.qgis.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake python-single-r1 virtualx xdg
-IUSE=3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain[qt5(+)] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) >=sci-libs/gdal-2.2.3[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/owslib[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/jinja[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/owslib[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_11(-)] dev-python/sip:=[python_targets_python3_11(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) serial? ( dev-qt/qtserialport:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) mapserver? ( python ) test? ( postgres )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.28.2.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9aec22072f0959dcb2b0048fa38e89ba
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index aca318658aa8..5166aae09467 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.14.1 b/metadata/md5-cache/sci-libs/hdf5-1.14.1
index ce286bcac1b0..81136ff37873 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.14.1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.14.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
 INHERIT=autotools fortran-2 flag-o-matic toolchain-funcs prefix
 IUSE=cxx debug examples fortran +hl mpi szip test threads unsupported zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:= ) fortran? ( virtual/fortran )
 REQUIRED_USE=!unsupported? ( cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.14.1
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.1/src/hdf5-1.14.1.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=07c8e8f692a35f9bd4048b2d04d77b64
+_md5_=05a3fe143a959a35b9fb94440741fc23
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.23 b/metadata/md5-cache/sci-libs/openblas-0.3.23
index a41111e0c1b2..5adc201ffa6d 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.23
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.23
@@ -4,7 +4,7 @@ DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
 EAPI=8
 HOMEPAGE=https://github.com/xianyi/OpenBLAS
-INHERIT=fortran-2 toolchain-funcs
+INHERIT=flag-o-matic fortran-2 toolchain-funcs
 IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( openmp pthread )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.23.tar.gz -> openblas-0.3.23.tar.gz
-_eclasses_=fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d925a1895bb8ac8334cc457cdc8105d9
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=b370a84c7f07a75dbdb2535239ce45cd
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 79fbd4fe8fdb..07523d0b4c85 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.9.0 b/metadata/md5-cache/sci-mathematics/flint-2.9.0
index 2727159d7631..517daa37ba28 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.9.0
+++ b/metadata/md5-cache/sci-mathematics/flint-2.9.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/17
 SRC_URI=https://github.com/wbhart/flint2/archive/refs/tags/v2.9.0.tar.gz -> flint-2.9.0.tar.gz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=34ac9a507d957c8d23d98c8ed1fad5f8
+_md5_=6bb15769c7401e26385c9ed45831da6d
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.9 b/metadata/md5-cache/sci-mathematics/fricas-1.3.9
new file mode 100644
index 000000000000..144c0ca5b75c
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) clozurecl? ( dev-lisp/clozurecl:= ) !clozurecl? ( clisp? ( dev-lisp/clisp:= ) !clisp? ( ecls? ( dev-lisp/ecls:= ) !ecls? ( gcl? ( dev-lisp/gcl:= ) !gcl? ( cmucl? ( dev-lisp/cmucl:= ) !cmucl? ( dev-lisp/sbcl:= ) ) ) ) )
+DESCRIPTION=FriCAS is a fork of Axiom computer algebra system
+EAPI=8
+HOMEPAGE=http://fricas.sourceforge.net/ https://github.com/fricas/fricas https://fricas.github.io/
+INHERIT=elisp-common
+IUSE=sbcl cmucl gcl ecls clisp clozurecl X emacs gmp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) clozurecl? ( dev-lisp/clozurecl:= ) !clozurecl? ( clisp? ( dev-lisp/clisp:= ) !clisp? ( ecls? ( dev-lisp/ecls:= ) !ecls? ( gcl? ( dev-lisp/gcl:= ) !gcl? ( cmucl? ( dev-lisp/cmucl:= ) !cmucl? ( dev-lisp/sbcl:= ) ) ) ) )
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/fricas/1.3.9/fricas-1.3.9.full.tar.bz2
+_eclasses_=elisp-common	dde4f515dde15603a26a3755438e9c78
+_md5_=3cb6744774a23e140d00cf79c3e7c623
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 42eaf65676fe..48f840a3eb6d 100644
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.1.1 b/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.1.1
deleted file mode 100644
index bf7cf53bbf5e..000000000000
--- a/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=configure install postinst postrm preinst prepare pretend setup unpack
-DESCRIPTION=JupyterLab desktop application, based on Electron
-EAPI=8
-HOMEPAGE=https://jupyter.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=chromium-2 desktop rpm xdg
-IUSE=+l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss >=dev-python/jupyterlab-4.0.1 media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://github.com/jupyterlab/jupyterlab-desktop/releases/download/v4.0.1-1/JupyterLab-Setup-Fedora.rpm -> jupyterlab-desktop-bin-4.0.1.1.rpm
-_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	rpm	745ef34afb8c31915d9d42a6aca23a35	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6ffa9fcaaab1cf4aaa76a5672b5a8211
diff --git a/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.2.1 b/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.2.1
new file mode 100644
index 000000000000..90f07de72160
--- /dev/null
+++ b/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.2.1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=configure install postinst postrm preinst prepare pretend setup unpack
+DESCRIPTION=JupyterLab desktop application, based on Electron
+EAPI=8
+HOMEPAGE=https://jupyter.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=chromium-2 desktop rpm xdg
+IUSE=+l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss >=dev-python/jupyterlab-4.0.2 media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://github.com/jupyterlab/jupyterlab-desktop/releases/download/v4.0.2-1/JupyterLab-Setup-Fedora.rpm -> jupyterlab-desktop-bin-4.0.2.1.rpm
+_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	rpm	745ef34afb8c31915d9d42a6aca23a35	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6ffa9fcaaab1cf4aaa76a5672b5a8211
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 970a7541d0df..5c9c9570a6ec 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.14 b/metadata/md5-cache/sys-apps/baselayout-2.14
new file mode 100644
index 000000000000..30215c10104e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-2.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst prepare setup
+DESCRIPTION=Filesystem baselayout and init scripts
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=multilib prefix
+IUSE=build +split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=!sys-apps/baselayout-prefix
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.14.tar.bz2
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0e22ca3d60f79ea8115ab8b17ac491bd
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.9 b/metadata/md5-cache/sys-apps/baselayout-2.9
deleted file mode 100644
index addb043ae4f8..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib prefix
-IUSE=build +split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=!sys-apps/baselayout-prefix
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.9.tar.bz2
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=a335fa98b23f629ba2b00f7ac7c7a01e
diff --git a/metadata/md5-cache/sys-apps/locale-gen-2.23-r1 b/metadata/md5-cache/sys-apps/locale-gen-2.23-r1
index 89f9d6346f46..4d2899ee60b9 100644
--- a/metadata/md5-cache/sys-apps/locale-gen-2.23-r1
+++ b/metadata/md5-cache/sys-apps/locale-gen-2.23-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Generate locales based upon the config file /etc/locale.gen
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/locale-gen.git/
 INHERIT=prefix
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-alternatives/awk app-alternatives/gzip sys-apps/gentoo-functions sys-apps/grep !<sys-libs/glibc-2.37-r3
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.23.tar.bz2
 _eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7
-_md5_=0fe827b8b78ebdbea59f795acc0369fd
+_md5_=c553280564001fded480f6481b2baebe
diff --git a/metadata/md5-cache/sys-apps/moar-1.15.3 b/metadata/md5-cache/sys-apps/moar-1.15.3
new file mode 100644
index 000000000000..2524057d1cae
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/moar-1.15.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-arch/bzip2 app-arch/xz-utils ) >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A pager designed to do the right thing without any configuration
+EAPI=8
+HOMEPAGE=https://github.com/walles/moar
+INHERIT=go-module
+IUSE=test
+KEYWORDS=~amd64 ~arm64
+LICENSE=BSD-2 BSD MIT
+RDEPEND=!dev-lang/moarvm
+RESTRICT=!test? ( test ) strip
+SLOT=0
+SRC_URI=https://github.com/walles/moar/archive/refs/tags/v1.15.3.tar.gz -> moar-1.15.3.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-apps/moar/moar-1.15.3-deps.tar.xz
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=d77fda73e650fc72bb1ff326e02d827d
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-2.5 b/metadata/md5-cache/sys-apps/nvme-cli-2.5
index 6522b32d358b..dcc24285a3ab 100644
--- a/metadata/md5-cache/sys-apps/nvme-cli-2.5
+++ b/metadata/md5-cache/sys-apps/nvme-cli-2.5
@@ -12,4 +12,4 @@ RDEPEND==sys-libs/libnvme-1.5*:=[json?] hugepages? ( sys-libs/libhugetlbfs:= ) j
 SLOT=0
 SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v2.5.tar.gz -> nvme-cli-2.5.gh.tar.gz
 _eclasses_=meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=d99ce33141616efa1ea434ee93b0552f
+_md5_=1f2201e34062144251cdc1b62d4dda55
diff --git a/metadata/md5-cache/sys-apps/openrazer-3.6.1-r1 b/metadata/md5-cache/sys-apps/openrazer-3.6.1-r1
deleted file mode 100644
index 0010e0cb987a..000000000000
--- a/metadata/md5-cache/sys-apps/openrazer-3.6.1-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=client? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) daemon? ( acct-group/plugdev dev-python/daemonize[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/notify2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyudev[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setproctitle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] x11-misc/xautomation x11-misc/xdotool ) virtual/linux-sources test? ( client? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) daemon? ( acct-group/plugdev dev-python/daemonize[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/notify2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyudev[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setproctitle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] x11-misc/xautomation x11-misc/xdotool ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) virtual/pkgconfig virtual/pkgconfig python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=virtual/linux-sources
-DESCRIPTION=Drivers and user-space daemon to control Razer devices on GNU/Linux
-EAPI=8
-HOMEPAGE=https://openrazer.github.io/ https://github.com/openrazer/openrazer/
-IDEPEND=sys-apps/kmod[tools]
-INHERIT=readme.gentoo-r1 systemd udev xdg-utils distutils-r1 linux-mod-r1
-IUSE=+client +daemon test python_targets_python3_10 python_targets_python3_11 dist-kernel modules-sign +strip
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=client? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) daemon? ( acct-group/plugdev dev-python/daemonize[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/notify2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyudev[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setproctitle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] x11-misc/xautomation x11-misc/xdotool ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
-REQUIRED_USE=client? ( daemon ) daemon? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) test? ( daemon ) || ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/openrazer/openrazer/archive/3.6.1.tar.gz -> openrazer-3.6.1.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3e629651de2f1c1177d063ede73873cb
diff --git a/metadata/md5-cache/sys-apps/openrazer-3.6.1-r2 b/metadata/md5-cache/sys-apps/openrazer-3.6.1-r2
new file mode 100644
index 000000000000..0d729286645b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrazer-3.6.1-r2
@@ -0,0 +1,18 @@
+BDEPEND=client? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) daemon? ( acct-group/plugdev dev-python/daemonize[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/notify2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyudev[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setproctitle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] x11-misc/xautomation x11-misc/xdotool ) virtual/linux-sources test? ( client? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) daemon? ( acct-group/plugdev dev-python/daemonize[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/notify2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyudev[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setproctitle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] x11-misc/xautomation x11-misc/xdotool ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) virtual/pkgconfig virtual/pkgconfig python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=virtual/linux-sources
+DESCRIPTION=Drivers and user-space daemon to control Razer devices on GNU/Linux
+EAPI=8
+HOMEPAGE=https://openrazer.github.io/ https://github.com/openrazer/openrazer/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=readme.gentoo-r1 systemd udev xdg-utils distutils-r1 linux-mod-r1
+IUSE=+client +daemon test python_targets_python3_10 python_targets_python3_11 dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=client? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) daemon? ( acct-group/plugdev dev-python/daemonize[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/notify2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyudev[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setproctitle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] x11-misc/xautomation x11-misc/xdotool ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+REQUIRED_USE=client? ( daemon ) daemon? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) test? ( daemon ) || ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/openrazer/openrazer/archive/3.6.1.tar.gz -> openrazer-3.6.1.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=dfd248b1b8f1d23061531c6a0d026cee
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1 b/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1
index 851f9ea7653b..c2df194533b1 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ggreer/the_silver_searcher
 INHERIT=autotools bash-completion-r1 flag-o-matic vcs-snapshot
 IUSE=lzma test zlib
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ggreer/the_silver_searcher/archive/a61f1780b64266587e7bc30f0f5f71c6cca97c0f.tar.gz -> the_silver_searcher-2.2.0_p20201217.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=e8b5942b280d12d79708e63ac013a550
+_md5_=7c03cf05bb0dee4efe84121586f09487
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 09cdcb9cfd4f..0dfc2762b6d2 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.86 b/metadata/md5-cache/sys-block/tgt-1.0.86
index 90d783923734..b5a76ac250b9 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.86
+++ b/metadata/md5-cache/sys-block/tgt-1.0.86
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://stgt.sourceforge.net
 INHERIT=toolchain-funcs systemd
 IUSE=fcoe fcp ibmvio infiniband rbd selinux
-KEYWORDS=amd64 arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-cluster/rdma-core ) dev-libs/libaio sys-apps/sg3_utils selinux? ( sec-policy/selinux-tgtd )
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/archive/v1.0.86.tar.gz -> tgt-1.0.86.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=55ec1ee6d16bd3e951ad73d8d08debf4
+_md5_=7b98f876f74c0499523a7eff022f3aac
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index dae02d929e00..b8ac3f062628 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/grub-2.06-r6 b/metadata/md5-cache/sys-boot/grub-2.06-r6
deleted file mode 100644
index e284fbe7c26f..000000000000
--- a/metadata/md5-cache/sys-boot/grub-2.06-r6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) >=sys-devel/flex-2.5.35 sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-DESCRIPTION=GNU GRUB boot loader
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/grub/
-INHERIT=python-any-r1 autotools bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
-IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
-RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
-REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
-RESTRICT=!test? ( test )
-SLOT=2/2.06-r6
-SRC_URI=mirror://gnu/grub/grub-2.06.tar.xz https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r2.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=00fc9d6376ad63b223ff7c3b5bbfcb92
diff --git a/metadata/md5-cache/sys-boot/grub-2.06-r7 b/metadata/md5-cache/sys-boot/grub-2.06-r7
new file mode 100644
index 000000000000..72b8dd5acf78
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/grub-2.06-r7
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) >=sys-devel/flex-2.5.35 sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+DESCRIPTION=GNU GRUB boot loader
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/grub/
+INHERIT=python-any-r1 autotools bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
+LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
+RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
+REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
+RESTRICT=!test? ( test )
+SLOT=2/2.06-r7
+SRC_URI=mirror://gnu/grub/grub-2.06.tar.xz https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r2.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=7529762e42daf8b3af8433842fb11d2a
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index ea4977a3c0ea..75d3b97cb098 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2/9999
 SRC_URI=fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ab8ec9ec84e0719af41a3f4031bc1f76
+_md5_=7bb14137ec39ea3f29590154c18eafce
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index e6c00987d45f..774348c49381 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.5 b/metadata/md5-cache/sys-devel/automake-1.16.5
index f115e15564e1..2066dbc44615 100644
--- a/metadata/md5-cache/sys-devel/automake-1.16.5
+++ b/metadata/md5-cache/sys-devel/automake-1.16.5
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) )
+BDEPEND=app-alternatives/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=>=dev-lang/perl-5.6 >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1.16
 SRC_URI=mirror://gnu/automake/automake-1.16.5.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.5.tar.xz
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=a670e49093a7a8a896a1810180fbd0a2
+_md5_=38edcd5e3e14d2b9b2966a1951356fcd
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.5-r1 b/metadata/md5-cache/sys-devel/automake-1.16.5-r1
index 47fc0f4c8fa1..042b92a6cf16 100644
--- a/metadata/md5-cache/sys-devel/automake-1.16.5-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.16.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) )
+BDEPEND=app-alternatives/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=>=dev-lang/perl-5.6 >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1.16
 SRC_URI=mirror://gnu/automake/automake-1.16.5.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.5.tar.xz
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=27c26ebf4845420749a1c9db4f03a81b
+_md5_=96d5b675676a5451bd096f8ecb7617f5
diff --git a/metadata/md5-cache/sys-devel/automake-9999 b/metadata/md5-cache/sys-devel/automake-9999
index fa880945587a..f6d5f9eb7221 100644
--- a/metadata/md5-cache/sys-devel/automake-9999
+++ b/metadata/md5-cache/sys-devel/automake-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=>=dev-lang/perl-5.6 >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -12,4 +12,4 @@ RDEPEND=>=dev-lang/perl-5.6 >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=01362612ad721678f6a12a3c5b6c95e2
+_md5_=0f7aece3751463a24597c668ddf35fa4
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r101 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r101
deleted file mode 100644
index 5574c0b03c0c..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r101
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config || ( sys-devel/gcc:* sys-devel/clang:* ) app-arch/xar dev-libs/libyaml
-DESCRIPTION=Darwin Xtools matching Xcode Tools binutils-apple
-EAPI=7
-HOMEPAGE=https://github.com/iains/darwin-xtools
-INHERIT=cmake
-KEYWORDS=~ppc-macos ~x64-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config || ( sys-devel/gcc:* sys-devel/clang:* ) app-arch/xar dev-libs/libyaml
-SLOT=8
-SRC_URI=https://github.com/grobian/darwin-xtools/archive/gentoo-8.2.1-r101.tar.gz -> darwin-xtools-8.2.1-r101.tar.gz
-_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1555d44e4c920751aea6148598a7a4b6
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r102 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r102
deleted file mode 100644
index 048f30ffdab5..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r102
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config || ( sys-devel/gcc:* sys-devel/clang:* ) app-arch/xar dev-libs/libyaml
-DESCRIPTION=Darwin Xtools matching Xcode Tools binutils-apple
-EAPI=7
-HOMEPAGE=https://github.com/iains/darwin-xtools
-INHERIT=cmake
-KEYWORDS=~arm64-macos ~ppc-macos ~x64-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config || ( sys-devel/gcc:* sys-devel/clang:* ) app-arch/xar dev-libs/libyaml
-SLOT=8
-SRC_URI=https://github.com/grobian/darwin-xtools/archive/gentoo-8.2.1-r102.tar.gz -> darwin-xtools-8.2.1-r102.tar.gz
-_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a27ee532b2379dedae91beea7966cb95
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r103 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r103
new file mode 100644
index 000000000000..7f484bda8a67
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r103
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-devel/binutils-config || ( sys-devel/gcc:* sys-devel/clang:* ) app-arch/xar dev-libs/libyaml
+DESCRIPTION=Darwin Xtools matching Xcode Tools binutils-apple
+EAPI=7
+HOMEPAGE=https://github.com/iains/darwin-xtools
+INHERIT=cmake
+KEYWORDS=~arm64-macos ~ppc-macos ~x64-macos
+LICENSE=APSL-2
+RDEPEND=sys-devel/binutils-config || ( sys-devel/gcc:* sys-devel/clang:* ) app-arch/xar dev-libs/libyaml
+SLOT=8
+SRC_URI=https://github.com/grobian/darwin-xtools/archive/gentoo-8.2.1-r103.tar.gz -> darwin-xtools-8.2.1-r103.tar.gz
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a27ee532b2379dedae91beea7966cb95
diff --git a/metadata/md5-cache/sys-devel/gcc-13.1.1_p20230708 b/metadata/md5-cache/sys-devel/gcc-13.1.1_p20230708
new file mode 100644
index 000000000000..d7d05755ab93
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-13.1.1_p20230708
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection modula2
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=13
+SRC_URI=mirror://gcc/snapshots/13-20230708/gcc-13-20230708.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.2.0-musl-patches-2.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	991f7a0a58b14de3b8d00b5dd9604f9b	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=5cbbf7bb3e4728901e8ffd828ea6b90e
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20230709 b/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20230709
new file mode 100644
index 000000000000..99d669fb014b
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20230709
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection modula2 rust
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=14
+SRC_URI=mirror://gcc/snapshots/14-20230709/gcc-14-20230709.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	991f7a0a58b14de3b8d00b5dd9604f9b	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=a874b5911019b1d33e28187d3955046c
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 509b46305630..8c88d2b0b2bb 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/sof-firmware-2.2.5 b/metadata/md5-cache/sys-firmware/sof-firmware-2.2.5
index 8303f6932478..18f66e2a1f20 100644
--- a/metadata/md5-cache/sys-firmware/sof-firmware-2.2.5
+++ b/metadata/md5-cache/sys-firmware/sof-firmware-2.2.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=install preinst
 DESCRIPTION=Sound Open Firmware (SOF) binary files
 EAPI=8
 HOMEPAGE=https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=media-libs/alsa-lib
 SLOT=0
 SRC_URI=https://github.com/thesofproject/sof-bin/releases/download/v2.2.5/sof-bin-v2.2.5.tar.gz -> sof-firmware-2.2.5.tar.gz
-_md5_=e4980841ead10b93fb489455d1e89fd0
+_md5_=03d000e304fb7f8f70b0a357e0438ff1
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index e3a1681c78c6..9da18dca280a 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/bees-0.10 b/metadata/md5-cache/sys-fs/bees-0.10
new file mode 100644
index 000000000000..89679504d81c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bees-0.10
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure prepare pretend setup
+DEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
+DESCRIPTION=Best-Effort Extent-Same, a btrfs dedup agent
+EAPI=8
+HOMEPAGE=https://github.com/Zygo/bees
+INHERIT=linux-info systemd toolchain-funcs
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-3
+RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
+SLOT=0
+SRC_URI=https://github.com/Zygo/bees/archive/v0.10.tar.gz -> bees-0.10.tar.gz
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=a5d95cb9f32aaf74eb7302e69a7ef391
diff --git a/metadata/md5-cache/sys-fs/bees-0.8 b/metadata/md5-cache/sys-fs/bees-0.8
deleted file mode 100644
index c999f683deef..000000000000
--- a/metadata/md5-cache/sys-fs/bees-0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure prepare pretend setup
-DEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
-DESCRIPTION=Best-Effort Extent-Same, a btrfs dedup agent
-EAPI=7
-HOMEPAGE=https://github.com/Zygo/bees
-INHERIT=linux-info systemd toolchain-funcs
-IUSE=tools
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-3
-RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
-SLOT=0
-SRC_URI=https://github.com/Zygo/bees/archive/v0.8.tar.gz -> bees-0.8.tar.gz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=aa3e58bbcbb3a5f373acdca0113867bb
diff --git a/metadata/md5-cache/sys-fs/bees-0.9 b/metadata/md5-cache/sys-fs/bees-0.9
deleted file mode 100644
index 35b5b34d015d..000000000000
--- a/metadata/md5-cache/sys-fs/bees-0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure prepare pretend setup
-DEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
-DESCRIPTION=Best-Effort Extent-Same, a btrfs dedup agent
-EAPI=8
-HOMEPAGE=https://github.com/Zygo/bees
-INHERIT=linux-info systemd toolchain-funcs
-KEYWORDS=amd64 ~arm64
-LICENSE=GPL-3
-RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
-SLOT=0
-SRC_URI=https://github.com/Zygo/bees/archive/v0.9.tar.gz -> bees-0.9.tar.gz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7856aee0467ef52663fb5facaa5efe13
diff --git a/metadata/md5-cache/sys-fs/bees-0.9.3 b/metadata/md5-cache/sys-fs/bees-0.9.3
new file mode 100644
index 000000000000..e171cb90023b
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bees-0.9.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure prepare pretend setup
+DEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
+DESCRIPTION=Best-Effort Extent-Same, a btrfs dedup agent
+EAPI=8
+HOMEPAGE=https://github.com/Zygo/bees
+INHERIT=linux-info systemd toolchain-funcs
+KEYWORDS=amd64 ~arm64
+LICENSE=GPL-3
+RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
+SLOT=0
+SRC_URI=https://github.com/Zygo/bees/archive/v0.9.3.tar.gz -> bees-0.9.3.tar.gz
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=7e51949bff05956497cd11ba282b318c
diff --git a/metadata/md5-cache/sys-fs/bees-9999 b/metadata/md5-cache/sys-fs/bees-9999
index a51bf72f2e63..995411c71863 100644
--- a/metadata/md5-cache/sys-fs/bees-9999
+++ b/metadata/md5-cache/sys-fs/bees-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f5ef69ae4563b8fd6714623aacfa79ce
+_md5_=a5d95cb9f32aaf74eb7302e69a7ef391
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.4-r1 b/metadata/md5-cache/sys-fs/udisks-2.9.4-r1
deleted file mode 100644
index b50f52a9ddea..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-2.9.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-auth/polkit-0.114 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo(-)?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-kernel/linux-headers-3.1
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
-INHERIT=autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
-IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=sys-auth/polkit-0.114 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo(-)?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit ) virtual/tmpfiles
-REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
-SLOT=2
-SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.4/udisks-2.9.4.tar.bz2
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f4a79ef3b49685428bc1feccd4acf432
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.4-r3 b/metadata/md5-cache/sys-fs/udisks-2.9.4-r3
new file mode 100644
index 000000000000..bcfd97cc66f4
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.4-r3
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=sys-auth/polkit-0.114 >=sys-libs/libblockdev-2.25:=[cryptsetup,lvm?,vdo(-)?] <sys-libs/libblockdev-3[cryptsetup,lvm?,vdo(-)?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd(-)] ) >=sys-kernel/linux-headers-3.1
+DESCRIPTION=Daemon providing interfaces to work with storage devices
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
+INHERIT=autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=sys-auth/polkit-0.114 >=sys-libs/libblockdev-2.25:=[cryptsetup,lvm?,vdo(-)?] <sys-libs/libblockdev-3[cryptsetup,lvm?,vdo(-)?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd(-)] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit ) virtual/tmpfiles
+REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
+SLOT=2
+SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.4/udisks-2.9.4.tar.bz2
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4e84a869e40afc815181fcc9b1c8fa85
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b82b885e7429..da7b8e0d8989 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/git-sources-6.4_rc1 b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc1
deleted file mode 100644
index 45210f8b1b4c..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.4_rc1
-SRC_URI=https://git.kernel.org/torvalds/p/v6.4-rc1/v6.2 -> patch-6.4-rc1.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc2 b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc2
deleted file mode 100644
index 605fd1108adb..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.4_rc2
-SRC_URI=https://git.kernel.org/torvalds/p/v6.4-rc2/v6.2 -> patch-6.4-rc2.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc3 b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc3
deleted file mode 100644
index 40e37dc4f054..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.4_rc3
-SRC_URI=https://git.kernel.org/torvalds/p/v6.4-rc3/v6.2 -> patch-6.4-rc3.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc4 b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc4
deleted file mode 100644
index 2763e634fd27..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.4_rc4
-SRC_URI=https://git.kernel.org/torvalds/p/v6.4-rc4/v6.2 -> patch-6.4-rc4.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc5 b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc5
deleted file mode 100644
index 34946992a968..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.4_rc5
-SRC_URI=https://git.kernel.org/torvalds/p/v6.4-rc5/v6.2 -> patch-6.4-rc5.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc6 b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc6
deleted file mode 100644
index f883d8d7ba1a..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.4_rc6
-SRC_URI=https://git.kernel.org/torvalds/p/v6.4-rc6/v6.2 -> patch-6.4-rc6.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc7 b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc7
deleted file mode 100644
index 99a0db81da55..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.4_rc7
-SRC_URI=https://git.kernel.org/torvalds/p/v6.4-rc7/v6.2 -> patch-6.4-rc7.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.5_rc1 b/metadata/md5-cache/sys-kernel/git-sources-6.5_rc1
new file mode 100644
index 000000000000..81a8ace1d6c8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-6.5_rc1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.6-r4
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+INHERIT=kernel-2
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.5_rc1
+SRC_URI=https://git.kernel.org/torvalds/p/v6.5-rc1/v6.4 -> patch-6.5-rc1.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	f3fe06845554116f3a63786f864ff07f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=e2f49b9fe9db805f05896054e5abff69
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 441e74967f2b..64217bb089af 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.37-r3 b/metadata/md5-cache/sys-libs/glibc-2.37-r3
index fa660ecf0c7f..912fe206d0cd 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.37-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.37-r3
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.gnu.org/software/libc/
 IDEPEND=!compile-locales? ( sys-apps/locale-gen )
 INHERIT=prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ) !<app-misc/pax-utils-1.3.3 perl? ( dev-lang/perl ) >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.37-patches-5.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f438ff9b9dd997b9f75aab3808fbe5de
+_md5_=0e8ac3e50832eef2b6240ba119ee930c
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.28-r1 b/metadata/md5-cache/sys-libs/libblockdev-2.28-r1
index a258e7cf9e8d..147d38c10d18 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.28-r1
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.28-r1
@@ -11,7 +11,7 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test ) test
-SLOT=0
+SLOT=0/2
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.28-1/libblockdev-2.28.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a11fc98a48a2d19e06424f5b98cb4a62
+_md5_=99cc54df9dc79147f0e1f470283a8ca7
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.28-r2 b/metadata/md5-cache/sys-libs/libblockdev-2.28-r2
index 17c0c6e706df..99a5d52ff43e 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.28-r2
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.28-r2
@@ -11,7 +11,7 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize sys-apps/gptfdisk >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test ) test
-SLOT=0
+SLOT=0/2
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.28-1/libblockdev-2.28.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=42be8da18da6d9377131bb1fd8008f2e
+_md5_=0c9219c6cd7e37b503989ed4fa286370
diff --git a/metadata/md5-cache/sys-libs/libblockdev-3.0.1 b/metadata/md5-cache/sys-libs/libblockdev-3.0.1
new file mode 100644
index 000000000000..1236ebddd6d1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libblockdev-3.0.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) test? ( python_single_target_python3_10? ( dev-libs/libbytesize[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/libbytesize[python,python_targets_python3_11(-)] ) sys-block/targetcli-fb ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize sys-apps/gptfdisk >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-apps/keyutils-1.5.0:= >=sys-fs/cryptsetup-2.3.0:= ) device-mapper? ( sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) nvme? ( sys-libs/libnvme ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+DESCRIPTION=A library for manipulating block devices
+EAPI=8
+HOMEPAGE=https://github.com/storaged-project/libblockdev
+INHERIT=autotools python-single-r1 xdg-utils
+IUSE=+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize sys-apps/gptfdisk >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-apps/keyutils-1.5.0:= >=sys-fs/cryptsetup-2.3.0:= ) device-mapper? ( sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) nvme? ( sys-libs/libnvme ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) escrow? ( cryptsetup )
+RESTRICT=!test? ( test ) test
+SLOT=0/3
+SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/3.0.1-1/libblockdev-3.0.1.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=bd40e757e8ef79ad375d2fd16cbe3ee2
diff --git a/metadata/md5-cache/sys-libs/libblockdev-9999 b/metadata/md5-cache/sys-libs/libblockdev-9999
index 96ff6e7be002..b9aebc0c0efe 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-9999
+++ b/metadata/md5-cache/sys-libs/libblockdev-9999
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/autoconf-archive dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/autoconf-archive dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) test? ( python_single_target_python3_10? ( dev-libs/libbytesize[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/libbytesize[python,python_targets_python3_11(-)] ) sys-block/targetcli-fb ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) nvme? ( sys-libs/libnvme ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize sys-apps/gptfdisk >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-apps/keyutils-1.5.0:= >=sys-fs/cryptsetup-2.3.0:= ) device-mapper? ( sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) nvme? ( sys-libs/libnvme ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 DESCRIPTION=A library for manipulating block devices
 EAPI=8
 HOMEPAGE=https://github.com/storaged-project/libblockdev
 INHERIT=autotools python-single-r1 xdg-utils git-r3
-IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd +nvme test +tools python_single_target_python3_10 python_single_target_python3_11
+IUSE=+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools python_single_target_python3_10 python_single_target_python3_11
 LICENSE=LGPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) nvme? ( sys-libs/libnvme ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize sys-apps/gptfdisk >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-apps/keyutils-1.5.0:= >=sys-fs/cryptsetup-2.3.0:= ) device-mapper? ( sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) nvme? ( sys-libs/libnvme ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test ) test
-SLOT=0
+SLOT=0/3
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7557437b385528eea14efcfdb94a8266
+_md5_=59a0c103799ba743377f118d6aa4b5d0
diff --git a/metadata/md5-cache/sys-libs/libnvme-1.5 b/metadata/md5-cache/sys-libs/libnvme-1.5
index ad713fdb0927..f374856f2f89 100644
--- a/metadata/md5-cache/sys-libs/libnvme-1.5
+++ b/metadata/md5-cache/sys-libs/libnvme-1.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/linux-nvme/libnvme
 INHERIT=python-r1 meson
 IUSE=dbus +json keyutils python ssl +uuid python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=json? ( dev-libs/json-c:= ) keyutils? ( sys-apps/keyutils:= ) dbus? ( sys-apps/dbus:= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) ) ssl? ( >=dev-libs/openssl-1.1:= ) uuid? ( sys-apps/util-linux:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0/1
 SRC_URI=https://github.com/linux-nvme/libnvme/archive/refs/tags/v1.5.tar.gz -> libnvme-1.5.tar.gz
 _eclasses_=meson	18d046bdb14e1bdb22cce6e5d953e364	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=513eab6db65dc55a801fa45fcbd042aa
+_md5_=d1f51c82523a6455b5601146d0301921
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index e9aabc9bc3a1..71a9de7fce35 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/fcron-3.3.1 b/metadata/md5-cache/sys-process/fcron-3.3.1
index f62b3e0e1b41..40d824bbb24e 100644
--- a/metadata/md5-cache/sys-process/fcron-3.3.1
+++ b/metadata/md5-cache/sys-process/fcron-3.3.1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.3.1.src.tar.gz -> fcron-3.3.1.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cron	7a997e295d297e4fa5c9ef0db828ee88	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cron	7a997e295d297e4fa5c9ef0db828ee88	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=73498c4793b18e004a24eea93baf6398
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 5eef17925f86..5f6fd25f12aa 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/hugo-0.110.0-r2 b/metadata/md5-cache/www-apps/hugo-0.110.0-r2
deleted file mode 100644
index cd00b0785dee..000000000000
--- a/metadata/md5-cache/www-apps/hugo-0.110.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 test? ( dev-python/docutils dev-ruby/asciidoctor virtual/pandoc ) >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=media-libs/libwebp-1.2.3-r1:= sass? ( dev-libs/libsass:= )
-DESCRIPTION=Fast static HTML and CSS website generator
-EAPI=8
-HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
-INHERIT=go-module bash-completion-r1
-IUSE=doc +sass test
-KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT Unlicense
-RDEPEND=>=media-libs/libwebp-1.2.3-r1:= sass? ( dev-libs/libsass:= )
-RESTRICT=!test? ( test ) strip
-SLOT=0
-SRC_URI=https://github.com/gohugoio/hugo/archive/v0.110.0.tar.gz -> hugo-0.110.0.tar.gz https://tastytea.de/files/gentoo/hugo-0.110.0-vendor.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6330286e6a76d535da724b54b383f931
diff --git a/metadata/md5-cache/www-apps/hugo-0.115.2 b/metadata/md5-cache/www-apps/hugo-0.115.2
new file mode 100644
index 000000000000..917b490a80e9
--- /dev/null
+++ b/metadata/md5-cache/www-apps/hugo-0.115.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.18 test? ( dev-python/docutils dev-ruby/asciidoctor virtual/pandoc ) >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=media-libs/libwebp-1.2.3-r1:= sass? ( dev-libs/libsass:= )
+DESCRIPTION=Fast static HTML and CSS website generator
+EAPI=8
+HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
+INHERIT=go-module bash-completion-r1
+IUSE=doc +sass test
+KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
+LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
+RDEPEND=>=media-libs/libwebp-1.2.3-r1:= sass? ( dev-libs/libsass:= )
+RESTRICT=!test? ( test ) strip
+SLOT=0
+SRC_URI=https://github.com/gohugoio/hugo/archive/v0.115.2.tar.gz -> hugo-0.115.2.tar.gz https://tastytea.de/files/gentoo/hugo-0.115.2-vendor.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=f2f6a0a1b9677ff1160e0db661cbdb56
diff --git a/metadata/md5-cache/www-apps/piwigo-13.8.0 b/metadata/md5-cache/www-apps/piwigo-13.8.0
new file mode 100644
index 000000000000..e238700a21f1
--- /dev/null
+++ b/metadata/md5-cache/www-apps/piwigo-13.8.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=app-admin/webapp-config
+DESCRIPTION=a photo gallery software for the web
+EAPI=8
+HOMEPAGE=http://piwigo.org/
+INHERIT=webapp
+IUSE=+exif +gd imagemagick vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=imagemagick? ( virtual/imagemagick-tools ) dev-lang/php[ctype,exif?,gd?,filter,iconv,json(+),mysqli] >=virtual/mysql-5.0 virtual/httpd-php app-admin/webapp-config
+REQUIRED_USE=|| ( gd imagemagick )
+SLOT=13.8.0
+SRC_URI=http://piwigo.org/download/dlcounter.php?code=13.8.0 -> piwigo-13.8.0.zip
+_eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=e2714eb1d0175ab798a8db625f896050
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 8a7a3508c52c..3f5506b4d827 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/epiphany-44.5 b/metadata/md5-cache/www-client/epiphany-44.5
index 0a5cfc8f4d13..08e94c401834 100644
--- a/metadata/md5-cache/www-client/epiphany-44.5
+++ b/metadata/md5-cache/www-client/epiphany-44.5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/44/epiphany-44.5.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8cadd48d1f8828e7c1d22926b49b82f8
+_md5_=bd7565579a2cbe4c2b9b3733c2d06e6e
diff --git a/metadata/md5-cache/www-client/firefox-bin-115.0 b/metadata/md5-cache/www-client/firefox-bin-115.0
deleted file mode 100644
index 61b8b3087355..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-115.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst setup unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop linux-info optfeature pax-utils xdg
-IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=rapid
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/en-US/firefox-115.0.tar.bz2 -> firefox-bin_x86_64-115.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-i686/en-US/firefox-115.0.tar.bz2 -> firefox-bin_i686-115.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ach.xpi -> firefox-115.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/af.xpi -> firefox-115.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/an.xpi -> firefox-115.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ar.xpi -> firefox-115.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ast.xpi -> firefox-115.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/az.xpi -> firefox-115.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/be.xpi -> firefox-115.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/bg.xpi -> firefox-115.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/bn.xpi -> firefox-115.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/br.xpi -> firefox-115.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/bs.xpi -> firefox-115.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-115.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ca.xpi -> firefox-115.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/cak.xpi -> firefox-115.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/cs.xpi -> firefox-115.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/cy.xpi -> firefox-115.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/da.xpi -> firefox-115.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/de.xpi -> firefox-115.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/dsb.xpi -> firefox-115.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/el.xpi -> firefox-115.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/en-CA.xpi -> firefox-115.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/en-GB.xpi -> firefox-115.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/eo.xpi -> firefox-115.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/es-AR.xpi -> firefox-115.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/es-CL.xpi -> firefox-115.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/es-ES.xpi -> firefox-115.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/es-MX.xpi -> firefox-115.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/et.xpi -> firefox-115.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/eu.xpi -> firefox-115.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/fa.xpi -> firefox-115.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ff.xpi -> firefox-115.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/fi.xpi -> firefox-115.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/fr.xpi -> firefox-115.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-115.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-115.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/gd.xpi -> firefox-115.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/gl.xpi -> firefox-115.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/gn.xpi -> firefox-115.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-115.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/he.xpi -> firefox-115.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-115.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/hr.xpi -> firefox-115.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/hsb.xpi -> firefox-115.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/hu.xpi -> firefox-115.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-115.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ia.xpi -> firefox-115.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/id.xpi -> firefox-115.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/is.xpi -> firefox-115.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/it.xpi -> firefox-115.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ja.xpi -> firefox-115.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ka.xpi -> firefox-115.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/kab.xpi -> firefox-115.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/kk.xpi -> firefox-115.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/km.xpi -> firefox-115.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/kn.xpi -> firefox-115.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ko.xpi -> firefox-115.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/lij.xpi -> firefox-115.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/lt.xpi -> firefox-115.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/lv.xpi -> firefox-115.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/mk.xpi -> firefox-115.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/mr.xpi -> firefox-115.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ms.xpi -> firefox-115.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/my.xpi -> firefox-115.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-115.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-115.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/nl.xpi -> firefox-115.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-115.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/oc.xpi -> firefox-115.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-115.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/pl.xpi -> firefox-115.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-115.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-115.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/rm.xpi -> firefox-115.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ro.xpi -> firefox-115.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ru.xpi -> firefox-115.0-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/sco.xpi -> firefox-115.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/si.xpi -> firefox-115.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/sk.xpi -> firefox-115.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/sl.xpi -> firefox-115.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/son.xpi -> firefox-115.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/sq.xpi -> firefox-115.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/sr.xpi -> firefox-115.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-115.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ta.xpi -> firefox-115.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/te.xpi -> firefox-115.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/th.xpi -> firefox-115.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/tl.xpi -> firefox-115.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/tr.xpi -> firefox-115.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/trs.xpi -> firefox-115.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/uk.xpi -> firefox-115.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/ur.xpi -> firefox-115.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/uz.xpi -> firefox-115.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/vi.xpi -> firefox-115.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/xh.xpi -> firefox-115.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-115.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/115.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-115.0-zh-TW.xpi )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6c3f45567d09154f57717d871a81cade
diff --git a/metadata/md5-cache/www-client/firefox-bin-115.0.1 b/metadata/md5-cache/www-client/firefox-bin-115.0.1
new file mode 100644
index 000000000000..d55400cc22a2
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-115.0.1
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop linux-info optfeature pax-utils xdg
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=rapid
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/en-US/firefox-115.0.1.tar.bz2 -> firefox-bin_x86_64-115.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-i686/en-US/firefox-115.0.1.tar.bz2 -> firefox-bin_i686-115.0.1.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ach.xpi -> firefox-115.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/af.xpi -> firefox-115.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/an.xpi -> firefox-115.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ar.xpi -> firefox-115.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ast.xpi -> firefox-115.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/az.xpi -> firefox-115.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/be.xpi -> firefox-115.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/bg.xpi -> firefox-115.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/bn.xpi -> firefox-115.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/br.xpi -> firefox-115.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/bs.xpi -> firefox-115.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-115.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ca.xpi -> firefox-115.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/cak.xpi -> firefox-115.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/cs.xpi -> firefox-115.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/cy.xpi -> firefox-115.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/da.xpi -> firefox-115.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/de.xpi -> firefox-115.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-115.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/el.xpi -> firefox-115.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-115.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-115.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/eo.xpi -> firefox-115.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-115.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-115.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-115.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-115.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/et.xpi -> firefox-115.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/eu.xpi -> firefox-115.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/fa.xpi -> firefox-115.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ff.xpi -> firefox-115.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/fi.xpi -> firefox-115.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/fr.xpi -> firefox-115.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-115.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-115.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/gd.xpi -> firefox-115.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/gl.xpi -> firefox-115.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/gn.xpi -> firefox-115.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-115.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/he.xpi -> firefox-115.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-115.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/hr.xpi -> firefox-115.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-115.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/hu.xpi -> firefox-115.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-115.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ia.xpi -> firefox-115.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/id.xpi -> firefox-115.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/is.xpi -> firefox-115.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/it.xpi -> firefox-115.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ja.xpi -> firefox-115.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ka.xpi -> firefox-115.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/kab.xpi -> firefox-115.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/kk.xpi -> firefox-115.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/km.xpi -> firefox-115.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/kn.xpi -> firefox-115.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ko.xpi -> firefox-115.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/lij.xpi -> firefox-115.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/lt.xpi -> firefox-115.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/lv.xpi -> firefox-115.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/mk.xpi -> firefox-115.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/mr.xpi -> firefox-115.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ms.xpi -> firefox-115.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/my.xpi -> firefox-115.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-115.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-115.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/nl.xpi -> firefox-115.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-115.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/oc.xpi -> firefox-115.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-115.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/pl.xpi -> firefox-115.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-115.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-115.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/rm.xpi -> firefox-115.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ro.xpi -> firefox-115.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ru.xpi -> firefox-115.0.1-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/sco.xpi -> firefox-115.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/si.xpi -> firefox-115.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/sk.xpi -> firefox-115.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/sl.xpi -> firefox-115.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/son.xpi -> firefox-115.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/sq.xpi -> firefox-115.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/sr.xpi -> firefox-115.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-115.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ta.xpi -> firefox-115.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/te.xpi -> firefox-115.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/th.xpi -> firefox-115.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/tl.xpi -> firefox-115.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/tr.xpi -> firefox-115.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/trs.xpi -> firefox-115.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/uk.xpi -> firefox-115.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/ur.xpi -> firefox-115.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/uz.xpi -> firefox-115.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/vi.xpi -> firefox-115.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/xh.xpi -> firefox-115.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-115.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/115.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-115.0.1-zh-TW.xpi )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6c3f45567d09154f57717d871a81cade
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 9da18cbee4da..7e5cd619b8f0 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.10 b/metadata/md5-cache/www-servers/tomcat-10.1.10
index fc15abe8d750..7fc243935488 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.10
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
 IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=~amd64 ~amd64-linux
+KEYWORDS=amd64 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=10.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.10/src/apache-tomcat-10.1.10-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.10/src/apache-tomcat-10.1.10-src.tar.gz.asc )
 _eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=4d3fb16e95ddbfa6fcfcd00978c20f4f
+_md5_=6db13a6d9ffb48b233c0c3ec3a889614
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.90 b/metadata/md5-cache/www-servers/tomcat-8.5.90
index 6347b53f179e..d58470c55adc 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.90
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.90
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
 IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.90/src/apache-tomcat-8.5.90-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.90/src/apache-tomcat-8.5.90-src.tar.gz.asc )
 _eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=accc51daae38666dc1dbe7efcd4e706c
+_md5_=7955f81eb23457c5c48117eca424c49f
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.76 b/metadata/md5-cache/www-servers/tomcat-9.0.76
index 73532414b691..c878ce9f36ea 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.76
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.76
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
 IUSE=extra-webapps doc source test verify-sig
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.76/src/apache-tomcat-9.0.76-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.76/src/apache-tomcat-9.0.76-src.tar.gz.asc )
 _eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=e9bbd1654e300ee0c034c0bda69ebf73
+_md5_=a14409084025987f3c5d5675cd0f67dd
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 000ea75dd121..f4a087a56849 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.8-r1 b/metadata/md5-cache/x11-base/xorg-server-21.1.8-r1
new file mode 100644
index 000000000000..57aab56e236b
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-21.1.8-r1
@@ -0,0 +1,18 @@
+BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
+DESCRIPTION=X.Org X servers
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
+INHERIT=flag-o-matic xorg-3 meson
+IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
+RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0/21.1.8
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.8.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xorg-3	94d3e3c20538edd72a65ea18d9a57af4
+_md5_=923f6ff7965511538362cf3228c54023
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 9b869c49e290..c8d371c76bac 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
index 229f5b974d0b..304e5f6684fa 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
@@ -12,5 +12,5 @@ LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT
 RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.157/NVIDIA-Linux-x86-390.157.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=29c5edc44ba7962afbde5694072ee5f1
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.02
index 4edfd14d3ee7..d2d665865ee9 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.02
@@ -12,5 +12,5 @@ LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( ~gui-libs/egl-wayland-1.1.7 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/470
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.199.02/NVIDIA-Linux-x86_64-470.199.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.199.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.199.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.199.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.199.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.199.02.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=e5c10c62c887e64c58d52d544b7fbe59
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.125.06 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.125.06
index 00a6f3d29968..3715d5710df1 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.125.06
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.125.06
@@ -13,5 +13,5 @@ RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistence
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/525
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/525.125.06/NVIDIA-Linux-x86_64-525.125.06.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/525.125.06/NVIDIA-Linux-aarch64-525.125.06.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.125.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.125.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.125.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.125.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.125.06.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-525.125.06.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=41bd831ecff7c6f7d94b0e9cd3db086d
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.27 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.27
index ba9ce0eebd54..b9a507622d12 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.27
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.27
@@ -13,5 +13,5 @@ RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistence
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/downloads/vulkan-beta-5254727-linux -> NVIDIA-Linux-x86_64-525.47.27.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.116.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.116.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.116.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.116.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.116.04.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/525.47.27.tar.gz -> open-gpu-kernel-modules-525.47.27.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=04d1414ce6e76e37570b7a633ffd3a40
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.54.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.54.03
index 06cd4c0c26f9..dc42579ff4c0 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.54.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.54.03
@@ -13,5 +13,5 @@ RDEPEND=acct-group/video sys-libs/glibc >=dev-libs/openssl-1.1:= X? ( x11-libs/l
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/535
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/535.54.03/NVIDIA-Linux-x86_64-535.54.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/535.54.03/NVIDIA-Linux-aarch64-535.54.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.54.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.54.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.54.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.54.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.54.03.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-535.54.03.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=9d927495bfdf10e17d415bec212bc110
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 142e6ba82edf..455f4bb674b5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Jul 2023 19:39:40 +0000
+Mon, 10 Jul 2023 05:39:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 32e2809e97f2..c0b1ae237792 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jul  8 07:39:39 PM UTC 2023
+Mon Jul 10 05:39:41 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8e4ab236a01a..01c7087412c3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Jul 2023 20:00:01 +0000
+Mon, 10 Jul 2023 06:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f4eaf6a408cc..993502145933 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-90b296e5f5a9bfa58b28259039e441bbe97d4cce 1688844252 2023-07-08T19:24:12+00:00
+5e7d98bc4aa5f3ffcb0e2aa2c15b76f3e309ddd0 1688967016 2023-07-10T05:30:16+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 53d557670f30..6175f30490cd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1688845201 Sat 08 Jul 2023 07:40:01 PM UTC
+1688967601 Mon 10 Jul 2023 05:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c57b25be6522..455f4bb674b5 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Jul 2023 19:39:39 +0000
+Mon, 10 Jul 2023 05:39:41 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1fc9684d0e1f..212328a59501 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index f4701d18726c..9c9f5215a752 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -2,4 +2,5 @@ DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4
 DIST munin-2.0.69-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.69.tar.gz 2258024 BLAKE2B 2d270f6f67fc9a86a592e2b7cbcf4111d6ae40bf1928b0ad0adb99ad32384810e5768c17019f9163e8b22fd8524b28257df527df023db9c1ba333691b384dd74 SHA512 4976e394e046d3fe1cbb000acdf081060188517e09abcf8b60dd7c55e0e1cdf46e33d1760368cb1423dfb9286e397df2072a2c55ba8b79adeae4ea2303130667
+DIST munin-2.0.73.tar.gz 2259959 BLAKE2B 2d2e4ce00b2df06f083280b9253f875ded100e42c991152f3f8e4b39e85d605367efc18df369e07e18eac38aabd78faa959c367752b153f97246bb47a9732f20 SHA512 4f1d59ff3f163c8fac883973ebba1221619d716c4cde506d9265544c52e73f43e8b587cda3fd00bcf779ceeaf8fef6e7780d9ea4be5b99894f0bb5047f24b935
 DIST munin-remove-Date-Manip-DM5.patch 3587 BLAKE2B fab1fb61607e83aac5cbd699c93015d77ca6e58d9734a5a6bc17af6c3c7695ddf4257104cd69db4d3b3e1d36bb1d66a1893ddb51bfc52d0a1dd2efb3ba32a9c0 SHA512 976d7a50de6437a26fa77917368ab604c1987f686030e097c200fe9ebebd08e5fae10c04640cadbfecef90eda76ba123cf303d2d671cefa78b09752d1f6757af
diff --git a/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch b/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch
new file mode 100644
index 000000000000..fee72bc23ad3
--- /dev/null
+++ b/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch
@@ -0,0 +1,36 @@
+From 75ae794b1c497a82c4ce8f63c9d016cd11d3c7ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Sun, 21 Oct 2012 13:39:21 -0700
+Subject: [PATCH 2/7] build: create an install-minimal target that only
+ installs the Node components
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is what Gentoo does right now manually, it's easier to maintain
+here though, and users might want to do the same if they are
+installing from sources, and only want a node.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index cdc3577..c119d38 100644
+--- a/Makefile
++++ b/Makefile
+@@ -64,7 +64,9 @@ tags:
+ 
+ ######################################################################
+ 
+-install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime
++install: install-master-prime install-minimal install-man
++
++install-minimal: install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-async-prime
+ 
+ install-pre: Makefile Makefile.config
+ 	@$(CHECKUSER)
+-- 
+2.2.1
+
diff --git a/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch b/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch
new file mode 100644
index 000000000000..63897f552c9a
--- /dev/null
+++ b/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch
@@ -0,0 +1,113 @@
+From b634d1396bc2fba170b414f09ea07d0de702fdb8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Sun, 4 Nov 2012 11:18:11 -0800
+Subject: [PATCH 3/7] master: make it possible to configure the default cgi-tmp
+ directory.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows distributions to use, for instance, /var/cache/munin-cgi,
+so that /var/lib preserves its designed purpose.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ Makefile                            | 7 ++++---
+ Makefile.config                     | 3 +++
+ common/lib/Munin/Common/Defaults.pm | 2 +-
+ master/_bin/munin-cgi-graph.in      | 2 +-
+ master/lib/Munin/Master/Config.pm   | 2 +-
+ master/munin.conf.in                | 2 +-
+ 6 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c119d38..2e30052 100644
+--- a/Makefile
++++ b/Makefile
+@@ -87,14 +87,14 @@ install-master-prime: $(INFILES_MASTER) install-pre install-master
+ 	mkdir -p $(PERLLIB)/Munin/Master
+ 	mkdir -p $(HTMLDIR)
+ 	mkdir -p $(DBDIR)
+-	mkdir -p $(DBDIR)/cgi-tmp
++	mkdir -p $(CGITMPDIR)
+ 	mkdir -p $(CGIDIR)
+ 
+ 	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
+ 	$(CHMOD) 0755 $(DBDIR)
+ 
+-	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
+-	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
++	$(CHOWN) $(CGIUSER) $(CGITMPDIR)
++	$(CHMOD) 0755 $(CGITMPDIR)
+ 
+ 	for p in master/www/*.tmpl ;  do \
+ 		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+diff --git a/Makefile.config b/Makefile.config
+index f5557ea..4378b60 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -44,6 +44,9 @@ CGIDIR     = $(PREFIX)/www/cgi
+ # Where to put internal data for master (RRD, internal files, ...)
+ DBDIR      = $(DESTDIR)/var/opt/munin
+ 
++# Where to put CGI cached files (for master only)
++CGITMPDIR  = $(DBDIR)/cgi-tmp
++
+ # Where to put internal data for node (plugin state, ...)
+ DBDIRNODE  = $(DESTDIR)/var/opt/munin-node
+ 
+diff --git a/common/lib/Munin/Common/Defaults.pm b/common/lib/Munin/Common/Defaults.pm
+index 131f52c..787b596 100644
+--- a/common/lib/Munin/Common/Defaults.pm
++++ b/common/lib/Munin/Common/Defaults.pm
+@@ -25,7 +25,7 @@ our $MUNIN_DOCDIR     = '';
+ our $MUNIN_LIBDIR     = '';
+ our $MUNIN_HTMLDIR    = '';
+ our $MUNIN_CGIDIR     = '';
+-our $MUNIN_CGITMPDIR     = '';
++our $MUNIN_CGITMPDIR  = '';
+ our $MUNIN_DBDIR      = '';
+ our $MUNIN_PLUGSTATE  = ''; 
+ our $MUNIN_SPOOLDIR   = '';
+diff --git a/master/_bin/munin-cgi-graph.in b/master/_bin/munin-cgi-graph.in
+index 651cf8c..f5a7ccd 100755
+--- a/master/_bin/munin-cgi-graph.in
++++ b/master/_bin/munin-cgi-graph.in
+@@ -337,7 +337,7 @@ sub get_picture_filename {
+     my $params  = shift;
+ 
+     # XXX - hack to fix cgitmpdir default 
+-    $config->{cgitmpdir} ||= "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp";
++    $config->{cgitmpdir} ||= "$Munin::Common::Defaults::MUNIN_CGITMPDIR";
+     my $cgi_tmp_dir = $config->{cgitmpdir} . "/munin-cgi-graph";
+ 
+     $params = $params ? "?$params" : "";
+diff --git a/master/lib/Munin/Master/Config.pm b/master/lib/Munin/Master/Config.pm
+index 291ffaf..b5c0813 100644
+--- a/master/lib/Munin/Master/Config.pm	2017-03-03 01:02:39.000000000 +0100
++++ b/master/lib/Munin/Master/Config.pm	2017-07-18 19:29:44.861742592 +0200
+@@ -161,7 +161,7 @@
+ 		tls_verify_depth => 5,
+ 		tmpldir          => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates",
+ 	        staticdir        => "$Munin::Common::Defaults::MUNIN_CONFDIR/static",
+-	        cgitmpdir        => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
++	        cgitmpdir        => "$Munin::Common::Defaults::MUNIN_CGITMPDIR",
+ 		ssh_command      => "ssh",
+ 		ssh_options      => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no",
+ 	    }, $class ),
+diff --git a/master/munin.conf.in b/master/munin.conf.in
+index 8d1a75f..046f369 100644
+--- a/master/munin.conf.in
++++ b/master/munin.conf.in
+@@ -21,7 +21,7 @@
+ # temporary cgi files are here. note that it has to be writable by 
+ # the cgi user (usually nobody or httpd).
+ #
+-# cgitmpdir @@DBDIR@@/cgi-tmp
++# cgitmpdir @@CGITMPDIR@@
+ 
+ # (Exactly one) directory to include all files from.
+ includedir @@CONFDIR@@/munin-conf.d
+-- 
+2.2.1
+
diff --git a/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch b/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch
new file mode 100644
index 000000000000..214cc4c4e6b8
--- /dev/null
+++ b/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch
@@ -0,0 +1,44 @@
+From e504b83d0db596a39f32227d4c473575e227037a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Sun, 11 Nov 2012 14:38:16 -0800
+Subject: [PATCH 5/7] node: use Net::Domain::hostfqdn instead of
+ Sys::Hostname::hostname to get the hostname.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This actually makes the test work correctly, but might change the
+returned values for some hosts.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ node/lib/Munin/Node/OS.pm | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/node/lib/Munin/Node/OS.pm b/node/lib/Munin/Node/OS.pm
+index 31bebac..b8fa58a 100644
+--- a/node/lib/Munin/Node/OS.pm
++++ b/node/lib/Munin/Node/OS.pm
+@@ -12,7 +12,7 @@ use Munin::Node::Config;
+ use Munin::Common::Timeout;
+ 
+ use POSIX ();
+-use Sys::Hostname;
++use Net::Domain qw(hostfqdn);
+ 
+ sub get_uid {
+     my ($class, $user) = @_;
+@@ -38,9 +38,7 @@ sub _get_xid {
+ }
+ 
+ sub get_fq_hostname { 
+-    my $short = Sys::Hostname::hostname();
+-
+-    return (gethostbyname $short)[0] || $short || "unknown";
++    return hostfqdn || "unknown";
+ }
+ 
+ sub check_perms_if_paranoid
+-- 
+2.2.1
+
diff --git a/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch b/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch
new file mode 100644
index 000000000000..07b86e4a9f60
--- /dev/null
+++ b/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch
@@ -0,0 +1,139 @@
+From 50ca7989a481e31d2434f755812070ac8f4e14c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Sun, 11 Nov 2012 15:18:51 -0800
+Subject: [PATCH 7/7] node: always use the Effective UID not just the UID.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ common/lib/Munin/Common/Defaults.pm |  6 +++---
+ node/t/munin_node_config.t          | 12 ++++++------
+ node/t/munin_node_os.t              |  6 +++---
+ node/t/munin_node_service.t         | 14 +++++++-------
+ 4 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/common/lib/Munin/Common/Defaults.pm b/common/lib/Munin/Common/Defaults.pm
+index 787b596..0f7f292 100644
+--- a/common/lib/Munin/Common/Defaults.pm
++++ b/common/lib/Munin/Common/Defaults.pm
+@@ -32,9 +32,9 @@ our $MUNIN_SPOOLDIR   = '';
+ our $MUNIN_MANDIR     = '';
+ our $MUNIN_LOGDIR     = "$COMPONENT_ROOT/log/";
+ our $MUNIN_STATEDIR   = ''; 
+-our $MUNIN_USER       = getpwuid $UID;
+-our $MUNIN_GROUP      = getgrgid $GID;
+-our $MUNIN_PLUGINUSER = getpwuid $UID;
++our $MUNIN_USER       = getpwuid $EUID;
++our $MUNIN_GROUP      = getgrgid $EGID;
++our $MUNIN_PLUGINUSER = getpwuid $EUID;
+ our $MUNIN_VERSION    = 'svn';
+ our $MUNIN_PERL       = '/usr/bin/perl';
+ our $MUNIN_PERLLIB    = '';
+diff --git a/node/t/munin_node_config.t b/node/t/munin_node_config.t
+index b8b6564..3d5530f 100644
+--- a/node/t/munin_node_config.t
++++ b/node/t/munin_node_config.t
+@@ -43,13 +43,13 @@ isa_ok($conf, 'Munin::Node::Config');
+ 
+ ### Default user
+ {
+-    my $uname = getpwuid $UID;
++    my $uname = getpwuid $EUID;
+ 
+     my @res = $conf->_parse_line("default_client_user $uname");
+-    is_deeply(\@res, [defuser => $UID], 'Parsing default user name');
++    is_deeply(\@res, [defuser => $EUID], 'Parsing default user name');
+ 
+     @res = $conf->_parse_line("default_client_user $UID");
+-    is_deeply(\@res, [defuser => $UID], 'Parsing default user ID');
++    is_deeply(\@res, [defuser => $EUID], 'Parsing default user ID');
+     
+     eval { $conf->_parse_line("default_client_user xxxyyyzzz") };
+     like($@, qr{Default user does not exist}, "Default user exists");
+@@ -184,13 +184,13 @@ isa_ok($conf, 'Munin::Node::Config');
+ 
+ ### user
+ {
+-    my $uname = getpwuid $UID;
++    my $uname = getpwuid $EUID;
+ 
+     my @res = $conf->_parse_plugin_line("user $uname");
+     is_deeply(\@res, [user => $uname], 'Parsing plugin user name');
+ 
+-    @res = $conf->_parse_plugin_line("user $UID");
+-    is_deeply(\@res, [user => $UID], 'Parsing plugin user ID');
++    @res = $conf->_parse_plugin_line("user $EUID");
++    is_deeply(\@res, [user => $EUID], 'Parsing plugin user ID');
+ }
+ 
+ ### group
+diff --git a/node/t/munin_node_os.t b/node/t/munin_node_os.t
+index 96d7c74..e10d9e6 100644
+--- a/node/t/munin_node_os.t
++++ b/node/t/munin_node_os.t
+@@ -13,10 +13,10 @@ my $os = 'Munin::Node::OS';
+ 
+ ### get_uid
+ {
+-	my $uname = getpwuid $UID;
++	my $uname = getpwuid $EUID;
+ 
+-	is($os->get_uid($uname), $UID, 'Lookup by user name');
+-	is($os->get_uid($UID),   $UID, 'Lookup by user ID');
++	is($os->get_uid($uname), $EUID, 'Lookup by user name');
++	is($os->get_uid($EUID),  $EUID, 'Lookup by user ID');
+ 
+ 	is($os->get_uid('%%SSKK¤¤'), undef, 'Nonexistent user name');
+ 	is($os->get_uid(999999999),  undef, 'Nonexistent user ID');
+diff --git a/node/t/munin_node_service.t b/node/t/munin_node_service.t
+index 18bda89..7fa050e 100644
+--- a/node/t/munin_node_service.t
++++ b/node/t/munin_node_service.t
+@@ -12,8 +12,8 @@ use Munin::Node::Service;
+ 
+ use English qw(-no_match_vars);
+ 
+-my $uname = getpwuid $UID;
+-my $gid   = (split / /, $GID)[0];
++my $uname = getpwuid $EUID;
++my $gid   = (split / /, $EGID)[0];
+ my $gname = getgrgid $gid;
+ 
+ 
+@@ -39,7 +39,7 @@ $config->reinitialize({
+ 
+         # testing user resolution
+         uname => { user => $uname },
+-        uid   => { user => $UID   },
++        uid   => { user => $EUID   },
+         bad_uname => { user => '%%SSKK¤¤' },
+         bad_uid   => { user => 999999999  },
+ 
+@@ -155,7 +155,7 @@ $ENV{MUNIN_MASTER_IP} = '';
+ 
+ ### export_service_environment
+ {
+-  my $services = Munin::Node::Service->new(defuser => $UID);
++  my $services = Munin::Node::Service->new(defuser => $EUID);
+ 
+   $services->export_service_environment('test');
+   is($ENV{test_environment_variable}, 'fnord', 'Service-specific environment is exported');
+@@ -164,10 +164,10 @@ $ENV{MUNIN_MASTER_IP} = '';
+ 
+ ### _resolve_uid
+ {
+-    my $services = Munin::Node::Service->new(defuser => $UID);
++    my $services = Munin::Node::Service->new(defuser => $EUID);
+ 
+-    is($services->_resolve_uid('uname'), $UID, 'Lookup by service-specific username');
+-    is($services->_resolve_uid('uid'),   $UID, 'Lookup by service-specific username');
++    is($services->_resolve_uid('uname'), $EUID, 'Lookup by service-specific username');
++    is($services->_resolve_uid('uid'),   $EUID, 'Lookup by service-specific username');
+ 
+     $services->{defuser} = 0;
+ 
+-- 
+2.2.1
+
diff --git a/net-analyzer/munin/files/patches/0009-perl-526.patch b/net-analyzer/munin/files/patches/0009-perl-526.patch
new file mode 100644
index 000000000000..d3cabb9906c3
--- /dev/null
+++ b/net-analyzer/munin/files/patches/0009-perl-526.patch
@@ -0,0 +1,26 @@
+
+
+diff -ruN munin-2.0.33.orig/master/Build.PL munin-2.0.33/master/Build.PL
+--- munin-2.0.33.orig/master/Build.PL	2017-03-03 00:02:39.000000000 -0000
++++ munin-2.0.33/master/Build.PL	2017-08-05 15:06:55.799816839 -0000
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use MasterBuilder;
+ 
+ use warnings;
+diff -ruN munin-2.0.33.orig/node/Build.PL munin-2.0.33/node/Build.PL
+--- munin-2.0.33.orig/node/Build.PL	2017-03-03 00:02:39.000000000 -0000
++++ munin-2.0.33/node/Build.PL	2017-08-05 15:11:07.689824612 -0000
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use NodeBuilder;
+ 
+ use warnings;
+diff -ruN munin-2.0.33.orig/plugins/Build.PL munin-2.0.33/plugins/Build.PL
+--- munin-2.0.33.orig/plugins/Build.PL	2017-03-03 00:02:39.000000000 -0000
++++ munin-2.0.33/plugins/Build.PL	2017-08-05 15:13:57.056168401 -0000
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use PluginsBuilder;
+ 
+ use warnings;
diff --git a/net-analyzer/munin/munin-2.0.73-r1.ebuild b/net-analyzer/munin/munin-2.0.73-r1.ebuild
new file mode 100644
index 000000000000..23d59f9dbda6
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.73-r1.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd tmpfiles
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="https://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	dev-perl/TimeDate
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.8 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		app-alternatives/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.8:*
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${FILESDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF || die
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local cgiuser=$(usex apache2 apache munin)
+
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run and /var/cache from the install, as it's not the
+	# package's to deal with.
+	rm -rf "${D}"/run "${D}"/var/cache || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
+	d /run/munin 0700 munin munin - -
+	d /var/cache/munin-cgi 0755 ${cgiuser} munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/munin/munin-2.0.73.ebuild b/net-analyzer/munin/munin-2.0.73.ebuild
new file mode 100644
index 000000000000..069169b51efe
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.73.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd tmpfiles
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="https://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	dev-perl/TimeDate
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.8 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		app-alternatives/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.8:*
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${FILESDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF || die
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild
index f953a68c1c37..98be0bac5446 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~sparc x86"
 fi
 
 S="${WORKDIR}"/${P/_/-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 568ad48acbf8..55356916819f 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 7dc7ba16fac7..5c21087ca335 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,3 +1,4 @@
 DIST pdns-4.7.3.tar.bz2 1353333 BLAKE2B 9dc693c940af08755dcf2c77d103bf219e453684f1714eb0790bc06b68ee01872fafc29ab7ba62a8d2cde9dc0035c527d9f241afe7fb170821dfeb5b6c32242d SHA512 25ca5ef04297efc56f6b88e06177d0db5ed390844225dbc53bff6a9299ba3f711aa27642adca31df0f04e6af7059280690a3793458090cd6b2703cbc4fc9072a
 DIST pdns-4.7.4.tar.bz2 1339609 BLAKE2B b5aebad86cf43d87939dcaf1f31cf95969ce3fe5cf55237117eb455c980f6b617ad2d4769d002698b87161a04c5c9e9cefad709cdae703756d6660aef82af6de SHA512 7b666bba72adb2058aa28cff9962bbbf5ddc77860e5f55f74629e2ba27787595347584b7881a846d6c7a698221de785a9dce45992b80313977bbe1e5e5d0d05c
 DIST pdns-4.8.0.tar.bz2 1354234 BLAKE2B 485b168b4fe8ee6dc23004f3382b51fc207f0ffeb8e7924a731a56afccdc1144b7f8fd5b192d229cffc64afbdc261f20228de974ffad6bd74a5149a95b0355c0 SHA512 5984877d392a61d849a83e139384db7834173534239e21ba02e4617d2d908839e497278764c9e9c15b89697a70295fab7ba46c63e06fdbf7d43fff8d29b56944
+DIST pdns-4.8.1.tar.bz2 1345713 BLAKE2B 4f56d67058b17f6b25b28896d1b25554ae84ddd5765b01292b2592d5dbc5746bbc57a1790122e318da4d57c5eb342d0d2df092d8af0fcb977d9dc8d172c6e176 SHA512 56b2995e90db179c89708bafbe8494dd885102c5f40772f7d48f4c5aea4ed6f0bb900c970f62f90f606ab0db995c512de1e6a5af6b546cd4fbbd232085b0e07c
diff --git a/net-dns/pdns/pdns-4.8.1.ebuild b/net-dns/pdns/pdns-4.8.1.ebuild
new file mode 100644
index 000000000000..54510e17d698
--- /dev/null
+++ b/net-dns/pdns/pdns-4.8.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic lua-single python-any-r1
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc geoip ldap lmdb lua-records mysql odbc postgres remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="${LUA_DEPS}
+	dev-libs/openssl:=
+	dev-libs/boost:=
+	lmdb? ( >=dev-db/lmdb-0.9.29 )
+	lua-records? ( >=net-misc/curl-7.21.3 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 )
+	odbc? ( dev-db/unixODBC )
+	sqlite? ( dev-db/sqlite:3 )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) )"
+RDEPEND="${DEPEND}
+	acct-user/pdns
+	acct-group/pdns"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	python-any-r1_pkg_setup
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
+}
+
+src_configure() {
+	local cnf_dynmodules="bind lua2 pipe" # the default backends, always enabled
+
+	use geoip && cnf_dynmodules+=" geoip"
+	use ldap && cnf_dynmodules+=" ldap"
+	use lmdb && cnf_dynmodules+=" lmdb"
+	use mysql && cnf_dynmodules+=" gmysql"
+	use odbc && cnf_dynmodules+=" godbc"
+	use postgres && cnf_dynmodules+=" gpgsql"
+	use remote && cnf_dynmodules+=" remote"
+	use sqlite && cnf_dynmodules+=" gsqlite3"
+	use tinydns && cnf_dynmodules+=" tinydns"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-modules= \
+		--with-dynmodules="${cnf_dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable lua-records) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		echo
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+
+	if use postgres; then
+		for old in ${REPLACING_VERSIONS}; do
+			ver_test ${old} -lt 4.1.11-r1 || continue
+
+			echo
+			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
+			ewarn "This security fix needs to be applied manually to the database schema."
+			ewarn "Please refer to the official security advisory for more information:"
+			ewarn
+			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
+
+			break
+		done
+	fi
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 52ccd0715504..72187a377b7e 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index ca7d6c77ec02..c1ddbbf15c76 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -1 +1,2 @@
 DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160
+DIST rbot-0.9.15_p20210609.tar.gz 769331 BLAKE2B 7dcdb3ffefefc0b2bfc8d232aec7fec2efecbbf2b025745673acac21733ed115c247cd988db0fb2739174ab1dad9fada83e1a291219e480d294ac32d1bbaad38 SHA512 068e3171bc2d2d0ffea36fbdf342766672fb83b9a4359b154b44b5e0283e6d1d0308dd7fbd66b515bcabb4ecc0eeca95fe670b49654e5d082a0be376138d4e50
diff --git a/net-irc/rbot/rbot-0.9.15_p20210609.ebuild b/net-irc/rbot/rbot-0.9.15_p20210609.ebuild
new file mode 100644
index 000000000000..76d3cf5e8335
--- /dev/null
+++ b/net-irc/rbot/rbot-0.9.15_p20210609.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31"
+
+GITHUB_COMMIT="3ace72d5642284665fce2c33c99dfeb1b931b2c6"
+inherit ruby-ng strip-linguas
+
+DESCRIPTION="A ruby IRC bot"
+HOMEPAGE="https://ruby-rbot.org/"
+SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( feh GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="spell aspell timezone translator nls figlet
+	fortune cal host sqlite toilet"
+ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
+RUBY_S="${PN}-${GITHUB_COMMIT}"
+
+CDEPEND="
+	acct-group/rbot
+	acct-user/rbot
+"
+
+RDEPEND+="
+	${CDEPEND}
+	spell? (
+		aspell? ( app-text/aspell )
+		!aspell? ( app-text/hunspell )
+	)
+	figlet? ( app-misc/figlet )
+	sqlite? ( dev-ruby/sqlite3 )
+	toilet? ( app-misc/toilet )
+	fortune? ( games-misc/fortune-mod )
+	cal? ( sys-apps/util-linux )
+	host? ( net-dns/bind-tools )"
+
+DEPEND+="${CDEPEND}"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/sqlite3
+	)
+	nls? (
+		>=dev-ruby/ruby-gettext-2
+		dev-ruby/rake
+	)"
+
+ruby_add_rdepend "
+	dev-ruby/tokyocabinet
+	timezone? ( dev-ruby/tzinfo:* )
+	translator? ( dev-ruby/mechanize )
+	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
+"
+
+all_ruby_prepare() {
+	eapply -p0 "${FILESDIR}"/rbot-rakefile-gettext.patch
+
+	# Avoid tests that are only compatible with ruby22
+	rm -f test/test_journal.rb || die
+
+	# Fix deprecated code that was removed with ruby22
+	sed -i -e 's/::Config/::RbConfig/' setup.rb || die
+
+	# Avoid tests for optional dependencies that are not packaged.
+	# sed -i -e '/RegistryDaybreakTest/,/^end/ s:^:#:' test/test_registry.rb || die
+
+	# Avoid broken tests that call code that doesn't exist
+	rm -f test/test_plugins_threshold.rb || die
+}
+
+all_ruby_compile() {
+	disable_rbot_plugin() {
+		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
+	}
+	use_rbot_plugin() {
+		use $1 && return
+		disable_rbot_plugin "$2"
+	}
+	rbot_conf() {
+		echo "$1: $2" >> "${T}"/rbot.conf
+	}
+	use_rbot_conf_path() {
+		use "$1" \
+			&& rbot_conf "$2" "$3" \
+			|| rbot_conf "$2" /bin/false
+	}
+
+	local spell_program="/usr/bin/hunspell -i"
+	if use !spell; then
+		disable_rbot_plugin spell
+		spell_program="/bin/false"
+	elif use aspell; then
+		spell_program="/usr/bin/ispell-aspell"
+	fi
+
+	rbot_conf spell.program "${spell_program}"
+
+	if use !figlet && use !toilet; then
+		disable_rbot_plugin figlet
+	fi
+
+	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
+	use_rbot_conf_path toilet toilet.path /usr/bin/toilet
+
+	use_rbot_plugin timezone time
+	use_rbot_plugin translator translator
+
+	use_rbot_plugin fortune fortune
+	use_rbot_conf_path fortune fortune.path /usr/bin/fortune
+
+	use_rbot_plugin cal cal
+	use_rbot_conf_path cal cal.path /usr/bin/cal
+
+	use_rbot_plugin host host
+	use_rbot_conf_path host host.path /usr/bin/host
+
+	local rbot_datadir="${D}"/usr/share/rbot
+
+	# This is unfortunately pretty manual at the moment, but it's just
+	# to avoid having to run special scripts to package new versions
+	# of rbot. The default if new languages are added that are not
+	# considered for an opt-out here is to install them, so you just
+	# need to add them later.
+	if use nls; then
+		strip-linguas ${ILINGUAS}
+		if [[ -n ${LINGUAS+set} ]]; then
+			# As the the language name used by the rbot data files does
+			# not correspond to the ISO codes we usually use for LINGUAS,
+			# the following list of local varables will work as a
+			# dictionary to get the name used by rbot from the ISO code.
+			local lang_rbot_zh_CN="traditional_chinese"
+			local lang_rbot_ru="russian"
+			local lang_rbot_nl="dutch"
+			local lang_rbot_de="german"
+			local lang_rbot_fi="finnish"
+			local lang_rbot_fr="french"
+			local lang_rbot_it="italian"
+			local lang_rbot_ja="japanese"
+
+			for lang in ${ILINGUAS}; do
+				has ${lang} ${LINGUAS} && continue
+
+				lang_varname="lang_rbot_${lang}"
+				lang_rbot=${!lang_varname}
+
+				rm -r \
+					"${S}"/data/rbot/languages/${lang_rbot}.lang \
+					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
+					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
+					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
+					"${S}"/po/${lang} &>/dev/null
+			done
+		fi
+
+		${RUBY} /usr/bin/rake makemo || die "locale generation failed"
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} setup.rb config --prefix="/usr" \
+		|| die "setup.rb install failed"
+}
+
+each_ruby_test() {
+	pushd test || die
+	${RUBY} -Ilib:. -e "Dir['test_*'].each{|f| require f}" || die
+	popd || die
+}
+
+each_ruby_install() {
+	${RUBY} setup.rb install --prefix="${D}" \
+		|| die "setup.rb install failed"
+}
+
+all_ruby_install() {
+	diropts -o rbot -g nobody -m 0700
+	keepdir /var/lib/rbot
+
+	insinto /etc
+	doins "${T}"/rbot.conf
+
+	newinitd "${FILESDIR}/rbot.init2" rbot
+	newconfd "${FILESDIR}/rbot.conf2" rbot
+}
+
+pkg_postinst() {
+	elog "rbot can be started as a normal service."
+	elog "Check /etc/conf.d/rbot file for more information about this feature."
+	ewarn "DEPRECATION NOTICE:"
+	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
+	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
+	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
+	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ec8cd0a4cb11..8b996a0f3a59 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libmbim/metadata.xml b/net-libs/libmbim/metadata.xml
index cbb9e5136915..bb3a90035797 100644
--- a/net-libs/libmbim/metadata.xml
+++ b/net-libs/libmbim/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
+    <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
   <upstream>
     <remote-id type="freedesktop-gitlab">mobile-broadband/libmbim</remote-id>
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 499da8b44f8b..69fdf63ced84 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,2 +1,3 @@
 DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754
 DIST libproxy-0.5.2.tar.gz 60024 BLAKE2B 7484b61f5eb3dbb148bce69c6d5d30d218c9392c559661c7e01e02339546c246afb47ab28956d90076d835f4a72ec260690cd0d3a52b8302ec238f1bb1eb87c0 SHA512 10d2d435288e8259bc16e6fc678bbd5edee7de8ef4235de29ed7740493690b33c3b1820f1a9befb60254069946e3ff3cc6130c7d19f34fff8062aec16dc1cbc8
+DIST libproxy-0.5.3.tar.gz 60069 BLAKE2B adfa982344470251667b113f12f77722f6793ceeec902ccf82e32e80e15836384fbe1ccbec8865fc877fa04b25e6985847eef75b4ce437dbf0410d16e2bd5f36 SHA512 0fa4c677372afa76a9f143abb1472af1df85e1190425ec4168b98e575a9b9c9fe3dcc56062609da8ef266d56dfb153e7f7a1c15aed2d385003d9f3f421d08590
diff --git a/net-libs/libproxy/libproxy-0.5.3.ebuild b/net-libs/libproxy/libproxy-0.5.3.ebuild
new file mode 100644
index 000000000000..485c43212d51
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.5.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib vala
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="https://github.com/libproxy/libproxy"
+SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="duktape gnome gtk-doc +introspection kde test vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}]
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	duktape? (
+		dev-lang/duktape:=
+		net-misc/curl
+	)
+	introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kde? ( kde-frameworks/kconfig:5 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_use test tests)
+		-Dconfig-env=true
+		$(meson_use gnome config-gnome)
+		-Dconfig-windows=false
+		-Dconfig-sysconfig=true
+		-Dconfig-osx=false
+		$(meson_use kde config-kde)
+		$(meson_native_use_bool duktape pacrunner-duktape)
+		$(meson_native_use_bool vala vapi)
+		$(meson_use duktape curl)
+		$(meson_native_use_bool introspection)
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml
index 315a6cf25473..6ef8fe82d4c9 100644
--- a/net-libs/libqmi/metadata.xml
+++ b/net-libs/libqmi/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
+    <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
   <slots>
     <subslots>libqmi-glib.so soname version</subslots>
diff --git a/net-libs/libqrtr-glib/metadata.xml b/net-libs/libqrtr-glib/metadata.xml
index 63bb0387cf76..26aedb1e65f2 100644
--- a/net-libs/libqrtr-glib/metadata.xml
+++ b/net-libs/libqrtr-glib/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
+    <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
   <slots>
     <subslots>libqrtr-glib.so soname version</subslots>
diff --git a/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch b/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch
new file mode 100644
index 000000000000..5eb0010092a8
--- /dev/null
+++ b/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/883285
+
+From e39b749619191226ccbf8730084c0d2dcadc9065 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sat, 8 Jul 2023 18:34:11 +0000
+Subject: [PATCH] Fix detection of dns_pton and dns_ntop with clang 16
+
+--- a/configure
++++ b/configure
+@@ -94,7 +94,8 @@ int main() {
+   char buf[64];
+   long x = 0;
+   inet_pton(AF_INET, &x, buf);
+-  return inet_ntop(AF_INET, &x, buf, sizeof(buf));
++  inet_ntop(AF_INET, &x, buf, sizeof(buf));
++  return 0;
+ } 
+ EOF
+ 
+-- 
+2.41.0
+
diff --git a/net-libs/udns/udns-0.4-r1.ebuild b/net-libs/udns/udns-0.4-r1.ebuild
deleted file mode 100644
index f8f8c3675854..000000000000
--- a/net-libs/udns/udns-0.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs
-
-DESCRIPTION="Async-capable DNS stub resolver library"
-HOMEPAGE="http://www.corpit.ru/mjt/udns.html"
-SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
-IUSE="ipv6 static +tools"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4-configure-clang16.patch
-)
-
-src_configure() {
-	# Uses non-standard configure script, econf doesn't work
-	CC="$(tc-getCC)" edo ./configure $(use_enable ipv6)
-}
-
-src_compile() {
-	emake $(usex tools shared sharedlib)
-}
-
-src_install() {
-	dolib.so libudns.so.0
-	dosym libudns.so.0 /usr/$(get_libdir)/libudns.so
-
-	if use tools; then
-		newbin dnsget_s dnsget
-		newbin ex-rdns_s ex-rdns
-		newbin rblcheck_s rblcheck
-	fi
-
-	doheader udns.h
-
-	doman udns.3
-	use tools && doman dnsget.1 rblcheck.1
-
-	dodoc NEWS NOTES TODO
-}
diff --git a/net-libs/udns/udns-0.4-r2.ebuild b/net-libs/udns/udns-0.4-r2.ebuild
new file mode 100644
index 000000000000..a963d2ac18b4
--- /dev/null
+++ b/net-libs/udns/udns-0.4-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Async-capable DNS stub resolver library"
+HOMEPAGE="http://www.corpit.ru/mjt/udns.html"
+SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
+IUSE="ipv6 static +tools"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-configure-clang16.patch
+	"${FILESDIR}"/${PN}-0.4-configure-pton-ntop-clang16.patch
+)
+
+src_configure() {
+	# Uses non-standard configure script, econf doesn't work
+	CC="$(tc-getCC)" edo ./configure $(use_enable ipv6)
+}
+
+src_compile() {
+	emake $(usex tools shared sharedlib)
+}
+
+src_install() {
+	dolib.so libudns.so.0
+	dosym libudns.so.0 /usr/$(get_libdir)/libudns.so
+
+	if use tools; then
+		newbin dnsget_s dnsget
+		newbin ex-rdns_s ex-rdns
+		newbin rblcheck_s rblcheck
+	fi
+
+	doheader udns.h
+
+	doman udns.3
+	use tools && doman dnsget.1 rblcheck.1
+
+	dodoc NEWS NOTES TODO
+}
diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 7cba3df6937e..7cbae12d5e78 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,2 +1,3 @@
 DIST xdp-tools-1.2.8.tar.gz 253786 BLAKE2B f745085b73da5193c3cdaf60c20dfa5de62f3d83487413c87b4c3d07b755dcf91cfbeb4ba970b4e04eef74b4cec4238057f4462074f49b7139d7652cb0f22998 SHA512 6ada9e433fcbefd13cebdffe93c3ce9159e9e09f1498d1615918ca6ecc4f11f03fcd9096980e8ceb7de126d4d8b953fa64917e777d54b5a3dfd1a9556de81626
 DIST xdp-tools-1.3.1.tar.gz 330516 BLAKE2B 89a61f47ba26efe6d0630d971e913e034d111d05c896e5af1bb28e6cb4e94133e6ecd827a10ee12a935ae2e6856f04556ac564ded1bcc65182766d656f8d0c5f SHA512 9dd434095a043158d14fb6829fa632fc4a0714dc0b6e08c219dfb55cb9f34005300db750115e08bd54210e90142bd499904616da077b8aa827e4de28c31be637
+DIST xdp-tools-1.4.0.tar.gz 337221 BLAKE2B 008dda0fcfd403e47ab2b8c801fc0a5c4e103fb3b9869f1d1bf5af258fc646dd5a0285d3126c012c9b81805408b9669da886b9fcf2fdf33b256f74bbf898222a SHA512 c17bd6e9e6e4cf59c33f4b9ae4e3e0434863d147abf80f87b425215261b96d4574898fa09cc2b201a427a5e9d49ad64d0c70e50e3f72e3a18c6fbdf7f4cd4a3a
diff --git a/net-libs/xdp-tools/files/1.4.0-toolchain.patch b/net-libs/xdp-tools/files/1.4.0-toolchain.patch
new file mode 100644
index 000000000000..d4bcb511310f
--- /dev/null
+++ b/net-libs/xdp-tools/files/1.4.0-toolchain.patch
@@ -0,0 +1,57 @@
+
+Patch from: https://github.com/xdp-project/xdp-tools/pull/341
+
+From b1377b35cd05daf4d3afc3d59839e9889a642ffb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Sat, 8 Jul 2023 12:34:20 +0200
+Subject: [PATCH] libxdp: don't use direct call to readelf for symbol table
+ comparison
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Gentoo CI previously reported symbol mismatches in libxdp
+(see #302 and https://bugs.gentoo.org/899742). This was
+caused by a direct call to 'readelf' instead of using the
+command injected by the environment/toolchain.
+The fix is simple: use $(READELF).
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+---
+ lib/libxdp/Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
+index 43de3e8a..532e0687 100644
+--- a/lib/libxdp/Makefile
++++ b/lib/libxdp/Makefile
+@@ -93,12 +93,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(SHARED_OBJDIR)
+ 
+ XDP_IN_SHARED	:= $(SHARED_OBJDIR)/libxdp.o $(SHARED_OBJDIR)/xsk.o
+ 
+-GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \
++GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \
+ 			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
+ 			   sed 's/\[.*\]//' | \
+ 			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
+ 			   sort -u | wc -l)
+-VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \
++VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \
+ 			      grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l)
+ 
+ check: $(CHECK_RULES)
+@@ -110,12 +110,12 @@ check_abi: $(OBJDIR)/libxdp.so
+ 		     "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
+ 		     "Please make sure all symbols are"	 \
+ 		     "versioned in $(VERSION_SCRIPT)." >&2;		 \
+-		readelf -s --wide $(XDP_IN_SHARED) |			 \
++		$(READELF) -s --wide $(XDP_IN_SHARED) |			 \
+ 		    cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' |	 \
+ 		    sed 's/\[.*\]//' |					 \
+ 		    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'|  \
+ 		    sort -u > $(OUTPUT)libxdp_global_syms.tmp;		 \
+-		readelf --dyn-syms --wide $(OUTPUT)libxdp.so |		 \
++		$(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so |		 \
+ 		    grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 |		 \
+ 		    sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; 	 \
+ 		diff -u $(OUTPUT)libxdp_global_syms.tmp			 \
diff --git a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild
new file mode 100644
index 000000000000..9df2ff21f8ae
--- /dev/null
+++ b/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="The libxdp library and various tools for use with XDP"
+HOMEPAGE="https://github.com/xdp-project/xdp-tools"
+SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+tools"
+
+DEPEND="
+	dev-libs/libbpf:=
+	dev-util/bpftool
+	net-libs/libpcap
+	sys-libs/zlib
+	virtual/libelf
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/grep[pcre]
+	>=sys-devel/clang-11.0.0
+"
+
+# Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
+QA_PREBUILT="usr/lib/bpf/*.o"
+
+MAKEOPTS+=" V=1"
+
+PATCHES=(
+	"${FILESDIR}"/1.3.1-no-Werror.patch
+	"${FILESDIR}"/${PV}-toolchain.patch
+)
+
+src_configure() {
+	export CC="$(tc-getCC)"
+	export LD="$(tc-getLD)"
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${PREFIX}/$(get_libdir)"
+	export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
+	export PRODUCTION=1
+	export DYNAMIC_LIBXDP=1
+	export FORCE_SYSTEM_LIBBPF=1
+
+	# bug 861587
+	filter-lto
+
+	default
+}
+
+src_test() { :; }
+
+src_install() {
+	default
+
+	# To remove the scripts/testing files that are installed.
+	rm -r "${ED}/usr/share/xdp-tools" || die
+	# We can't control static archive generation yet.
+	rm "${ED}/usr/$(get_libdir)/libxdp.a" || die
+
+	use tools || { rm "${ED}/usr/sbin"/* || die; }
+
+	# These are ELF objects but BPF ones.
+	dostrip -x /usr/lib/bpf
+}
+
+pkg_postinst() {
+	elog
+	elog "Many BPF utilities need access to a mounted bpffs virtual file system."
+	elog "Either mount it manually like this:"
+	elog
+	elog "  mount bpffs /sys/fs/bpf -t bpf -o nosuid,nodev,noexec,relatime,mode=700"
+	elog
+	elog "or add the following line to your /etc/fstab to always mount it at boot time:"
+	elog
+	elog "  bpffs  /sys/fs/bpf  bpf  nosuid,nodev,noexec,relatime,mode=700  0 0"
+	elog
+	elog "You can verify that bpffs is mounted with:"
+	elog
+	elog "  mount | grep /sys/fs/bpf"
+	elog
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 78809ed36cab..87b3ec3e5ec3 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 146d924f2570..797d4fa655a0 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,3 +1,3 @@
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
-DIST iperf-3.12.tar.gz 648136 BLAKE2B 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae SHA512 9b0600a19750311557833b32ca5c4be809ab98643522f125645dd8f83c482017e42fbe5fc9484624731176a59b67203a468eb81eebf1a37b9c1b3eff818857ba
 DIST iperf-3.13.tar.gz 648754 BLAKE2B 8b08ae0e67ed066c7dabd115b757fefff03196aa2d732b6d88e20cf82ea3a5431b9be753fcc7b331932a5e59dc3e24ff4b929a7a1af5b500704cdd5094bf6859 SHA512 067147edffa1d7482a9fc5d54638091f8bc099b9c45d9a471f4e33730463548fb2350749620f2ca3ff509cd7a9c4f63bf01f84cab36718edd8784ce7a15ca368
+DIST iperf-3.14.tar.gz 650626 BLAKE2B 3809689964721ec2f58d29985c1767bc12473f9b659fd8bd430adb00558ceda2519276dbc0df5cb9634ef96d3d98708b8413a712cdb372bd34a28a330049349f SHA512 a90fbaddd73e5b721a84cee71cefb63391c13f64107f5785e954e7c44e9a8c5072e402b6fe45434966d3cc58ac97227c608ca9719161fc23459c5e5efcf8232b
diff --git a/net-misc/iperf/iperf-3.12.ebuild b/net-misc/iperf/iperf-3.12.ebuild
deleted file mode 100644
index 43049cb7d17e..000000000000
--- a/net-misc/iperf/iperf-3.12.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_/}
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="sctp"
-
-DEPEND="
-	>=dev-libs/cJSON-1.7.15
-	dev-libs/openssl:=
-	sctp? ( net-misc/lksctp-tools )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.md RELNOTES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
-	"${FILESDIR}"/${PN}-3.12-fix-bashism.patch
-	"${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch
-)
-
-src_prepare() {
-	default
-
-	# Drop bundled cjson
-	rm src/cjson.{c,h} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with sctp)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/iperf.confd iperf3
-	newinitd "${FILESDIR}"/iperf3.initd iperf3
-	systemd_dounit contrib/iperf3.service
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-misc/iperf/iperf-3.14.ebuild b/net-misc/iperf/iperf-3.14.ebuild
new file mode 100644
index 000000000000..bac1a8c31e7d
--- /dev/null
+++ b/net-misc/iperf/iperf-3.14.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf"
+SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_/}
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+	>=dev-libs/cJSON-1.7.15
+	dev-libs/openssl:=
+	sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md RELNOTES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+	"${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop bundled cjson
+	rm src/cjson.{c,h} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with sctp)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	systemd_dounit contrib/iperf3.service
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild
new file mode 100644
index 000000000000..e5c93282a1f9
--- /dev/null
+++ b/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python API to get song lyrics from LyricWikia"
+HOMEPAGE="https://github.com/enricobacis/lyricwikia"
+SRC_URI="https://github.com/enricobacis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+PATCHES="${FILESDIR}/${P}-skip-online-test.patch"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# do not depend on deprecated dep
+	sed -i -e '/pytest-runner/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# rename the executable to avoid file conflict with net-im/lyrics-in-terminal
+	find "${D}" -name 'lyrics' -execdir mv {} lyricwikia \; || die
+}
+
+pkg_postinst() {
+	elog "Note that access to LyricWikia through this API (and products that use this API) should comply to the LyricWikia terms of use"
+	elog ""
+	elog "LyricWikia is now offline, this package is provided solely for the purpose of satisfying media-video/vidify's dependencies"
+}
diff --git a/net-misc/lyricwikia/metadata.xml b/net-misc/lyricwikia/metadata.xml
index 270110553011..264f58e3938d 100644
--- a/net-misc/lyricwikia/metadata.xml
+++ b/net-misc/lyricwikia/metadata.xml
@@ -7,4 +7,7 @@
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">enricobacis/lyricwikia</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index 9d7421218e6c..136f0f9354a1 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
+    <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
   <use>
     <flag name="mbim">Enable MBIM modem protocol</flag>
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 3c81569d2310..723094d86e23 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups/cups-2.4.6.ebuild b/net-print/cups/cups-2.4.6.ebuild
index bd1cbc9533a8..f853476a539d 100644
--- a/net-print/cups/cups-2.4.6.ebuild
+++ b/net-print/cups/cups-2.4.6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 	fi
 fi
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 49226d22b87d..950fa373123b 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/kismet/kismet-2022.08.1-r1.ebuild b/net-wireless/kismet/kismet-2022.08.1-r1.ebuild
deleted file mode 100644
index 0a5165e0f65b..000000000000
--- a/net-wireless/kismet/kismet-2022.08.1-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit autotools python-single-r1 udev systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
-	inherit git-r3
-	RESTRICT="strip"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/_beta/-BETA}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P/BETA/beta}
-
-	#normally we want an official release
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-
-	#but sometimes we want a git commit
-	#COMMIT="9ca7e469cf115469f392db7436816151867e1654"
-	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-
-	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	acct-user/kismet
-	acct-group/kismet
-	networkmanager? ( net-misc/networkmanager:= )
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd:=
-	net-libs/libwebsockets:=[client,lejp]
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	libusb? ( virtual/libusb:1 )
-	dev-libs/protobuf-c:=
-	dev-libs/protobuf:=
-	$(python_gen_cond_dep '
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	')
-	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	ubertooth? ( net-wireless/ubertooth:= )
-	"
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_USEDEP}]
-	')
-	rtlsdr? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-		net-wireless/rtl-sdr
-	)
-	selinux? ( sec-policy/selinux-kismet )
-"
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	<dev-libs/libfmt-9
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	#this was added to quiet macosx builds but it makes gcc builds noisier
-	sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
-
-	#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
-
-	rm -r boost || die
-	rm -r fmt || die
-
-	#dev-libs/jsoncpp
-	#rm -r json || die
-	#sed -i 's#"json/json.h"#<json/json.h>#' jsoncpp.cc kis_net_beast_httpd.h \
-	#	log_tools/kismetdb_clean.cc log_tools/kismetdb_dump_devices.cc \
-	#	log_tools/kismetdb_statistics.cc log_tools/kismetdb_to_gpx.cc \
-	#	log_tools/kismetdb_to_kml.cc log_tools/kismetdb_to_pcap.cc \
-	#	log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \
-	#	trackedelement.h trackedelement_workers.h
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in || die
-
-	eapply_user
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-	# VERSION was incorrectly removed in 4e490cf0b49a287e964df9c5e5c4067f6918909e upstream
-	# https://github.com/kismetwireless/kismet/issues/427
-	# https://bugs.gentoo.org/864298
-	echo "${PV}" > VERSION
-}
-
-src_configure() {
-	econf \
-		$(use_enable libusb libusb) \
-		$(use_enable pcre) \
-		$(use_enable lm-sensors lmsensors) \
-		$(use_enable networkmanager libnm) \
-		$(use_enable ubertooth) \
-		--sysconfdir=/etc/kismet \
-		--disable-optimization
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	python_optimize
-	emake DESTDIR="${D}" forceconfigs
-	use udev && udev_dorules packaging/udev/*.rules
-
-	insinto /usr/share/${PN}
-	doins Makefile.inc
-	if [ "${PV}" = "9999" ];then
-		doins "${FILESDIR}"/gdb
-		dobin "${FILESDIR}"/kismet-gdb
-	fi
-
-	dodoc README*
-	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
-	systemd_dounit packaging/systemd/kismet.service
-}
-
-pkg_preinst() {
-	if use suid; then
-		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_cap_pcapfile
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_cap_pcapfile
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
-
-migrate_config() {
-	einfo "Kismet Configuration files are now read from /etc/kismet/"
-	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then
-		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
-	fi
-	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
-		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
-	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
-		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test ${v} -lt 2019.07.2 ; then
-				migrate_config
-				break
-			fi
-			if ver_test ${v} -eq 9999 ; then
-				migrate_config
-				break
-			fi
-		done
-	fi
-	udev_reload
-}
-pkg_postrm() {
-	udev_reload
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a4cb2cd050f7..9aa922e951a0 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 7bc135207b0c..00a675095efc 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-07-09)
+# sys-libs/libhugetlbfs is broken w/ newer glibc, bug #806079
+sys-apps/nvme-cli hugepages
+
 # Michał Górny <mgorny@gentoo.org> (2023-06-24)
 # dev-db/mongodb builds practically only on the authors' computer.
 dev-python/pymongo test-full
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index b11621632a51..3eae4f7b546e 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2023-07-08)
+# Uses attr even if disabling is requested, bug 910070
+# Workaround that should fix some stage builds
+>=sys-devel/gettext-0.22-r1 xattr
+
 # Joonas Niilola <juippis@gentoo.org> (2023-06-06)
 # 114 looks very broken regarding unified build. It has too many 
 # conditions when it works and when it doesn't. Bug #905780
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index ff18eb9cf1eb..b500832a58bf 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -50,12 +50,6 @@ dev-python/subprocess-tee test-full
 # app-text/pandoc is not stable
 app-text/nuspell doc
 
-# Sam James <sam@gentoo.org> (2022-02-11)
-# Needs glibc-2.35(?) (or <2.34) which is not yet even keyworded but
-# won't be stable for a while. Can be unmasked then.
-# bug #806079
-sys-apps/nvme-cli hugepages
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-12-24)
 # test deps are not stable
 >=sys-fs/zfs-2.0.7 test-suite
diff --git a/profiles/features/big-endian/package.mask b/profiles/features/big-endian/package.mask
index 33a1b137be24..13300d04d70e 100644
--- a/profiles/features/big-endian/package.mask
+++ b/profiles/features/big-endian/package.mask
@@ -1,6 +1,11 @@
 # Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-30)
+# Test failures on BE
+# https://github.com/libjxl/libjxl/issues/2433
+media-libs/libjxl
+
 # James Le Cuirot <chewi@gentoo.org> (2023-06-24)
 # Test failures on BE (#901391).
 # https://github.com/any1/neatvnc/issues/85
diff --git a/profiles/features/big-endian/use.mask b/profiles/features/big-endian/use.mask
index 146182d4c1f9..49de7dd81e15 100644
--- a/profiles/features/big-endian/use.mask
+++ b/profiles/features/big-endian/use.mask
@@ -1,6 +1,11 @@
 # Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-30)
+# media-libs/libjxl casualties
+# https://github.com/libjxl/libjxl/issues/2433
+jpegxl
+
 # matoro <matoro_gentoo@matoro.tk> (2023-05-05)
 # media-libs/zimg casualties (https://github.com/sekrit-twc/zimg/pull/156)
 zimg
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 4a7b55def97a..90847dcce68f 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -26,6 +26,7 @@ dev-python/dirty-equals
 dev-python/inflect
 dev-python/jaraco-itertools
 dev-python/josepy
+>=dev-python/jsonschema-4.18.0
 dev-python/jsonschema-spec
 dev-python/jsonschema-specifications
 dev-python/keyring
@@ -39,6 +40,7 @@ dev-python/mkdocs-i18n
 dev-python/mkdocs-material-extensions
 dev-python/mkdocs-git-revision-date-localized-plugin
 dev-python/oauthlib
+dev-python/openapi-schema-validator
 dev-python/openapi-spec-validator
 dev-python/openstacksdk
 dev-python/orjson
diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults
index 9dee8c00f5f0..e4b9746c663a 100644
--- a/profiles/prefix/darwin/macos/arch/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="x64-macos"
 ACCEPT_KEYWORDS="~x64-macos"
 
+USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
 CPU_FLAGS_X86="mmx mmxext sse sse2"
 
 # multilib build stuff, single ABI (no multilib)
diff --git a/profiles/prefix/darwin/macos/arch/x64/use.mask b/profiles/prefix/darwin/macos/arch/x64/use.mask
index 01a9fae674b6..6bf08722e781 100644
--- a/profiles/prefix/darwin/macos/arch/x64/use.mask
+++ b/profiles/prefix/darwin/macos/arch/x64/use.mask
@@ -4,3 +4,26 @@
 # Unmask the flag corresponding to the default ABI
 -x64-macos
 -abi_x86_64
+
+# Benda Xu <heroxbd@gentoo.org> (2023-07-09)
+# Unmask the CPU-flag related USE EXPAND, as in the general arch/amd64
+
+-cpu_flags_x86_3dnow
+-cpu_flags_x86_3dnowext
+-cpu_flags_x86_aes
+-cpu_flags_x86_avx
+-cpu_flags_x86_avx2
+-cpu_flags_x86_fma3
+-cpu_flags_x86_fma4
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_padlock
+-cpu_flags_x86_popcnt
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_sse3
+-cpu_flags_x86_sse4_1
+-cpu_flags_x86_sse4_2
+-cpu_flags_x86_sse4a
+-cpu_flags_x86_ssse3
+-cpu_flags_x86_xop
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index cc6f25ce78cf..a0d4caecafae 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,8 +1,13 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Benda Xu <heroxbd@gentoo.org> (2023-07-09)
+# Requires Glibc <sys/xattr.h> to work properly.
+# For example, 'lgetxattr' is not available on macOS or gnulib.
+# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html
+sys-apps/attr
+
 # Fabian Groffen <grobian@gentoo.org> (2023-06-05)
 # Fails to compile using GCC, misdetecting sincosf
 # https://github.com/harfbuzz/harfbuzz/issues/4266
-=media-libs/harfbuzz-7.2.0
 =media-libs/harfbuzz-7.3.0
diff --git a/profiles/prefix/darwin/macos/use.mask b/profiles/prefix/darwin/macos/use.mask
new file mode 100644
index 000000000000..334d27168fee
--- /dev/null
+++ b/profiles/prefix/darwin/macos/use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Benda Xu <heroxbd@gentoo.org> (2023-07-09)
+# xattr requires sys-apps/attr, which is masked.
+xattr
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index fbda04428af4..47b1d8ab9f58 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (2014-01-14)
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index 980886cdc0dc..b3b6dcd4f1e3 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 #Add USE flags that don't work on Darwin/OpenDarwin/OS X here
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index bd2fe8fd3273..dbb1185a8cae 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Benda Xu <heroxbd@gentoo.org> (2023-07-09)
+# Requires Glibc <sys/xattr.h> to work properly.
+# For example, 'lgetxattr' is not available on Solaris or gnulib.
+# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html
+sys-apps/attr
+
 # Fabian Groffen <grobian@gentoo.org> (2023-06-09)
 # Fails to compile due to missing DT_* symbols
 # fix: https://lore.kernel.org/git/20230606205935.3183276-1-asedeno@google.com/
diff --git a/profiles/prefix/sunos/solaris/use.mask b/profiles/prefix/sunos/solaris/use.mask
new file mode 100644
index 000000000000..334d27168fee
--- /dev/null
+++ b/profiles/prefix/sunos/solaris/use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Benda Xu <heroxbd@gentoo.org> (2023-07-09)
+# xattr requires sys-apps/attr, which is masked.
+xattr
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 875fdb97c4dd..1cc476b28157 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Re-add SunOS libc
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3c6a1d68f2f7..f983b7e83c40 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8232,7 +8232,6 @@ sys-fs/android-file-transfer-linux:zune - Enable support for Microsoft Zune
 sys-fs/avfs:lzip - Enable app-arch/lzip support via app-arch/lzlib
 sys-fs/avfs:webdav - Allow mounting WebDAV shares via net-libs/neon
 sys-fs/bcachefs-tools:fuse - Enable bcachefs FUSE support (experimental!)
-sys-fs/bees:tools - Build extra tools useful for debugging (fiemap, fiewalk)
 sys-fs/btrfs-progs:convert - Build ext2 conversion utility (btrfs-convert)
 sys-fs/btrfs-progs:reiserfs - Enable reiserfs support in btrfs-convert tool.
 sys-fs/btrfs-progs:static - Build static binaries in addition to the dynamic ones
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 0613147f2248..28ead5ccf573 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 6b7f77954444..978525436fff 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -3,25 +3,19 @@ DIST gromacs-2019.6.tar.gz 33446147 BLAKE2B adc21fb6b841b06d499607f8c0166a673645
 DIST gromacs-2020.7.tar.gz 29175554 BLAKE2B 98f1aa415946f8eb113febc81105f0c1b0919b96fc3c55a0ab83bf3950ff509b81eade92e645adb0bc2b407df239e20cf3f19828b6e08616437c8693c1fddcc8 SHA512 1d375c44cec38445e56cea252623b5b6c565680268999d4b6c14d6dc38759a27227655b2d29efaab9f9115d3677b446cb555e11cddafa0dc10c4827caaa2477b
 DIST gromacs-2021.6.tar.gz 38012702 BLAKE2B 023ae37dc53643758afa050fd179cd66f3c6d6266f6afceee5eb35c890a3ae284956f2bc2409156d6e1fa03a7f23f7b04c27e1820547fd5f147b344d94da7d40 SHA512 65d7874e5cd838ce4f29d033c66304738ccc30f1987f9f8541725058b2fc4551302a399f6ce773e81ac9485963187c48feaf92c71789f4c345c82bd335f806a7
 DIST gromacs-2021.7.tar.gz 38028032 BLAKE2B 2dc1b15ca8692ca5cf4ad1c7a266b9e2ced064d34a63cef61fea69e48231dd0310cfd8484d29c56cdb599f795d7655959f40038ac933b46ad2841d57bf2b3646 SHA512 ca478533da3bcb377fda30682660db8eb13beef6456fac6013a1a97ec3be60b5594567412e1e2a31392e484f9a40a22da1f12336f4738cf0422ff4f3e8814609
-DIST gromacs-2022.4.tar.gz 40352282 BLAKE2B 616ba05a70a483d7d8fadefb383ac9fc8825ac09ea92f55a0222c57ac91e4a045fb55405ec963303d8dbabb04b3d1f8c73062785b3812b3c6b7582e002dc5538 SHA512 15c642f2b63c1731a01a3b58c13d454f57c29607554a6693c2e62f38da574c6d596c5cb6f361e0feb5e1069b3b19bb49ceaa432c030da91f48e41654e3e6a62f
 DIST gromacs-2022.5.tar.gz 40362776 BLAKE2B e77c96cd995fb6c8284bcf9728e2f95e265911f643c69d00cc5910c6d22ada41293a1cb74033e708957776551b253453f64dba46497d68b2f73c675e94f30ddd SHA512 79310d6fd39a160e7bbc661a04540c9bcb89f40c133d1031ca16998ef0a67fc4a023f57950b22793f0c91b5fe47fd78cb2e7afedb50fe9251b1c920c9267344d
 DIST gromacs-2023.1.tar.gz 41934072 BLAKE2B 6d04642ba37a8563fafc10e0be83e33aab5ce25ef43ec2c9555e84328096bbe61426558a1433b086028f3c6637a5b3ae82241e67f206c0dd0b5254f5ec27ae4c SHA512 4bddbbc56f26487db9d35f371d65725289d1355dc4c295d32698499e05eb74e31d4db579fc1f665edb55a68b002bddacf37c0f05d3f970b1111c149990d434b1
-DIST gromacs-2023.tar.gz 41863526 BLAKE2B 81669eaf176e48855e168da81f410f949851a5b7d1fde43ee367f4bbaeef4a61b963e7c936c8a07d0eb51ad0e412e2826c6dd194c1df6d3ba39490decdf9fb21 SHA512 4593a0802d809ea797c3d3ba157851c279e9569e96c3aefa2dbcf97b5a1a74cd9840f0fcf0f032f49024691458941efb43e59e4e05c7ee44ee46d6b3621e52d5
 DIST manual-2018.8.pdf 10025023 BLAKE2B afb0a6e6a72d78df743fcb57e7c1716848589e571dd35167b957a9b407ca27978ccfb6cb9e0df9c9439b888f352501a00ba32281ed1e0b4193bd606f1d77152e SHA512 b1972f7ce965bfc9377542993c5943ea4868a8ed23a969d4203264746d6bea3a7a65c6379196ece37fd6d68ec7ec80f827bde87d1049284af7082759a124f1d5
 DIST manual-2019.6.pdf 12702376 BLAKE2B c350127bc06a9eb3dee73da39037c84daeb89500e23cb131bd19a150bf60602d4dde7611e0c6f0f344af4093e96a899303dac71b4df56fd0c44c3a48a56606b7 SHA512 dfdff67c2c1c9ce1f1c236b7686c5331b0fe86951da6c98eddd6a3e748815e0be0a9653ae4318469fcdd913c4e7c355d64a997cc80b9d9fbe6282ef6d98e61eb
 DIST manual-2020.7.pdf 11850780 BLAKE2B 38594e87993badfbbcf47d6010a7f67d3c3426dab85e1462916b4d62be27b5764953f912cf2b71ee24877e0bfa27b3f74431da2da81b4977d58cb66b2cc795a3 SHA512 4f184f2c90e0bac01a48069cc546cd5b04fa5f543f90dd2d68c6d17be278152fd09456b6a6c5c8236f8fb85a174d6ec7a1c7b44d437b4e6fea5d0ada73cec0f6
 DIST manual-2021.6.pdf 12256595 BLAKE2B 5d808e38571b38c1f6e0d115f6e604238206cc001f59d05ed855e80c324c0e6fd7767adb723b3d0edd1267ae5973a3b83b76bd04d2dc99769e6440600d8e2146 SHA512 64fe56422d7417f6f61b10346c99e24c3f423f0cedc3794e0809250282bc87ef692b47ae6c3f95ad7994aa3860ed82035cbacc76eb78a2f54a29052a05260af2
 DIST manual-2021.7.pdf 12256526 BLAKE2B 6f298d7dac142f66914bbc2ea7d6ca70c4aeafaf33ccf12336d5cec64b1f1097b5332c767bb411ccef706ec6184479a84bcf59bda21c4249d45d8ce3dea08e79 SHA512 197765accb8ab6c5f1cc94b2697ff1817e157d85fa231dfe36a85036076e04da2a8035de66aba4f46c6dd7f553176357b94c92e1da5d1dabc574c627deee5279
-DIST manual-2022.4.pdf 13080976 BLAKE2B 45685fa1d727aa30425e946ac72e0bd723528032e3fb45525d3c025316ee2682ea3c9cc2fd75b5cd4e900adbc6e7f577e3368d9e0681294fd1515df3d2e5d840 SHA512 a7ac3a80a90f14b6917e15633d77230d24cdcf19ade38d14b35c6451074848a7754b33c612e2a26a657f2edd3d6710e5a8130cacb107d4085d1bd934267ad623
 DIST manual-2022.5.pdf 13081119 BLAKE2B 7a0ffd086d98527d42da4a22984d8351ad7861e32951e8b65c88e7d0df1559303750886ae31a7c158b4e22f616f6dd5deed9a63b0ed114bb1e0adfda9350a487 SHA512 707869ee6052f1b7f75376b0f78fcc4859035234957cc740bd770ea3bea3a591f7fc1fbc0b8526baab48eebfa506d03927df94ddc9c412c75dc2f2864574dd82
 DIST manual-2023.1.pdf 13526498 BLAKE2B a9aabcb722954c9c83a8f5945c85e634b0b82ace8b9b077c3f2b9ff432ca71d3e2d5ca2dd52d6ce489d77d3d4ca7b41d75e5566205bb8855caa650fa2722e5ec SHA512 b6ca6c822ac5b3cbe3c84d8fd51d3ed465268c00bb5f96e2afa557d45f9c534b0de278f33a0fdf43080c9c619344b98cd71847e17b297a789eec4c8b42dea7b2
-DIST manual-2023.pdf 13516908 BLAKE2B 03a62190921c1a5ddf1ce6b0af5f8d83eaea26d31ac9b7e2f59f8b08e350d7147ee03ff8ec4e81e43777d04fa3d91c96d2a3dc8daa53a2565df02c39d6897d06 SHA512 2b16ca234941ede6415f89e0e31ee611ea1324454f5ddaf3cbcbdfbb5e864344faf012e5106131dcb9d3c1ffbbac358f1ea387166b1e45035e6427e344ff1964
 DIST regressiontests-2018.8.tar.gz 67855469 BLAKE2B 34c9b339f6229f483afbb5192ee6ba8b8f72d5c26907a853af9c53dfece0d88739e48f6b44b78d1c010f988f9385d077285300522164f533a5861e9dda879275 SHA512 3642389d27bd1942cd0f091c940ae97b197b94856a387fe581dc516b0d4169480f16551d4ba357f9282b3337d605c286d51dd38112ac87c826dda634904836bb
 DIST regressiontests-2019.6.tar.gz 67643195 BLAKE2B 1e054e24b187946f7ea28090d4f20cf8e1d79a26253f57ba07d130e0773d8541b8a1552a38023d31a68ce8bc62d8e0af1d98609234bb3e7d3e6d567307ebb386 SHA512 eacf1c55b982515a305c29459fe80a7cd558a8481e5689962aa956148af542568b1d1ce59c6784ecb0afd4768c2b664afa21e12af2d89ae2b06b1ba61ad72036
 DIST regressiontests-2020.7.tar.gz 48541487 BLAKE2B 255608b52158c6c01e7c7c4dcf075128ecf22b2f26d32e8c203de8a4bc69c60ec95f49cf8ccd64abc3073c5e8dca9d6b01daed9dfb8f67bce2dd068ed01acd05 SHA512 2458582f94f3c9f4e1454824ce3940b4f5b6cb2151d06846c42e7a9448296fd2a6df4f53be9624e0d3317d2b59f89bb5348eb8b2970d7b46ac22ca989ef3458a
 DIST regressiontests-2021.6.tar.gz 48537070 BLAKE2B 982fad6b23da5c1e6d32009f9f08772419c08f15549aea85ec0cd144c7faf5b48ed9b49a2cae662c28008514911cc18e0b39b994854d95f4f206e728b76f3fe5 SHA512 9c0ca29df822bc13005fd35bdb85cc075ea667112ae1670af0d8306cdd2bd348a9f9904bd10da6db458d9c11f4d44860e1fc62e9686d2c6e396e265d18768ba4
 DIST regressiontests-2021.7.tar.gz 48537500 BLAKE2B b0c97fa652cb9b972c50f29822f530fcaa2ec9acb6d6442114fc6446c54aade5eb1bfa153c69a7e8bf64b66e8b041d7f8e0d51e7f7b0516f9e03f3d9ad626193 SHA512 7cbead90aa6d62346dcf7c2249c3cfa179884b987a749624444d2f59d93e0322f7721143bf6eb44d26102635dc70a73546ef82d4647558b6320bfdd459074017
-DIST regressiontests-2022.4.tar.gz 48614599 BLAKE2B d41d59d4336455c87f3877be48ec49b2cdc989548c51ef9c8277b05bb6cf3dc05ebfa91a0248cc113c130a0ed19aae2c8316184caf37b72aa612b211fe41b144 SHA512 6495a286b201774ea2a922376ff5c0abaae7aaef1dfd28a1a61c817b5c6ac83db99300d43cc019745ca32a025e1f8a7f538342af539d9d753e494c550b429706
 DIST regressiontests-2022.5.tar.gz 48615858 BLAKE2B 6655946155291eb24f76832c76e21b5c606905e94426fd057ecdaa44d74844613ba288b651f94120553ef7d7f938de345ddaac7c3738d67bdad148359b7b4500 SHA512 8dd0c8a9b30f4c047fb756dee8eee1cb667803c231fd114717e3156c5694a195dec2b57d80b50b417312949bc4cb7da90027cc98102d84fa154a93862bc69790
 DIST regressiontests-2023.1.tar.gz 48613205 BLAKE2B b64716e08e5597676794209a0a951d2a5a46aab2b05bc1615d6f4ba666d5c81a7fe9247fc90ce8d9a5da1a9d52eea73d3d3cd4a4072a8bad66b8de0e06dfa599 SHA512 c6924ec75e456950cef0809ea9718be1bf9d85fe6e9ba5553b2df86ef604b0c7f54d41476f45cbc0ccf801ee0290a829bf4f9eb8d0773586bb8385efc5242d4d
-DIST regressiontests-2023.tar.gz 48620353 BLAKE2B 536550976dd761a59ff5684bc4928d534f7e45e69b0a86831e661887a3ad1ea72c1ddb72ab3a27237926083a711dd0f17ea60079fec201dd0992c1aee32ebd7e SHA512 f6b62fab39c77491698822b2f5b3f66c505e801266b31ea7ddc46378f69b524461187bba31b1b23d29f06bfc35630b0cae9a921aa92c0dfba46b2f1d904ce2b6
diff --git a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild
deleted file mode 100644
index bcd5c2754d50..000000000000
--- a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
-
-SRC_URI="
-	https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
-	doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
-	test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="https://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( <sys-apps/hwloc-2:= )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	opencl? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use doc; then
-			newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite gromacs related papers from list:"
-	einfo  "https://www.gromacs.org/Gromacs_papers"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2018.8-r2.ebuild b/sci-chemistry/gromacs/gromacs-2018.8-r2.ebuild
new file mode 100644
index 000000000000..47be575cee41
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2018.8-r2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
+
+SRC_URI="
+	https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
+	doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
+	test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
+KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="https://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +doc double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0= )
+	hwloc? ( <sys-apps/hwloc-2:= )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	opencl? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	#go from slowest to fastest acceleration
+	local acce="None"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( "-DGMX_GPU=ON" )
+		local opencl=( "-DGMX_USE_OPENCL=OFF" )
+		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			"${opencl[@]}"
+			"${cuda[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON
+			-DGMX_OPENMM=OFF
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			"${opencl[@]}"
+			"${cuda[@]}"
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use doc; then
+			newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite gromacs related papers from list:"
+	einfo  "https://www.gromacs.org/Gromacs_papers"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild
deleted file mode 100644
index 747eb39a8046..000000000000
--- a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
-
-SRC_URI="
-	https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
-	doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
-	test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="https://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	lmfit? ( sci-libs/lmfit:= )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	opencl? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-PATCHES=( "${FILESDIR}/${P}-missing-include.patch" )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	if use lmfit; then
-		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
-	else
-		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMXAPI=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use doc; then
-			newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite gromacs related papers from list:"
-	einfo  "https://www.gromacs.org/Gromacs_papers"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r3.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r3.ebuild
new file mode 100644
index 000000000000..d984f873f939
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2019.6-r3.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
+
+SRC_URI="
+	https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
+	doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
+	test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
+KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="https://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +doc double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:= )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0= )
+	hwloc? ( sys-apps/hwloc:= )
+	lapack? ( virtual/lapack )
+	lmfit? ( sci-libs/lmfit:= )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	${PYTHON_DEPS}
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	opencl? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+PATCHES=( "${FILESDIR}/${P}-missing-include.patch" )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	#go from slowest to fastest acceleration
+	local acce="None"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	if use lmfit; then
+		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
+	else
+		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( "-DGMX_GPU=ON" )
+		local opencl=( "-DGMX_USE_OPENCL=OFF" )
+		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			"${opencl[@]}"
+			"${cuda[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON
+			-DGMX_OPENMM=OFF
+			-DGMXAPI=OFF
+			"${opencl[@]}"
+			"${cuda[@]}"
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use doc; then
+			newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite gromacs related papers from list:"
+	einfo  "https://www.gromacs.org/Gromacs_papers"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2020.7-r1.ebuild b/sci-chemistry/gromacs/gromacs-2020.7-r1.ebuild
new file mode 100644
index 000000000000..21bdf25bd343
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2020.7-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="
+		https://gitlab.com/gromacs/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		git://git.gromacs.org/gromacs.git"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="
+		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
+		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
+		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
+	KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="https://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:= )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0= )
+	hwloc? ( sys-apps/hwloc:= )
+	lapack? ( virtual/lapack )
+	lmfit? ( sci-libs/lmfit:= )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	${PYTHON_DEPS}
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	build-manual? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	doc? ( !build-manual )
+	cuda? ( single-precision )
+	opencl? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+PATCHES=( "${FILESDIR}/${PN}-2020-pytest.patch" )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+	if use build-manual; then
+		# try to create policy for imagemagik
+		mkdir -p ${HOME}/.config/ImageMagick
+		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+		<?xml version="1.0" encoding="UTF-8"?>
+		<!DOCTYPE policymap [
+		<!ELEMENT policymap (policy)+>
+		!ATTLIST policymap xmlns CDATA #FIXED ''>
+		<!ELEMENT policy EMPTY>
+		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+		]>
+		<policymap>
+			<policy domain="coder" rights="read | write" pattern="PS" />
+			<policy domain="coder" rights="read | write" pattern="PS2" />
+			<policy domain="coder" rights="read | write" pattern="PS3" />
+			<policy domain="coder" rights="read | write" pattern="EPS" />
+			<policy domain="coder" rights="read | write" pattern="PDF" />
+			<policy domain="coder" rights="read | write" pattern="XPS" />
+		</policymap>
+		EOF
+	fi
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	if use custom-cflags; then
+		#go from slowest to fastest acceleration
+		local acce="None"
+		use cpu_flags_x86_sse2 && acce="SSE2"
+		use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+		use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+		use cpu_flags_x86_avx && acce="AVX_256"
+		use cpu_flags_x86_avx2 && acce="AVX2_256"
+	else
+		strip-flags
+	fi
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	if use lmfit; then
+		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
+	else
+		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex build-manual)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( "-DGMX_GPU=ON" )
+		local opencl=( "-DGMX_USE_OPENCL=OFF" )
+		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
+			"${opencl[@]}"
+			"${cuda[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			-DGMX_PYTHON_PACKAGE=$(usex python)
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON
+			-DGMX_OPENMM=OFF
+			-DGMXAPI=OFF
+			"${opencl[@]}"
+			"${cuda[@]}"
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile	python_packaging/all
+			BUILD_DIR="${WORKDIR}/${P}" \
+				distutils-r1_src_compile
+		fi
+		# not 100% necessary for rel ebuilds as available from website
+		if use build-manual; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake_src_install	python_packaging/install
+		fi
+		if use build-manual; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+
+		if use doc; then
+			if [[ ${PV} != *9999* ]]; then
+				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
+			fi
+		fi
+
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite gromacs related papers from list:"
+	einfo  "https://www.gromacs.org/Gromacs_papers"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2020.7.ebuild b/sci-chemistry/gromacs/gromacs-2020.7.ebuild
deleted file mode 100644
index 9a4372f3f255..000000000000
--- a/sci-chemistry/gromacs/gromacs-2020.7.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=no
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://gitlab.com/gromacs/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		git://git.gromacs.org/gromacs.git"
-	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="
-		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
-		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
-		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="https://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	lmfit? ( sci-libs/lmfit:= )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	build-manual? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	doc? ( !build-manual )
-	cuda? ( single-precision )
-	opencl? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-PATCHES=( "${FILESDIR}/${PN}-2020-pytest.patch" )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	if use build-manual; then
-		# try to create policy for imagemagik
-		mkdir -p ${HOME}/.config/ImageMagick
-		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-		<?xml version="1.0" encoding="UTF-8"?>
-		<!DOCTYPE policymap [
-		<!ELEMENT policymap (policy)+>
-		!ATTLIST policymap xmlns CDATA #FIXED ''>
-		<!ELEMENT policy EMPTY>
-		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-		]>
-		<policymap>
-			<policy domain="coder" rights="read | write" pattern="PS" />
-			<policy domain="coder" rights="read | write" pattern="PS2" />
-			<policy domain="coder" rights="read | write" pattern="PS3" />
-			<policy domain="coder" rights="read | write" pattern="EPS" />
-			<policy domain="coder" rights="read | write" pattern="PDF" />
-			<policy domain="coder" rights="read | write" pattern="XPS" />
-		</policymap>
-		EOF
-	fi
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	if use custom-cflags; then
-		#go from slowest to fastest acceleration
-		local acce="None"
-		use cpu_flags_x86_sse2 && acce="SSE2"
-		use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-		use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-		use cpu_flags_x86_avx && acce="AVX_256"
-		use cpu_flags_x86_avx2 && acce="AVX2_256"
-	else
-		strip-flags
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	if use lmfit; then
-		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
-	else
-		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex build-manual)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMXAPI=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use build-manual; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake_src_install	python_packaging/install
-		fi
-		if use build-manual; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-
-		if use doc; then
-			if [[ ${PV} != *9999* ]]; then
-				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
-			fi
-		fi
-
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite gromacs related papers from list:"
-	einfo  "https://www.gromacs.org/Gromacs_papers"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2021.7-r1.ebuild b/sci-chemistry/gromacs/gromacs-2021.7-r1.ebuild
new file mode 100644
index 000000000000..f209fdeadb3e
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2021.7-r1.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="
+		https://gitlab.com/gromacs/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		git://git.gromacs.org/gromacs.git"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="
+		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
+		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
+		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
+	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="https://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14:=[profiler] )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0= )
+	hwloc? ( sys-apps/hwloc:= )
+	lapack? ( virtual/lapack )
+	lmfit? ( sci-libs/lmfit:= )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	${PYTHON_DEPS}
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	build-manual? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	doc? ( !build-manual )
+	cuda? ( single-precision )
+	opencl? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021-musl-stdint.patch"
+	"${FILESDIR}/${PN}-2021-cuda-detection.patch"
+)
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+	if use build-manual; then
+		# try to create policy for imagemagik
+		mkdir -p ${HOME}/.config/ImageMagick
+		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+		<?xml version="1.0" encoding="UTF-8"?>
+		<!DOCTYPE policymap [
+		<!ELEMENT policymap (policy)+>
+		!ATTLIST policymap xmlns CDATA #FIXED ''>
+		<!ELEMENT policy EMPTY>
+		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+		]>
+		<policymap>
+			<policy domain="coder" rights="read | write" pattern="PS" />
+			<policy domain="coder" rights="read | write" pattern="PS2" />
+			<policy domain="coder" rights="read | write" pattern="PS3" />
+			<policy domain="coder" rights="read | write" pattern="EPS" />
+			<policy domain="coder" rights="read | write" pattern="PDF" />
+			<policy domain="coder" rights="read | write" pattern="XPS" />
+		</policymap>
+		EOF
+	fi
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+	local acce="AUTO"
+
+	if use custom-cflags; then
+		#go from slowest to fastest acceleration
+		acce="None"
+		if (use amd64 || use x86); then
+			use cpu_flags_x86_sse2 && acce="SSE2"
+			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+			use cpu_flags_x86_avx && acce="AVX_256"
+			use cpu_flags_x86_avx2 && acce="AVX2_256"
+			use cpu_flags_x86_avx512f && acce="AVX_512"
+		elif (use arm); then
+			use cpu_flags_arm_neon && acce="ARM_NEON"
+		elif (use arm64); then
+			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
+		fi
+	else
+		strip-flags
+	fi
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	if use lmfit; then
+		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
+	else
+		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex build-manual)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local gpu=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
+		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
+			"${gpu[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			-DGMX_PYTHON_PACKAGE=$(usex python)
+		)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON
+			-DGMX_OPENMM=OFF
+			-DGMXAPI=OFF
+			"${opencl[@]}"
+			"${cuda[@]}"
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile	python_packaging/all
+			BUILD_DIR="${WORKDIR}/${P}" \
+				distutils-r1_src_compile
+		fi
+		# not 100% necessary for rel ebuilds as available from website
+		if use build-manual; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake_src_install	python_packaging/install
+		fi
+		if use build-manual; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+
+		if use doc; then
+			if [[ ${PV} != *9999* ]]; then
+				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
+			fi
+		fi
+
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite gromacs related papers from list:"
+	einfo  "https://www.gromacs.org/Gromacs_papers"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2021.7.ebuild b/sci-chemistry/gromacs/gromacs-2021.7.ebuild
deleted file mode 100644
index 1a6dbcab47f4..000000000000
--- a/sci-chemistry/gromacs/gromacs-2021.7.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=no
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://gitlab.com/gromacs/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		git://git.gromacs.org/gromacs.git"
-	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="
-		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
-		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
-		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="https://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	lmfit? ( sci-libs/lmfit:= )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	build-manual? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	doc? ( !build-manual )
-	cuda? ( single-precision )
-	opencl? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021-musl-stdint.patch"
-	"${FILESDIR}/${PN}-2021-cuda-detection.patch"
-)
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	if use build-manual; then
-		# try to create policy for imagemagik
-		mkdir -p ${HOME}/.config/ImageMagick
-		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-		<?xml version="1.0" encoding="UTF-8"?>
-		<!DOCTYPE policymap [
-		<!ELEMENT policymap (policy)+>
-		!ATTLIST policymap xmlns CDATA #FIXED ''>
-		<!ELEMENT policy EMPTY>
-		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-		]>
-		<policymap>
-			<policy domain="coder" rights="read | write" pattern="PS" />
-			<policy domain="coder" rights="read | write" pattern="PS2" />
-			<policy domain="coder" rights="read | write" pattern="PS3" />
-			<policy domain="coder" rights="read | write" pattern="EPS" />
-			<policy domain="coder" rights="read | write" pattern="PDF" />
-			<policy domain="coder" rights="read | write" pattern="XPS" />
-		</policymap>
-		EOF
-	fi
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-	local acce="AUTO"
-
-	if use custom-cflags; then
-		#go from slowest to fastest acceleration
-		acce="None"
-		if (use amd64 || use x86); then
-			use cpu_flags_x86_sse2 && acce="SSE2"
-			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-			use cpu_flags_x86_avx && acce="AVX_256"
-			use cpu_flags_x86_avx2 && acce="AVX2_256"
-			use cpu_flags_x86_avx512f && acce="AVX_512"
-		elif (use arm); then
-			use cpu_flags_arm_neon && acce="ARM_NEON"
-		elif (use arm64); then
-			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
-		fi
-	else
-		strip-flags
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	if use lmfit; then
-		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
-	else
-		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex build-manual)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local gpu=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
-		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${gpu[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-		)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMXAPI=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use build-manual; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake_src_install	python_packaging/install
-		fi
-		if use build-manual; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-
-		if use doc; then
-			if [[ ${PV} != *9999* ]]; then
-				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
-			fi
-		fi
-
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite gromacs related papers from list:"
-	einfo  "https://www.gromacs.org/Gromacs_papers"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2022.4.ebuild b/sci-chemistry/gromacs/gromacs-2022.4.ebuild
deleted file mode 100644
index ca908310a723..000000000000
--- a/sci-chemistry/gromacs/gromacs-2022.4.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=no
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://gitlab.com/gromacs/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		git://git.gromacs.org/gromacs.git"
-	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="
-		https://ftp.gromacs.org/gromacs/${P}.tar.gz
-		doc? ( https://ftp.gromacs.org/manual/manual-${PV}.pdf )
-		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV}.tar.gz )"
-	# since 2022 arm support was dropped (but not arm64)
-	KEYWORDS="~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="https://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi[cxx] )
-	sci-libs/lmfit:=
-	>=dev-cpp/muParser-2.3:=
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	clang? ( >=sys-devel/clang-6:* )
-	build-manual? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}
-	<sci-chemistry/dssp-4"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	doc? ( !build-manual )
-	cuda? ( single-precision )
-	opencl? ( single-precision )
-	cuda? ( !opencl )
-	clang-cuda? ( clang cuda )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	# we can use clang as default
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	# clang-cuda need to filter mfpmath
-	if use clang-cuda ; then
-		filter-mfpmath sse
-		filter-mfpmath i386
-	fi
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	if use build-manual; then
-		# try to create policy for imagemagik
-		mkdir -p ${HOME}/.config/ImageMagick
-		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-		<?xml version="1.0" encoding="UTF-8"?>
-		<!DOCTYPE policymap [
-		<!ELEMENT policymap (policy)+>
-		!ATTLIST policymap xmlns CDATA #FIXED ''>
-		<!ELEMENT policy EMPTY>
-		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-		]>
-		<policymap>
-			<policy domain="coder" rights="read | write" pattern="PS" />
-			<policy domain="coder" rights="read | write" pattern="PS2" />
-			<policy domain="coder" rights="read | write" pattern="PS3" />
-			<policy domain="coder" rights="read | write" pattern="EPS" />
-			<policy domain="coder" rights="read | write" pattern="PDF" />
-			<policy domain="coder" rights="read | write" pattern="XPS" />
-		</policymap>
-		EOF
-	fi
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-	local acce="AUTO"
-
-	if use custom-cflags; then
-		#go from slowest to fastest acceleration
-		acce="None"
-		if (use amd64 || use x86); then
-			use cpu_flags_x86_sse2 && acce="SSE2"
-			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-			use cpu_flags_x86_avx && acce="AVX_256"
-			use cpu_flags_x86_avx2 && acce="AVX2_256"
-			use cpu_flags_x86_avx512f && acce="AVX_512"
-		elif (use arm); then
-			use cpu_flags_arm_neon && acce="ARM_NEON"
-		elif (use arm64); then
-			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
-		fi
-	else
-		strip-flags
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_USE_LMFIT=EXTERNAL
-		-DGMX_USE_MUPARSER=EXTERNAL
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex build-manual)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DGMX_DSSP_PROGRAM_PATH="${EPREFIX}/usr/bin/dssp"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local gpu=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
-		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
-		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=$(usex mpi)
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${gpu[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-		)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use build-manual; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile manual
-		fi
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake_src_install	python_packaging/install
-		fi
-		if use build-manual; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-
-		if use doc; then
-			if [[ ${PV} != *9999* ]]; then
-				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
-			fi
-		fi
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite gromacs related papers from list:"
-	einfo  "https://www.gromacs.org/Gromacs_papers"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2022.5-r1.ebuild b/sci-chemistry/gromacs/gromacs-2022.5-r1.ebuild
new file mode 100644
index 000000000000..33f192f4a04f
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2022.5-r1.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="
+		https://gitlab.com/gromacs/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		git://git.gromacs.org/gromacs.git"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="
+		https://ftp.gromacs.org/gromacs/${P}.tar.gz
+		doc? ( https://ftp.gromacs.org/manual/manual-${PV}.pdf )
+		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV}.tar.gz )"
+	# since 2022 arm support was dropped (but not arm64)
+	KEYWORDS="~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="https://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0= )
+	hwloc? ( sys-apps/hwloc:= )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi[cxx] )
+	sci-libs/lmfit:=
+	>=dev-cpp/muParser-2.3:=
+	${PYTHON_DEPS}
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	clang? ( >=sys-devel/clang-6:* )
+	build-manual? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}
+	<sci-chemistry/dssp-4"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	doc? ( !build-manual )
+	cuda? ( single-precision )
+	opencl? ( single-precision )
+	cuda? ( !opencl )
+	clang-cuda? ( clang cuda )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	# we can use clang as default
+	if use clang && ! tc-is-clang ; then
+		export CC=${CHOST}-clang
+		export CXX=${CHOST}-clang++
+	else
+		tc-export CXX CC
+	fi
+	# clang-cuda need to filter mfpmath
+	if use clang-cuda ; then
+		filter-mfpmath sse
+		filter-mfpmath i386
+	fi
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+	if use build-manual; then
+		# try to create policy for imagemagik
+		mkdir -p ${HOME}/.config/ImageMagick
+		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+		<?xml version="1.0" encoding="UTF-8"?>
+		<!DOCTYPE policymap [
+		<!ELEMENT policymap (policy)+>
+		!ATTLIST policymap xmlns CDATA #FIXED ''>
+		<!ELEMENT policy EMPTY>
+		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+		]>
+		<policymap>
+			<policy domain="coder" rights="read | write" pattern="PS" />
+			<policy domain="coder" rights="read | write" pattern="PS2" />
+			<policy domain="coder" rights="read | write" pattern="PS3" />
+			<policy domain="coder" rights="read | write" pattern="EPS" />
+			<policy domain="coder" rights="read | write" pattern="PDF" />
+			<policy domain="coder" rights="read | write" pattern="XPS" />
+		</policymap>
+		EOF
+	fi
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+	local acce="AUTO"
+
+	if use custom-cflags; then
+		#go from slowest to fastest acceleration
+		acce="None"
+		if (use amd64 || use x86); then
+			use cpu_flags_x86_sse2 && acce="SSE2"
+			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+			use cpu_flags_x86_avx && acce="AVX_256"
+			use cpu_flags_x86_avx2 && acce="AVX2_256"
+			use cpu_flags_x86_avx512f && acce="AVX_512"
+		elif (use arm); then
+			use cpu_flags_arm_neon && acce="ARM_NEON"
+		elif (use arm64); then
+			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
+		fi
+	else
+		strip-flags
+	fi
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_USE_LMFIT=EXTERNAL
+		-DGMX_USE_MUPARSER=EXTERNAL
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex build-manual)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DGMX_DSSP_PROGRAM_PATH="${EPREFIX}/usr/bin/dssp"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local gpu=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
+		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
+		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=$(usex mpi)
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
+			"${gpu[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			-DGMX_PYTHON_PACKAGE=$(usex python)
+		)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile	python_packaging/all
+			BUILD_DIR="${WORKDIR}/${P}" \
+				distutils-r1_src_compile
+		fi
+		# not 100% necessary for rel ebuilds as available from website
+		if use build-manual; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile manual
+		fi
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake_src_install	python_packaging/install
+		fi
+		if use build-manual; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+
+		if use doc; then
+			if [[ ${PV} != *9999* ]]; then
+				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
+			fi
+		fi
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite gromacs related papers from list:"
+	einfo  "https://www.gromacs.org/Gromacs_papers"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2022.5.ebuild b/sci-chemistry/gromacs/gromacs-2022.5.ebuild
deleted file mode 100644
index ca908310a723..000000000000
--- a/sci-chemistry/gromacs/gromacs-2022.5.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=no
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://gitlab.com/gromacs/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		git://git.gromacs.org/gromacs.git"
-	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="
-		https://ftp.gromacs.org/gromacs/${P}.tar.gz
-		doc? ( https://ftp.gromacs.org/manual/manual-${PV}.pdf )
-		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV}.tar.gz )"
-	# since 2022 arm support was dropped (but not arm64)
-	KEYWORDS="~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="https://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi[cxx] )
-	sci-libs/lmfit:=
-	>=dev-cpp/muParser-2.3:=
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	clang? ( >=sys-devel/clang-6:* )
-	build-manual? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}
-	<sci-chemistry/dssp-4"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	doc? ( !build-manual )
-	cuda? ( single-precision )
-	opencl? ( single-precision )
-	cuda? ( !opencl )
-	clang-cuda? ( clang cuda )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	# we can use clang as default
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	# clang-cuda need to filter mfpmath
-	if use clang-cuda ; then
-		filter-mfpmath sse
-		filter-mfpmath i386
-	fi
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	if use build-manual; then
-		# try to create policy for imagemagik
-		mkdir -p ${HOME}/.config/ImageMagick
-		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-		<?xml version="1.0" encoding="UTF-8"?>
-		<!DOCTYPE policymap [
-		<!ELEMENT policymap (policy)+>
-		!ATTLIST policymap xmlns CDATA #FIXED ''>
-		<!ELEMENT policy EMPTY>
-		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-		]>
-		<policymap>
-			<policy domain="coder" rights="read | write" pattern="PS" />
-			<policy domain="coder" rights="read | write" pattern="PS2" />
-			<policy domain="coder" rights="read | write" pattern="PS3" />
-			<policy domain="coder" rights="read | write" pattern="EPS" />
-			<policy domain="coder" rights="read | write" pattern="PDF" />
-			<policy domain="coder" rights="read | write" pattern="XPS" />
-		</policymap>
-		EOF
-	fi
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-	local acce="AUTO"
-
-	if use custom-cflags; then
-		#go from slowest to fastest acceleration
-		acce="None"
-		if (use amd64 || use x86); then
-			use cpu_flags_x86_sse2 && acce="SSE2"
-			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-			use cpu_flags_x86_avx && acce="AVX_256"
-			use cpu_flags_x86_avx2 && acce="AVX2_256"
-			use cpu_flags_x86_avx512f && acce="AVX_512"
-		elif (use arm); then
-			use cpu_flags_arm_neon && acce="ARM_NEON"
-		elif (use arm64); then
-			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
-		fi
-	else
-		strip-flags
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_USE_LMFIT=EXTERNAL
-		-DGMX_USE_MUPARSER=EXTERNAL
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex build-manual)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DGMX_DSSP_PROGRAM_PATH="${EPREFIX}/usr/bin/dssp"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local gpu=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
-		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
-		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=$(usex mpi)
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${gpu[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-		)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use build-manual; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile manual
-		fi
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake_src_install	python_packaging/install
-		fi
-		if use build-manual; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-
-		if use doc; then
-			if [[ ${PV} != *9999* ]]; then
-				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
-			fi
-		fi
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite gromacs related papers from list:"
-	einfo  "https://www.gromacs.org/Gromacs_papers"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
index ca908310a723..33f192f4a04f 100644
--- a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
@@ -43,7 +43,7 @@ IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precis
 
 CDEPEND="
 	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0= )
 	hwloc? ( sys-apps/hwloc:= )
diff --git a/sci-chemistry/gromacs/gromacs-2023.1-r1.ebuild b/sci-chemistry/gromacs/gromacs-2023.1-r1.ebuild
new file mode 100644
index 000000000000..7d65ee4958c2
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2023.1-r1.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="
+		https://gitlab.com/gromacs/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		git://git.gromacs.org/gromacs.git"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="
+		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
+		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
+		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
+	# since 2022 arm support was dropped (but not arm64)
+	KEYWORDS="~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="https://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0= )
+	hwloc? ( sys-apps/hwloc:= )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi[cxx] )
+	sci-libs/lmfit:=
+	>=dev-cpp/muParser-2.3:=
+	${PYTHON_DEPS}
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	clang? ( >=sys-devel/clang-6:* )
+	build-manual? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-copybutton[${PYTHON_USEDEP}]
+			dev-python/sphinx-inline-tabs[${PYTHON_USEDEP}]
+			dev-python/sphinx-argparse[${PYTHON_USEDEP}]
+			dev-python/sphinxcontrib-autoprogram[${PYTHON_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	doc? ( !build-manual )
+	cuda? ( single-precision )
+	opencl? ( single-precision )
+	cuda? ( !opencl )
+	clang-cuda? ( clang cuda )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	# we can use clang as default
+	if use clang && ! tc-is-clang ; then
+		export CC=${CHOST}-clang
+		export CXX=${CHOST}-clang++
+	else
+		tc-export CXX CC
+	fi
+	# clang-cuda need to filter mfpmath
+	if use clang-cuda ; then
+		filter-mfpmath sse
+		filter-mfpmath i386
+	fi
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+	if use build-manual; then
+		# try to create policy for imagemagik
+		mkdir -p ${HOME}/.config/ImageMagick
+		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+		<?xml version="1.0" encoding="UTF-8"?>
+		<!DOCTYPE policymap [
+		<!ELEMENT policymap (policy)+>
+		!ATTLIST policymap xmlns CDATA #FIXED ''>
+		<!ELEMENT policy EMPTY>
+		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+		]>
+		<policymap>
+			<policy domain="coder" rights="read | write" pattern="PS" />
+			<policy domain="coder" rights="read | write" pattern="PS2" />
+			<policy domain="coder" rights="read | write" pattern="PS3" />
+			<policy domain="coder" rights="read | write" pattern="EPS" />
+			<policy domain="coder" rights="read | write" pattern="PDF" />
+			<policy domain="coder" rights="read | write" pattern="XPS" />
+		</policymap>
+		EOF
+	fi
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+	local acce="AUTO"
+
+	if use custom-cflags; then
+		#go from slowest to fastest acceleration
+		acce="None"
+		if (use amd64 || use x86); then
+			use cpu_flags_x86_sse2 && acce="SSE2"
+			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+			use cpu_flags_x86_avx && acce="AVX_256"
+			use cpu_flags_x86_avx2 && acce="AVX2_256"
+			use cpu_flags_x86_avx512f && acce="AVX_512"
+		elif (use arm); then
+			use cpu_flags_arm_neon && acce="ARM_NEON"
+		elif (use arm64); then
+			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
+		fi
+	else
+		strip-flags
+	fi
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_USE_LMFIT=EXTERNAL
+		-DGMX_USE_MUPARSER=EXTERNAL
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex build-manual)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local gpu=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
+		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
+		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
+		local mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=$(usex mpi)
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
+			"${gpu[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			-DGMX_PYTHON_PACKAGE=$(usex python)
+		)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile	python_packaging/all
+			BUILD_DIR="${WORKDIR}/${P}" \
+				distutils-r1_src_compile
+		fi
+		# not 100% necessary for rel ebuilds as available from website
+		if use build-manual; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile manual
+		fi
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake_src_install	python_packaging/install
+		fi
+		if use build-manual; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+
+		if use doc; then
+			if [[ ${PV} != *9999* ]]; then
+				newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
+			fi
+		fi
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite gromacs related papers from list:"
+	einfo  "https://www.gromacs.org/Gromacs_papers"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2023.1.ebuild b/sci-chemistry/gromacs/gromacs-2023.1.ebuild
deleted file mode 100644
index f57ac5829eb7..000000000000
--- a/sci-chemistry/gromacs/gromacs-2023.1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=no
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://gitlab.com/gromacs/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		git://git.gromacs.org/gromacs.git"
-	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="
-		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
-		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
-		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-	# since 2022 arm support was dropped (but not arm64)
-	KEYWORDS="~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="https://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi[cxx] )
-	sci-libs/lmfit:=
-	>=dev-cpp/muParser-2.3:=
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	clang? ( >=sys-devel/clang-6:* )
-	build-manual? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-copybutton[${PYTHON_USEDEP}]
-			dev-python/sphinx-inline-tabs[${PYTHON_USEDEP}]
-			dev-python/sphinx-argparse[${PYTHON_USEDEP}]
-			dev-python/sphinxcontrib-autoprogram[${PYTHON_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	doc? ( !build-manual )
-	cuda? ( single-precision )
-	opencl? ( single-precision )
-	cuda? ( !opencl )
-	clang-cuda? ( clang cuda )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	# we can use clang as default
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	# clang-cuda need to filter mfpmath
-	if use clang-cuda ; then
-		filter-mfpmath sse
-		filter-mfpmath i386
-	fi
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	if use build-manual; then
-		# try to create policy for imagemagik
-		mkdir -p ${HOME}/.config/ImageMagick
-		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-		<?xml version="1.0" encoding="UTF-8"?>
-		<!DOCTYPE policymap [
-		<!ELEMENT policymap (policy)+>
-		!ATTLIST policymap xmlns CDATA #FIXED ''>
-		<!ELEMENT policy EMPTY>
-		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-		]>
-		<policymap>
-			<policy domain="coder" rights="read | write" pattern="PS" />
-			<policy domain="coder" rights="read | write" pattern="PS2" />
-			<policy domain="coder" rights="read | write" pattern="PS3" />
-			<policy domain="coder" rights="read | write" pattern="EPS" />
-			<policy domain="coder" rights="read | write" pattern="PDF" />
-			<policy domain="coder" rights="read | write" pattern="XPS" />
-		</policymap>
-		EOF
-	fi
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-	local acce="AUTO"
-
-	if use custom-cflags; then
-		#go from slowest to fastest acceleration
-		acce="None"
-		if (use amd64 || use x86); then
-			use cpu_flags_x86_sse2 && acce="SSE2"
-			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-			use cpu_flags_x86_avx && acce="AVX_256"
-			use cpu_flags_x86_avx2 && acce="AVX2_256"
-			use cpu_flags_x86_avx512f && acce="AVX_512"
-		elif (use arm); then
-			use cpu_flags_arm_neon && acce="ARM_NEON"
-		elif (use arm64); then
-			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
-		fi
-	else
-		strip-flags
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_USE_LMFIT=EXTERNAL
-		-DGMX_USE_MUPARSER=EXTERNAL
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex build-manual)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local gpu=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
-		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
-		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=$(usex mpi)
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${gpu[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-		)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use build-manual; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile manual
-		fi
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake_src_install	python_packaging/install
-		fi
-		if use build-manual; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-
-		if use doc; then
-			if [[ ${PV} != *9999* ]]; then
-				newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
-			fi
-		fi
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite gromacs related papers from list:"
-	einfo  "https://www.gromacs.org/Gromacs_papers"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2023.9999.ebuild b/sci-chemistry/gromacs/gromacs-2023.9999.ebuild
index f57ac5829eb7..7d65ee4958c2 100644
--- a/sci-chemistry/gromacs/gromacs-2023.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2023.9999.ebuild
@@ -43,7 +43,7 @@ IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precis
 
 CDEPEND="
 	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0= )
 	hwloc? ( sys-apps/hwloc:= )
diff --git a/sci-chemistry/gromacs/gromacs-2023.ebuild b/sci-chemistry/gromacs/gromacs-2023.ebuild
deleted file mode 100644
index f57ac5829eb7..000000000000
--- a/sci-chemistry/gromacs/gromacs-2023.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=no
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="
-		https://gitlab.com/gromacs/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		git://git.gromacs.org/gromacs.git"
-	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="
-		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
-		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
-		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-	# since 2022 arm support was dropped (but not arm64)
-	KEYWORDS="~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="https://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0= )
-	hwloc? ( sys-apps/hwloc:= )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi[cxx] )
-	sci-libs/lmfit:=
-	>=dev-cpp/muParser-2.3:=
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	clang? ( >=sys-devel/clang-6:* )
-	build-manual? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-copybutton[${PYTHON_USEDEP}]
-			dev-python/sphinx-inline-tabs[${PYTHON_USEDEP}]
-			dev-python/sphinx-argparse[${PYTHON_USEDEP}]
-			dev-python/sphinxcontrib-autoprogram[${PYTHON_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	doc? ( !build-manual )
-	cuda? ( single-precision )
-	opencl? ( single-precision )
-	cuda? ( !opencl )
-	clang-cuda? ( clang cuda )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	# we can use clang as default
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	# clang-cuda need to filter mfpmath
-	if use clang-cuda ; then
-		filter-mfpmath sse
-		filter-mfpmath i386
-	fi
-
-	cmake_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	if use build-manual; then
-		# try to create policy for imagemagik
-		mkdir -p ${HOME}/.config/ImageMagick
-		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-		<?xml version="1.0" encoding="UTF-8"?>
-		<!DOCTYPE policymap [
-		<!ELEMENT policymap (policy)+>
-		!ATTLIST policymap xmlns CDATA #FIXED ''>
-		<!ELEMENT policy EMPTY>
-		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-		]>
-		<policymap>
-			<policy domain="coder" rights="read | write" pattern="PS" />
-			<policy domain="coder" rights="read | write" pattern="PS2" />
-			<policy domain="coder" rights="read | write" pattern="PS3" />
-			<policy domain="coder" rights="read | write" pattern="EPS" />
-			<policy domain="coder" rights="read | write" pattern="PDF" />
-			<policy domain="coder" rights="read | write" pattern="XPS" />
-		</policymap>
-		EOF
-	fi
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-	local acce="AUTO"
-
-	if use custom-cflags; then
-		#go from slowest to fastest acceleration
-		acce="None"
-		if (use amd64 || use x86); then
-			use cpu_flags_x86_sse2 && acce="SSE2"
-			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-			use cpu_flags_x86_avx && acce="AVX_256"
-			use cpu_flags_x86_avx2 && acce="AVX2_256"
-			use cpu_flags_x86_avx512f && acce="AVX_512"
-		elif (use arm); then
-			use cpu_flags_arm_neon && acce="ARM_NEON"
-		elif (use arm64); then
-			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
-		fi
-	else
-		strip-flags
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_USE_LMFIT=EXTERNAL
-		-DGMX_USE_MUPARSER=EXTERNAL
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex build-manual)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local gpu=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
-		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
-		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		local mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=$(usex mpi)
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${gpu[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-		)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use build-manual; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake_src_compile manual
-		fi
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake_src_compile check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake_src_install	python_packaging/install
-		fi
-		if use build-manual; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-
-		if use doc; then
-			if [[ ${PV} != *9999* ]]; then
-				newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
-			fi
-		fi
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite gromacs related papers from list:"
-	einfo  "https://www.gromacs.org/Gromacs_papers"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index f57ac5829eb7..7d65ee4958c2 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -43,7 +43,7 @@ IUSE="blas clang clang-cuda cuda  +custom-cflags +doc build-manual double-precis
 
 CDEPEND="
 	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11:=[profiler] )
 	opencl? ( virtual/opencl )
 	fftw? ( sci-libs/fftw:3.0= )
 	hwloc? ( sys-apps/hwloc:= )
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 2bbb5f06be11..89f1cdcd35fc 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 22593c224ed0..5bd5fba6dce6 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.28.2.tar.bz2 158641485 BLAKE2B fbf121e9761135bcf511f55e84153e98b3fe7142887ac45a314bdc18f37ddd695ff3a117a087b842678a76f40927c591bf235a14fd4a8057ce70509f342b5bcf SHA512 287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad
 DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f SHA512 4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/qgis-3.28.2.ebuild b/sci-geosciences/qgis/qgis-3.28.2.ebuild
deleted file mode 100644
index 1a561cc37a44..000000000000
--- a/sci-geosciences/qgis/qgis-3.28.2.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 ~x86"
-fi
-inherit cmake python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	mapserver? ( python )
-	test? ( postgres )
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# At some point the dependency on qwtpolar should be
-# replaced with a dependency on qwt[polar]. Currently
-# it does not build with qwt-6.2[polar] though.
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( sci-geosciences/grass:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	pdal? ( sci-libs/pdal:= )
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-	serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( app-doc/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests want to be run inside a git repo
-	if [[ ${PV} != *9999* ]]; then
-		if use test; then
-			git init -q || die
-			git config user.email "larry@gentoo.org" || die
-			git config user.name "Larry the Cow" || die
-			git add . || die
-			git commit -m "init" || die
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=$(usex doc)
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=$(usex test)
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_PDAL=$(usex pdal)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QT5SERIALPORT=$(usex serial)
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	# We list all supported versions *by upstream for this version*
-	# here, even if we're not allowing it (e.g. bugs for now), so
-	# we enable/disable all the right versions. This is so qgis doesn't
-	# try to automatically use a version the build system knows about.
-	local supported_grass_versions=( 7 8 )
-	if use grass; then
-		# We can do this because we have a := dep on grass &
-		# it changes subslot (ABI) when major versions change, so
-		# the logic here doesn't end up becoming stale.
-		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
-		readarray -d'.' -t v <<<"${f[2]}"
-		grassdir="grass${v[0]}${v[1]}"
-
-		GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
-		einfo "Supported versions: ${supported_grass_versions[@]}"
-		einfo "Found GRASS version: ${v[0]}*"
-
-		local known_grass_version
-		# GRASS isn't slotted (in Gentoo, anyway) so we pick
-		# the best version we can to build against, and disable the others.
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			case "${known_grass_version}" in
-				"${v[0]}")
-					einfo "GRASS version ${known_grass_version} is supported. Enabling."
-					mycmakeargs+=(
-						"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
-						"-DWITH_GRASS${known_grass_version}=ON"
-					)
-					;;
-				*)
-					einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
-					mycmakeargs+=(
-						"-DWITH_GRASS${known_grass_version}=OFF"
-					)
-					;;
-			esac
-		done
-	else
-		local known_grass_version
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			mycmakeargs+=(
-				"-DWITH_GRASS${known_grass_version}=OFF"
-			)
-		done
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	CMAKE_BUILD_TYPE=Release  # RelWithDebInfo enables debug logging
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
-		-E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_core_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimitedTextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)'
-
-		--output-on-failure
-	)
-
-	virtx cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 98677ad7d3aa..eec36623b683 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/hdf5/hdf5-1.14.1.ebuild b/sci-libs/hdf5/hdf5-1.14.1.ebuild
index 32728bd51372..07005227c9e1 100644
--- a/sci-libs/hdf5/hdf5-1.14.1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.14.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="cxx debug examples fortran +hl mpi szip test threads unsupported zlib"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/sci-libs/openblas/openblas-0.3.23.ebuild b/sci-libs/openblas/openblas-0.3.23.ebuild
index a29cc595fcae..7638b7e3d707 100644
--- a/sci-libs/openblas/openblas-0.3.23.ebuild
+++ b/sci-libs/openblas/openblas-0.3.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit fortran-2 toolchain-funcs
+inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="https://github.com/xianyi/OpenBLAS"
@@ -53,6 +53,9 @@ pkg_setup() {
 
 	# List of most configurable options - Makefile.rule
 
+	# not an easy fix, https://github.com/xianyi/OpenBLAS/issues/4128
+	filter-lto
+
 	# https://github.com/xianyi/OpenBLAS/pull/2663
 	tc-export CC FC LD AR AS RANLIB
 
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 17e263f332f1..56b0d5a367c6 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch b/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch
new file mode 100644
index 000000000000..b057ea207bbd
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch
@@ -0,0 +1,69 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9784633c4..641ab9ed4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ cmake_minimum_required(VERSION 3.9)
+ 
+-include(CheckIPOSupported)
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+ include(CheckPrototypeDefinition)
+@@ -126,13 +125,6 @@ with open(join('${CMAKE_SOURCE_DIR}','qadic', 'CPimport.txt')) as fin:
+ )
+ configure_file(${CMAKE_BINARY_DIR}/CPimport.h.in ${CMAKE_BINARY_DIR}/CPimport.h COPYONLY)
+ 
+-# Setup for flint-config.h
+-check_c_compiler_flag("-mpopcnt" HAS_FLAG_MPOPCNT)
+-check_c_compiler_flag("-funroll-loops" HAS_FLAG_UNROLL_LOOPS)
+-
+-if(HAS_FLAG_MPOPCNT)
+-  set(CMAKE_REQUIRED_FLAGS "-mpopcnt")
+-endif()
+ # Testing __builtin_popcountl...
+ check_c_source_runs([[int main(int argc, char ** argv) {
+   #if defined(_WIN64)
+@@ -141,7 +133,6 @@ check_c_source_runs([[int main(int argc, char ** argv) {
+   return __builtin_popcountl(argc) == 100;
+   #endif
+   }]] FLINT_USES_POPCNT)
+-unset(CMAKE_REQUIRED_FLAGS)
+ 
+ # fenv configuration
+ check_c_source_compiles([[#include <fenv.h>
+@@ -250,13 +241,6 @@ if(BUILD_SHARED_LIBS AND WIN32)
+     target_compile_definitions(flint PUBLIC "MSC_USE_DLL")
+ endif()
+ 
+-if (HAS_FLAG_MPOPCNT)
+-    target_compile_options(flint PUBLIC "-mpopcnt")
+-endif()
+-if (HAS_FLAG_UNROLL_LOOPS)
+-    target_compile_options(flint PUBLIC "-funroll-loops")
+-endif()
+-
+ # Versioning
+ 
+ set_target_properties(flint PROPERTIES
+@@ -279,21 +263,6 @@ elseif (WIN32)
+     set_target_properties(flint PROPERTIES RUNTIME_OUTPUT_NAME "flint-${FLINT_MAJOR}")
+ endif()
+ 
+-if(NOT DEFINED IPO_SUPPORTED)
+-    message(STATUS "Checking for IPO")
+-    check_ipo_supported(RESULT ipo_supported LANGUAGES C)
+-    if(ipo_supported)
+-        message(STATUS "Checking for IPO - found")
+-    else()
+-        message(STATUS "Checking for IPO - not found")
+-    endif()
+-    set(IPO_SUPPORTED ${ipo_supported} CACHE INTERNAL "Introprocedural Optimization" FORCE)
+-endif()
+-
+-if(IPO_SUPPORTED)
+-    set_target_properties(flint PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
+-endif()
+-
+ if(NOT MSVC)
+ 	target_link_libraries(flint PUBLIC m)
+ endif()
diff --git a/sci-mathematics/flint/flint-2.9.0.ebuild b/sci-mathematics/flint/flint-2.9.0.ebuild
index 5a1fb677b0b8..494339dd488e 100644
--- a/sci-mathematics/flint/flint-2.9.0.ebuild
+++ b/sci-mathematics/flint/flint-2.9.0.ebuild
@@ -41,6 +41,7 @@ DEPEND="dev-libs/gmp:=
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/flint2-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-2.9.0-remove-hardcoded-CFLAGS.patch" )
 
 src_prepare() {
 	# https://github.com/wbhart/flint2/issues/1140
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index 276c12bbc607..f880d5c7a0bf 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1 +1,2 @@
 DIST fricas-1.3.8-full.tar.bz2 10878913 BLAKE2B 214eecd430a2b758a10d985f512f3c79f6b12de35bc29e8f0a3fd296fe871b2e9a6b362060cbeec317dc355bd3c661fcab44087feeaa092fe6afcdebd0fb94a8 SHA512 330554f9dc36b47451195e3dee88fe26a80ab2bf9b6750d651cd53c5ba16b9c9736176936c7c69e699685be25aa62b6a099ed7340913e946a4f5e53579835dbb
+DIST fricas-1.3.9.full.tar.bz2 10949173 BLAKE2B c535d2a384fa55db53b6901d3ba5d1cc8eca35ccf67a2664f934da427a808b5adc7a5522b935f5dcff89795c0ca5816818d9cf37399b6f9bdc63cfe4d622a7c3 SHA512 9cfcb8bad52550a46216509154d5c06dac23625bc14d504a1febbea7ff771fd3172f91c2824df51375b8d85adc19959a5cbbfa2b77a0095ca37e8a4d4b8cc405
diff --git a/sci-mathematics/fricas/fricas-1.3.9.ebuild b/sci-mathematics/fricas/fricas-1.3.9.ebuild
new file mode 100644
index 000000000000..e3004457c1e1
--- /dev/null
+++ b/sci-mathematics/fricas/fricas-1.3.9.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit elisp-common
+
+DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
+HOMEPAGE="http://fricas.sourceforge.net/
+	https://github.com/fricas/fricas
+	https://fricas.github.io/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.full.tar.bz2"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Supported lisps, number 0 is the default
+LISPS=( sbcl cmucl gcl ecls clisp clozurecl )
+# Version restrictions, . means no restrictions
+REST=(  .    .     .   .    .     . )
+# command name: . means just ${LISP}
+COMS=(  .    lisp  .   ecl  .     ccl )
+
+IUSE="${LISPS[*]} X emacs gmp"
+RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gmp? ( dev-libs/gmp:= )"
+
+# Generating lisp deps
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+	LISP=${LISPS[$n]}
+	if [ "${REST[$n]}" = "." ]; then
+		DEP="dev-lisp/${LISP}"
+	else
+		DEP="${REST[$n]}"
+	fi
+	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
+done
+if [ "${REST[0]}" = "." ]; then
+	DEP="dev-lisp/${LISPS[0]}"
+else
+	DEP="${REST[0]}"
+fi
+RDEPEND="${RDEPEND} ${DEP}:="
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+	RDEPEND="${RDEPEND} )"
+done
+
+DEPEND="${RDEPEND}"
+
+# necessary for clisp and gcl
+RESTRICT="strip"
+
+src_configure() {
+	local LISP n GMP
+	LISP=sbcl
+	n=${#LISPS[*]}
+	for ((n--; n > 0; n--)); do
+		if use ${LISPS[$n]}; then
+			LISP=${COMS[$n]}
+			if [ "${LISP}" = "." ]; then
+				LISP=${LISPS[$n]}
+			fi
+		fi
+	done
+	einfo "Using lisp: ${LISP}"
+
+	# bug #650788
+	if [[ ${LISP} = sbcl || ${LISP} = ccl ]]
+	then GMP=$(use_with gmp)
+	else GMP=''
+	fi
+
+	# aldor is not yet in portage
+	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP}
+}
+
+src_compile() {
+	# bug #300132
+	emake -j1
+}
+
+src_test() {
+	emake -j1 all-input
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	dodoc README.rst FAQ
+
+	if use emacs; then
+		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
+			-i "${D}"/usr/bin/efricas \
+			|| die "sed efricas failed"
+		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
+		elisp-make-site-file 64${PN}-gentoo.el
+	else
+		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
+	fi
+	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/fricas/metadata.xml b/sci-mathematics/fricas/metadata.xml
index c17dd82db612..5f547acf8a41 100644
--- a/sci-mathematics/fricas/metadata.xml
+++ b/sci-mathematics/fricas/metadata.xml
@@ -25,5 +25,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">fricas</remote-id>
+    <remote-id type="github">fricas/fricas</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 37dcc75922ec..f926c037e405 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/jupyterlab-desktop-bin/Manifest b/sci-misc/jupyterlab-desktop-bin/Manifest
index d751fee62f94..43aad07a74ba 100644
--- a/sci-misc/jupyterlab-desktop-bin/Manifest
+++ b/sci-misc/jupyterlab-desktop-bin/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab-desktop-bin-3.6.3.1.rpm 273770065 BLAKE2B 69285092ad9e31d886a3e3e8d096d1c0e3c0c74f27a05d722025d9412751035447cb8989cb0fd4410618f78ca753d2071941424390565e6891fdcaec061e03f5 SHA512 e48cf23da01001639cbe774bc38a4d4b702906aac3432d0b210bb4481378f87456c6b0d9bc4bed51dbbc6a38bbc24383676be56deae9ed993daf49933b0ed4d6
 DIST jupyterlab-desktop-bin-4.0.0.1.rpm 262569685 BLAKE2B a39d488f4b90235ab6e18744fe35720d44157da794e33dd0eec62ee6b62d4924f055478cc9325e83b98b8fdf2f946251635613490deaf862db475e1bbb6f5f23 SHA512 b5534652283632d0e96e9a42f1a1bcbb7206af7d51dd0140c165c0fd739349d3d05ddf0aaa9f4df0c4cfb99fd4cbed43a2bc85678ed72d6a2bc2926dce91f290
-DIST jupyterlab-desktop-bin-4.0.1.1.rpm 263192209 BLAKE2B 35afc54703d3f833b6f4c78ad5761981969b33638842fc805f0cadb9eb27ed6578400b30c94e8cc3b16893162297c72f3ca6199148b32b4e0564a08e1ee681ec SHA512 33d2e7cddb0c5fc7179ab37513ec38f6b179367eba95280030fd74c9a18110ba40f05fabbb534852aaeb3131c114dc949762e0d8d5e76926c81496f2fbb82126
+DIST jupyterlab-desktop-bin-4.0.2.1.rpm 263334769 BLAKE2B 0bc68c9a5e82af5ab16fc0a5925fabccbee1f9ba92cb47e4f767e48114bb9c1ca42e7194878c7ac02a1409877f3b5dfbf869c4d5cad73676eb2edfd0bccf18b7 SHA512 227bca1becebbb38a94e32d2e563090a60ca9062ba1aed82740cdd82f4c556a9ef15a1bb763ab4f872199e071366a2814d4905a6720f0af942ab0b248a6fd388
diff --git a/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.1.1.ebuild b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.2.1.ebuild
similarity index 100%
rename from sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.1.1.ebuild
rename to sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.2.1.ebuild
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5d4c2eeba4aa..a5ab82cd11a9 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 294492d1164a..8f24feb7c25e 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,2 +1,2 @@
 DIST baselayout-2.13.tar.bz2 29423 BLAKE2B a399e515297d3a936c5821205f1f0d6de844580099936be50e80a463b9fa6239aead52b7b371136680e263e326f7e6a1faea8cd8db0f11462cf0e8166707fc91 SHA512 ff16f20cf2c65258ab6d48c403607113f84fc57ffee6650652202746095f402f8c6a4f22040d0bb9310180945131bed6a0fda3717b39080a987e4f5224339095
-DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02
+DIST baselayout-2.14.tar.bz2 30182 BLAKE2B c5f67795233e565c2c75c97a55c000aec98e901bb0a25f1aeb52b01b44d7c09bfc6e67813234629ca71ff32d603e82ada8e66e5ab6007fa0664b95367256320d SHA512 bffd118f5e92975b9247d854fc5683a311dbcd03efa37a13dfd05d04e92a6e784858d3a55aa689f782229afc5985e829eb332c08a79eed081bf0a47720ca7e8a
diff --git a/sys-apps/baselayout/baselayout-2.14.ebuild b/sys-apps/baselayout/baselayout-2.14.ebuild
new file mode 100644
index 000000000000..a588c68f51e9
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.14.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build +split-usr"
+
+RDEPEND="!sys-apps/baselayout-prefix"
+
+riscv_compat_symlink() {
+	# Here we apply some special sauce for riscv.
+	# Two multilib layouts exist for now:
+	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
+	#    these are chosen by us to closely resemble other arches
+	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
+	#    this is the glibc/gcc default
+	# Unfortunately, the default has only one fallback, which is "lib"
+	# for both 32bit and 64bit. So things do not break in 1), we need
+	# to provide compatibility symlinks...
+
+	# This function has exactly two parameters:
+	# - the default libdir, to determine if 1) or 2) applies
+	# - the location of the symlink (which points to ".")
+
+	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
+	# there never was a ${SYMLINK_LIB} = yes riscv profile.
+
+	case ${CHOST} in
+	riscv*)
+		# are we on a one level libdir profile? is there no symlink yet?
+		if [[ ${1} != */* && ! -L ${2} ]] ; then
+			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
+		fi
+		;;
+	esac
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+		for prefix in "${prefix_lst[@]}"; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
+					libdir="${libdir%%/*}"
+					dir="${prefix}${libdir}"
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die "Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+			[[ -d "${prefix}${def_libdir}" ]] && riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep || die
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" || die #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep || die
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die "Unable to make ${EROOT}${libdir} symlink"
+			fi
+		done
+	fi
+}
+
+pkg_setup() {
+	multilib_layout
+}
+
+src_prepare() {
+	default
+
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr && ! use prefix-guest; then
+		sed \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/shells share/passwd
+		hprefixify -w '/PATH=/' etc/env.d/50baselayout
+		hprefixify -w 1 etc/env.d/50baselayout
+		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+
+		# change branding
+		sed -i \
+			-e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \
+			-e '/make_os_release/s/${OS}/Prefix/' \
+			Makefile || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		if use split-usr || use prefix-guest; then
+			ldpaths+=":${EPREFIX}/${libdir}"
+		fi
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		install
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# add SDK path which contains development manpages
+		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
+			> "${ED}"/etc/env.d/98macos-sdk
+	fi
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	dodoc ChangeLog
+
+	# bug 858596
+	if use prefix-guest ; then
+		dodir sbin
+		cat > "${ED}"/sbin/runscript <<- EOF
+			#!/usr/bin/env sh
+			source "${EPREFIX}/lib/gentoo/functions.sh"
+
+			eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
+			exit 1
+		EOF
+		chmod 755 "${ED}"/sbin/runscript || die
+		cp "${ED}"/sbin/{runscript,openrc-run} || die
+	fi
+}
+
+pkg_preinst() {
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
+
+	# Create symlinks in pkg_preinst to avoid Portage collision check.
+	# Create the symlinks in ${ED} via dosym so that we own it.
+	# Only create the symlinks if it wont cause a conflict in ${EROOT}.
+	if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then
+		dosym ../run/lock /var/lock
+	fi
+	if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then
+		dosym ../run /var/run
+	fi
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		if [ -e "${EROOT}/etc/${x}" ] ; then
+			chmod o-rwx "${EROOT}/etc/${x}" || die
+		fi
+	done
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run || die
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test 2.4 -lt ${x}; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ver_test 2.6 -lt ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}/{,usr" || die
+		fi
+	done
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/baselayout/baselayout-2.9.ebuild b/sys-apps/baselayout/baselayout-2.9.ebuild
deleted file mode 100644
index 4cf8882d3ef8..000000000000
--- a/sys-apps/baselayout/baselayout-2.9.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-RDEPEND="!sys-apps/baselayout-prefix"
-
-pkg_setup() {
-	multilib_layout
-}
-
-riscv_compat_symlink() {
-	# Here we apply some special sauce for riscv.
-	# Two multilib layouts exist for now:
-	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
-	#    these are chosen by us to closely resemble other arches
-	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
-	#    this is the glibc/gcc default
-	# Unfortunately, the default has only one fallback, which is "lib"
-	# for both 32bit and 64bit. So things do not break in 1), we need
-	# to provide compatibility symlinks...
-
-	# This function has exactly two parameters:
-	# - the default libdir, to determine if 1) or 2) applies
-	# - the location of the symlink (which points to ".")
-
-	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
-	# there never was a ${SYMLINK_LIB} = yes riscv profile.
-
-	case ${CHOST} in
-	riscv*)
-		# are we on a one level libdir profile? is there no symlink yet?
-		if [[ ${1} != */* && ! -L ${2} ]] ; then
-			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
-		fi
-		;;
-	esac
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-		for prefix in "${prefix_lst[@]}"; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
-					libdir="${libdir%%/*}"
-					dir="${prefix}${libdir}"
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die "Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-			riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep || die
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" || die #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep || die
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die "Unable to make ${EROOT}${libdir} symlink"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
-	default
-
-	# don't want symlinked directories in PATH on systems with usr-merge
-	if ! use split-usr && ! use prefix-guest; then
-		sed \
-			-e 's|:/usr/sbin:|:|g' \
-			-e 's|:/sbin:|:|g' \
-			-e 's|:/bin:|:|g' \
-			-i etc/env.d/50baselayout || die
-	fi
-
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/shells share.Linux/passwd
-		hprefixify -w '/PATH=/' etc/env.d/50baselayout
-		hprefixify -w 1 etc/env.d/50baselayout
-		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-
-		# change branding
-		sed -i \
-			-e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \
-			-e '/make_os_release/s/${OS}/Prefix/' \
-			Makefile || die
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		if use split-usr || use prefix-guest; then
-			ldpaths+=":${EPREFIX}/${libdir}"
-		fi
-		ldpaths+=":${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-}
-
-src_install() {
-	emake \
-		OS=Linux \
-		DESTDIR="${ED}" \
-		install
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# add SDK path which contains development manpages
-		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
-			> "${ED}"/etc/env.d/98macos-sdk
-	fi
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	dodoc ChangeLog
-
-	# bug 858596
-	if use prefix-guest ; then
-		dodir sbin
-		cat > "${ED}"/sbin/runscript <<- EOF
-			#!/usr/bin/env sh
-			source "${EPREFIX}/lib/gentoo/functions.sh"
-
-			eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
-			exit 1
-		EOF
-		chmod 755 "${ED}"/sbin/runscript || die
-		cp "${ED}"/sbin/{runscript,openrc-run} || die
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		if [ -e "${EROOT}/etc/${x}" ] ; then
-			chmod o-rwx "${EROOT}/etc/${x}" || die
-		fi
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test 2.4 -lt ${x}; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . /etc/profile"
-		fi
-
-		if ver_test 2.6 -lt ${x}; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}/{,usr" || die
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/locale-gen/locale-gen-2.23-r1.ebuild b/sys-apps/locale-gen/locale-gen-2.23-r1.ebuild
index c9eac88e19ad..5b1012c996b8 100644
--- a/sys-apps/locale-gen/locale-gen-2.23-r1.ebuild
+++ b/sys-apps/locale-gen/locale-gen-2.23-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/${P}.tar.bz2"
 LICENSE="GPL-2+"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	app-alternatives/awk
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index b264f40416e1..5f210682e1ed 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -4,3 +4,5 @@ DIST moar-1.15.1-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803
 DIST moar-1.15.1.tar.gz 2780649 BLAKE2B 79145ae426f5ae77d73dd556521135bfad21af3841818c4092eb476a52b408da86a4ce1f4c8e43712e74be233b7fc9469788e2134c866e8bb8ba83927c7f4f2d SHA512 c58fc57f583e8051c3e1f567e9d8ad0aca45dcbfb1998d0156cb07b90bc2359d70c8fe90849f753f969980af919d9faef82cde7dedcf2aa9aeab4c080edc7752
 DIST moar-1.15.2-deps.tar.xz 4760036 BLAKE2B 6fd72d710a620fdf104766be84f3fa68652c760818cdee66bb8475cc8949872c82be026c04b54cb61c0108c5977cb1f787f9a4fa0316bde0293cdedb1f6f94f8 SHA512 f40520a1b2e94f4a3e97d6a4e19191484b66e13a57c7b30416c813d84cad3d29295e862d5b75870313cc905112425c731d052619d49e78b33fb3d5d8750df3df
 DIST moar-1.15.2.tar.gz 2780812 BLAKE2B c104349cb94399f2c0c4a3219f2d59020cb7a9fa445edcde639c706070cae38ce54c7f181a0bf2de3ee831c146aaa19effbabf76509bfae948a22771951c0e34 SHA512 b4b7afa1b884a50e3939b59174e610357c6259667d3cac190aab24c5991bf59ff617200f04ec7292fd7eebf36a828748c54ce2eccbbe0cc413f3e0b5994d8cf4
+DIST moar-1.15.3-deps.tar.xz 4760036 BLAKE2B 6fd72d710a620fdf104766be84f3fa68652c760818cdee66bb8475cc8949872c82be026c04b54cb61c0108c5977cb1f787f9a4fa0316bde0293cdedb1f6f94f8 SHA512 f40520a1b2e94f4a3e97d6a4e19191484b66e13a57c7b30416c813d84cad3d29295e862d5b75870313cc905112425c731d052619d49e78b33fb3d5d8750df3df
+DIST moar-1.15.3.tar.gz 2781596 BLAKE2B 36e908245fbdebb89e2ed5cc1ef80c2000aeb03d8f35b84dff6d7e8b270d337d3dec9829d718d576e6ca4b0a6ac8694c5fa72b167a67dd3e7cde97ff06f7bfc5 SHA512 cce9eef06af14c320527a1b6a1832608b8267b9453eafb1153677aea98372e3fc3800e2a8938e9460e0f914c72f5c31380a0ee8ff0bd7db903756bea5352b424
diff --git a/sys-apps/moar/moar-1.15.3.ebuild b/sys-apps/moar/moar-1.15.3.ebuild
new file mode 100644
index 000000000000..a32bbea5ec05
--- /dev/null
+++ b/sys-apps/moar/moar-1.15.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A pager designed to do the right thing without any configuration"
+HOMEPAGE="https://github.com/walles/moar"
+SRC_URI=" https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-lang/moarvm"
+BDEPEND="
+	test? (
+		app-arch/bzip2
+		app-arch/xz-utils
+	)
+"
+
+src_compile() {
+	# https://github.com/walles/moar/blob/master/build.sh#L28
+	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
+}
+
+src_test() {
+	# From test.sh (we don't run that because it has some linting etc)
+	ego test -timeout 20s ./...
+}
+
+src_install() {
+	dobin moar
+	doman moar.1
+	einstalldocs
+}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.5.ebuild b/sys-apps/nvme-cli/nvme-cli-2.5.ebuild
index 96f6ab025153..6a60b7ff63e2 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.5.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.5.ebuild
@@ -45,10 +45,6 @@ src_configure() {
 	meson_src_configure
 }
 
-src_install() {
-	meson_src_install
-}
-
 pkg_postinst() {
 	udev_reload
 }
diff --git a/sys-apps/openrazer/openrazer-3.6.1-r1.ebuild b/sys-apps/openrazer/openrazer-3.6.1-r1.ebuild
deleted file mode 100644
index d3f1a25658b7..000000000000
--- a/sys-apps/openrazer/openrazer-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit readme.gentoo-r1 systemd udev xdg-utils distutils-r1 linux-mod-r1
-
-DESCRIPTION="Drivers and user-space daemon to control Razer devices on GNU/Linux"
-HOMEPAGE="https://openrazer.github.io/
-	https://github.com/openrazer/openrazer/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="+client +daemon"
-REQUIRED_USE="
-	client? ( daemon )
-	daemon? ( ${PYTHON_REQUIRED_USE} )
-	test? ( daemon )
-"
-
-RDEPEND="
-	client? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	daemon? (
-		acct-group/plugdev
-		dev-python/daemonize[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyudev[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		x11-misc/xautomation
-		x11-misc/xdotool
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/linux-sources
-"
-
-DOCS=( README.md )
-
-DOC_CONTENTS="To successfully use OpenRazer: load desired kernel module
-(razeraccessory, razerkbd, razerkraken and/or razermouse),
-add your user to the \"plugdev\" group and start the OpenRazer daemon.
-To automatically start up the OpenRazer daemon on session login copy
-/usr/share/openrazer/openrazer-daemon.desktop file into Your user's
-~/.config/autostart/ directory."
-
-distutils_enable_tests unittest
-
-python_compile() {
-	if use daemon ; then
-		( cd "${S}"/daemon || die ; distutils-r1_python_compile )
-	fi
-	if use client ; then
-		( cd "${S}"/pylib || die ; distutils-r1_python_compile )
-	fi
-}
-
-python_install() {
-	if use daemon ; then
-		( cd "${S}"/daemon || die ; distutils-r1_python_install )
-		python_scriptinto /usr/bin
-		python_newscript "${S}"/daemon/run_openrazer_daemon.py ${PN}-daemon
-	fi
-	if use client ; then
-		( cd "${S}"/pylib || die ; distutils-r1_python_install )
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-	distutils-r1_src_prepare
-
-	# Remove bad tests.
-	rm "${S}"/daemon/tests/test_effect_sync.py || die
-}
-
-src_compile() {
-	local -a modargs=(
-		SUBDIRS="${S}"/driver
-		KERNELDIR="${KERNEL_DIR}"
-	)
-	local -a modlist=(
-		{razeraccessory,razerkbd,razerkraken,razermouse}="hid:${S}:driver"
-	)
-	linux-mod-r1_src_compile
-
-	distutils-r1_src_compile
-
-	if use daemon ; then
-		emake -C "${S}"/daemon PREFIX=/usr service
-	fi
-
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	( cd "${S}"/daemon/tests || die ; distutils-r1_src_test )
-}
-
-src_install() {
-	linux-mod-r1_src_install
-	distutils-r1_src_install
-
-	udev_dorules "${S}"/install_files/udev/99-razer.rules
-	exeinto "$(get_udevdir)"
-	doexe "${S}"/install_files/udev/razer_mount
-
-	# Install configuration example so that the daemon does not complain.
-	insinto /usr/share/${PN}
-	newins "${S}"/daemon/resources/razer.conf razer.conf.example
-
-	if use daemon ; then
-		# dbus service
-		insinto /usr/share/dbus-1/services
-		doins "${S}"/daemon/org.razer.service
-
-		# systemd unit
-		systemd_douserunit "${S}"/daemon/${PN}-daemon.service
-
-		# xdg autostart example file
-		insinto /usr/share/${PN}
-		doins "${S}"/install_files/desktop/openrazer-daemon.desktop
-
-		# Manpages
-		doman "${S}"/daemon/resources/man/${PN}-daemon.8
-		doman "${S}"/daemon/resources/man/razer.conf.5
-	fi
-}
-
-pkg_postinst() {
-	linux-mod-r1_pkg_postinst
-	udev_reload
-
-	if use daemon ; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	udev_reload
-
-	if use daemon ; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/sys-apps/openrazer/openrazer-3.6.1-r2.ebuild b/sys-apps/openrazer/openrazer-3.6.1-r2.ebuild
new file mode 100644
index 000000000000..a2efe041bbf6
--- /dev/null
+++ b/sys-apps/openrazer/openrazer-3.6.1-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit readme.gentoo-r1 systemd udev xdg-utils distutils-r1 linux-mod-r1
+
+DESCRIPTION="Drivers and user-space daemon to control Razer devices on GNU/Linux"
+HOMEPAGE="https://openrazer.github.io/
+	https://github.com/openrazer/openrazer/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="+client +daemon"
+REQUIRED_USE="
+	client? ( daemon )
+	daemon? ( ${PYTHON_REQUIRED_USE} )
+	test? ( daemon )
+"
+
+RDEPEND="
+	client? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	daemon? (
+		acct-group/plugdev
+		dev-python/daemonize[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyudev[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		x11-misc/xautomation
+		x11-misc/xdotool
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/linux-sources
+"
+
+DOCS=( README.md )
+
+DOC_CONTENTS="To successfully use OpenRazer: load desired kernel module
+(razeraccessory, razerkbd, razerkraken and/or razermouse),
+add your user to the \"plugdev\" group and start the OpenRazer daemon.
+To automatically start up the OpenRazer daemon on session login copy
+/usr/share/openrazer/openrazer-daemon.desktop file into Your user's
+~/.config/autostart/ directory."
+
+distutils_enable_tests unittest
+
+python_compile() {
+	cd "${S}"/daemon || die
+
+	distutils_pep517_install "${BUILD_DIR}"/install
+
+	if use client ; then
+		cd "${S}"/pylib || die
+
+		distutils_pep517_install "${BUILD_DIR}"/install
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_scriptinto /usr/bin
+	python_newscript "${S}"/daemon/run_openrazer_daemon.py ${PN}-daemon
+}
+
+src_prepare() {
+	xdg_environment_reset
+
+	if use daemon ; then
+		distutils-r1_src_prepare
+	fi
+
+	# Remove bad tests.
+	rm "${S}"/daemon/tests/test_effect_sync.py || die
+}
+
+src_compile() {
+	local -a modargs=(
+		SUBDIRS="${S}"/driver
+		KERNELDIR="${KERNEL_DIR}"
+	)
+	local -a modlist=(
+		{razeraccessory,razerkbd,razerkraken,razermouse}="hid:${S}:driver"
+	)
+	linux-mod-r1_src_compile
+
+	if use daemon ; then
+		distutils-r1_src_compile
+
+		emake -C "${S}"/daemon PREFIX=/usr service
+	fi
+
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cd "${S}"/daemon/tests || die
+
+	distutils-r1_src_test
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	udev_dorules "${S}"/install_files/udev/99-razer.rules
+	exeinto "$(get_udevdir)"
+	doexe "${S}"/install_files/udev/razer_mount
+
+	# Install configuration example so that the daemon does not complain.
+	insinto /usr/share/${PN}
+	newins "${S}"/daemon/resources/razer.conf razer.conf.example
+
+	if use daemon ; then
+		# Python libraries/scripts, "client" also requires USE="daemon"
+		distutils-r1_src_install
+
+		# dbus service
+		insinto /usr/share/dbus-1/services
+		doins "${S}"/daemon/org.razer.service
+
+		# systemd unit
+		systemd_douserunit "${S}"/daemon/${PN}-daemon.service
+
+		# xdg autostart example file
+		insinto /usr/share/${PN}
+		doins "${S}"/install_files/desktop/openrazer-daemon.desktop
+
+		# Manpages
+		doman "${S}"/daemon/resources/man/${PN}-daemon.8
+		doman "${S}"/daemon/resources/man/razer.conf.5
+	fi
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+	udev_reload
+
+	if use daemon ; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	udev_reload
+
+	if use daemon ; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
index eb85f58a5cd2..b1f5f48499dd 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index dda74570542a..bbd02f90abe7 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/tgt/tgt-1.0.86.ebuild b/sys-block/tgt/tgt-1.0.86.ebuild
index 805337363ac3..e2b6a07d8cfb 100644
--- a/sys-block/tgt/tgt-1.0.86.ebuild
+++ b/sys-block/tgt/tgt-1.0.86.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="fcoe fcp ibmvio infiniband rbd selinux"
 
 DEPEND="
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 9c230a0072c3..75cb12da05fa 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/grub/files/grub-2.06-locale.patch b/sys-boot/grub/files/grub-2.06-locale.patch
new file mode 100644
index 000000000000..14706cbca3a2
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-locale.patch
@@ -0,0 +1,68 @@
+From 5983c2c6adf1c1bbb3ecd751253d1e898bdfd8a3 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Tue, 26 Oct 2021 15:11:00 +0800
+Subject: templates: Filter out POSIX locale for translation
+
+The POSIX locale is default or native operating system's locale
+identical to the C locale, so no translation to human speaking languages
+are provided. For this reason we should filter out LANG=POSIX as well as
+LANG=C upon generating grub.cfg to avoid looking up for it's gettext's
+message catalogs that will consequently result in an unpleasant message:
+
+  error: file `/boot/grub/locale/POSIX.gmo' not found
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub.d/00_header.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 93a9023..f74c2a4 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -191,7 +191,7 @@ EOF
+ EOF
+ 
+ # Gettext variables and module
+-if [ "x${LANG}" != "xC" ] &&  [ "x${LANG}" != "x" ]; then
++if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
+   cat << EOF
+   set locale_dir=\$prefix/locale
+   set lang=${grub_lang}
+-- 
+cgit v1.1
+
+From f42266a8a2a4215e4ffe419b8092bdf9ced33e8e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Mon, 19 Sep 2022 15:31:28 +0200
+Subject: templates: Filter C.UTF-8 locale for translation
+
+In addition to C locale there is also C.UTF-8 locale now. Filter that as
+well, by using ${grub_lang}, which contains a stripped value.
+This fixes the following message and resulting boot failure:
+
+    error: file `/boot/grub/locale/C.gmo' not found.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub.d/00_header.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index f74c2a4..6a316a5 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -191,7 +191,7 @@ EOF
+ EOF
+ 
+ # Gettext variables and module
+-if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
++if [ "x${grub_lang}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
+   cat << EOF
+   set locale_dir=\$prefix/locale
+   set lang=${grub_lang}
+-- 
+cgit v1.1
+
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild b/sys-boot/grub/grub-2.06-r6.ebuild
deleted file mode 100644
index 707acec900be..000000000000
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This ebuild uses 3 special global variables:
-# GRUB_BOOTSTRAP: Depend on python and invoke bootstrap (gnulib).
-# GRUB_AUTOGEN: Depend on python and invoke autogen.sh.
-# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
-#
-# When applying patches:
-# If gnulib is updated, set GRUB_BOOTSTRAP=1
-# If gentpl.py or *.def is updated, set GRUB_AUTOGEN=1
-# If gnulib, gentpl.py, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1
-#
-# If any of the above applies to a user patch, the user should set the
-# corresponding variable in make.conf or the environment.
-
-if [[ ${PV} == 9999  ]]; then
-	GRUB_AUTORECONF=1
-	GRUB_BOOTSTRAP=1
-fi
-
-GRUB_AUTOGEN=1
-GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python3_{8..11} )
-WANT_LIBTOOL=none
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-	inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
-	inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
-		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
-		MY_P=${P/_/'~'}
-		SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
-	else
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-		S=${WORKDIR}/${P%_*}
-	fi
-	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r2.tar.xz"
-
-PATCHES=(
-	"${WORKDIR}/${P}-backports"
-	"${FILESDIR}"/gfxpayload.patch
-	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-	"${FILESDIR}"/grub-2.06-test-words.patch
-	"${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
-	"${FILESDIR}"/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
-	"${FILESDIR}"/grub-2.06-fs-ext2-ignore-checksum-seed.patch
-	"${FILESDIR}"/grub-2.06-riscv.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
-	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/"
-
-# Includes licenses for dejavu and unifont
-LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot
-	qemu qemu-mips pc uboot xen xen-32 xen-pvh )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
-	grub_platforms_coreboot? ( fonts )
-	grub_platforms_qemu? ( fonts )
-	grub_platforms_ieee1275? ( fonts )
-	grub_platforms_loongson? ( fonts )
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/flex-2.5.35
-	sys-devel/bison
-	sys-apps/help2man
-	sys-apps/texinfo
-	fonts? (
-		media-libs/freetype:2
-		virtual/pkgconfig
-	)
-	test? (
-		app-admin/genromfs
-		app-arch/cpio
-		app-arch/lzop
-		app-emulation/qemu
-		dev-libs/libisoburn
-		sys-apps/miscfiles
-		sys-block/parted
-		sys-fs/squashfs-tools
-	)
-	themes? (
-		app-arch/unzip
-		media-libs/freetype:2
-		virtual/pkgconfig
-	)
-	truetype? ( virtual/pkgconfig )
-"
-DEPEND="
-	app-arch/xz-utils
-	>=sys-libs/ncurses-5.2-r5:0=
-	grub_platforms_emu? (
-		sdl? ( media-libs/libsdl )
-	)
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	libzfs? ( sys-fs/zfs:= )
-	mount? ( sys-fs/fuse:0 )
-	truetype? ( media-libs/freetype:2= )
-	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-"
-RDEPEND="${DEPEND}
-	kernel_linux? (
-		grub_platforms_efi-32? ( sys-boot/efibootmgr )
-		grub_platforms_efi-64? ( sys-boot/efibootmgr )
-	)
-	!sys-boot/grub:0
-	nls? ( sys-devel/gettext )
-"
-
-RESTRICT="!test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		pushd "${P}" >/dev/null || die
-		local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
-		local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
-		git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
-		git-r3_checkout "${GNULIB_URI}" gnulib
-		popd >/dev/null || die
-	fi
-	default
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-		python_setup
-	else
-		export PYTHON=true
-	fi
-
-	if [[ -n ${GRUB_BOOTSTRAP} ]]; then
-		eautopoint --force
-		AUTOPOINT=: AUTORECONF=: ./bootstrap || die
-	elif [[ -n ${GRUB_AUTOGEN} ]]; then
-		FROM_BOOTSTRAP=1 ./autogen.sh || die
-	fi
-
-	if [[ -n ${GRUB_AUTORECONF} ]]; then
-		eautoreconf
-	fi
-}
-
-grub_do() {
-	multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
-	multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
-	local platform
-
-	case ${MULTIBUILD_VARIANT} in
-		efi*) platform=efi ;;
-		xen-pvh) platform=xen_pvh ;;
-		xen*) platform=xen ;;
-		guessed) ;;
-		*) platform=${MULTIBUILD_VARIANT} ;;
-	esac
-
-	case ${MULTIBUILD_VARIANT} in
-		*-32)
-			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-				local CTARGET=i386
-			fi ;;
-		*-64)
-			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-				local CTARGET=x86_64
-				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-			fi ;;
-	esac
-
-	local myeconfargs=(
-		--disable-werror
-		--program-prefix=
-		--libdir="${EPREFIX}"/usr/lib
-		$(use_enable device-mapper)
-		$(use_enable mount grub-mount)
-		$(use_enable nls)
-		$(use_enable themes grub-themes)
-		$(use_enable truetype grub-mkfont)
-		$(use_enable libzfs)
-		$(use_enable sdl grub-emu-sdl)
-		${platform:+--with-platform=}${platform}
-
-		# Let configure detect this where supported
-		$(usex efiemu '' '--disable-efiemu')
-	)
-
-	if use fonts; then
-		ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
-	fi
-
-	if use themes; then
-		ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
-	fi
-
-	local ECONF_SOURCE="${S}"
-	econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# Bug 508758.
-	replace-flags -O3 -O2
-
-	# Workaround for bug 829165.
-	filter-ldflags -pie
-
-	# We don't want to leak flags onto boot code.
-	export HOST_CCASFLAGS=${CCASFLAGS}
-	export HOST_CFLAGS=${CFLAGS}
-	export HOST_CPPFLAGS=${CPPFLAGS}
-	export HOST_LDFLAGS=${LDFLAGS}
-	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
-	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
-	unset LDFLAGS
-
-	tc-export CC NM OBJCOPY RANLIB STRIP
-	tc-export BUILD_CC BUILD_PKG_CONFIG
-
-	# Force configure to use flex & bison, bug 887211.
-	export LEX=flex
-	unset YACC
-
-	MULTIBUILD_VARIANTS=()
-	local p
-	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
-		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
-	done
-	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
-	grub_do grub_configure
-}
-
-src_compile() {
-	# Sandbox bug 404013.
-	use libzfs && addpredict /etc/dfs:/dev/zfs
-
-	grub_do emake
-	use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
-	# The qemu dependency is a bit complex.
-	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
-	grub_do emake check
-}
-
-src_install() {
-	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
-	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
-	einstalldocs
-
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default-4 grub
-
-	# https://bugs.gentoo.org/231935
-	dostrip -x /usr/lib/grub
-}
-
-pkg_postinst() {
-	elog "For information on how to configure GRUB2 please refer to the guide:"
-	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test -gt ${v}; then
-				ewarn
-				ewarn "Re-run grub-install to update installed boot code!"
-				ewarn
-				break
-			fi
-		done
-	else
-		elog
-		optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
-		optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn
-		optfeature "enabling RAID device detection" sys-fs/mdadm
-	fi
-
-	if has_version 'sys-boot/grub:0'; then
-		elog "A migration guide for GRUB Legacy users is available:"
-		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
-	fi
-
-	if has_version sys-boot/os-prober; then
-		ewarn "Due to security concerns, os-prober is disabled by default."
-		ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
-	fi
-}
diff --git a/sys-boot/grub/grub-2.06-r7.ebuild b/sys-boot/grub/grub-2.06-r7.ebuild
new file mode 100644
index 000000000000..3a2f6087bced
--- /dev/null
+++ b/sys-boot/grub/grub-2.06-r7.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This ebuild uses 3 special global variables:
+# GRUB_BOOTSTRAP: Depend on python and invoke bootstrap (gnulib).
+# GRUB_AUTOGEN: Depend on python and invoke autogen.sh.
+# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
+#
+# When applying patches:
+# If gnulib is updated, set GRUB_BOOTSTRAP=1
+# If gentpl.py or *.def is updated, set GRUB_AUTOGEN=1
+# If gnulib, gentpl.py, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1
+#
+# If any of the above applies to a user patch, the user should set the
+# corresponding variable in make.conf or the environment.
+
+if [[ ${PV} == 9999  ]]; then
+	GRUB_AUTORECONF=1
+	GRUB_BOOTSTRAP=1
+fi
+
+GRUB_AUTOGEN=1
+GRUB_AUTORECONF=1
+PYTHON_COMPAT=( python3_{8..11} )
+WANT_LIBTOOL=none
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+	inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+	inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+		MY_P=${P/_/'~'}
+		SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+	else
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+		S=${WORKDIR}/${P%_*}
+	fi
+	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r2.tar.xz"
+
+PATCHES=(
+	"${WORKDIR}/${P}-backports"
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+	"${FILESDIR}"/grub-2.06-test-words.patch
+	"${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
+	"${FILESDIR}"/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
+	"${FILESDIR}"/grub-2.06-fs-ext2-ignore-checksum-seed.patch
+	"${FILESDIR}"/grub-2.06-riscv.patch
+	"${FILESDIR}"/grub-2.06-locale.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-12.1.02
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
+
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot
+	qemu qemu-mips pc uboot xen xen-32 xen-pvh )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+	grub_platforms_coreboot? ( fonts )
+	grub_platforms_qemu? ( fonts )
+	grub_platforms_ieee1275? ( fonts )
+	grub_platforms_loongson? ( fonts )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/flex-2.5.35
+	sys-devel/bison
+	sys-apps/help2man
+	sys-apps/texinfo
+	fonts? (
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
+	test? (
+		app-admin/genromfs
+		app-arch/cpio
+		app-arch/lzop
+		app-emulation/qemu
+		dev-libs/libisoburn
+		sys-apps/miscfiles
+		sys-block/parted
+		sys-fs/squashfs-tools
+	)
+	themes? (
+		app-arch/unzip
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
+	truetype? ( virtual/pkgconfig )
+"
+DEPEND="
+	app-arch/xz-utils
+	>=sys-libs/ncurses-5.2-r5:0=
+	grub_platforms_emu? (
+		sdl? ( media-libs/libsdl )
+	)
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	libzfs? ( sys-fs/zfs:= )
+	mount? ( sys-fs/fuse:0 )
+	truetype? ( media-libs/freetype:2= )
+	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+"
+RDEPEND="${DEPEND}
+	kernel_linux? (
+		grub_platforms_efi-32? ( sys-boot/efibootmgr )
+		grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	)
+	!sys-boot/grub:0
+	nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		pushd "${P}" >/dev/null || die
+		local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+		local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+		git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+		git-r3_checkout "${GNULIB_URI}" gnulib
+		popd >/dev/null || die
+	fi
+	default
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+		python_setup
+	else
+		export PYTHON=true
+	fi
+
+	if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+		eautopoint --force
+		AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+	elif [[ -n ${GRUB_AUTOGEN} ]]; then
+		FROM_BOOTSTRAP=1 ./autogen.sh || die
+	fi
+
+	if [[ -n ${GRUB_AUTORECONF} ]]; then
+		eautoreconf
+	fi
+}
+
+grub_do() {
+	multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+	multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+	local platform
+
+	case ${MULTIBUILD_VARIANT} in
+		efi*) platform=efi ;;
+		xen-pvh) platform=xen_pvh ;;
+		xen*) platform=xen ;;
+		guessed) ;;
+		*) platform=${MULTIBUILD_VARIANT} ;;
+	esac
+
+	case ${MULTIBUILD_VARIANT} in
+		*-32)
+			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+				local CTARGET=i386
+			fi ;;
+		*-64)
+			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+				local CTARGET=x86_64
+				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+			fi ;;
+	esac
+
+	local myeconfargs=(
+		--disable-werror
+		--program-prefix=
+		--libdir="${EPREFIX}"/usr/lib
+		$(use_enable device-mapper)
+		$(use_enable mount grub-mount)
+		$(use_enable nls)
+		$(use_enable themes grub-themes)
+		$(use_enable truetype grub-mkfont)
+		$(use_enable libzfs)
+		$(use_enable sdl grub-emu-sdl)
+		${platform:+--with-platform=}${platform}
+
+		# Let configure detect this where supported
+		$(usex efiemu '' '--disable-efiemu')
+	)
+
+	if use fonts; then
+		ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+	fi
+
+	if use themes; then
+		ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+	fi
+
+	local ECONF_SOURCE="${S}"
+	econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# Bug 508758.
+	replace-flags -O3 -O2
+
+	# Workaround for bug 829165.
+	filter-ldflags -pie
+
+	# We don't want to leak flags onto boot code.
+	export HOST_CCASFLAGS=${CCASFLAGS}
+	export HOST_CFLAGS=${CFLAGS}
+	export HOST_CPPFLAGS=${CPPFLAGS}
+	export HOST_LDFLAGS=${LDFLAGS}
+	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+	tc-ld-disable-gold #439082 #466536 #526348
+	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+	unset LDFLAGS
+
+	tc-export CC NM OBJCOPY RANLIB STRIP
+	tc-export BUILD_CC BUILD_PKG_CONFIG
+
+	# Force configure to use flex & bison, bug 887211.
+	export LEX=flex
+	unset YACC
+
+	MULTIBUILD_VARIANTS=()
+	local p
+	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+	done
+	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+	grub_do grub_configure
+}
+
+src_compile() {
+	# Sandbox bug 404013.
+	use libzfs && addpredict /etc/dfs:/dev/zfs
+
+	grub_do emake
+	use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+	# The qemu dependency is a bit complex.
+	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+	grub_do emake check
+}
+
+src_install() {
+	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+	einstalldocs
+
+	insinto /etc/default
+	newins "${FILESDIR}"/grub.default-4 grub
+
+	# https://bugs.gentoo.org/231935
+	dostrip -x /usr/lib/grub
+}
+
+pkg_postinst() {
+	elog "For information on how to configure GRUB2 please refer to the guide:"
+	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test -gt ${v}; then
+				ewarn
+				ewarn "Re-run grub-install to update installed boot code!"
+				ewarn "Re-run grub-mkconfig to update grub.cfg!"
+				ewarn
+				break
+			fi
+		done
+	else
+		elog
+		optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
+		optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn
+		optfeature "enabling RAID device detection" sys-fs/mdadm
+	fi
+
+	if has_version 'sys-boot/grub:0'; then
+		elog "A migration guide for GRUB Legacy users is available:"
+		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
+	fi
+
+	if has_version sys-boot/os-prober; then
+		ewarn "Due to security concerns, os-prober is disabled by default."
+		ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
+	fi
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 359da219ea62..e10ab779e8e6 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -306,6 +306,7 @@ pkg_postinst() {
 			if ver_test -gt ${v}; then
 				ewarn
 				ewarn "Re-run grub-install to update installed boot code!"
+				ewarn "Re-run grub-mkconfig to update grub.cfg!"
 				ewarn
 				break
 			fi
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 83c812cf034f..fb424b520408 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 23a2236bae2f..4e9c907a8a1a 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -42,7 +42,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	sys-apps/help2man
 	test? ( ${PYTHON_DEPS} )
 "
diff --git a/sys-devel/automake/automake-1.16.5.ebuild b/sys-devel/automake/automake-1.16.5.ebuild
index 779a853293c6..156318f9ba77 100644
--- a/sys-devel/automake/automake-1.16.5.ebuild
+++ b/sys-devel/automake/automake-1.16.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -42,7 +42,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	sys-apps/help2man
 	test? ( ${PYTHON_DEPS} )
 "
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 571985fea6d6..8935774850e8 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -42,7 +42,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	app-arch/gzip
+	app-alternatives/gzip
 	sys-apps/help2man
 	test? ( ${PYTHON_DEPS} )
 "
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 35303fe424de..22c77453207c 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -5,8 +5,7 @@ DIST binutils-apple-patches-7.3-r2.tar.bz2 44551 BLAKE2B 036cd2a2e4a66b046467f29
 DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3fdc0685fc46f82366df0b6153c1a59fbe5c122622e799754397e980e8752ef01ef25bbac81bb8f0339e92168790211b1d9c03bef2d SHA512 e7ca8cbac75671846c044abcd5415cfcf5832ff71acd5a2799b643369b02f2f7148990398c51913a3758e589f9fbff875e333aadf568e2a8a2defeafaa2aca95
 DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ead9a4734c49955a824d2cc127308eed46a614665dfe08a9d3036eb37f587e1b765a7df727facc42a33befacb0 SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
-DIST darwin-xtools-8.2.1-r101.tar.gz 3105898 BLAKE2B 3516cd252d4880b1e80c76365efef6f96830578bb5512befe33f86decdeb026fbad17fd3b27e9c3cf20d100897002e86ec08822041baa0291bb53e0b0ecf4d10 SHA512 f84cbde0853c14f03af40a124133d71d3e1710da021a593336eb4351c60edbca5753af0780f269ed4716cd194973f5437d428c5ff9615d9ce025dba3b7daef77
-DIST darwin-xtools-8.2.1-r102.tar.gz 3105944 BLAKE2B c60854e77afde1a109834e6bac2485f79387b37b871b00a83cfe42c8793685fc414a6a9fa8ef588badf824a9255478fd64c171015f22e848b41dc47d011e202a SHA512 e115e29b5b358cec5c254fc7e4f5d94567c6788f745fd48dfea464a69bd7f4e3a48bccf3334f9fbb26ca3a3cd1c4b366198e05f2f567c7fb43e81ea8f3bf151c
+DIST darwin-xtools-8.2.1-r103.tar.gz 3106189 BLAKE2B f13e77f796eefc393389206d5663c98d55c3fe0eb5123b366155e7c993cea421a039121d705cab2aa5fcdab2ef08d2b17dd5b9d6e0b2c50c97db067b0ec10283 SHA512 241f402ac368606eb9b89421a3e0a2ebbde1ea79d6e84cc55680a7f3dbc31dfa402ee7b20f605627c1bfd9097bbe824dea466339a7ff9026810911ef70940bda
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-421.2.tar.gz 625173 BLAKE2B 8f8325314861ae2ea10fbe78c74c7199b547973ac61a8e9cb76fb874a0e53395ea31c04e489f85ac7cfdb5715ae5051679453de75eb195e313113e7bbbc70340 SHA512 75f2fb840da980d44649aa3e045f50c4e37d4403fbdb1e2e5f1a85bf6d8859e1130053c3806f7ef992fdfc6573f7f18146263c690144bdd3df31452c6bdd8bd8
 DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a7978aa050b329132963b26e4a2b3ef3dd034b04247531a11a07de5135b3726a429165cbfcae50e06c09531f4 SHA512 7b4e17f199909450b697bf719564c6841d46f5116c48dd47ff483ae7ddfe2965db1b7c024ed8ebeeaf90cd983ed353b95f7f23c93c8971536977dc892e6d6a9d
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
deleted file mode 100644
index 5c87dd7ecf22..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r101.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake  # keep dependencies down
-
-inherit cmake
-
-DESCRIPTION="Darwin Xtools matching Xcode Tools ${PN}"
-HOMEPAGE="https://github.com/iains/darwin-xtools"
-SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -> darwin-xtools-${PVR}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="8"
-KEYWORDS="~ppc-macos ~x64-macos"
-
-# xtools uses c++11 features, not available in gcc-apple, hence gcc/clang dep
-DEPEND="sys-devel/binutils-config
-	|| ( sys-devel/gcc:* sys-devel/clang:* )
-	app-arch/xar
-	dev-libs/libyaml"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/darwin-xtools-gentoo-${PVR}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.2.1-macos-12.patch
-)
-
-src_configure() {
-	CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/xtools-${PV}
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/xtools-${PV}
-	if [[ ${CHOST} != ${CTARGET} ]] ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/xtools-${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/xtools-${PV}
-	fi
-
-	is-host-64bit() {
-		case ${CTARGET} in
-			x86_64-*|powerpc64-*|arm64-*)   echo YES   ;;
-			*)                              echo NO    ;;
-		esac
-	}
-
-	local mycmakeargs=(
-		-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
-		-DPACKAGE_VERSION="Gentoo ${PN}-${PVR}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${BINPATH%/*}" # cmake insists on /bin
-		-DCCTOOLS_LD_CLASSIC=NO  # fails to link, and is useless anyway
-		-DXTOOLS_AS_USE_CLANG=YES  # default to host as for unsupported targets
-		-DXTOOLS_AS_CLANG_USE_HOST=YES  # search for arch/as-host iso clang
-		-DXTOOLS_AS_SUBDIR="${EPREFIX}${LIBPATH}/"
-		-DXTOOLS_LTO_SUPPORT=NO
-		-DXTOOLS_HAS_LIBPRUNETRIE=YES
-		-DXTOOLS_TAPI_SUPPORT=ON
-		-DXTOOLS_USE_TAPILITE=ON
-		-DXTOOLS_HOST_IS_64B=$(is-host-64bit)
-		-DXTOOLS_BUGURL="https://bugs.gentoo.org/"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# cmake insists on installing in /bin, so move bins to the place we
-	# want them
-	mv "${ED}${BINPATH%/*}/bin" "${ED}${BINPATH}" || die
-
-	# move as impls into LIBPATH, such that binutils-config doesn't
-	# create links for this
-	dodir "${LIBPATH}"
-	local as
-	for as in "${ED}${BINPATH}"/*/as ; do
-		as=${as%/as}
-		mv "${as}" "${ED}${LIBPATH}"/ || die
-	done
-
-	# provide as-host wrappers, used on "unsupported" platforms: x86,
-	# x64, arm, arm64, the main reason here is missing support for
-	# instructions, e.g. the as works fine, until newer instruction sets
-	# are used like SSE4.1, AVX, etc.
-	local arch
-	for arch in i386 x86_64 arm arm64 ; do
-		mkdir -p "${ED}${LIBPATH}"/${arch}
-		as="${ED}${LIBPATH}"/${arch}/as-host
-		rm -f "${as}"
-		cat <<-EOF > "${as}"
-			#!/usr/bin/env bash
-			exec /usr/bin/as "\$@"
-		EOF
-		chmod 755 "${as}"
-	done
-
-	doman ld64/doc/man/man*/* cctools/man/*.[135]
-	dodir "${DATAPATH}"
-	mv "${ED}"/usr/share/man "${ED}/${DATAPATH}/" || die
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="xtools-${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-xtools-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-xtools-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r102.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r103.ebuild
similarity index 100%
rename from sys-devel/binutils-apple/binutils-apple-8.2.1-r102.ebuild
rename to sys-devel/binutils-apple/binutils-apple-8.2.1-r103.ebuild
diff --git a/sys-devel/binutils-apple/metadata.xml b/sys-devel/binutils-apple/metadata.xml
index 481c99bd5bd5..d64768b87649 100644
--- a/sys-devel/binutils-apple/metadata.xml
+++ b/sys-devel/binutils-apple/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="classic">Use nm, otool, etc. from this ebuild
 			instead of llvm-based tools</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">grobian/darwin-xtools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index c79da63bd7b4..a8e811c9f373 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -21,10 +21,12 @@ DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69ae
 DIST gcc-13-20230527.tar.xz 83956360 BLAKE2B 86a2131b88144817673a6300c73b29c2dbb8559a7057609601029aaf60aeb4c4926fa4b99c4e1768726cde09f994159685768b62b3ca73d7b606847788301e82 SHA512 87566c74258f9981742eae77f552361c220f79fa6f17c36d5b5a9e73f41c50d8a2cab16b9ffb17f07829005f0d42b4b1d524150d3dcba9710091532cbfad7152
 DIST gcc-13-20230624.tar.xz 83969940 BLAKE2B 8a145ade87b38226d25161a0494b781e3cba1cfda229ffa367ed570aa97cdd3c38a520ae14e9ed9050fe844b229ac7bd8c2ef37544c472d39b8d75f7b9ecc3af SHA512 98e5fe2e780646f67f6d8ed2e9f8338a9be27ade40c2cfa78b7fa3f9c9a0a74771292b3eb81c5713f230f90bdec46104fa655ca4286bb9e6065432ae10122f54
 DIST gcc-13-20230701.tar.xz 83971804 BLAKE2B 3f5bab12f47e44f57556c320d2d9a8ca4a64ba392af62e59d34188aca1cad759358fc3082ec3b959c938d03f6819f9c2974f6252754e0038baec6652f325cb5b SHA512 68d5ade55c082ef80dd4b66bcac1c5fc59f82f5dabaf6b4f703d7f4bc04a92c34e9a554bfa7794861630af97df668b5c7b81548ee7692e22cad25c0a5eb651ef
+DIST gcc-13-20230708.tar.xz 83997508 BLAKE2B b19c5f8bb90bb38f8e30e5cc04ddc7c26db007b309ce4007163b0be2d73fa0f8adbbcc318e9933e58ecdb52fa17d4b70221df4ac48f1b5fa28599e418bb71ae9 SHA512 c3fc449a6ec66786d3a6bd665749eed94108295e1c787c95e27e46311fd86d17f0e501636f2fb5db5d9f90d4a137632933056a8ff5fcb1988ffd4310adce95e3
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B 29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907 SHA512 4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c
 DIST gcc-14-20230625.tar.xz 84461556 BLAKE2B 231980a191e231a3f7dabc8f69ab364ecf1f3cf9a165a7e0bcbb9ad4ed17bda0616be325fe6cd2996321f6bfbc69f5e8d4a13513c3126132a0797d9d1c5c422f SHA512 d794a977a7a6b759729386eb13bff934f90c093716c47e89b7490dbd36ea489f5dfb03d0c6c0f7d57e1d4214dad8a82d886438c8eb5af53620cf2a85236f0b45
 DIST gcc-14-20230702.tar.xz 84492372 BLAKE2B f78631cadce2926dba3f5d5a7b139cb8c29fe16a12fc430b393061529a181598a633d92a6bc927644f372fab3514a9c42faeda7e9bbc115478fc472657848776 SHA512 33e37d41c00f48b674061d37f142fc9b1bf23f0f77311877910a97dc86c617857b32559aae994421867b549659b8f0669c5953ee58a884e008e9e33115839942
+DIST gcc-14-20230709.tar.xz 84551412 BLAKE2B 0c60b49481d72b8a08410a726158c7a071c41a71553a4988c15be5072a412e806d3524a7df4712a167c35022984ae80b242e54ed2cd6c66218c13947d5e78693 SHA512 4023fcb3e3b4a730c46d7affd504efa53d7fd8f941b7028af90f4b0f27e9687e4554d91220d38eb5aec214728d19ee9c07ccf5a921c9e9516d71dfeb52d1b61f
 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
 DIST gcc-14.0.0-patches-2.tar.xz 11484 BLAKE2B 6ff968051d286f21eb7f4ec80303b232530c153cca8d9e61ddfdf3675ef8c5740223a8b720ec9d5c4561b505993c675cc6fc7a9bab659ee1db99e1d97911eb74 SHA512 b255338d6110d9bfe211ba14da7b186f69b81503dba6e4ec19ee6fa37d44c0690e713c763abe27ce934ff7f9e5d0c8788a54c30587f07f65858b1e817cbf7247
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
diff --git a/sys-devel/gcc/gcc-13.1.1_p20230708.ebuild b/sys-devel/gcc/gcc-13.1.1_p20230708.ebuild
new file mode 100644
index 000000000000..994717045fb5
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.1.1_p20230708.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="13.2.0"
+PATCH_VER="3"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-14.0.0_pre20230709.ebuild b/sys-devel/gcc/gcc-14.0.0_pre20230709.ebuild
new file mode 100644
index 000000000000..59534d9e96dd
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.0.0_pre20230709.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.0.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="14.0.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 11314a2bc56a..0d6ef8d4f8bb 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild b/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild
index 4bb0bf958007..82f72de46998 100644
--- a/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild
+++ b/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/sof-bin-v${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Needed for sof-ctl
 RDEPEND="media-libs/alsa-lib"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 576bb6292ac1..74d3de2e52cd 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 56d866ff5c0e..f00537cdc1c0 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,2 +1,2 @@
-DIST bees-0.8.tar.gz 166890 BLAKE2B 26c7563ed1433526371d45e5f2f9e4f2a749e18f0d97e7a2ee445ef9d4cdf49210c8a96f756c04d19337497d12eacde28430f9ad64df198ff44c901b1bfc36c2 SHA512 92208ee186de18e764fab42f3de4e518047a21f4ed2429040a706fe7a45e0b2d39d1e468beefc92553659fc4587f4894a33d5a26bfd59278923208db3acc7da0
-DIST bees-0.9.tar.gz 176570 BLAKE2B f210afc342debb9fcdaba977ecccee9c07929197ccda942566634ef4d08c8bd11edb67ea50e05b046771faad212a9c3e01fc98c74dc759785afa588ba1d68b06 SHA512 dce90fc6f1741356331cc8c43536ea497c41a702be1b2bc2196f9ad0d5083d7255f15d529cf2804e4f36675ccc4a1d11d25ee266071a984199706ae2cd285c43
+DIST bees-0.10.tar.gz 177509 BLAKE2B 269cf65d5250a07297dfaee6c0fd6bc25199d63fe423d63ce39df8bcdb64d6f8110a0e03d0dc7dc1b105a8886f2a9364da8878481546eaa8dbf3dc46abc569ed SHA512 77a4ae3d66430c2d9dc0351c16c60bad95f21e238fc00f5f5787f55929ba75ee25212ac4bb4a3e4a9419cec27bbcfd2987aa925a54bc2872609b38a698dbedc3
+DIST bees-0.9.3.tar.gz 177265 BLAKE2B f0363771647ee07b12afe3ef44c1453e4677e12b051e33a81517a6044a459237b72712a09b31895147cd171a649ba15fc75676f34df46c9520248eae09e193e1 SHA512 5517773478cd56915ec3aee6542f6128a0f72b10aa96708d20778a76a427890bdfd9d8ba775b9dff3395d2e203fa2995070f9aca509b8150b9a9bcf076828ebb
diff --git a/sys-fs/bees/bees-0.10.ebuild b/sys-fs/bees/bees-0.10.ebuild
new file mode 100644
index 000000000000..1b164eb56b08
--- /dev/null
+++ b/sys-fs/bees/bees-0.10.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+else
+	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-fs/btrfs-progs-4.20.2
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+PATCHES=(
+	"${FILESDIR}/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt 4 11; then
+			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
+			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
+			ewarn "running, it's recommended to run at least kernel 4.11."
+			ewarn
+		elif kernel_is -lt 4 14 29; then
+			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
+			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
+			ewarn "with more recent kernels:"
+			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
+			ewarn
+		elif kernel_is -lt 5 7 0; then
+			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
+			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
+			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
+			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
+			ewarn
+		fi
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
+		if kernel_is -lt 5 4 19; then
+			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
+			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
+			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
+			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
+			ewarn "the device RO without writing corrupted meta-data. More details:"
+			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
+			ewarn
+		fi
+		if kernel_is -gt 5 15 106; then
+			if kernel_is -lt 6 3 10; then
+				ewarn "With kernel versions 5.15.107 or later, there is a memory fragmentation"
+				ewarn "issue with LOGICAL_INO which can lead to cache thrashing and cause IO"
+				ewarn "latency spikes. This version ships with a work-around at the cost of not"
+				ewarn "handling highly duplicated filesystems that well. More details:"
+				ewarn "https://github.com/Zygo/bees/issues/260"
+				ewarn
+			fi
+		fi
+
+		elog "Bees recommends running the latest current kernel for performance and"
+		elog "reliability reasons, see README.md."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
+src_configure() {
+	tc-export CC CXX AR
+	cat >localconf <<-EOF || die
+		ETC_PREFIX="${EPREFIX}/etc"
+		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
+		PREFIX="${EPREFIX}/usr"
+		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
+		DEFAULT_MAKE_TARGET=all
+	EOF
+	if [[ ${PV} != "9999" ]] ; then
+		echo BEES_VERSION=v${PV} >>localconf || die
+	fi
+}
+
+src_compile() {
+	default
+	# localconf quotes leak in the systemd unit but are still needed for spaces
+	sed -i 's/"//g' scripts/beesd@.service || die
+}
diff --git a/sys-fs/bees/bees-0.8.ebuild b/sys-fs/bees/bees-0.8.ebuild
deleted file mode 100644
index 8c6ac6117418..000000000000
--- a/sys-fs/bees/bees-0.8.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
-HOMEPAGE="https://github.com/Zygo/bees"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
-else
-	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="tools"
-
-DEPEND="
-	>=sys-apps/util-linux-2.30.2
-	>=sys-fs/btrfs-progs-4.20.2
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~BTRFS_FS"
-ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 11; then
-			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
-			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
-			ewarn "running, it's recommended to run at least kernel 4.11."
-			ewarn
-		elif kernel_is -lt 4 14 29; then
-			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
-			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
-			ewarn "with more recent kernels:"
-			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
-			ewarn
-		elif kernel_is -lt 5 7 0; then
-			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
-			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
-			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
-			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
-			ewarn
-		fi
-		if kernel_is -lt 5 1 0; then
-			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
-			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
-			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
-			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
-			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
-			ewarn
-		fi
-		if kernel_is -lt 5 4 19; then
-			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
-			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
-			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
-			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
-			ewarn "the device RO without writing corrupted meta-data. More details:"
-			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
-			ewarn
-		fi
-		if kernel_is -ge 5 4 0; then
-			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
-			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
-			ewarn "by bees but also other software running such operations, bees will just more"
-			ewarn "likely trigger this bug. You can work around this issue by reducing the"
-			ewarn "thread count of bees to 1."
-			ewarn
-		fi
-
-		elog "Bees recommends running the latest current kernel for performance and"
-		elog "reliability reasons, see README.md."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i 's/ -Werror//' makeflags || die
-}
-
-src_configure() {
-	tc-export CC CXX AR
-	cat >localconf <<-EOF || die
-		ETC_PREFIX="${EPREFIX}/etc"
-		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
-		PREFIX="${EPREFIX}/usr"
-		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
-		DEFAULT_MAKE_TARGET=all
-	EOF
-	if [[ ${PV} != "9999" ]] ; then
-		echo BEES_VERSION=v${PV} >>localconf || die
-	fi
-	if use tools; then
-		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
-	fi
-}
-
-src_compile() {
-	default
-	# localconf quotes leak in the systemd unit but are still needed for spaces
-	sed -i 's/"//g' scripts/beesd@.service || die
-}
diff --git a/sys-fs/bees/bees-0.9.3.ebuild b/sys-fs/bees/bees-0.9.3.ebuild
new file mode 100644
index 000000000000..a1b15c2ef627
--- /dev/null
+++ b/sys-fs/bees/bees-0.9.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+else
+	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-fs/btrfs-progs-4.20.2
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+PATCHES=(
+	"${FILESDIR}/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt 4 11; then
+			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
+			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
+			ewarn "running, it's recommended to run at least kernel 4.11."
+			ewarn
+		elif kernel_is -lt 4 14 29; then
+			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
+			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
+			ewarn "with more recent kernels:"
+			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
+			ewarn
+		elif kernel_is -lt 5 7 0; then
+			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
+			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
+			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
+			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
+			ewarn
+		fi
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
+		if kernel_is -lt 5 4 19; then
+			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
+			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
+			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
+			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
+			ewarn "the device RO without writing corrupted meta-data. More details:"
+			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
+			ewarn
+		fi
+		if kernel_is -gt 5 15 106; then
+			if kernel_is -lt 6 3 10; then
+				ewarn "With kernel versions 5.15.107 or later, there is a memory fragmentation"
+				ewarn "issue with LOGICAL_INO which can lead to cache thrashing and cause IO"
+				ewarn "latency spikes. This version ships with a work-around at the cost of not"
+				ewarn "handling highly duplicated filesystems that well. More details:"
+				ewarn "https://github.com/Zygo/bees/issues/260"
+				ewarn
+			fi
+		fi
+
+		elog "Bees recommends running the latest current kernel for performance and"
+		elog "reliability reasons, see README.md."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
+src_configure() {
+	tc-export CC CXX AR
+	cat >localconf <<-EOF || die
+		ETC_PREFIX="${EPREFIX}/etc"
+		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
+		PREFIX="${EPREFIX}/usr"
+		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
+		DEFAULT_MAKE_TARGET=all
+	EOF
+	if [[ ${PV} != "9999" ]] ; then
+		echo BEES_VERSION=v${PV} >>localconf || die
+	fi
+}
+
+src_compile() {
+	default
+	# localconf quotes leak in the systemd unit but are still needed for spaces
+	sed -i 's/"//g' scripts/beesd@.service || die
+}
diff --git a/sys-fs/bees/bees-0.9.ebuild b/sys-fs/bees/bees-0.9.ebuild
deleted file mode 100644
index 4834204acfcf..000000000000
--- a/sys-fs/bees/bees-0.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
-HOMEPAGE="https://github.com/Zygo/bees"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
-else
-	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=sys-apps/util-linux-2.30.2
-	>=sys-fs/btrfs-progs-4.20.2
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~BTRFS_FS"
-ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 11; then
-			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
-			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
-			ewarn "running, it's recommended to run at least kernel 4.11."
-			ewarn
-		elif kernel_is -lt 4 14 29; then
-			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
-			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
-			ewarn "with more recent kernels:"
-			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
-			ewarn
-		elif kernel_is -lt 5 7 0; then
-			ewarn "With kernel versions below 5.4.96 and 5.7, the kernel may hold file system"
-			ewarn "locks for a long time while at the same time CPU usage increases when bees is"
-			ewarn "operating. bees tries to avoid this behavior by excluding very common extents"
-			ewarn "from deduplication. This has only a minimal impact on dedupe effectiveness."
-			ewarn
-		fi
-		if kernel_is -lt 5 1 0; then
-			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
-			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
-			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
-			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
-			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
-			ewarn
-		fi
-		if kernel_is -lt 5 4 19; then
-			ewarn "With kernel versions below 5.4.19, bees may trigger a btrfs bug when running"
-			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
-			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
-			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
-			ewarn "the device RO without writing corrupted meta-data. More details:"
-			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
-			ewarn
-		fi
-		if kernel_is -ge 5 4 0; then
-			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
-			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
-			ewarn "by bees but also other software running such operations, bees will just more"
-			ewarn "likely trigger this bug. You can work around this issue by reducing the"
-			ewarn "thread count of bees to 1."
-			ewarn
-		fi
-
-		elog "Bees recommends running the latest current kernel for performance and"
-		elog "reliability reasons, see README.md."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i 's/ -Werror//' makeflags || die
-}
-
-src_configure() {
-	tc-export CC CXX AR
-	cat >localconf <<-EOF || die
-		ETC_PREFIX="${EPREFIX}/etc"
-		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
-		PREFIX="${EPREFIX}/usr"
-		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
-		DEFAULT_MAKE_TARGET=all
-	EOF
-	if [[ ${PV} != "9999" ]] ; then
-		echo BEES_VERSION=v${PV} >>localconf || die
-	fi
-}
-
-src_compile() {
-	default
-	# localconf quotes leak in the systemd unit but are still needed for spaces
-	sed -i 's/"//g' scripts/beesd@.service || die
-}
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index f84aba717799..1b164eb56b08 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -29,6 +29,10 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
+PATCHES=(
+	"${FILESDIR}/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch"
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if kernel_is -lt 4 11; then
@@ -66,13 +70,15 @@ pkg_pretend() {
 			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
 			ewarn
 		fi
-		if kernel_is -ge 5 4 0; then
-			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
-			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
-			ewarn "by bees but also other software running such operations, bees will just more"
-			ewarn "likely trigger this bug. You can work around this issue by reducing the"
-			ewarn "thread count of bees to 1."
-			ewarn
+		if kernel_is -gt 5 15 106; then
+			if kernel_is -lt 6 3 10; then
+				ewarn "With kernel versions 5.15.107 or later, there is a memory fragmentation"
+				ewarn "issue with LOGICAL_INO which can lead to cache thrashing and cause IO"
+				ewarn "latency spikes. This version ships with a work-around at the cost of not"
+				ewarn "handling highly duplicated filesystems that well. More details:"
+				ewarn "https://github.com/Zygo/bees/issues/260"
+				ewarn
+			fi
 		fi
 
 		elog "Bees recommends running the latest current kernel for performance and"
diff --git a/sys-fs/bees/files/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch b/sys-fs/bees/files/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch
new file mode 100644
index 000000000000..0ceb5cbfc79e
--- /dev/null
+++ b/sys-fs/bees/files/0001-HACK-crucible-Work-around-kernel-memory-fragmentatio.patch
@@ -0,0 +1,34 @@
+From 10c2006e627b5bda74f9f8aca1a574aa0e0e1eaa Mon Sep 17 00:00:00 2001
+From: Kai Krakow <kai@kaishome.de>
+Date: Sun, 9 Jul 2023 12:24:40 +0200
+Subject: [PATCH] HACK: crucible: Work around kernel memory fragmentation
+
+According to @Zygo:
+
+> This will drastically reduce the number of reflinks bees can handle
+> to a single extent, but that size is beyond more than enough for most
+> filesystems. Making the buffer smaller may also reduce the size of
+> vmallocs which might be aggravating the kernel's memory manager.
+
+Link: https://github.com/Zygo/bees/issues/260#issuecomment-1627586574
+Signed-off-by: Kai Krakow <kai@kaishome.de>
+---
+ include/crucible/fs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/crucible/fs.h b/include/crucible/fs.h
+index 6d1780b..5da7da0 100644
+--- a/include/crucible/fs.h
++++ b/include/crucible/fs.h
+@@ -65,7 +65,7 @@ namespace crucible {
+ 	};
+ 
+ 	struct BtrfsIoctlLogicalInoArgs {
+-		BtrfsIoctlLogicalInoArgs(uint64_t logical, size_t buf_size = 16 * 1024 * 1024);
++		BtrfsIoctlLogicalInoArgs(uint64_t logical, size_t buf_size = 64 * 1024);
+ 
+ 		uint64_t get_flags() const;
+ 		void set_flags(uint64_t new_flags);
+-- 
+2.39.3
+
diff --git a/sys-fs/bees/metadata.xml b/sys-fs/bees/metadata.xml
index 29a9cccdbdf5..c7b55c3b67c7 100644
--- a/sys-fs/bees/metadata.xml
+++ b/sys-fs/bees/metadata.xml
@@ -9,11 +9,8 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-<use>
-	<flag name="tools">Build extra tools useful for debugging (fiemap, fiewalk)</flag>
-</use>
-<upstream>
-	<bugs-to>https://github.com/Zygo/bees/issues</bugs-to>
-	<remote-id type="github">Zygo/bees</remote-id>
-</upstream>
+	<upstream>
+		<bugs-to>https://github.com/Zygo/bees/issues</bugs-to>
+		<remote-id type="github">Zygo/bees</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/udisks/udisks-2.9.4-r1.ebuild b/sys-fs/udisks/udisks-2.9.4-r1.ebuild
deleted file mode 100644
index 2d8d5e0ce7dc..000000000000
--- a/sys-fs/udisks/udisks-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	elogind? ( daemon )
-	systemd? ( daemon )
-	zram? ( systemd )
-"
-
-# See configure.ac file for the required min version
-BLOCKDEV_MIN_VER="2.25"
-
-COMMON_DEPEND="
-	>=sys-auth/polkit-0.114
-	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[cryptsetup,lvm?,vdo(-)?]
-	virtual/udev
-	acl? ( virtual/acl )
-	daemon? (
-		>=dev-libs/glib-2.50:2
-		>=dev-libs/libatasmart-0.19
-		>=dev-libs/libgudev-165:=
-	)
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	lvm? ( sys-fs/lvm2 )
-	systemd? ( >=sys-apps/systemd-209 )
-	zram? ( >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[kbd] )
-"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-block/parted-3
-	>=sys-apps/util-linux-2.30
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.1
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	>=dev-util/gdbus-codegen-2.32
-	>=dev-util/gtk-doc-am-1.3
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-"
-# If adding a eautoreconf, then these might be needed at buildtime:
-# dev-libs/gobject-introspection-common
-# sys-devel/autoconf-archive
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-undefined.patch" # 782061
-)
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-	default
-
-	if ! use systemd ; then
-		sed -i -e 's:libsystemd-login:&disable:' configure || die
-	fi
-
-	# Added for bug # 782061
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-btrfs
-		--disable-gtk-doc
-		--disable-static
-		--localstatedir="${EPREFIX}"/var
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-udevdir="${EPREFIX}$(get_udevdir)"
-		$(use_enable acl)
-		$(use_enable daemon)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_enable lvm lvm2)
-		$(use_enable lvm lvmcache)
-		$(use_enable nls)
-		$(use_enable vdo)
-		$(use_enable zram)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-}
-
-pkg_preinst() {
-	# Remove gtk-doc symlink, #597628
-	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
-		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-
-	# TODO: obsolete with tmpfiles_process?
-	# mkdir -p "${EROOT}"/run #415987
-
-	tmpfiles_process udisks2.conf
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/udisks/udisks-2.9.4-r3.ebuild b/sys-fs/udisks/udisks-2.9.4-r3.ebuild
new file mode 100644
index 000000000000..12ec4ea23ef4
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.9.4-r3.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+	zram? ( systemd )
+"
+
+# See configure.ac file for the required min version
+BLOCKDEV_MIN_VER="2.25"
+
+# <libblockdev-3 dep for bug #910077, should go away with udisks-2.10
+COMMON_DEPEND="
+	>=sys-auth/polkit-0.114
+	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,vdo(-)?]
+	<sys-libs/libblockdev-3[cryptsetup,lvm?,vdo(-)?]
+	virtual/udev
+	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.50:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+	)
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+	zram? ( >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[kbd(-)] )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-block/parted-3
+	>=sys-apps/util-linux-2.30
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# dev-libs/gobject-introspection-common
+# sys-devel/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-undefined.patch" # 782061
+)
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+
+	# Added for bug # 782061
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-udevdir="${EPREFIX}$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable daemon)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable lvm lvmcache)
+		$(use_enable nls)
+		$(use_enable vdo)
+		$(use_enable zram)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	# TODO: obsolete with tmpfiles_process?
+	# mkdir -p "${EROOT}"/run #415987
+
+	tmpfiles_process udisks2.conf
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 449b86cac98f..57fc9e340458 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index b91da04e9455..adb8ab145f9e 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,8 +1,2 @@
-DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
-DIST patch-6.4-rc1.patch 150354035 BLAKE2B a2f069cd47ad350fe811cf8abe2094afd8a107f7dec1eb978ccdecbd25e2beff27dafef569617d333facbd68c23be149719ac474c7bd1526dbd36b05424f4725 SHA512 eb31cb141d8ce6ffd0bdfc6b0a27e1e8bfa5bfe43e150e35d097afb3d8fca9bae811a85da337af8b5eceaac417d2cf19728e2f35125500b03fea03c86a4eeb9a
-DIST patch-6.4-rc2.patch 150656723 BLAKE2B 624d3779fac3e586aa6609d1714f59a5c61d9b8c2ced2afaf1700d3118b8b3c8cf8a4c878b2005a72d4ef456df86412334b5390ffd3e6d4bdfa4e8cd976ba0e2 SHA512 dcd1df2705c022d46ace14f80bb163a529f15e46251120c8e5c20aaf6fbbd0a97d45170ac4995ca96fa2b8adb7016ea24b0137cfe8914e1ea8b0d8c94c890413
-DIST patch-6.4-rc3.patch 151001733 BLAKE2B d53e66f071130fb1ac0258370b261d2e84c6a5e8dedbb464a0357f73cfdd855f9ef95c34bfd373e582f6b7a655ca9f5c18748089a4326d1e2ba5d8d0f43fa133 SHA512 513cd524de5e243ea97e7c3ccb47c07dcad57fd7de6fdd05e9ad6f93a5b8687416e0edadbd2d1212546abc92680282c4879ec078fa1bb99bd2b8e539ac71b4b8
-DIST patch-6.4-rc4.patch 157630177 BLAKE2B 168e13117170797794bc6efab20c5f5be09e04a4ca785192071e4e45e20a9679d18fb4279c05b1636dc4cea8b722ac85e276259b54c0e4c31caa5caf392a1921 SHA512 3de0114828d7386640c72168286e90e5e0999a3611e27b3c22389d5b894004aae3ddbd8ac69e1fc9630c75a0d2fc8fdcb4056eb71558287803ae3cf0a0e6b291
-DIST patch-6.4-rc5.patch 157869611 BLAKE2B 6f033eb3575198e7bb8216eb16d548d75c40376cdfd0692ecd110b9a6c9d8c2262a30b53367972a87a774c94b0a2050418ec688ee2962256023943b55323925b SHA512 77ebfcb6d6241f9310e997c83f8a6b4a481e1eb82c0c1456bf4c4148757cc8f7e0b3490acb2f6bd361471fe5364146800b1132882de39cc5be3137519512cce0
-DIST patch-6.4-rc6.patch 158112889 BLAKE2B 131ab84ca69986efe2f6031dcb94625ba281764bda20aa070a13fdb1e55e29ba99efb6aea58051f406b8fd985edc0ce4dfac0b16cef01214612cbcd5d13bd637 SHA512 f07e70e63ed79fb5c5b048b5dfad772368611d7f47bd17db78330286f5ba383eb0e70191922d293e6d8344396a6d387351c60bfc887a5996b02a718f89850657
-DIST patch-6.4-rc7.patch 158329762 BLAKE2B daca6c7612ef24b4c3b09d6fe1564082008735bd5363a0b77e846308ec3e639ad7da868345561d60b2796b189746993c131c8afed0039878afcbbb284e5d05fc SHA512 779a48b836c3fb42cfc80f873d34e794d264390064661ff86b3252683d2f2be685640c98f42f635ad1c678985f87612062eedd1a75de8f8055fe5b8367d7d10f
+DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928
+DIST patch-6.5-rc1.patch 78732464 BLAKE2B b075400393c866b64193e651350457e7f653d26bb67d3e14de002ebbaf2c5cb683b687afd415a063f2fd8738910650c2d303533d0b26e6af904416bf959a9c94 SHA512 a0cce4013ad2281809a770615101cf620f33e3e4774f41942b1705e60fb1180065dd1226bf7b24eb4f4e5e9bcab2591383619dad8a460b94c1f011e779607226
diff --git a/sys-kernel/git-sources/git-sources-6.4_rc1.ebuild b/sys-kernel/git-sources/git-sources-6.4_rc1.ebuild
deleted file mode 100644
index ae9a3401cdd2..000000000000
--- a/sys-kernel/git-sources/git-sources-6.4_rc1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.2"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.4_rc2.ebuild b/sys-kernel/git-sources/git-sources-6.4_rc2.ebuild
deleted file mode 100644
index ae9a3401cdd2..000000000000
--- a/sys-kernel/git-sources/git-sources-6.4_rc2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.2"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.4_rc3.ebuild b/sys-kernel/git-sources/git-sources-6.4_rc3.ebuild
deleted file mode 100644
index ae9a3401cdd2..000000000000
--- a/sys-kernel/git-sources/git-sources-6.4_rc3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.2"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.4_rc4.ebuild b/sys-kernel/git-sources/git-sources-6.4_rc4.ebuild
deleted file mode 100644
index ae9a3401cdd2..000000000000
--- a/sys-kernel/git-sources/git-sources-6.4_rc4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.2"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.4_rc5.ebuild b/sys-kernel/git-sources/git-sources-6.4_rc5.ebuild
deleted file mode 100644
index ae9a3401cdd2..000000000000
--- a/sys-kernel/git-sources/git-sources-6.4_rc5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.2"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.4_rc6.ebuild b/sys-kernel/git-sources/git-sources-6.4_rc6.ebuild
deleted file mode 100644
index ae9a3401cdd2..000000000000
--- a/sys-kernel/git-sources/git-sources-6.4_rc6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.2"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.4_rc7.ebuild b/sys-kernel/git-sources/git-sources-6.4_rc7.ebuild
deleted file mode 100644
index ae9a3401cdd2..000000000000
--- a/sys-kernel/git-sources/git-sources-6.4_rc7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.2"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-6.5_rc1.ebuild b/sys-kernel/git-sources/git-sources-6.5_rc1.ebuild
new file mode 100644
index 000000000000..ddb3116ab32a
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.5_rc1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.4"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6d54fdbfabfc..b547b0cc8322 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/glibc-2.37-r3.ebuild b/sys-libs/glibc/glibc-2.37-r3.ebuild
index f5259765d7d6..e92a8205be02 100644
--- a/sys-libs/glibc/glibc-2.37-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r3.ebuild
@@ -42,7 +42,7 @@ MIN_PAX_UTILS_VER="1.3.3"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 4df36cdc8961..4046bb32be93 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1 +1,2 @@
 DIST libblockdev-2.28.tar.gz 925698 BLAKE2B 63ac7ab5bd02c1ef1848d0b252e09fe721cfe86258f063b7bab616766cbc56311707dcb2dd3a1fadf0e0840187f121aa178fd5959500cd590b846238a9d3e36e SHA512 9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392
+DIST libblockdev-3.0.1.tar.gz 1066201 BLAKE2B bc213683fcfe78fcbeb494be90a5974911603f301152095b7aa6e0f14c0acfcaf946e8ef175b201d04d47de9d7743d9feaff5a31b23086b0253b5cab9cab24ee SHA512 b45e2f26691fe4016c8a161e1300f1edfca7a810e7535dd1eb787ad88a0d3110f75e0da289027eaed16bad275bfbb709b29b946e5fc3750a56e86c6453aa3a6d
diff --git a/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch b/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch
new file mode 100644
index 000000000000..c57464c39d86
--- /dev/null
+++ b/sys-libs/libblockdev/files/libblockdev-3.0.1-sh_tests.patch
@@ -0,0 +1,23 @@
+bash is fine with "test . == ." but e.g. dash fails on not having
+the two dots quoted as strings.
+
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ html-doc.stamp: ${srcdir}/libblockdev-docs.xml ${srcdir}/libblockdev-sections.txt ${srcdir}/3.0-api-changes.xml $(wildcard ${srcdir}/../src/plugins/*.[ch]) $(wildcard ${srcdir}/../src/lib/*.[ch]) $(wildcard ${srcdir}/../src/utils/*.[ch])
+ 	touch ${builddir}/html-doc.stamp
+-	test ${builddir} = ${srcdir} || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir}
++	test "${builddir}" = "${srcdir}" || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir}
+ 	gtkdoc-scan --rebuild-types --module=libblockdev --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ --ignore-headers="${srcdir}/../src/plugins/check_deps.h ${srcdir}/../src/plugins/dm_logging.h ${srcdir}/../src/plugins/vdo_stats.h ${srcdir}/../src/plugins/fs/common.h"
+ 	gtkdoc-mkdb --module=libblockdev --output-format=xml --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ --source-suffixes=c,h
+ 	test -d ${builddir}/html || mkdir ${builddir}/html
+@@ -13,7 +13,7 @@
+ 	-rm -rf ${builddir}/html
+ 	-rm -rf ${builddir}/xml
+ 	test ! -f ${builddir}/html-doc.stamp || rm ${builddir}/html-doc.stamp
+-	test ${builddir} = ${srcdir} || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml ${builddir}/3.0-api-changes.xml
++	test "${builddir}" = "${srcdir}" || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml ${builddir}/3.0-api-changes.xml
+ 
+ install-data-local:
+ 	test -d ${DESTDIR}${datadir}/gtk-doc/html/libblockdev || mkdir -p ${DESTDIR}${datadir}/gtk-doc/html/libblockdev
diff --git a/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
index 4d0836e9f708..16134d249951 100644
--- a/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 fi
 LICENSE="LGPL-2+"
-SLOT="0"
+SLOT="0/2"	# subslot is SOVERSION
 IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
 # Tests require root. In a future release, we may be able to run a smaller
 # subset with new run_tests.py arguments.
diff --git a/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild b/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild
index 1be0372d3a14..b0ea270cfb87 100644
--- a/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.28-r2.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="LGPL-2+"
-SLOT="0"
+SLOT="0/2"	# subslot is SOVERSION
 IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
 # Tests require root. In a future release, we may be able to run a smaller
 # subset with new run_tests.py arguments.
diff --git a/sys-libs/libblockdev/libblockdev-3.0.1.ebuild b/sys-libs/libblockdev/libblockdev-3.0.1.ebuild
new file mode 100644
index 000000000000..f5bc2e4fb5e5
--- /dev/null
+++ b/sys-libs/libblockdev/libblockdev-3.0.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit autotools python-single-r1 xdg-utils
+
+DESCRIPTION="A library for manipulating block devices"
+HOMEPAGE="https://github.com/storaged-project/libblockdev"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
+	BDEPEND="
+		sys-devel/autoconf-archive
+	"
+else
+	MY_PV="${PV}-1"
+	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
+fi
+LICENSE="LGPL-2+"
+SLOT="0/3"	# subslot is SOVERSION
+IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools"
+# Tests require root. In a future release, we may be able to run a smaller
+# subset with new run_tests.py arguments.
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.2
+	dev-libs/libbytesize
+	sys-apps/gptfdisk
+	>=sys-apps/kmod-19
+	>=sys-apps/util-linux-2.27
+	>=sys-block/parted-3.1
+	cryptsetup? (
+		escrow? (
+			>=dev-libs/nss-3.18.0
+			dev-libs/volume_key
+		)
+		>=sys-apps/keyutils-1.5.0:=
+		>=sys-fs/cryptsetup-2.3.0:=
+	)
+	device-mapper? ( sys-fs/lvm2 )
+	lvm? (
+		sys-fs/lvm2
+		virtual/udev
+	)
+	nvme? ( sys-libs/libnvme )
+	${PYTHON_DEPS}
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND+="
+	dev-util/gtk-doc-am
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
+	test? (
+		$(python_gen_cond_dep '
+			dev-libs/libbytesize[python,${PYTHON_USEDEP}]
+		')
+		sys-block/targetcli-fb
+	)
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		escrow? ( cryptsetup )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.1-sh_tests.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_environment_reset #623992
+	default
+
+	# https://bugs.gentoo.org/744289
+	find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
+		| xargs --null sed "s@ -Werror@@" -i || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-btrfs
+		--with-fs
+		--with-part
+		--with-python3
+		--without-mpath
+		--without-nvdimm
+		$(use_enable introspection)
+		$(use_enable test tests)
+		$(use_with cryptsetup crypto)
+		$(use_with device-mapper dm)
+		$(use_with escrow)
+		$(use_with gtk-doc)
+		$(use_with lvm lvm)
+		$(use_with lvm lvm-dbus)
+		$(use_with nvme)
+		$(use_with tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See http://storaged.org/libblockdev/ch03.html
+	# The 'check' target just does Pylint.
+	# ... but it needs root.
+	emake test
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
+	# doesn't work at all.
+	if ! use lvm ; then
+		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
+	fi
+	python_optimize #718576
+}
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 73e19fc076a1..59bd04d7fe4e 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
@@ -20,8 +20,8 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd +nvme test +tools"
+SLOT="0/3"	# subslot is SOVERSION
+IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools"
 # Tests require root. In a future release, we may be able to run a smaller
 # subset with new run_tests.py arguments.
 RESTRICT="!test? ( test ) test"
@@ -29,6 +29,7 @@ RESTRICT="!test? ( test ) test"
 RDEPEND="
 	>=dev-libs/glib-2.42.2
 	dev-libs/libbytesize
+	sys-apps/gptfdisk
 	>=sys-apps/kmod-19
 	>=sys-apps/util-linux-2.27
 	>=sys-block/parted-3.1
@@ -37,13 +38,10 @@ RDEPEND="
 			>=dev-libs/nss-3.18.0
 			dev-libs/volume_key
 		)
-		>=sys-fs/cryptsetup-1.6.7:=
+		>=sys-apps/keyutils-1.5.0:=
+		>=sys-fs/cryptsetup-2.3.0:=
 	)
 	device-mapper? ( sys-fs/lvm2 )
-	dmraid? (
-		sys-fs/dmraid
-		sys-fs/lvm2
-	)
 	lvm? (
 		sys-fs/lvm2
 		virtual/udev
@@ -60,6 +58,12 @@ BDEPEND+="
 	dev-util/gtk-doc-am
 	gtk-doc? ( dev-util/gtk-doc )
 	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
+	test? (
+		$(python_gen_cond_dep '
+			dev-libs/libbytesize[python,${PYTHON_USEDEP}]
+		')
+		sys-block/targetcli-fb
+	)
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -90,13 +94,10 @@ src_configure() {
 		--without-nvdimm
 		$(use_enable introspection)
 		$(use_enable test tests)
-		$(use_with bcache)
 		$(use_with cryptsetup crypto)
 		$(use_with device-mapper dm)
-		$(use_with dmraid)
 		$(use_with escrow)
 		$(use_with gtk-doc)
-		$(use_with kbd)
 		$(use_with lvm lvm)
 		$(use_with lvm lvm-dbus)
 		$(use_with nvme)
diff --git a/sys-libs/libnvme/libnvme-1.5.ebuild b/sys-libs/libnvme/libnvme-1.5.ebuild
index eebf0dc02112..8939d9860409 100644
--- a/sys-libs/libnvme/libnvme-1.5.ebuild
+++ b/sys-libs/libnvme/libnvme-1.5.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit python-r1 meson
 
 DESCRIPTION="C Library for NVM Express on Linux"
 HOMEPAGE="https://github.com/linux-nvme/libnvme"
+SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="dbus +json keyutils python ssl +uuid"
 
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 DEPEND="
 	json? ( dev-libs/json-c:= )
@@ -29,10 +33,6 @@ BDEPEND="
 	dev-lang/swig
 "
 
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
 src_configure() {
 	local emesonargs=(
 		-Dpython=false
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 65796a4be719..4769b66d6f18 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 82e456ea2c2a..113a2f218faa 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,4 +1,4 @@
-DIST hugo-0.110.0-vendor.tar.xz 5792924 BLAKE2B a70283d9b5764c3340591e40d6472c0f14b029e5bed086c4f294951e00a45041a869868884328ea39b75caccf8e2089250a98502a3ec38c730989a77e55c976b SHA512 c6a0cd262934b6434eac7122a0ec257ca4eec1611b938585e6ee22d56991632fd5e52c061d552772e0e8bd10e13c23aecc461d52c23dff009e8e522b651642da
-DIST hugo-0.110.0.tar.gz 29055652 BLAKE2B d8c9e04c3141f02eeea1a951ba92c552148b604817e60041a3b944ccea37565ab8a6c3a47300877f5497d4575df4cdf598627d8dea65a1c935073b7bd8e99b70 SHA512 b64a6fa50201c0d95bf49fd0193138123163e0dad077491cc4c3e0d851de03ed2cd2e81482c1e6291d9a10d2d99f89c9dbbcfaafcd17f702906901dc6f28b3de
 DIST hugo-0.111.3-vendor.tar.xz 5812152 BLAKE2B c3daccdd3e6841df3a45c4fb7c82cf5ffba0a9267881733898c54814fbc0707f0cb110604de1a0604d986bc8668347b71eb9b845217a6c1a5764a776282caea3 SHA512 ba08add570db8d8f92a31474252470f3b6440884c9d595a8bd128a0c8f9ce066553e28531c331ddc51e8f665acb555ec8f31525ceda94c5542be229b80b1a274
 DIST hugo-0.111.3.tar.gz 29191902 BLAKE2B a5c4bf3f53579b7870e5a0bed247feff016d3a06c0683949ecada5083db07ee2108c712b41b1f15edd42f0a77d5649657d3fe76d8704a8a7668911a56b045e3b SHA512 fd9fa9138cf714572d50328abc332edcdaaa3d45440914705d0d2119fd2a062c8df59732d9f5c23f540076e0c5a4104ac1d332f8633d93ab1479f82dd5ecce39
+DIST hugo-0.115.2-vendor.tar.xz 6196068 BLAKE2B 0d98ed1f3553c5eb28ceb66751c36d4b0e6bb5838a37166d1c006e4a05a888bfd850250a77c1786293bc34bad2f731052782e42b0d8c1e6cc158c076d46945d4 SHA512 e1eb88cd8fbb01bb86c265e3416bf236cb6b049467218f5ff66e2702f4304eca4ab43edbfbb4d3972d636d4dcf0fd04375fd4ebce2a40b78c1a3de1f27e08049
+DIST hugo-0.115.2.tar.gz 28547893 BLAKE2B 18496be5d24be6b0b34ff88806b6621cb361f61641efd67ed11fd413379107aad029b241a7b8730ad016c1eb1469b29feee7af33fbf0b94bb0f2fbe2a209c1bb SHA512 4c35d5d6699de1e675fa0c1dfca0f2436ac3ab7a0c164e7662400fb7b81b16ed23a6961e297f262273c18ef2eaa551b813c7d99a8634d0687e78343b23f275f6
diff --git a/www-apps/hugo/files/hugo-0.115.2-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.115.2-skip-some-tests.patch
new file mode 100644
index 000000000000..a078a7793265
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.115.2-skip-some-tests.patch
@@ -0,0 +1,138 @@
+From e1553fba06ef652c55d0d0775098aeae8dd4139c Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Thu, 15 Jun 2023 22:13:18 +0200
+Subject: [PATCH] skip some tests
+
+reasons:
+  - needs to be in a git repo
+  - needs special test dependencies
+  - requires network access
+---
+ hugo-0.113.0-skip-some-tests.patch            | 65 +++++++++++++++++++
+ modules/client_test.go                        |  4 ++
+ .../create/integration_test.go                |  1 +
+ 3 files changed, 70 insertions(+)
+ create mode 100644 hugo-0.113.0-skip-some-tests.patch
+
+diff --git a/hugo-0.113.0-skip-some-tests.patch b/hugo-0.113.0-skip-some-tests.patch
+new file mode 100644
+index 000000000..846d64c95
+--- /dev/null
++++ b/hugo-0.113.0-skip-some-tests.patch
+@@ -0,0 +1,65 @@
++From 6d1aed716addf79cc1148da704282f65bd0ab26f Mon Sep 17 00:00:00 2001
++From: tastytea <tastytea@tastytea.de>
++Date: Thu, 15 Jun 2023 22:13:18 +0200
++Subject: [PATCH] skip some tests
++
++reasons:
++  - needs to be in a git repo
++  - needs special test dependencies
++  - requires network access
++---
++ modules/client_test.go                        |  4 ++
++ .../create/integration_test.go                |  1 +
++ 3 files changed, 5 insertions(+), 44 deletions(-)
++
++diff --git a/modules/client_test.go b/modules/client_test.go
++index 75e3c2b08..235d6ed32 100644
++--- a/modules/client_test.go
+++++ b/modules/client_test.go
++@@ -68,6 +68,7 @@ github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0 github.com/gohugoio/h
++ 	}
++ 
++ 	c.Run("All", func(c *qt.C) {
+++		c.Skip("Test dependencies not available")
++ 		client, clean := newClient(c, func(cfg *ClientConfig) {
++ 			cfg.ModuleConfig = DefaultModuleConfig
++ 		}, defaultImport)
++@@ -107,6 +108,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
++ 	})
++ 
++ 	c.Run("IgnoreVendor", func(c *qt.C) {
+++		c.Skip("Test dependencies not available")
++ 		client, clean := newClient(
++ 			c, func(cfg *ClientConfig) {
++ 				cfg.ModuleConfig = DefaultModuleConfig
++@@ -125,6 +127,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
++ 	})
++ 
++ 	c.Run("NoVendor", func(c *qt.C) {
+++		c.Skip("Test dependencies not available")
++ 		mcfg := DefaultModuleConfig
++ 		mcfg.NoVendor = "**"
++ 		client, clean := newClient(
++@@ -144,6 +147,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
++ 	})
++ 
++ 	c.Run("VendorClosest", func(c *qt.C) {
+++		c.Skip("Test dependencies not available")
++ 		mcfg := DefaultModuleConfig
++ 		mcfg.VendorClosest = true
++ 
++diff --git a/resources/resource_factories/create/integration_test.go b/resources/resource_factories/create/integration_test.go
++index 2d9a700d3..42185d9f7 100644
++--- a/resources/resource_factories/create/integration_test.go
+++++ b/resources/resource_factories/create/integration_test.go
++@@ -20,6 +20,7 @@ import (
++ )
++ 
++ func TestGetResourceHead(t *testing.T) {
+++	t.Skip("Requires network access")
++ 
++ 	files := `
++ -- config.toml --
++-- 
++2.39.3
++
+diff --git a/modules/client_test.go b/modules/client_test.go
+index 75e3c2b08..235d6ed32 100644
+--- a/modules/client_test.go
++++ b/modules/client_test.go
+@@ -68,6 +68,7 @@ github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0 github.com/gohugoio/h
+ 	}
+ 
+ 	c.Run("All", func(c *qt.C) {
++		c.Skip("Test dependencies not available")
+ 		client, clean := newClient(c, func(cfg *ClientConfig) {
+ 			cfg.ModuleConfig = DefaultModuleConfig
+ 		}, defaultImport)
+@@ -107,6 +108,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
+ 	})
+ 
+ 	c.Run("IgnoreVendor", func(c *qt.C) {
++		c.Skip("Test dependencies not available")
+ 		client, clean := newClient(
+ 			c, func(cfg *ClientConfig) {
+ 				cfg.ModuleConfig = DefaultModuleConfig
+@@ -125,6 +127,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
+ 	})
+ 
+ 	c.Run("NoVendor", func(c *qt.C) {
++		c.Skip("Test dependencies not available")
+ 		mcfg := DefaultModuleConfig
+ 		mcfg.NoVendor = "**"
+ 		client, clean := newClient(
+@@ -144,6 +147,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
+ 	})
+ 
+ 	c.Run("VendorClosest", func(c *qt.C) {
++		c.Skip("Test dependencies not available")
+ 		mcfg := DefaultModuleConfig
+ 		mcfg.VendorClosest = true
+ 
+diff --git a/resources/resource_factories/create/integration_test.go b/resources/resource_factories/create/integration_test.go
+index 2d9a700d3..42185d9f7 100644
+--- a/resources/resource_factories/create/integration_test.go
++++ b/resources/resource_factories/create/integration_test.go
+@@ -20,6 +20,7 @@ import (
+ )
+ 
+ func TestGetResourceHead(t *testing.T) {
++	t.Skip("Requires network access")
+ 
+ 	files := `
+ -- config.toml --
+-- 
+2.39.3
+
diff --git a/www-apps/hugo/hugo-0.110.0-r2.ebuild b/www-apps/hugo/hugo-0.110.0-r2.ebuild
deleted file mode 100644
index 68c6effbbe55..000000000000
--- a/www-apps/hugo/hugo-0.110.0-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Fast static HTML and CSS website generator"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-SRC_URI="
-	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
-"
-
-# NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="doc +sass test"
-
-BDEPEND="
-	>=dev-lang/go-1.18
-	test? (
-		dev-python/docutils
-		dev-ruby/asciidoctor
-		virtual/pandoc
-	)
-"
-RDEPEND="
-	>=media-libs/libwebp-1.2.3-r1:=
-	sass? ( dev-libs/libsass:= )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch
-	"${FILESDIR}"/${PN}-0.110.0-skip-some-tests.patch
-	"${FILESDIR}"/${PN}-0.99.1-test-timeout.patch
-)
-
-src_configure() {
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export MY_BUILD_FLAGS="$(usev sass "-tags extended")"
-
-	default
-}
-
-src_compile() {
-	mkdir -pv bin || die
-	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
-		${MY_BUILD_FLAGS} -o "${S}/bin/hugo"
-
-	bin/hugo gen man --dir man || die
-
-	mkdir -pv completions || die
-	bin/hugo completion bash > completions/hugo || die
-	bin/hugo completion fish > completions/hugo.fish || die
-	bin/hugo completion zsh > completions/_hugo || die
-
-	if use doc ; then
-		bin/hugo gen doc --dir doc || die
-	fi
-}
-
-src_test() {
-	ego test "./..." ${MY_BUILD_FLAGS}
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-
-	dobashcomp completions/${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/${PN}.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/_${PN}
-
-	if use doc ; then
-		dodoc -r doc/*
-	fi
-}
diff --git a/www-apps/hugo/hugo-0.115.2.ebuild b/www-apps/hugo/hugo-0.115.2.ebuild
new file mode 100644
index 000000000000..b8cc129acc16
--- /dev/null
+++ b/www-apps/hugo/hugo-0.115.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Fast static HTML and CSS website generator"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+SRC_URI="
+	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
+"
+
+# NOTE: To create the vendor tarball, run:
+# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="doc +sass test"
+
+BDEPEND="
+	>=dev-lang/go-1.18
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+		virtual/pandoc
+	)
+"
+RDEPEND="
+	>=media-libs/libwebp-1.2.3-r1:=
+	sass? ( dev-libs/libsass:= )
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch
+	"${FILESDIR}"/${PN}-0.115.2-skip-some-tests.patch
+)
+
+src_configure() {
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export MY_BUILD_FLAGS="$(usev sass "-tags extended")"
+
+	default
+}
+
+src_prepare() {
+	# wants to run command that require network access
+	rm testscripts/commands/mod{,_vendor}.txt || die
+
+	default
+}
+
+src_compile() {
+	mkdir -pv bin || die
+	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
+		${MY_BUILD_FLAGS} -o "${S}/bin/hugo"
+
+	bin/hugo gen man --dir man || die
+
+	mkdir -pv completions || die
+	bin/hugo completion bash > completions/hugo || die
+	bin/hugo completion fish > completions/hugo.fish || die
+	bin/hugo completion zsh > completions/_hugo || die
+
+	if use doc ; then
+		bin/hugo gen doc --dir doc || die
+	fi
+}
+
+src_test() {
+	ego test "./..." ${MY_BUILD_FLAGS}
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+
+	dobashcomp completions/${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/${PN}.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/_${PN}
+
+	if use doc ; then
+		dodoc -r doc/*
+	fi
+}
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index c21532689bd1..c476c768ce69 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1 +1,2 @@
 DIST piwigo-13.7.0.zip 18306599 BLAKE2B 2be2dbccc3cc1ea42c3a9ff7d3578b96261230953eb8bda0b7d50e6fe559a2a72c98419e688b6f25b43d52117163c12d2ea81424a02197d64a6d9d1872618906 SHA512 8af4f2e8fce1db9c28a86202f2b7d1d7d2f4ffd802131e8db41b00b304bf487c1b161a0a6d72a61944c72cc6c391097f3fa2221c4d91dbd82bb7979defeac2be
+DIST piwigo-13.8.0.zip 18345886 BLAKE2B d2cb7c334a651c302b9a94bb09c5fcb0f658cc82ce45aebdb782da26f137348f77d93a9915f56584739e4f493f0cdffbaf353997842424b1aab20488554dfa6d SHA512 52c29ca0899f5df34667c0148d57c9e71f75056e94caffafdb98d0181f2198123d123121bd2ada3405293dea71cb95371f4387ee3dbcfe942d9530b21d76ce34
diff --git a/www-apps/piwigo/piwigo-13.8.0.ebuild b/www-apps/piwigo/piwigo-13.8.0.ebuild
new file mode 100644
index 000000000000..825f7096685f
--- /dev/null
+++ b/www-apps/piwigo/piwigo-13.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="http://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="
+	imagemagick? ( virtual/imagemagick-tools )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json(+),mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+BDEPEND="app-arch/unzip"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index acddc7223676..252553bb31b0 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/epiphany/epiphany-44.5.ebuild b/www-client/epiphany/epiphany-44.5.ebuild
index 8af546e9bfe1..08712d0db0e2 100644
--- a/www-client/epiphany/epiphany-44.5.ebuild
+++ b/www-client/epiphany/epiphany-44.5.ebuild
@@ -68,7 +68,7 @@ src_configure() {
 }
 
 src_test() {
-	virtx meson_src_test --timeout-multiplier=30
+	virtx meson_src_test
 }
 
 pkg_postinst() {
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 3da23e92a288..620daa13b1d6 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -94,103 +94,103 @@ DIST firefox-102.13.0esr-vi.xpi 611417 BLAKE2B e67df605c3f3a94f34d82c87df46d25cc
 DIST firefox-102.13.0esr-xh.xpi 427930 BLAKE2B e7c691d36360e7d6353bf0e183cc08b64b0f7758411e37c7b5324511236f4f55957ee2120b6d2a7e11cef779af4927ccb535f2a052d3def6c108b76dc984cd39 SHA512 721c3b68e7af4712230f9be29222c73b9380907778ca7af2e26e0886fee583b4c01508aaada6cbf622b7d72184a18b7cb2f623f7e41917642757d908734f47d4
 DIST firefox-102.13.0esr-zh-CN.xpi 613299 BLAKE2B 315e07eb480c9374e5d9dbd963f72f750757fac9aafd902e47b77fc0d8707c72f509b0aa420a40dfa2edd94f873d965265d12f949338c753df367e154938ac0c SHA512 4c1baaabda6bbf5d06476d49aad5b000410b0af71b81140aae3f6e5d6299427b99b1d1e60075f05b95a430f10cf5e55932a6c071704e61831fb596bd60c900c1
 DIST firefox-102.13.0esr-zh-TW.xpi 614569 BLAKE2B 68fdce9b0ece08978f8d514451a86a562e5d0cd7d9f0d1d99396013ec408eb6996206e8cbae4ebeba9be992da8b15b74076e875a05fa8a01d5bd1fe8471a0ac8 SHA512 70fd7d18b6662a328c8b1503adf27b42c9cd515a07eae325d56325aa459a5af84222779311d9162974b5763469e5c3e28c27833b72ca8155bfedf6d81d4315e4
-DIST firefox-115.0-ach.xpi 469323 BLAKE2B acf6ba5b45e646cb7e7baa5b9c8858f6ce3ea4c93573e0d735d997dc2a3fa3b56c6987205d9d6cfa4673a3770010b2b95f88a4b2e0791e765b86cf03671c87c8 SHA512 96eec943ca55df56c049dedddc6e36dbd8f987c2cfe1a76bd11f7a8b027a02bfa3bcf50d64ebcc07a4119e634062d17dcdf515952f2b9b633bca7764b8289e5e
-DIST firefox-115.0-af.xpi 430127 BLAKE2B b60e1fce53b3b72f5e310d4c81d59d55cc4b7f6680f40b35b9d6035d07bd8eb84bb7ea8e727766270a23d990bfe097c559895d8f3b8a0d052a91b0ac7475ed4f SHA512 e58a0aec9a360deb3b3cd7aae6e11c2c5f839710163bc180065bf26c5ac03424fe02cf946fe9b2eb4217b3eb133e6120b520ff75ff6000c57fed94182c7dc4f9
-DIST firefox-115.0-an.xpi 514837 BLAKE2B 3ac14201242f8ae6ba77a3fb0e37ceb2ceed34a9fe6252f1ff310aea10b427847050e9b190dddcff2b78e6767daf991854dcbc70eab2c7df78994bdac422a22b SHA512 67f654a645d58c044667c8a12fc02844f219d2f00962b8b659fca840c821d853fee0ba15d612ed96dae11666107e5ff1ca983ba32cc91779a1bd501a426dcd98
-DIST firefox-115.0-ar.xpi 583860 BLAKE2B 32a1324e9feedb8c82616b02e0c2a1d439b1842f64a5b3133afc1895ba472172d89b155bdd7530ca506b26a937f979a14c64c71468b4f0b762a0fd58566c4cda SHA512 f6cd085577423bc05a70b39a350b777275cfdb2417d97f4061d3d1da10587de4ea58890f54317543ab221301e1c87015775895f915c2885d72030ba7ab062abc
-DIST firefox-115.0-ast.xpi 496713 BLAKE2B b9acfaf492af9ba4ac672879e48f89c8fab85c573caf70ba5a6b9c6c8c1dce0de4e5206958794706bb563cbd5a4dd08bbf483fdb9f26b054fe1082db02d89ad4 SHA512 06e4863e0d1bd25a755a8996d3e377899210c4351d6a98bf4245880e2bcdb3f633ed7a5d94c2879c8c038de636c01edb9cb0c54fd5705b91f0e215fdb696900c
-DIST firefox-115.0-az.xpi 501984 BLAKE2B e242faddc02b11f76c491e3b83074371856e8c7c91d884d7581ac520b5fee425f88b06abb5bb566b15ff758fd719e84e5f0ec201e12702e09a817d3ead54abd4 SHA512 2a5b79da74538cf265511434befde24fb2d8c90df10bc23add0ae9003846886944fa962651f5ad92b7939c7d8373011cf7221afe2b4e44c5432e74320395aadc
-DIST firefox-115.0-be.xpi 686957 BLAKE2B 0947853cee92d08b5d07173167f818fb4e1f3762d4b8a9038268a9eb72b328eeb070233daa5290fc4af5049c4ae7587abf7cf7384c8c768181d55d4c8b7a974d SHA512 d15ad246c2af2cecb4c58ff857372ca8964c3371242a158656f263ecb59eb32f32e772b5ea946d09a2bf47ea1dea37cb72b31c1b5d339350b0bce2f205d96c4a
-DIST firefox-115.0-bg.xpi 600442 BLAKE2B d6679cdde0cf2c531f50abaee66e3c7100c0e0771567fed65aee3ecf03c8fc8ec4f35452a2a0ea707fb1617c2235cfa6b8e08b33f041c50e390609007938a79b SHA512 f9f8a7f382ec8c416cd321a7eb47041512e42e4028a7c8420cb271fe25be1ef2734cc80ef86c056b16340227f33b6ea4ba0618f0ec039032e595865854a8b49d
-DIST firefox-115.0-bn.xpi 593723 BLAKE2B bf87b085ba2cc515bca0ec5a99c7ed2c502fa464f29c2a843c6dff0e1a1dfb696b6685bfc5aa71e11e7787a10e325f1a737baedd52793f162ffb14dc845e1340 SHA512 5cef8e494e00baad9f3405f0a667ce0809e060517643ad41e03d37273a006ef22e31113ef66d04c54028dd8aaae91692cc9e300a2fcb5ac87d750a0828f76427
-DIST firefox-115.0-br.xpi 565383 BLAKE2B 9080ec465f886d07717dd4778389a7fd48e131fca7ac5fd79c8a1805b1cd770cd5846e34e0fb25c04e333c8707ef603100ed4f1789f430fc6ca67eb9d5503ca3 SHA512 0e75b613b766ad86aced077451ed65b08596570645c0a3dcc1b0dc00ee2aa004d10d10b6a8fcfbb61c6d05c3e533bab4d2d69de66cc9aba574ff91e1e8321586
-DIST firefox-115.0-bs.xpi 474031 BLAKE2B e6e13730f8444588ba9e4b55e2e0b4ba39f151c0e00074d0ae6d325c7c324d0c910e5a761bebf591e063f3590c3f88a0fc46362aa7c85e5c279af8c80063d56e SHA512 8d07e686f8fe73543e6245d88cfd1ab0e482a7df4ce13d58939211db5fb48309a19be3b1cdc6d88e95aadaed3bcc88ae0b417116433563a9e3a1856279406ffa
-DIST firefox-115.0-ca-valencia.xpi 554621 BLAKE2B 9185c4a7d950f33928ecbc2feffdd4213930f663dc3c5cfd56509b5c09e8b798da4abbaa1ee9e1df941e6c1e8f2e8014563e755d2c4c835d75029f5b9d453f03 SHA512 f69cd5c73f9cbcbfb50fb54961f83f03d1711d7943739c86254b59ac1fe8a2d82e35334f0bd4dd3c20d787dbbfe205ea8e65ac57fdfd6bfb7325c6b4580f35cf
-DIST firefox-115.0-ca.xpi 576650 BLAKE2B 09dd8b01db8e2b7014ca3f21c81fbe02ec1b274f0761a02f8ae7c073d48f2bb5fa7149dee4911fba96af398edeeb64892ea2ee0e12ab26c0ebe95c3493b34a0b SHA512 09586581bd1ff2b1bf56ddfbfec0e27793f9f4fdd6f0cb0d05cee821bdc5b0bb62fcaa13f4956d57d84bc4b45802074af678e043b5acaa03e06aeb8429e47e67
-DIST firefox-115.0-cak.xpi 599851 BLAKE2B d59b69406e68059c8a3d8db37539bfb2d3814ce47f0300086a801210a549428f3f98c7cc74f24b261413e18461497c5c5536d1c896d090abe88210a392a79079 SHA512 98b131d5b1d223a538485b9b0d0327cc261f71e6f76badb53e9cefb4d9bc79374e2edcb9b02825542a7c790d8a7c639d9e8f30c5d12aedba5f643cf8bf8aa69c
-DIST firefox-115.0-cs.xpi 627674 BLAKE2B fe1f28135d977df8fc27b14f8320d31117ce83212396d7ca3d74a592b1387b5978c75c5b4482f86231cfa285a82e2d9dd24ff7f02ce74d3079cd925161bef3dc SHA512 865bcce330ff8aa8b1b21bd3eb220ead26154eba6a51458b2eb17ddb6385125d81e4cd04a6308edc83458fb93ebdcbcd091c6b8fbe45d2a1e2fe98b40daf9de6
-DIST firefox-115.0-cy.xpi 598156 BLAKE2B fe95ced7bbcd0be932e098f385c706b52452a442dd17e9e3986f9f3917e47c1560b7756bde1b66651a06689739ce1518bcd3cd4f30727da1884c576983d6e5ab SHA512 7220d48a100d5a40bc5b3779e447ebe4bd355a28bdeaee6ee4e11fd014dcc814662161cac76f0c6f5f726e281fa1c6a02e6b7a4f0ffbc886fa0932e9f6bb2e41
-DIST firefox-115.0-da.xpi 587176 BLAKE2B 6b89b935ed124b31b4b9e3552d0db192bd2c90de69e414d80fbb6907eb87e36526e03c839ed9d72cf8e3dee8c11036ef8061b07db4ac5be48ab23c907ccae34c SHA512 ee7be208120e967714f9eacfff8eb2e96b1b083ea7c9191d449af690c37d8e579aea091b7468139697a993c777024b1973781f813421dd41c993b72243e0234f
-DIST firefox-115.0-de.xpi 608951 BLAKE2B 8b672194c6e172cb260d38010df3f82f8ab13b82a99bff1c9a14923f718ef47818265af2d50e05b86a1fa9a1ac3ab42ba6720f694a2f72d17dba9e733a8db9c3 SHA512 b064902bfdaaa3efdeb95b066b62b328c400fef3c10f31f3a43c5edb5c617c8441d0c57c0edaab80448590904329f00ccc8f7b4ffbf31501eb059475b618257b
-DIST firefox-115.0-dsb.xpi 620446 BLAKE2B 5ea32c1fdceddfffd40765690d4bba406ff54a8cb782ac02e946ae016ac0d529fd335f5719f0a0154bbecf9a9db182457ccf865574d6cd25786de96039149996 SHA512 81ce0de8399b878ddf3f7a9980b8c9d0e9466f53037534f01c93a514af527e2e977277db976df2bef125d5b3c5f3a81c298dfcde7f90cca1ed1c17775a1fa8ab
-DIST firefox-115.0-el.xpi 703012 BLAKE2B 364b87bb7e91acf444b0cdf1adbc25d6dee86a8a866b291bcda00074dd6f55e618fb97f29f43f1c0693822ef15c3419b737310633c81a4ff86fd3b528c5e5eb9 SHA512 e2695d7fdfdc36e3a7688d093aea64cd8f064453ae418f2e40a4e72aef68c4b157c9643d06536255b3514ee4dc83ea3f6b8116d939849f29dc6d5535d62221c7
-DIST firefox-115.0-en-CA.xpi 551498 BLAKE2B ab35e3b204b711f4ae1753f4eb2a1595b8cc6de5df8846f05be16acb5e3901567142733da29e93a3052e8c29fc5fefe483b779d9a1b74e9f8072a4417aa485f5 SHA512 07b7fd89932b77cc105c2d9a3dbd314929ac1e4002c88fee08b548e9a2dba302ef67c86edd98088a94fd7a991055df395d72c546f536328a6db135a884488af2
-DIST firefox-115.0-en-GB.xpi 561370 BLAKE2B 80f9b4a05d024a1c832a2b9482beef237c23b64ab9184afb9f3822bd027edb0a2973039769dc90100d14571218df14498116c7688ffc29385266dd9ce76d2273 SHA512 0d3e872e6e03cb496f7fe3503b5ecd4662ccae9ee514bb17fa118b4d9a7028e82e6ab9c77ad8a6308cd7dfe13c1cbe9bba7cb66dae199aa7e4b9f8eee93dd250
-DIST firefox-115.0-eo.xpi 583949 BLAKE2B 06a185b05d8f3a2e4f804d031ee93787794b59c2476e9cd9314f2f45e00b098de84853db861d099f9cceb8a63374a01e427221af7bde08b6f5ea03f2b865bc1f SHA512 639bf60269b593e7893ddbcc27538057d8a7db1823af78f4c9c5f7e49606add2a5f05baf65efc5b30f07f82d594b31964d3f5169dfd71011351ca92b95698847
-DIST firefox-115.0-es-AR.xpi 602624 BLAKE2B eed559239f38b9e5810cc3b7b9ffdd5c7a84cf484c08740b7142c85d6e91f9b87862a7fb21619db16c4701ed1553db548fc43439adaced43bc2c00b2674607e2 SHA512 d78fe353eab6f2708746419475c8f4570ba9fbc05470abb0b052265117d03206295757a6618f0030b3da2fbd61446738841485cad0d6cc8816036afe84fa0fc9
-DIST firefox-115.0-es-CL.xpi 601297 BLAKE2B a419512b45201e05ace6b0ef0e854db15a3a3f5c03f8b989b7c0474374352034cd305bb3c4c34a8cff5c4d27bc34a1da78dd1b667d89db32b0a745f3ecde3afd SHA512 d54b88bda2b4b38859d4c06e91fa02596d6d4bb725297e1090c25763691f044d58209374cdf0779666b196655f744a6bbd0d6b5b6c052966c5f3cbab5a3bf603
-DIST firefox-115.0-es-ES.xpi 595240 BLAKE2B c0b54de9fca3d5bceebf0876371c284076859b4a4499867deba09df8a14e1574e9a279206fbc1dbb5bc07a0bba6072a4a7c185092d9699f1c659dbd0f390ed53 SHA512 b264d68a1bf7c3aa02b6675b99b937d461774471acaa97854004f23230d18e400d31a3b8b9a5a4b8b837bd20101846216d9ca4671f3e2a0f15f016e8beb26375
-DIST firefox-115.0-es-MX.xpi 600969 BLAKE2B 2bf515ca1920a91c0ca07c11f3ab9ed9b19471ac9eed4a2232a838cb21c84be78551862c3223487c3a75a828da13570d7620b9e2fedb8262a0e8740c7550d24d SHA512 62b8bed642737b98b555b11ffcbda317d07b21acab524e95752c791e93853e9bcef22b7054e47220fe4c5e5b440dda6045bb3232c9aa87be850e0cfbdc850987
-DIST firefox-115.0-et.xpi 548989 BLAKE2B 84aa9c639f7d898d30a0e2473aaad57d8bdf8ef569306999c25c9ed1b96ab8005a80e79ccd8af81da9ad9a015b085b081bcc3927807504289648d70b2a41d6a8 SHA512 fb5b7e56aeb973eb240ada3a05d1a09f675c8a0edd7b5a0d58f79c5bc6ef7c77eb66df1d16b2153a2951e73047b0d7f0c57c2942f69f2686ba2e79c29f96f1b5
-DIST firefox-115.0-eu.xpi 586425 BLAKE2B c66e2411c52b6458d21f32c5e000c711506e4844e52e72aec0b2bc9c53dc75cdfd586e39754ccd7508eda1b4ef370df36477bb44f41937ca8b16bd6f389ea294 SHA512 17f07fa8351e73b3de5523fa136fd51cf59b772bdde80fd78a445dd1f515c98096e7578cd9a9d5e27625decb0658ff36822821704333511a7759f9b9deb490db
-DIST firefox-115.0-fa.xpi 601519 BLAKE2B 5df06132cb78e058e52ab5094463b4a93d056202a31a2e0c98004b693333afe88dda8227e63b816962e1b94809eb179ea5014485f95477350e34ac59468f4a7b SHA512 f6bc3274f2a646fc9aeaee27332c736dfd0769c57319be89eb0a186bc7052f4b2f0ae44fabc65a70a1974d9af071853227d4a489b66d50edc3e58a6402c7350b
-DIST firefox-115.0-ff.xpi 485916 BLAKE2B 14392981765478f957b98a224c84e83afb9a4acc2f4174c45b293551cb6bba4755df2af87326586408ac3333c8c6c29eafbcbf5ade3c1ef109ca8a41f96d21b4 SHA512 83618aabcae4c312214ab795beb02d178a76c7cc01baafcdd7e9bf6751a7ab7c0fb78b5daf6a2a5d846a36600fd6227122b2c9a34bf73ce79bf48a740a40d8af
-DIST firefox-115.0-fi.xpi 586042 BLAKE2B 151e8a3f21d1cfcc0badc24527f1915942cd62d21f21fee4384cb4d06c901f07c64fe466036bc77dc05186bcbcb573701192899f7693a7e61c3a761eac0e82a9 SHA512 42cbc1af00a6c3048b3cf30e687047e69dd79c5796d479b4535ecab8840feb9bab9e52d252bc89c86bfe261c76267c29f7ef2e08929040b3b86e62a0b9f2b234
-DIST firefox-115.0-fr.xpi 615060 BLAKE2B dbde8cf870335fd03328fb270b81955a5766e4eb0c7c35a02480a2a92ff5d824c965581053c097195fc073a24cf6af1188969d9ef2cea61d7132df29689f0a5d SHA512 16383ab981b4f89ea6c359f107ebcd383d281e493d4959f16558876b2c0aecf6b083089b44b52b3de9504f60650ba4f3eb0f850e455b92ed13942a21cbb58e7c
-DIST firefox-115.0-fy-NL.xpi 598085 BLAKE2B 7c64adbaf1aefc0c54cbac8d5de7c38d3378fad2d1714b16faeae8b8fabbf323c70dc16a5f6d00324ba6da3019b2b6cfd8e7da715c1a4d2d6e53414edd6c752f SHA512 30349acc92f571b4bc1fdca685d9b872ba4254a697d89f6afbd958d1a3021e691e178af7430ec02928349aa19cd0a2d938ebfa8880d3c2309d9969a3b650e89f
-DIST firefox-115.0-ga-IE.xpi 482381 BLAKE2B fc32ed29597500a8df7f7a886da71b4ee4d71cf2a2fe58870f075f2fe3005f364782686afa32814555162c9c7bcac643e8d733cea9e0adca9343154bab8f49ae SHA512 fe2ac607c4fe8c391aeb19b24346df5ce8dd3e4b8e6cf08fad5165de8dd5230f11ed73cc1ca99685adf46d25d9a69c23f5ef06462e7505696e5a45b092485b1c
-DIST firefox-115.0-gd.xpi 603642 BLAKE2B f6db5c71b702228107f433b08ee88d6b5f57a5536bf6bbd8d5ca1470f2a35791f9d94b278da03e8d24bd29fbfbdce73f8e6c505bb1a7c1b6a546cecf3f1ad99c SHA512 985e194461c06bec0acbe224fd4667f11ce7385d48c505450137f8346751266b3fc8b7fac0ba1795a7adf823b2e6ea1ff90851f1fd0220e41e536ee54f207928
-DIST firefox-115.0-gl.xpi 598447 BLAKE2B 95ebc26fa2b1ddd81e4645f9d3fc5277caf99885b33aef7063f85ab170ebb7ede8f5917fddfaf2752f3e93d5b7db082ec4db7041ddbcbd939ad64a77d26cbee8 SHA512 bcb475d5fa8124a177a1aac56fe8ceafc0ef5bf23fa27e6b7cdcb4b6229853b3690ddba2432eb3cd809bd39d881d4ee706af9eecf7e7b52eb04b504ce1730d32
-DIST firefox-115.0-gn.xpi 612060 BLAKE2B b87348e75b840bc46b5f9013417fd60dfc52f4c5437108e7ffcb3d3a411e1863d40aded4dac21dce86a6678728a767a07e0eda01e758feff821385ac6fe5d2d6 SHA512 6984920296a920c953aa72a6c0744a44c5e3f3cc09e2c549b3888972da60d3d04abbc77379c8b7ecf748ef51f1955eed29fb9e2f3e13c749a8d972d08fca86dc
-DIST firefox-115.0-gu-IN.xpi 541879 BLAKE2B a1ae7cc54f89ba23fe73dcf29c345318182f0635debb1d9efc99f912ee41eafa8b2dc08721551f3709ef8b448881a506512351509cc56b7511dd9c8c7c44adb8 SHA512 af211f79308a22bbe8259f0a0eeea016bcd838bfcefcff51131989925c8a8c46a8f727a7739fd12ec8d548e7fc980138b59fdc8bc3365d7698784cacd89024a8
-DIST firefox-115.0-he.xpi 608010 BLAKE2B 31ca0065202772f4c81c270fa7ba4ff6874d43f190f4481b509bf25aceb3856c1ec7fb255857ee9b3f0c99373ecd43a1c1c2dedf86800799eddbb930895cdf16 SHA512 a45007ab6f16451ae63e03180cadd8df36f089701947973316be5cf6321ed68e40442fd89f6ddde70c25ebe689f351a4bbcc6a4474bf5168d850f045b1f09e7c
-DIST firefox-115.0-hi-IN.xpi 571178 BLAKE2B 20ad609b77e22d21200593df401c4f5696534dabceb7577d4c25ff86f899ab638c8378862acc2744404765213c9fa55a3b3f85e42a0964d04b700a01cade3ed8 SHA512 409d5f46b14e89efcade96fbf17465d1cea72bbbd1cfa9c588ebfca16fd2cba6d45107d41c7c669f8a27a480e00138df7527997e5003a35840d4beefe58d4894
-DIST firefox-115.0-hr.xpi 564504 BLAKE2B 0dcf6b0fdaba07f3356edea5946d777f721bde005e5deabf667fe51dedda37cf8951543764b77bfb41ebfac33bd534a1017e9074932580373d09d2456464c344 SHA512 0dd0b4469d33fda4b2b352150b3487d85c7fe4e656e89eec3019f34eac10e380005cf60a11a890509b6a3698b084eb20680b9d89602145e399cc55c708644d9d
-DIST firefox-115.0-hsb.xpi 620455 BLAKE2B 29ce7d313aeba4d8253b6fc56bfc803c95e190d549e0f4cebffe84e9a69afd1fe1f354ac836416f80b7726ad3eeab67e8ba0a9967766c121579657dcc439efbd SHA512 f50e012b64c9fb1a8d3891f10ea1d7b774442bd324b0c7fba88ce76038a5ab17edd5b2fcc0107ea13c1a8315c0ecbc0a679a4957256e14863c7294b86f0958ab
-DIST firefox-115.0-hu.xpi 623862 BLAKE2B eb11291006c7539cdef35dd1054af7c8bbac6d0c94e8624a783579f1ee9b3836e23ae98c008b41bba3590bb2c782979eb0bad8522f63237d9aff472d62bcff62 SHA512 7271d6f6c8ff3268d9fdaecab5d00767964ae322770892ad6c1db985fb93d862d2c0e7b8d15b8b352fcbc38d5c421ed8b16ba71fb4ff5aee584007bf81e4995a
-DIST firefox-115.0-hy-AM.xpi 614925 BLAKE2B c6d3e7155af491060bb88a23cdf4db537f3700822cf04998945065dbe26b68ac718069b30d417a753b92b5e286d0ff223d0605d2934ccddacdba89a415c9f709 SHA512 46893dfc94e3b4901977ca133a1048a45b9c4c57ed81112229a68d7fdc747e289c9e077f33b72ca49cb6e1957193c72d636b257f4c5a6ca624a00b76714fac17
-DIST firefox-115.0-ia.xpi 585627 BLAKE2B 02a7613deef7bc02bbd8595475e55588cb43e46d5f899040b1b28aaaffc57d29ef4141a372162311d6aa4ae9ba2dd170a0ec632adfe1848e6abf923e4a5b4c7d SHA512 be6f754911c9001c1e2b12c7276436495cf2b15806c7f3b721d84ba853d5b2541be2d975d211aa10854505ed78f5eb9e161987ea7a1df16a69d26e2a58a67cb6
-DIST firefox-115.0-id.xpi 571365 BLAKE2B 18addfc6364ff0368c750554d7c06b9bb9550eb473c03705db1064c04b062224744fe6b5bbce5c30434459d90f4c9a80430836a84c4d89e2b429dcf056cb558d SHA512 01f44ca55b18fc62a46995a0ca5042232286be423c27221be2b27f7809d8a22d33a4b470d2dd55475908f029ad3f567131756ec2e9773531b90dc07e490e2708
-DIST firefox-115.0-is.xpi 593515 BLAKE2B bb572bd2185b7d37a7073d54da59b39ab12afc5e2aea5e78d7923a60c6d7eb6e2d270b5bd85a45a02b22ee649730ba5a7f0dcfe5420957cf1b7d8f6f5d24a5d5 SHA512 bab962f78c82de9071148bd540892f4e0d922165590e299345a1dd376f122837c6bcdbd83ee74897354bd39b78fbacbc9f219569cd637908bc8e1cb86d9df039
-DIST firefox-115.0-it.xpi 536400 BLAKE2B e42bf23cbfbf98c1d7cd10742fa38c8a4dc386d5727b1b4b6aaeebae786200dba595bf164c6e33adf2c4d7024ad0dafb08fd22b0a316ed495ee3e7b5d3e76aed SHA512 59115e5e877511b7c7f180577348ebd26c1139924479cd80678226aa861ea3309609319594f629bbd673d73e66438ec448490d9a0d097118c35744c65bedeb83
-DIST firefox-115.0-ja.xpi 648099 BLAKE2B c65c268e19b5f57db271964b80655b3e8c909aba7c6cd7e5de04e10c9d4d0c214ef0f06d095622378f3818214e06dd3eeee7bdf52e44db78a656d2a4bad61747 SHA512 ac40a8b7f43c471ce75a16f72dd275c23ac2219f8f9fd21572c14542d96b692c9f93969d1685cfa6f5324e8c3b7b2972ab174f304c6cdafbc7a7f6f9e64bbec5
-DIST firefox-115.0-ka.xpi 651351 BLAKE2B 0e7093f6d1fc277c6307d4611e0df977d70c7ffe724a0ef4331a327ff4e915283bff570fbe98e77894d2a6d28c46a0be61b1d22c32ed3dd22a48aa041608b641 SHA512 3fcabf254bbf6f2cb298f8b962abf165167cedf8d9830a9f8cb179410c8c7f9eb44da02e01641404c5a7db264ad6c396d79f9a337a9322cb9b8be7da19b56e7c
-DIST firefox-115.0-kab.xpi 598563 BLAKE2B 3255924946f466f63e1dfaaf9d5e83e0cb7fb7105d2a53c13898dfcf9d1c65f2b47de74d20a5efe671537a5314fbc1893ac9480fc5c5eb0423f924b06a8613bf SHA512 40cd89cac3cb28ab3bbb123c5439e9786ddd5c413d37a003debccaa300dd5b5fcf5688cd432071d01742de828b12606e5b7f5f6400d606a48ced376ae639f75f
-DIST firefox-115.0-kk.xpi 674098 BLAKE2B 35d2664e9b9268f669164949d4a91b008d4661eb0ce903ec921ba6c29f05b736c91fbf0f7e2f2a78e31b5bf6482485d92e6993c8456f2203fb76d1b3deaac21d SHA512 e63f17dee22752647d25276416d0f0949ecbe185b287c3669926edf2057a6d4234998e4c8b8bef64a277b2afa9bd39c34846fcba125ad72dfff9822f98390fb3
-DIST firefox-115.0-km.xpi 543685 BLAKE2B 45f13ef0f1e54dd7f599438faa07dff887d21b819c59a9b3059a36e51b414cf509445b172bcd3f8524bda7cb1de3ceeaea9be5b8fc38704171ff46867a7b1a9f SHA512 a918d03fcee91ad32da8c67abe1a0270dddf859ba872fc6e44bebf95cfd44ba5c743d47a1ac1c32943692602b55195b46abb23de93131b080c6cb32ae6358f5a
-DIST firefox-115.0-kn.xpi 508145 BLAKE2B d16c60dd10f8534f85d8faf3c73276890a63f26e0dbf4c1641e824e1341bae4d6d9dbec88f20660369920ff2eb01ba9f3717015cfe19fca9c805dabb92205410 SHA512 e793e1272f6810d90eae35876248bc69dddae61443c58ba8efb9da41b015e8b16a6f13633e9fc8fd5cc8a79be3cc1bb31b68d28a21468e601c55fad4f072083f
-DIST firefox-115.0-ko.xpi 634974 BLAKE2B a50ceb29c6d706a8665d7c31b673d3bd5c8ffebcdf34bbf2205e4f0be5f18adf44a366fbd3a5be717101245d01d1f4bf6e2081b877618de4be33786b36cdfd93 SHA512 8a41c23034990c784a2a166a6c895da5dcf267991aa6fa8970f49a54faabde92bcd02f108725e07889d5d4566c1360203d86b7ec5575a167cf01a8d3bd2fc46f
-DIST firefox-115.0-lij.xpi 493479 BLAKE2B 8ae8568b18b561be194fc43b010134b881dfeb91679c235914a4202c4afc39ce41a75df06c0ab42c7353460795adb30dd50d6017d6ae1403553438febeeaf967 SHA512 34d4954983413eaa0c0f4b4867420b67d686a0c35691842be2c8ffebcb0a8d527cb07e538885302256c3703faa364a66bcb4aa948bf3b902c94a7e386db46535
-DIST firefox-115.0-lt.xpi 583783 BLAKE2B d49e14d36f9241dd23ab2864b995ef88b3fdab7963ebcf17e3a55edef6250f32fe92f10ca142fb74488ebf4b9146de8588328fec9022eaa2de794d948dbebc25 SHA512 7e828c59709c1f2b0ec0096b5123d2e55243b4baf8a38a8d0d851ea58c81a1091b28d20fcd0348abd86b86ff74961809744318d8a97f67a9f8b44d12654faefd
-DIST firefox-115.0-lv.xpi 481423 BLAKE2B 49e047b55f019d12bf5f4ee8e236d4fa2fe161694440c165c1b5d98f87c9d38f251aec4273642a39bc15a9f1acc3aa899b33889fb5647976d424f8b58e8bd8de SHA512 a02d4acdaba005efeac9d5784a5446d41fc4ef0646cc4865dcf214e7c4a6ef80deb856875cfa99f61a4bdbba97106fa1555f71fb34bf8114a03e991037ed54c9
-DIST firefox-115.0-mk.xpi 496401 BLAKE2B 350096469a8123b6d944c3edfba925c39e51ff269402c77bf7df63eae125185e47971031b4b1d7a7e7781855405d24413eac527b318a2c9b44385c187b0a28ff SHA512 659b1ee42080110a2a7de7d6cfa427aa6c0a4a4169cf66983ecbed736c618aee51ce17533de65be994b46f6f8665ff1ffe6fabf1209f97a5c30ab4b252857853
-DIST firefox-115.0-mr.xpi 544681 BLAKE2B 5fa02dc03780f87ce09bce25d1aa829c458635a96f76674baa5df6637d2cbadd193490e8ea38391793bdaf05f2279e575b9953ca9f1553c33638d03f1c789716 SHA512 a1d3e8e070e934fa79d9d7bbc0008d88a5b9012f3dac4d349edacbefcff1dfd4027a0aa3e09bd90ec491353d3c7e9902e340c93b21ff0b42c596d1d7bbd5f64b
-DIST firefox-115.0-ms.xpi 461873 BLAKE2B 0b42bf06c77020d6fd6248e9156dec09239dc17f9407d7ab29eaa8662a6464ae3521501172d1df0dac56bfc938bdee790b377dfa4ffb28e5c69d534a0730dd11 SHA512 27ff6e6ffe4f8f1d8369ea67eaee0982954fe964b7d27c5f7a3885349dcde9cbe6ba49d653321b59d112159f43e244323ee52339fbf0f64a28fcdc43e2574e6f
-DIST firefox-115.0-my.xpi 529045 BLAKE2B 1c82712fa3ea44cd2d6c8387e9cfe3aa178ad6f66a24b3583284585b9eaee8da5185598adf91ea56bd8943724c751d82086961a51da596f5fdb52c368e97018a SHA512 c45772e45beda65440b3c3170cc9764e65b0d2bacc129f0f44f8f5b359803fb16bbbdbfef517c589b94a9ab165148e37a7cb2c7cdfb382012e6325d06c87aac1
-DIST firefox-115.0-nb-NO.xpi 582798 BLAKE2B d3eb90b81a731a86cbb2180d9b06e99d5484639247645e05e6e474d32bf85338355c1836e46ea821f0d2accbbe9d88974d53e7c6ab2568639e3fe3cf6a6872e8 SHA512 b5d07d6f6c5e5ceac5a676ab90472bba4ece4f8782d0b64d9c0f2ecb04a5ddccf6707d920f242fedc3fb231b7e0aac24321c71d6286ca165b99559478cde55ca
-DIST firefox-115.0-ne-NP.xpi 496628 BLAKE2B 0f8924ba1e479517c265d8b1ec0ef7ae0caa5b8c36e3d272350389973b3b8c816b5da1ccf36b5819664cddf5bfac272a1e1e2ee2be8621ca43430ec37478586b SHA512 ae359757ec10146c59bc151e5b2bd36c908947fad1659e50e7426b84e20ebcd4ab09c0a143088c976dafa860028e9458002d8b303012ef048157bcc3e567b0b9
-DIST firefox-115.0-nl.xpi 591940 BLAKE2B 1bc30b8535096b98b6b2bd30963eb1c55c8f9cccec0f5d7946e93bb31d6a49c5f6867a4c09ee1dc747a633a32827982f1f8ad1c50283be59dd4743155341ddff SHA512 c23a69e5a881bc5bd8da2e36c72379cff5f3908ab5626ad39327ba5c7e236f372d25551c57c0a508c5e0228ccdd23a8a647886ad092a142c152c988ca56fb8f1
-DIST firefox-115.0-nn-NO.xpi 585567 BLAKE2B dfcea0f685efecf1d7f55e4c8d337e8047e1726afb18576573e4e9024fa36b1dacf47f862dc88f443378ba1f6c7f13db6b015465d09a51c9a8b991703e7f2c75 SHA512 0d0129b9cbfea0c5fad34851f8a3195dff380fc52f8a758818bf9d4511ebbbb0503417c5ce2a9a360355cf10bdc7f80962aee3d2b9a81ca497eec50fceea385d
-DIST firefox-115.0-oc.xpi 606886 BLAKE2B 4c94a2d3fe969d7a19ff09701cb981c0f9a53be753aad5d881b9bc8f6077d689b6b93b9627f13893e66517f23a612954590cbc040f6abb07f2ae993bf1403f48 SHA512 40880d25a66ef128121eeec8a3937b7bea7b2dfd114a5266bd80dd8728c033f006e693eee64c3d402b5eb4edb842ed81efd62d9bce3400387b3eae685a7f8e84
-DIST firefox-115.0-pa-IN.xpi 665209 BLAKE2B 5279093866d41fd83bf8e5814e6fbc241c7dfc485211ff1387828675c60f6b719a5b2f88baba8af11d85bff4f97f4df4d15b98299545337ec36b20cf1da66dc5 SHA512 967d818786cc48956c5e9a29724536cf37a218a57d4ab3a22ddb615330ed0836d47f126f1ae74c59c1ba842209c3d299fce5990689e4c543f58e3ec950aeed4a
-DIST firefox-115.0-pl.xpi 617013 BLAKE2B e4df7d5f055985a8a54371f2e35b8fa0d0ff3164ff1a545ef5e17f86bca383c6fb6f5eeb08b79e3cdac04befa3ff67d0439c45f5b9db359febd5626430e446ff SHA512 f6c4f9545d11d67fe5e53fc2829bdd159da79806413bd1da7413ef347a8bfb0de16948751460051d6717896f97ba48b588e39c32343475d2a232d2d83cb99c10
-DIST firefox-115.0-pt-BR.xpi 596737 BLAKE2B fd32ddb82135c7b8def7a1f5b2cc389b65b8b65fab83c5618039e73260fd18e6c690aa153b86c189745a7a5e07040312fad6f984dfd2c3cada28d33e8394e327 SHA512 8f0c9db44e620e4be08d63fb8e3939e4a7c2e108d1c85b7c79a79eb98e89abdac729bbdf2e92a63bb7b3a571292066fb1a86a484484ae105b7903731c744b8c9
-DIST firefox-115.0-pt-PT.xpi 598844 BLAKE2B 82126c931a28278d982881a3410971f9c29c5a38af9b9426320d1e8b02573c696fd6913345a3e4fddec4ac87b59cd1d801c974c07f5fe9e09e08a5fd5e855823 SHA512 7d4e1764c6a1a978cbee827dc232c2c83854b878dcf6071ceff3ad2981e2351fce7a009e8270d8dc8ec7d290ea62e3f826aca252ec24534ea9fc2f8239ea904c
-DIST firefox-115.0-rm.xpi 592654 BLAKE2B a773dbe0ada3946ca3f0114cfa01957ffe4cae4a7d050582241f475f8165c48e1dc263aa8cdcfb6e095ba42308ff7b6252cef19ed5ed65da60e88e8d61a59ee2 SHA512 3bcf5ac252dfa6832c7618456ef96c9e5bc99e7a9383a9de7c76844cb592ae60ad44acf4a6525e32627e9dc36848969ec37246505893dd26a399d845159c931b
-DIST firefox-115.0-ro.xpi 556990 BLAKE2B 9398a2e339be0dd6b2e87df063d13221cea47b570f50b6085467e125673ddec064aeb1d9f5be7fbbd067db0682ebe03230d08b02ce4570d3702c4b9f57c17334 SHA512 0462907802031b86c0030dd96cef07264eb023fb36b5e41187c07664b853bf5725445bc9c4ebef58614be93ceca6744d498e94913ea108ec843b26e7b102139d
-DIST firefox-115.0-ru.xpi 691640 BLAKE2B bd79c1b3431035b25c1da5bd6c079f5395ec625d36211100a3dbd955c1dd79d6724d61c0294ae959a97babb2b95da4b93bb06d84d3f1c8cb31201a33e4d9853d SHA512 6495a9f5acd87252c6c5682e2ec04824109f43a5d37e2415dda57a927556c8b08531149f3e26a3ab194f9f3721393160f9c0a2de56146bf7d18dda656e2b4a9b
-DIST firefox-115.0-sco.xpi 518337 BLAKE2B 1d7ae0ed063b954cec82b6fbc5129ce4042ba32c22ba41efbfeb4711fcf450152b4712144f4b0ef8fffc74b625f35e187c862e2447d8352e9c063f1dedb09610 SHA512 f04e4d1c7aaae01e0778d92c487cf496d53aefe4caa852e997e45f72dfa86fdc1bb3ef6edc2cb0ee96ef6dcaa7fcf26d83cf7be479cd29c0133a07d0887c0d99
-DIST firefox-115.0-si.xpi 593124 BLAKE2B 2e26e0f2efd089ba4b34e8912cc87cdfe7cb3d469997e58a57aa958e021a9abd6b76c44e115151636dd826f3b1d09d4a809b2d2f30f2204fec9554ed7861feac SHA512 f06c72408a476c147887caeb5df8624800f7c9ec70b9fda0597a2ba71f91cae3039dacf434345c119074014ac00dd077aeb225938de9e456f333e8a148bf1b86
-DIST firefox-115.0-sk.xpi 625402 BLAKE2B edd155a9667eb4d1243ffd03a0103fb7310adcc5be4e2f8dbe3ea5d6f2297d39ffa45669114b58ebf1d56646f59deec602b209f00beb7c503ae2528f31f7178f SHA512 bf77e9c2627b44094c7d7eaecd7f702b7974d6f45323446ace8cdcc777cfc8fae62012cb5657c77bb131a129e92be1939f08045c6216fa110a2d01e7ddf717d3
-DIST firefox-115.0-sl.xpi 596057 BLAKE2B e823f208c490ccde23b4178afd56e824823c2a05f89a6dd7c8465c6aede8c009859e62f8493fc0ff2cf7de34411a666249b2749a35fc681de84359169c618b46 SHA512 34f7afb32c8c510aa5055bbe2c75971e2562afd4410f574b8c92f4def8b69d19ab0c1a48a6b4ed98b386d70b97e36d46f6ad1e8b1bcf90d00cd78a5404e2c284
-DIST firefox-115.0-son.xpi 432497 BLAKE2B 49a186b5553c1ab42740513ec1b87f1666039076ba9a72919361784d994ac53b9957cfedd2fa745bf412b85b9cf347fc4c59f674a42143ad790a3ac97553742d SHA512 619be73df867a7179820f6d2ab45f3f01098541afd37a5df7952b767e9e10145ad493d06bd01a25aff941d08bc53de7efcf42e37998f9e0b9ec563bc4fd0c700
-DIST firefox-115.0-sq.xpi 600793 BLAKE2B 9eb98617904946c380963c7db6887aeb00898686c2efa62b54520b63d7950151d427d834855f7d55119032a161630d60375a5c758bcce387e1c0c10f9311c206 SHA512 4506df3ec6aca690b2e708650a564601a9c03cb25f6fcdadfc7e3376349fffbd3bd5ffb81ad62b086c82080827e71ac4e15a5a70d8194d1fea9633646ce0cdca
-DIST firefox-115.0-sr.xpi 653896 BLAKE2B bcebcaa4a75aedfced2b1d05acaf68dbae09133dcd976dd5be439dc88929a3ccb842ae883c5b28eb821f591cb78f8ff5b832676f26752f66c00c3098aa7b1729 SHA512 767dabb85aa65c4ca26bad24b98465365a7095d9672f84ac07c4e849bb03b9e6d6055402e3bdcd032acace907109f69952fad5ba2db91329684071f76d3ab854
-DIST firefox-115.0-sv-SE.xpi 593892 BLAKE2B ce614c13d9f9b27e8a7d60fd6cd101646e0ff2446c35fe0f35721877d040dbb231790d64670ae7d378280b4d36a91398840dbd8927cc1fff2b8f88a7079d1c23 SHA512 bcb9b7f6a13b1525d3a2608f12951d9f030100f0c814d448bbfbcd23ab752008c4899bd157abd487ff57ffc85a10ed68151ff8c983e66b391d26ce4611735703
-DIST firefox-115.0-ta.xpi 520718 BLAKE2B 4871972ce721c76fea4c8ea3a62da1402bbdfa69cea74faf57f5d02e872c17777686b8295f1a627e3fdf808ecea79ce57e814ecefd472ef741dbf6d97b0a5061 SHA512 94cf50ffc354f614f9e1d180ac43b1c48e79c46a8b2039be825cd86d1cf540dc484b7ced1bac9d2c062c187e2530f3d087c07a8374faee438849ca1744a51a6a
-DIST firefox-115.0-te.xpi 570042 BLAKE2B 54ed438aafbc78ed8d9ca2bc87c0835403ad6a2f43ce1c25a82b18d32134c79ef3362952464c3403e00d0ebbda095188435fc00dc0a37e1c51c8aeb6f05c2294 SHA512 fa6f4402a0c701e66c678bd3bd08d39eea1d56abda80e748d96f66e53ee2f637cba77a5993f02c4a0fb27014cba9da1980a683aa6d1ac11a8dc2223b8aee5933
-DIST firefox-115.0-th.xpi 667031 BLAKE2B 53076afeb87c9027e3c2d864880a24986d030eab0f35f1f38126b3fb8601d9edf365514042e6da5dc6cdd0fde3664107b388d7c4f89207f940f753c9b36b8573 SHA512 8dfa0382ea21f55387f422f39e14da5529357163f069e58b2450e518b85e57b6f5f1438cb6a0759a8e52f5785f881c0b3fcbe8c64559644f15486f084009619a
-DIST firefox-115.0-tl.xpi 541132 BLAKE2B 0f071fdedf89d642ab4eece4eb50fe9320fa48626a0754a8ef6dcdc4dc626fa09e5335c68bcec82b2ded9941714d21a3afea0838d98eb8fb612c725fc43b9dd8 SHA512 e1c8cfa9bfa4e56fe7ff0d0a92901946bf4a0fc629a6cdcda93af62ad983c71658bc43375d26005c74a4300e9d076b216bf5566d55ed417aceaad274335c2431
-DIST firefox-115.0-tr.xpi 607283 BLAKE2B 46fa8a2bcbc9d2c00aee43b3a34e4d7b69365b4d8a34d7664fc59682006ffd292a9b332d172866707bc8f7fca1aaa72e66ca4dd2c209a37916e08a63d29df335 SHA512 fd7d088bb1b72ffbddb07f32bb5ac93b1cab2051beca78ac7bf32c6729819777ae6e4557af33af75c14e606922bcfa742ac1a8410c2864ed3c6409506cd2a6db
-DIST firefox-115.0-trs.xpi 501893 BLAKE2B 6c5dec9dc0a223858a6c285c14b0e1c9d684a40d448aa12717da38ff860b14553e62aa3e752a85a93a9c7486a4e885c2230e2847c364d989d7159bd496e0ab02 SHA512 bbf6cf5434dd17e765ab6c135b30829e5a4b9e19fb2cabe071827bd46b253d2d5c7a1ea097ecf5383825d6e253e2d8ab96f1d97ee14304d6047ee46fca5f8cbf
-DIST firefox-115.0-uk.xpi 684819 BLAKE2B 4d9163c890645efbb27233ba51579e8fec42f30d8bf822e10f0e660407f0adbb58252e42e446aeb528cbc49a49351bbd0edca2dee7b9795fd5142c799f42353c SHA512 8970e2ce1b312fc5618d6a547e6e7b0c7688483a354f3f8bd6ae4d2b0ea6ed9c38e80686e0bb055c91d3c5b428637722959c7417171c7626333385753af1bb8a
-DIST firefox-115.0-ur.xpi 570586 BLAKE2B 7c2f57a9ec094062afbb0a9025fcd3d907676b32665dd40018c55f7a3465b52a352acaa673e5bfc035be0efbae1080127439da9efe94f69fa4ef5ae64b42341f SHA512 4210e9d081d260c8ea860ff5e664e532e1f230727c199331ebdf00d0ab7f22616813af79c8f8fc6e83fde39e7e14c125cab19afbed7b92c0692a32afacac9548
-DIST firefox-115.0-uz.xpi 488313 BLAKE2B 7186fe5c3e14f0d52d8ff3ef0bef5a285e57285bdc867e0611d93db148874d23d70c7427d0f2082231407c0d6a9e9e78e0ad686841868636d197914b4798b633 SHA512 3485f3f4fa74bd0d7a6c500f2c18cfa077ae90b5b952dea25352031990fca4dd832897e9a8782e39db7c12017dcb28a80b0a04a05d4236171123428742370d31
-DIST firefox-115.0-vi.xpi 631054 BLAKE2B 78293b383d62796d9731cfa669671c3405faba23119c20767893cf5df3d66cef59b5fc406d243808a4c68e1fed793bfd2ef05193379452d1c56078757ca7c525 SHA512 c2910481a0950ed69a52283b70c40e3c7ad5840865efc07cfc82f8e5deec1144fd80b60e62324c73eba0dbc675b57ee0f89f8b20220e818ae77e1b4bb943871c
-DIST firefox-115.0-xh.xpi 429450 BLAKE2B 206183f10758acde849aaddf3ac261c49fc49c274ca643ae46b0609779b18b85391df3a2f3e34b4854f4234860df374c8aadb2711a0220f8414dcd0988c0fd9a SHA512 e696b5a960f12173e6766002f6cb8b743c422ea13d0067ca1c78b6626846fb42216dec1fac536407c3a4466cbc48c25cc7526544537a3be4215882f6beceeb24
-DIST firefox-115.0-zh-CN.xpi 629739 BLAKE2B 4fdd9f7534512796b5540aa08a0519bebeb12b1d41ebfa6b7669de94a68769b53bbb90535c5b7473f3791378fdd92a7bd3901189dcf93e6a8a5fa437a45ba9bc SHA512 9ba2ccfe09104ee005f39a6171724f0fdfa89d11dac3d1747c77d431513ac4cec1b5cd869ad003f8b07249fdff7bdc335e7596a5326b4e6d738809d1d79a610e
-DIST firefox-115.0-zh-TW.xpi 631510 BLAKE2B ceb95485fd162e056a4d02b310d751d3023963d4cd64d11205fd06198ee4757c83601cfa65163ecb2c1868fdf7d8872beb0b1dc491dd4b59fba98330398d8fb0 SHA512 afa77b7e710329af3cb1c8b1fd65a42e5c2bac52495a3917047b7fa7e5d813cb4e39d03e649e6aed34449011926cd82baa2c7fa31eefb969f9806c1d9485b052
+DIST firefox-115.0.1-ach.xpi 469318 BLAKE2B 28a950ab6b7f0286e18616227156ab674c3b9e7e5afc97e63a42d50a3f1bd1213d1d3c8d4083cdb44a8887ab4a9f27c385c101645ae6f1c31cb93084cea13321 SHA512 8ab27e5de02a0c50ecc1c29918fe64c3540472281c1ec084dbf5081e1dcf346c1eef79065a19367f76f9a9e374cd2b47d8566964c7648e70756d4181fd91778e
+DIST firefox-115.0.1-af.xpi 430127 BLAKE2B 94dae035d7ab1d5c1e5e81e20d13d23eb2f2f1cca7e09e760ce2e91144204b41dc95f9e8674a6809129404d3e44d0618b945603dcacde697c5ede5938105517c SHA512 3019b943a1a2b6a4fde1221b9fac0c99ef3ffbf3f4be313b04f44826732802543db62a3109a6b595a823a64483d3b45f9189a6400f227864030d73dc056fa785
+DIST firefox-115.0.1-an.xpi 514819 BLAKE2B 6381ed00e0906e546aa3ed3c6b384521eb53e4cc4692711766e4aa86d3cffaa8cef84812677ab9a761a819bcda8c5c20924b43ef4e748510116bbcdcc1adf2a1 SHA512 01d524efb61ec1b6150109fee018161d4b74c5d0abf8d298142a8c659c7279a003d59c6bc8075e39683e48aaa7db25aaadcd4f3ba74302c9d750c261fb704a5b
+DIST firefox-115.0.1-ar.xpi 583858 BLAKE2B 919e6ecf047eda974fa578cb7b9ebd36b090817ff06a3c6a55954956bc7780c29fe93f83036fb801a4c1e1caf9604a618fa4bfec366319e47a69ca3f2efcd674 SHA512 f4003e001b73074992fe0bb0237cea9dde5e4e0647b05a79ad12832ae3f21d92e6edd5ec11be4ae2d1fbffa97adb7dd87c00536bf6bbec587ecf2014c8c88098
+DIST firefox-115.0.1-ast.xpi 496697 BLAKE2B bd0a46aa1993fb5a029afb951f4a4f486fedf730ebe99f713918033884d06a870ca01bc92aa67cb3f06219f27e34aefdb6ca7c3f7bedd89ad5c03a682e469c96 SHA512 a084a1ab8e91bfe5908505ea76a6ff44e699288ee95361b1eccee275df1a987c72b5b294bc2f5b693cff4ff11eee5755afd36857f336b9c9425b1cfedcc65581
+DIST firefox-115.0.1-az.xpi 501988 BLAKE2B b36482393801f8b5cd6bc2a51f760ee6d4c90f93686b4e837cb3377ec5079ef304efa8270be8c24aefe4002f8940b8ec34a601825bc3ebaef064f768d8e8815d SHA512 51f905f7aca47c25cf69259de54978b91ac83ebf94ae077a18a4a630d50cfbae24f735f9a161dbd37d6a173f0259e8705f174e713e00636e852a0eaa55bbed5e
+DIST firefox-115.0.1-be.xpi 686947 BLAKE2B 30c029ff30d71018fd5812d08905ec7276f74ec3aabe78a4400971517e8755952dd67b03dfc5b7bb237974cfb49cbc85f4b2d91768ddadd01e3aa6b7f3e0e93e SHA512 e99838746427d5967f3ce959dc67bf3118588e8e80356cba97b30db3ea7e645b0a871d63d93e815a99b41207e33bea725cce27d811604be789fbe704d650f299
+DIST firefox-115.0.1-bg.xpi 600448 BLAKE2B 49a4aa98466d02b23737eb1e38561bd23d5dc5a63c242c6362566c556e31857bfa52b195dd90f4ef0894f52c74cfcac234bf0db86bfaf4bd2c037ec517a089df SHA512 facbb66aa49ccf45a3519697ce9645fc453803cbc8678b856626e8273cc0241e97ff033769ae12d0824131d5d7365ecfbd98c5dff595ba57a7c1b09e2ad878c7
+DIST firefox-115.0.1-bn.xpi 593728 BLAKE2B 9de6d61dfdf80c7798d47f0e12124118849acf58b60280bdf6fe33ff50b83d3572119dd1f5d8c20ac915a9e1addfa78c045fcf59387e8d98f4de2e64db6017d0 SHA512 0763f032344f679a530f783fec1f599e552c86e167b06599cb4899d18235cef595053fcf3487b3b8428ea7ed6532dac22ed3a4d37ff789ac440dc3e521883355
+DIST firefox-115.0.1-br.xpi 565387 BLAKE2B 776ebcd57d167ae4bc258910156edd6824341c220ce3c0a69a0aed614a4885e481cca33419f243fba0b3398fe3cddfa21ae6670188f725c72e5fc68bbaa1aac7 SHA512 a9d894dd6e02e02c4274a40b761803427d404207efcb7c9c32d7fb3cd034c1f7c3d60d3f58915017bfaaab493ef793c0178e5c717ee15974bd448e1aeb86b920
+DIST firefox-115.0.1-bs.xpi 474032 BLAKE2B 14fa5a3027b0101dde8228af1a5fbba15a23c51675b606156bf4d8b66a47b0c3349e512423f8207608354c5dd73f6efd96f2fce9b44fd832d36ccb9c645bffff SHA512 95168327d7ff91d97f12ee356d0781a93bae06013a54ae9e5bb6654d2b0b3a374edcc571b1b60489464260106850a0ebf4f0825f443f690ed3ea7105872ecdc5
+DIST firefox-115.0.1-ca-valencia.xpi 554614 BLAKE2B 83b07e9740cc0667504a010d41dd951c87816b82d12332639700f97c17a1dec9cfb68154a86b08c205cbc9664e198c6e1723ba98b0d89c8813e868808c3f63d7 SHA512 1b9a2b986e2a7a80caa437187046950acbfb1e37ae951c65aa81afd2c9f93549304074f14240a7ba431a497728227048c119e2c7e4865ce9cbea34ef308e6b84
+DIST firefox-115.0.1-ca.xpi 576656 BLAKE2B 6a27ec1028045b956e283fc2969770b472dc8dac0fd5092ad7e94097a7d9589251ee10cf8a5fe5397ac6ab06e26fab72a2e1f456a7cc31a8a111d755dcac85df SHA512 ed170a19412bd25413acb4121f8b3b26d25a3c6001cbaf09ac9a689189cc212091da61bbdcfa0b0a90531a04158ae14559392254e526ea2789c10d80ac3636df
+DIST firefox-115.0.1-cak.xpi 599841 BLAKE2B 3cf98aa9990f853ca4c723f428d09c47b8687bddbdaa74528a910d003036bb54fadaf9f24c94394be9b2d9a8ef24151451f1053ba0342d5981cb4920f5b68fb3 SHA512 3d39a56259621c163d2f78675e56a7729023cce9a8983096ddde56e26e9f5191370bc3c95b53bbb9a132d926472c561dc830da614c413e681b276e59231c17c9
+DIST firefox-115.0.1-cs.xpi 627663 BLAKE2B efea717c170fff62a66327d6e698e7a475cfcb883abafcfb8b3ba925b83625fadd841d0c41e841e85f52e9f3392ae4f9a41ceb8a16d3b1fd0f057230c7877e9b SHA512 d064ba7d3dc21390753eb01090af40c46e416bfdd07d807a7d2dbb2293ae5664723ac6154b9bafdf4244f716e8ca962b786b8c1592007d01a5579856fd398a77
+DIST firefox-115.0.1-cy.xpi 598164 BLAKE2B 2756ef0802baf1db3fa387dcf11ab60d938b81b1370d65c68227056a6b9d1c1a04ba19fa468d2cfee2f4caa1991beef019d0d5f8e2c03db9ca87300b31e46c16 SHA512 7ffe278448b9fc6e110a4f2fc5c6a1f9d12cdfcda166435a28464865dc34808f2c87535e592369d6f914cebed4e07463c2be4df2e448d37d4a1f0aa3c55ef5e6
+DIST firefox-115.0.1-da.xpi 587178 BLAKE2B 16bda8282a5f6c6f632542244c2fa3370b997604fe280ae5fc02c52e7328ee1684d14eb083bee515e40f6116fed91efa98655bf7231b17d27af9116824e404ee SHA512 5c2cd9767d70b9c78831d649038cdab90be467f6e87acde65c3e4b132a71540d1944e14b997bf3dfa890d93d9fba3cfa368ac1ccb851e8d77b890b4c41cf0261
+DIST firefox-115.0.1-de.xpi 608952 BLAKE2B 57d35978f0b5738db3ef2e0286d6868a547d0a300ed838585c8b6df87872e227b0523f93f6329c96f27d113f27941dd78837da3cb094c234456afa24052fa703 SHA512 1e98e7b7358769a84ebeff20857c5ec7f67bbbf7d7fb855e5a6c1e9f427995fb0af0bb908b31fb61b95656fa5720df27287ca76f70f22b45940323f36d190012
+DIST firefox-115.0.1-dsb.xpi 620447 BLAKE2B b9d1ac95b8bb5e9c04ddceb4e3bb04dacdb196f68d1144165908c1e2e1bc1dffa9c98e0b6a2f61f6e628c54792c13f22a35e1f163d172383725493ffd990ff92 SHA512 8e06f4dbb56f5713fe4ac99414cf5380392d4e3858a1cad5d2a0359864cc0e3fc3e9559659c1238c2bfac638c5361f5657fcc276afb39b3afda21d37eda9e4d6
+DIST firefox-115.0.1-el.xpi 703007 BLAKE2B 9980c6a827eec9ba2e527612ce23dc1ebcbf46e4b495cc5a463ea18850668b331a5686057e6fa508e4f55de24ec4db0dfdaa37bf939af267cbf755a25645fbc4 SHA512 cdd3eb7318dddce2ea910a14cc17be871010b713023ec7142cf5deeda346c8cb3b25d6c22d32af7cdd47eb23efbb9d12da625df07010e7ad50bf5273ac753a5c
+DIST firefox-115.0.1-en-CA.xpi 551493 BLAKE2B b237e9baeb951b9dc75a416ef5019d599bcf83c8b656e7d0fb909cff73b9376c0b9f28248b5b23f18f24c338a01571ec593e1cfc558d390cdd1e2319682b800a SHA512 44ce9bb1d642975e40bab85f535ed23fe667701d95d16cf10de967a942f8517f4d1726af44879a418653e10440be8afbcfc44665727fa0a8ff0fc628f4ebf3ca
+DIST firefox-115.0.1-en-GB.xpi 561378 BLAKE2B 4badea40aa07b099d176d3f3c65c44f1efbb5de0ebeaaada3c3175273c461d412ba865a8c4318f102250259d1834cf3b7713ac673592f79c2fe1306b3b4247c5 SHA512 6a0217fd99850c9c0bae9148e5696d7491f6c45e1a75f0989977d3aa304b2791add514e43667e031399081a6632cc38571be1c3b5e97d4e519bdeb889262b269
+DIST firefox-115.0.1-eo.xpi 583948 BLAKE2B 6b5366c4e5761635a7f5a98542085d14557a4bebab226adedde57b4c2e59b57b32ae04fc9bbfa9385211619705e62bc043d5a44d518b0ec4ee9f5384e3c980c8 SHA512 290fac7091388305d18b66923619004251dbc3f0dfee1908f9ae92c676e6ecfac8559474791999d1901ba145abe4447158793e24bed3b89be3d36875d57fea5f
+DIST firefox-115.0.1-es-AR.xpi 602620 BLAKE2B 3c943d561dd636c9faacd0ae7fa6ecc2414c39dad20c18c0e258ca8037fc4e180f86c9cc360f2be088860e2416eed027d7f62f635a0f38977a8920b42257eb3a SHA512 5fac2bf6db92af3f5b091a7d33c213f2dc96f5047e8fe463f78da67a3347489c8b0c822250914b2f9762e9e32c36c40de045d139952262775809357eb05bb630
+DIST firefox-115.0.1-es-CL.xpi 601296 BLAKE2B 51a463c4d84c90c139fb190533af13f9b82063c108efcf8a231ed09391220801504f80bd4a8ee30e3c6ecd51b618260bb945f4447baf8940efeee831216096fe SHA512 781dd7bb57a8d8b22b0f474e42b25d4149679ec1f024ea328db561751b60cd3c061e56e0364f8d86707cdcd6d0491bac68c3fdc4bf9ed9d25f081524b60c084c
+DIST firefox-115.0.1-es-ES.xpi 595244 BLAKE2B e0e282bf5a17ed2ce59868c10fd136aacb60fba7b74d183325db756f432234724532fd1b02325185f9667a55c050da7bae1cf6cdace84527801c442542e48aa8 SHA512 a5818db703d852f4170d2b7c2b633639af819659f11cec947ee51b94b99e550886ad6516a2ebc78d3dc46f0bf9cb3017f0b4f9ff3f2c2cfe047697d17c8854ef
+DIST firefox-115.0.1-es-MX.xpi 600968 BLAKE2B e4bedbd8dba83bf7a38f8a0b33a3909ca77654c62546650b52680d716c092c8bc27fc3dcaa8b94d6b273c320dd95f4d0d29b54d81523afabc006d59ee6a0e30d SHA512 f811562d534366864f9fbba171563d72a6f06122ea5dc7456bcec9ff90aafe1d36bdc252f8e76e94902c33b60545dd045ee45602f45cc49b99eb1249c6ea6e62
+DIST firefox-115.0.1-et.xpi 548998 BLAKE2B 3e9bb150cb4b3703bdfcbcfc77b0769395df5053a0d483833d7901cbdabb26f0775f01505779f98f1625f22fc6429f3b9381e4b62fdf19c909415c38545d81bb SHA512 63ee421f3ddeb80d80d100dd93b70f9e72e654eaff3006328460830b1b38fb0a029906d2b1676dd471c4c2eaa8d6473417f62dc1e37cc8620a276a95bdd0a4c8
+DIST firefox-115.0.1-eu.xpi 586436 BLAKE2B 8076e460f7bfeb9ea626ad55738fb4a47f581b8f5452b901a718d910731bb570fcb6d1f40ee1ddd44ca4b9efe1dd9f077d44146fb043149998e171f1f624160e SHA512 fc922074df8bb055e590f8376135c4e481de133ca437db8e8474e340b41fadf2893bc57b62ed768032604eac87151f0d92cd290d72ad44d2a8b3c9ef12cb639c
+DIST firefox-115.0.1-fa.xpi 601513 BLAKE2B d6f453003d909b0c0eb65ca7901cc530dd26d8d66db1ad7b6bff0fbc134fd27d97dc746b151be61e180bd6056b31d96a47cdde2e6f72ae5d540a20ca52d1ba5f SHA512 55aa6d148ea3a24f39926031d3b7104b0153a5ecd9bae77bd8a367bc22bb69e564352d8c1dd2efe8053cafdbbfddc553f64035a0478d45a04fe2411934f6d16e
+DIST firefox-115.0.1-ff.xpi 485917 BLAKE2B 2cfe0c2875a84979b128057ed083293b2ad616c37168076c0aea9362bf72b879cc12cdcf3507f28f1bdafa234d79f67220dd9c6164431d52365b00bd5601468e SHA512 70a71a9768f303923c8b9a07351df09224ad0ba1151cbfa1117adfaf3385e611dee3d4fe3220a0fa9bdbf69bf0a4ffae29ebe721cdceea654350a1008a633418
+DIST firefox-115.0.1-fi.xpi 586038 BLAKE2B ff3265b5cc850e4de5a9c709d5d0f24d13b908484a5169769bcf96dc0c0fc8e843939f96a627535f33bc93ab5ca0b91f1cb2af225f1e76f7b91da3af0b33fe94 SHA512 090693f9cc3d499294a851f84d053e6f0e7d468015ea0f9b0a14f4e33be62bbb654a6a1160d30b30142d2015c4eb77eaa29e6dd6ca8643cd46f1e9fa9088be37
+DIST firefox-115.0.1-fr.xpi 615064 BLAKE2B 9c0e6f00e6336ec36a56a1191019dc250667afbe5e40c34fadcf6b5e4e1ec7a1cae358f5cc18b18c0e19ca33326f4ce360736d406037adb2219559d978b8e061 SHA512 1b8bdc3920e9f9d24590a5084848864a530b0e46960464c1c6a2662988e311156ac6eff0d6f33b764a96217226dd7111b333682ccb3faba01d674877205ddfea
+DIST firefox-115.0.1-fy-NL.xpi 598099 BLAKE2B ce1f69901b7d3fb3fad268b5fe40e082de306a3cc6683a4fac61bd41d8f835587a47f763e147ad6776fd7a9a5b09bb666a3235b3edb4a75fe5e21e2f9d359070 SHA512 66e00d547f476076f78886cc03a29b7a9e863bf864f18702354804235973d88c890f09b7414e6c9cd4c1615b2a00ff497183bdd2d9891c7efe92d66e1cafa5a1
+DIST firefox-115.0.1-ga-IE.xpi 482375 BLAKE2B 0598ca597f7964eeb992d8cc63049ee1d9c82d7a1ecc4468301d786d5853026f65d20e5c8ca802723d3d1c7ee36e1d84aa53fd29997bde58bc2ff64b4e311857 SHA512 81e4821ba4e3a9764c85955e932a13924e8a613a2ba3383deab12d248d003a21d8cc757f715397d6b752e7cdd2eeeb0d73fb1bf39514052583f55034d7339606
+DIST firefox-115.0.1-gd.xpi 603638 BLAKE2B 8c1c584f6399d536dc303dce506fceb1db709047d1b10e62a49b2f8c50b4d1a321421f3408fe52b979cdc77173d1ed96521f0787fdc86b0ab536b934beccd531 SHA512 1cd358b2e6e8d09e936c0c788a9347fedc6344686cdb6b41320b4491aa51651869013fbb3b15c833622c176d2ff5df34f88065aa3d6a1d11d51cfee5bfb5bad0
+DIST firefox-115.0.1-gl.xpi 598446 BLAKE2B 77192195cb3717b4c089ee727f03ac42b424f524b48ca9ad363d9b7b6e8714467084201aecfd29e2ec47af5fc975f26553557725bb013992633ddab1d18e29f0 SHA512 727cf01cac5885715e7c0eb397f3c91ddf0ce773a1c1af18b5c89ba3167ced483843822c0649ee72c5fdaaf81ebb02313cf1cb6875c58e6d6caa06fcad7fe767
+DIST firefox-115.0.1-gn.xpi 612069 BLAKE2B 715e72ed79628b15999bfabff771b49aab08b34114e74a375791423cf0548003392113bdf96988ab131541eb0dbd5b6e160a34c6b3e3c4fb35f001902d3d1c7d SHA512 08edba31f7f86a259d5b4fcced3ad7946c2070fb7fd018b4ba001a69a387d8ce6c33dcf03b38494aa2c203b5e7ca9dea38ed0bc3b381f3c45fe6120bf9c9e45e
+DIST firefox-115.0.1-gu-IN.xpi 541867 BLAKE2B 48f108dff903209b97947b633709c38a21b8aa92f39e8b3c6a8d07fa38b104bf681d13f1b067784de3c84d6db23f0cf68ff38dd8663fc3bbebe3f080173079cf SHA512 c4cc78e3cf71c3633b857db474d3a7ba1a563362022eed855b25cc1dad1c4ba268a3baec3f7112300f86c7666ed7dcdb1b1dd22a53f18b68e1c1b1bf9183d5b2
+DIST firefox-115.0.1-he.xpi 608006 BLAKE2B f715ec5b59f8a68a518592bd410f7822a726cf2c6a0166488e7d21a5c8607f8f51bd34d83992d15cfc6bb713cad74527ad79556447985e448da23565e5b0d697 SHA512 59c18f63817c277aaf6c5f50693a79d469235fb08ae3d7f07fa960e487a908a1d15785edf46754b9a0250423ba9807335d11960ae59adbc9e5ed3134b71196ee
+DIST firefox-115.0.1-hi-IN.xpi 571176 BLAKE2B 7f85cfa45a13753cba3eb2f1d32c66484b3c353a4bbbb2bea5f5dd84f31e9067ff3764024e2500428d200f213d90b84bad9f9119350104e02be988a196d8cb58 SHA512 7c7e512e6371045bda88cfdfd0f531730dfd51b69aa3e9ec9bed5ce64eb08813ff2da85a4dd707f647e5a7f3d0e3dbf76bb071c15438f88cd8ca4f8e96ced19a
+DIST firefox-115.0.1-hr.xpi 564496 BLAKE2B 93a80a70e26cff8cc7f2bf4813a1373feed53b75ed8161f1d36c843a00981356f4c800ae834865935d1ef2b2f7e50e714541484056760fb0e3bd5c15c1808400 SHA512 f321f1e660e6be7e9fea005888d0d7bfeb5d2d834eb2dfc411b5f59c962b3248ecd5650575afeb2af2e82d9c43466f6d2d640c7eaebc1760d0679d7f24519efe
+DIST firefox-115.0.1-hsb.xpi 620454 BLAKE2B a6f80e4f4ed9d0dd983dceed9643a40029349a455a538ccb65e74243031f00809655294c5ea26fc1761b4916163f6d44130d902164af680d0635cc15d6f4d723 SHA512 3c8b7ded8be5de3165383a66c32be4007ab04720f270e670c39378b3be6a32b9c1b86b7b1284c0ec6155637c1c958c704dc2b7caec17d130b83dd28ad81fa2bb
+DIST firefox-115.0.1-hu.xpi 623866 BLAKE2B 55f01f0ed0558180598bf1e1ad1fbeef3c39aaf256878a662aa1309d30b626960fdf14d41381cbb431f4d17c775e01a9359204ca87ba2d24997deef142bcb663 SHA512 84d825575e5e5f3ced0f6a6c0036154c4e71cd0578e7763a0087dc81494c2ad76169d7c2d0d3817c1c4866e61fa4d2ee951e8be62136b6c5974afa0fc44b955f
+DIST firefox-115.0.1-hy-AM.xpi 614929 BLAKE2B f2073d5e290d539dd3ce6f853d3a34bfeeb42787317d157d5834005dc3da7575a4e6b978d2438cfe56d5e3d18174158c32a42d6082760560dec8b42a325ec91c SHA512 443dd28979cd8ceeda4cdc92139acd41b6430936c9ef5f1fc9c3160217bbf71997b66a3fc06baba2e26799c2743b23c480f81a2fc9ca2b4fdcc8d983d13cdaa8
+DIST firefox-115.0.1-ia.xpi 585634 BLAKE2B 8b82e50549dd07ef77d1e6bf57874894c9541707b99a422835c28a4dd25e2f1971b5d30576f5e35686f99d32826f3b984153b0db38b27e33df09eaba120f65da SHA512 6050c4ffa195a71ce67642e90a2e5a699f46af6317e775043877e58a2c02d5a77c0908ce1d660cd37364e02a69dc4b7c6f56e1c77eb91543bf74832c78967c67
+DIST firefox-115.0.1-id.xpi 571368 BLAKE2B 8480cb5159b18b02c6c41e56a4cb53be603efc121cac14a0beea30937497090464bad201acda580114c27c045cbf673c1dc9cd7c08af2fb24c76fde4daf3182d SHA512 1f519df1ae9e7369a92709c46458d6b48fe0a3d0cad68c9e6a47bfef1660b3a295f53d676e20b77662de0c2fc48d3315a38bf9caac1bc7a594f77d59cd458fdb
+DIST firefox-115.0.1-is.xpi 593519 BLAKE2B d200caef47641f4c8867c46732fe04527d21071da70a7c91b763900bceba26a2611479ec3518119e1747f82c4e0b0ddc5e9dba01a27c3887de5cc852b583029f SHA512 e3bf5531661d4fb6ab12c38b90b94e12ad57390635c252b6a36cf0fb933ee36967d307ccb54c3411871b4e69ed3bd0d96999f3bc3afbd5ea5923cfe327c7086e
+DIST firefox-115.0.1-it.xpi 536403 BLAKE2B 6225bea7f7771e50f61492c1be891754946723e36dc9f9fafc972805785a5604733566bab6594a64e59cde2024cc9f716c97cf710e110814db949f80fb54b25b SHA512 032c540d5708b31b5c00a97a6a64ef40320a95a3a6207d4b944c5876c77d9ed3204fdf9b775671a9b972d67eb6105622712a01a33c4d0f76dea5f37461b1b931
+DIST firefox-115.0.1-ja.xpi 648102 BLAKE2B 2a130c3f3c3153a99a10a7da5044505679dbd4a4b755652d759f7bb5fba718c054732a69741cf08bfcefe330a1e72db0469fcd8ead48f371e239bcb41fc3185a SHA512 ea87a88a2791a3dea98209da30a1f68f68420218aba12086e60983cc2aa2d1de855771758c6c91796c45bef612164f540f62b983bd477f9890560c26f86a5cd8
+DIST firefox-115.0.1-ka.xpi 651354 BLAKE2B d9b5d718027cfd2552e39b5903d244889f18979abdce51451d73db44d573b847449526fbb35ccbb3ae8f55b04ca8893da425f30ae8ef36a63a930396107e15ca SHA512 f58e9cf183116c2a1fdc2313d8686a4e86287a8fa05cc82ed0b795ad8c6f70de3e89b5c59732260e4853951f143ecb20a16cfd9a1083b7ec4c1ffad912b8aa3b
+DIST firefox-115.0.1-kab.xpi 598557 BLAKE2B d63b7f746c296b4917eba154d1062e304ecc212931fc9817956a0b2e1c4e50273e73a100c3eb68504b9d5053890cb92c4e4db80d05da37fe36e12c7e74f78edb SHA512 673f15bdfc2e6847b5a101577e58f5a1cd9c13cacf7e07df41e67b3c3bec759e8d87b55577dcb90056664e5705efcc511e2ab1293e1b3c5f05aeacfa8f9f84f6
+DIST firefox-115.0.1-kk.xpi 674091 BLAKE2B bd7fd8872ea848d5a4eeac05c0e83534536d6bf280fa99df434209dc6d0ba1ed04293997da77a9d4c42fbf2fb9f1944944c6b90fd07e0eb5cb6b6de8442d35e0 SHA512 d75273d44009d173aa3cbe94aba988bdf517d944e08972eea545c8eb12de4e4f0f32ccebe40cec0a96eb0cd9e5e334b486669e97c6f21aab9d7872395dcc38de
+DIST firefox-115.0.1-km.xpi 543686 BLAKE2B 14367f5956fbfac9a77dc8bf460312d9337c128442a36c2cd5929795b4c452df56ad0d8e044bce8b17615b9dff0b5f1804916446df54414d571a3402fcc2c149 SHA512 e7e0d4954c546f27abc9cc38dff5b6d74a5eaa63a2e49e76e8e20734ae362b91690eb26ab01f0f45cb5804e8539bb1e3e87b8ad187f9b226767f7f0c081bdc5f
+DIST firefox-115.0.1-kn.xpi 508137 BLAKE2B b6cf2825ac1a1f9badcad6c8025af5f51fb7c592650f38e1ef3b6467977c208e4057a2703732b60c9da60966b835914c39946f3535820b407b33d15aecdb69bd SHA512 9449edb86b074ce3cf31255b1dc7dac4f878d67701651fba85e501615604b46619a27219d574a6d211ad2f0f6a2a23332430162a9cb5e7987a6df6e47c980828
+DIST firefox-115.0.1-ko.xpi 634977 BLAKE2B ef64eba539f9ab895c20f88219a0f73d6f37bdfa781edab021be44bcc31e9a4c01ff01cbdfa1325fd85e32f26d7a6b53da7aa61db9d1c2cbf66a7baf5fbfdf6e SHA512 7ac4a5d915ea161fdd8c4ff0b0c8c9db4d8e29bb27ce8c0e96fc443eaf8f8e350fd8c481c7d43b0d5212b069b00ecd57242923653b74931c601046be1afe7762
+DIST firefox-115.0.1-lij.xpi 493480 BLAKE2B dd4687c0dca0252b9b2e26c16f641bbe361e2161c141439fdd9c971cdf8ef35e00d825039f2786157cc4f141304fe15c48a85893f5051524007e0ea567a2bbee SHA512 406ddb2e6265536946e96c1dde19e8837b4cc74765923c063a8ba372a3927ff9b272536e54d7d25bedb4e4f68e070979eaf5b949e73f96d6d4caee164329b01e
+DIST firefox-115.0.1-lt.xpi 583782 BLAKE2B 44bf7c0a530b8ed7ba8f29e00c25324ffa0fcbb2370d14df6d3e72f539274a2088db9105c3cec7e19374161bbe85bc9cdaaa668924281567736d759b8b60ce98 SHA512 dc5a2f5f295a94fd2e68e1c42a2ff84753076711b1001bd5565ed024426c5639db3c6999fbd8f6d54c58385e0bcf4ec47545ea772decc6e4fe8f424754803d68
+DIST firefox-115.0.1-lv.xpi 481429 BLAKE2B 946eb89fecd83bac1e28f513b34bce445596e35bf1c15620040807325531047ba84ca0b7b947b167e1f2057510c323d842bf4fe6958e4729de1cb6af6f5a6237 SHA512 1fe1603e4298a4831c7bce8e7c17f03863fc929570bba1ae5bfe92ba3435f5d0479adf9c64fcbca088d5413566f19a749dd26dbaeb46c0235238641d7746e5a1
+DIST firefox-115.0.1-mk.xpi 496389 BLAKE2B 7f7117ace8fe1b831e5ccdd56be8ef0c3b98cb57c7cb7833851757839f95b849055de675a311f58d8691cd1f87bd4bef90004df411a31334721cb6129579f19a SHA512 98f0e20c7f7fd1a0173e8204dabd2bd63da96c1eb483ac853c35c0a4ab22b9db0f79d6917f303f7fae42244168129ab8a22884a5e40fabcd67cf0f27a65e4861
+DIST firefox-115.0.1-mr.xpi 544668 BLAKE2B 013ea4b8fcc39436720b76de9298220fbe4c48571297bbdb2f732aa516397c65c673050fed128772fd2a62fd274fc1ca0c0204c7d33514ff8baf1680a3bfc878 SHA512 1ca817b9a8b4e0d9adf25c3e6d4bb88a7a6e06c2ae2b0d5ba4f9d34bbc77498b3b6c5acdef0a1ca3bda0e32d49f379fae2915bc0f81f3c9fdd04de8775c765b1
+DIST firefox-115.0.1-ms.xpi 461878 BLAKE2B 0754f21391fa9f100f0150d659db78e2868de368f407f8cf4a006f717eb490b7d40f097a6291621687c4037cb165f1a1c63bb8e690b25cd4828b0ff406081b4b SHA512 8fe2ee17183799647d7f9aeb64ca7cb02a9670bc7399461af403cd8002595b6641c9fbd80bc2675b44f68260806af3375ac54b705b4d5499a4b238625941b216
+DIST firefox-115.0.1-my.xpi 529044 BLAKE2B ea17fa646c7e38318f9541dd6c412929820940228be1d2ebffa5029df67f6a441d5869ebccf3a1d95c509ced2a69cad7dab55dd8f79aa18406171b2cd7712eff SHA512 9bdf9b52baa2c0d6509c1fe83a1987054d58ab112fdd8b33f99de498afb29ac44c5d8d00533dd2ae6c8093c0b6eb4813d35477ba960e550eab7c59a2f9ed3ac7
+DIST firefox-115.0.1-nb-NO.xpi 582796 BLAKE2B c5be054980c6f4118193659508cb4eeceb9860c7fc1dfa765b57086ff3d7b1e2277cb046577d96d268ccf6490c563c2e813dd9c333428fec459271b58dd616e1 SHA512 11ca093f2d357421a13af3a77c6a60554250d6790f5b5ddb5f6be8147527c053e40f384b39c176e47766af13e40ce724a3df789aa2173470b8efa813db53fcdb
+DIST firefox-115.0.1-ne-NP.xpi 496638 BLAKE2B f34552e9656f086ecc5c3a2c5a93f959a7ccfe9ff425e9097be9bad347226b574fb79b48c56d5703b8bcf7becbe9fa40f8b927b05cb9d5842069b3779ce9476a SHA512 8cb28a248792ffa030137d07398105823765467236deab097bf9c7a9a19489e033f199d100a7dfe08a8537f0ea511ca7b8990701324b9416cfecfb87db1d957c
+DIST firefox-115.0.1-nl.xpi 591934 BLAKE2B 456d99a7f95f8ef5ae6e10ea84419eec43f8625d27cae48c71668442bc546d7e497f53c77545437062ae9e3e3edb9081b376f59d512fc2f2755f3c04b0098a2b SHA512 2837fae12c9168e61f1fce5b357103221d8f86a070ce7ecabc2c2c080513e26c9025950c343dc255d340deff265c72b2ab41bb06babcabf7fcfe4237a81a54c6
+DIST firefox-115.0.1-nn-NO.xpi 585569 BLAKE2B 5e3c4c85fa32064834abbf296714f5428095ce1f2e153b33ab7066dffb0c8a1adb2983c6593ac392d25c821e8a8f7fdd5d8b71d5ee0f607602d6ec2890d2edf0 SHA512 aa9a17d181bd5e10174211f6bacb59ef0eb4c4467ace78928e00fba703fab03d119677d587fc683710feb626686be72912a4dc3c7c1b90fe06512f0a76f1fefa
+DIST firefox-115.0.1-oc.xpi 606882 BLAKE2B 4cdec31e52cb8e41582efab78004003b8f06648abe23c1b8ab023ec12f99ecb55787122861eec0e002f75c1fed226bf70d7cbf9fa8814ffe0fc27c228f8a7008 SHA512 2b661d37039a1705e9c08a910cd80cd9ff6a6a1dc386c297de8aaf7296c6039e6fdacd04eec327d49fcf80eec3e7e23f08166d4652bd98f8f8591b9352c56ac0
+DIST firefox-115.0.1-pa-IN.xpi 665204 BLAKE2B 1e633a07ade27d4238ce34d7913a88ef30a5b30fc64f60f53c0767d147e4589992e5207e0f22a7fe63fc19e4713464089b1c4309b13baaf76487983635bc2c7f SHA512 f8b8a693f4ce1814cf7016bab00bd6ab347551a1e1a429609e1d42ad2d78d7ccb5483d7ad719c5a396ba9813c74f47750a61a8d227e9f9ede62a9169240d6888
+DIST firefox-115.0.1-pl.xpi 617013 BLAKE2B 45a376f81bcb7ad79fa458908ba26c7740fea2be03fef352222fc8c5efa221a68835aad5d17ecd7200de570e3579d7ad52e7295daad3aa13cb705de00771f46a SHA512 18c6a6d29445404841be896fc4aa057c41948a0200c756a80f69a46e822e5238999d629db5c8337dfa8fd7a5c7122487f5c9f4615c630bf278410bb5252a8fd5
+DIST firefox-115.0.1-pt-BR.xpi 596721 BLAKE2B 092f6a1b9c84c7e85a05a910b328e23167bf783443d7b31f31f25503ae5096b5a578495b877c2937ad7335e416e01b4904c19b91ac70517ba1fac5b5202c6657 SHA512 29efaac800cdf5fb370b03684cf871cdfb18e508aa584460222f23ae594df2e0d3b4ceb032ad9ab1c776e77dff12c2180e6428e9471046877feefcfd522d819c
+DIST firefox-115.0.1-pt-PT.xpi 598851 BLAKE2B 2ec6719c46ad8492158a9725c554b4170592db7c412688b2ef9952a210c8ab1ac52d643388c219fc813e98da6d91d41db5992559402295bfaeaf878e261e3e55 SHA512 99a20dc0406755c247924c57cb0939a712728d3a1ca619c5c094c62947856344b3bc916d56e57ef25e5541e0cec9f1acd6de76ac7dc7ad06c88543683b8cbe93
+DIST firefox-115.0.1-rm.xpi 592651 BLAKE2B 803b792abc7210745c45bb1244a921a659e8f5968e72b02a52773dfc4c06548a88b4fc753846e88f327b4bb55e787610725e7be301c0612440e022a63d54fc3f SHA512 acddbecfb1a6c07014c1e925a934264bf811dfff5d1c9892b46f91de31ab7eab16da37c01e8f8697fa4dbb5eba462378e3e7292fbc6e2223230d41f66c27565a
+DIST firefox-115.0.1-ro.xpi 556983 BLAKE2B 5cbf720dfa5ce1ac6c66bea2a2a4e0af671f412403c638927b491cad0493bcb5595fa8c9eeb6f0089149602212ab3973f0b1921841a4bc055ff953ee57204925 SHA512 0f8dc8be13d8cc80658590e5208fc92e55ff7c70ea0e4fed6a24f74eae0c7e61477697bebb2e5c91b1a677a29279b6cd32bfd423bbca0d85c75fde967db32d58
+DIST firefox-115.0.1-ru.xpi 691640 BLAKE2B 6b5165ef2197a815f4038ecac29c7c5fa67d2b0c8db31171f51db86fb986abb897038b7ecae7625affcaafb7bf741f3512e93bcac7a39b9f43f74ff9c72786c3 SHA512 8dff864ded1436539a52a9e314b38efe5383d74bb0ac85af79402f065967802234a4b80a10e08999b7a4b0c04f193d26595e533d96bfd6d0f2ac8b8305fb4930
+DIST firefox-115.0.1-sco.xpi 518343 BLAKE2B f14a4b6aa30578d749488e39b4660bd4e080280c536a634c86dfd60d6c696f3087ad4ff622a993f98119720fb5e2dd7ef48d391d404a7de6146f199c0ae22e63 SHA512 0079b13e7e1159f8d4abbd7bdc355af1a5456b7d6134b830521fe33b0d2a1272de4b371168d2020e1091af15078db900c4893169228cb6cd296f3ea3cb2b2979
+DIST firefox-115.0.1-si.xpi 593127 BLAKE2B 434706e92f125003d2f7ce1ba168898f657a1f15f42d9e65a4442e2b4df4b70f71ea0eb68adfc176491579369c6174d0fdc51e652328d999b8dbacab164cac69 SHA512 ee9c8d7fc39d0c2f1ac81edf5626eefb1edc744ef0b080bd4249bc5f60021038ac781ba1d1806f80030c1cd5adfaf2cc72fc0b4aeccc756eda35b6fe84114c9c
+DIST firefox-115.0.1-sk.xpi 625397 BLAKE2B b183d89639d142e98029710909e26518b49907fa847de2b1402e7bb9f1b05a56de6d7894dfd7a56c982683c9e6c1022aff246a4bb7f762c15e2e9ab75bf5fa4e SHA512 ce728deefb79526ee7b63e0820d82cc7b335d45edfb424bc5295b53306fcdf3bbe34fdb9703f564a3a0a7e9b6495458d7d58fe617297df0770ae09ec3a0c202a
+DIST firefox-115.0.1-sl.xpi 596046 BLAKE2B 3fe6ffcc3d2519b8d4ec9b1f7d971fd62c90bff54c9fc2683521dad6c485949e5ecf0078c1950d0ad4a9ff89d82756079da67883b2e77545db140bc463009806 SHA512 cc53513eff8ec473fc802374d236c2cbafb76d0d3b2f2c1f158c27a15dfb1f2c74ec7d244e90a4f98433731dc920ddb0bd5a7238f0d966216e569620b49c0ffb
+DIST firefox-115.0.1-son.xpi 432507 BLAKE2B f4525e273c369d98cb0939a1cfcb081b64f479234aca0250203765952cc3d3b7a9cec2b649198cf59d9869d460faccc94eb00528d54ac056bd3940c3d2525630 SHA512 3337284bb4fabe208787942f2c2e02a00033688b51b88ac8a4b660b899392a53216a24434a84b83a5ee9f936b2db1ec2c9ce0462b5a232ce583cb9d2df411689
+DIST firefox-115.0.1-sq.xpi 600796 BLAKE2B 4ebb01fbffd25a2d2f71a64b34e6f355d009d33e8d6fc609f795d53324c498ab2c602fdb6b290a411e53cae1f125d0ad647e0f800af52f726f9bcbf43821227c SHA512 e1474d985fe675475caabbd8d6715f943e8be04bed2b462e6f66debe7df72380aea91e6334a36913d66d1b34fa5b85873ad5c59732037bfeff47d09ea9baf7f2
+DIST firefox-115.0.1-sr.xpi 653896 BLAKE2B 13b376373eebd614f61f33afdc4faec0bc7a7ab23dc0ea7af8ec09bbbee1e4ee7b22aec05a8032d0afddf47cc744375122d02a91c2e8a94ef8ee0a077d7575f9 SHA512 dcfb27261da66696883c551cf1f8a8d0f150b8f3bce5075ee0312d81997901b8c5e3aaf46781db9c908f71ccae0587e617dd53850ead4ce1c719cd50663cee77
+DIST firefox-115.0.1-sv-SE.xpi 593892 BLAKE2B a4e0353ca08ee1e07e3286cc2875d694eb44c08e373efeda24b542a6a2354d9bfae8b388a94fa268bcdd1bbef6aed2deccd929979e78b64c75a69907e0ebbdbe SHA512 3d6cff0e404c8308006177d6812c30a4680879471eafda234ce2b617d7b59ca5a60fa7b1e765820c41f2a7701ccf7f5e3c5731fcf1bdb2f034f1d4fa76445cf9
+DIST firefox-115.0.1-ta.xpi 520708 BLAKE2B bbdba277c99de2d4106dd739cf36e8c2d444f9c69b9d4c2d034fd6495250711e9078a2097b280e08d89e3411ad17693ab8bbe80d567d54e01f309661112bf86e SHA512 14062c41f21fdac995976120261ca7731b24e8b83b5211769b6273ace3d80cd41b8103a7f2052b8dec6986342e09f520abc901fc3c6bffcaf0df0283cec1571b
+DIST firefox-115.0.1-te.xpi 570040 BLAKE2B 2fb923b83f61e7879c1b4bd93fed1c994e3e1fce250985cdad358a4fb1ccee50b5b414ad3c767ef7899797d9041d149c99fed46a171a46e8e0f1da97718da2bb SHA512 623629db70d31f147f47c1b08b8082a62b537d6400e5e4e8f346c0e6aa3fb869e52594f69b6e57f7495b467a49674629c50af51b32d94f08046fe574ffc55bab
+DIST firefox-115.0.1-th.xpi 667029 BLAKE2B cd583800b16a7ea9b2f9c51ef9c3b0685ee335f935e1ddefe3bb1483edd9f5c8bdd593591e625dd79e1d7955c422e39084ae352fb39d0f1ef317e14a9a01a3be SHA512 d382d1eaeb470e30cd14b1bdb398f2c13b6391a36b4b54905efa5097563f6401258a9d5b0a748c4b6d098d5d601cdc8a0c5b9fdf018a170af8dfca64e7a66398
+DIST firefox-115.0.1-tl.xpi 541134 BLAKE2B 8b694e68ebbe0fa64e11c71bf43ce0eb91e687a73baf42e7df64ba5806c0c480437c825e66bd5ae7a4d7fe41c2c15afa71b2124ff05e823091eaee1c9e14e575 SHA512 1c826c2d2728b33d7eccc3edf8e066d6449cf4b0bbf623f18badb6c09ec99a6c59fcb0c171c7e59616a2c4ef3c8a2c152ab9d4ff89c713ae9c56607d414afbb6
+DIST firefox-115.0.1-tr.xpi 607273 BLAKE2B cf3016e774dde77c5fd2c4bee452a2d392f8327776153d9d1e5a7af0a4e4cb5846b2be8863bdc331a80ab5a0d498830a9843e9775a37c5e3d19c864461777484 SHA512 cd8339f9a3f08645b9e9f8e66ff58d3ba87a532a11dfa8aabb5ac7ce782e80d0cb835c0598c2dc1bbceca7a8c5673d58a8630598492d6e023aea69951ccfaf91
+DIST firefox-115.0.1-trs.xpi 501893 BLAKE2B 7c6b26894280a7fd27fbaeeebd002fc017f771254bdd8230c860dcc30c3e02ef1b73a62c43dfbf10dbb733cd17ff908532e509d54cfffcf62a907c2e6958ce14 SHA512 0760ce7e1e477b5b2012eaf90d1de3d4b9b971ef40057b5ebd78b251967c8f61fc95b34b329f33bc1d73288ec7d231418fbda822e1c85bac26fdd41d312c35ca
+DIST firefox-115.0.1-uk.xpi 684821 BLAKE2B 6283b74fd2cc1d187bc9f459cb48bc9b462e4f2844d3a0f3a7e3ffb8a081fd8d12381a600ebcb86ec8588830aff5cc05a38bec63ed751053bd954f7a68d921da SHA512 35edda92a867f3473edb77b29c3bf7fce329e47b777b424a5ad5c2c10a704490e20410f46c3ecb05c00808a692acc5564aa430c1108c15f03169a2687680e9ec
+DIST firefox-115.0.1-ur.xpi 570569 BLAKE2B 756a1bcc24b87f48e7a2c2745dbceddac4cb897b58c2e98f3d762f6e48a17d42c9963c152556c8719c6690e02cdcc5a47a146f238e3bb6c65037b74560cda67b SHA512 65866ce9100973b73ffac7fa39dde50939f5c104c16e566255d9219be06015b39203515e8ac91dea70000dbd07c3559cfcef437c3b3bbe725cbc40a66125e514
+DIST firefox-115.0.1-uz.xpi 488306 BLAKE2B b37645d1c044ebcc1366dc8489226c51a510ae0912e2c8317ac4e226d5dd703baba92d5933db33fa034a836035f06dbd4f6d72c90d685a583bde3e584b9310b6 SHA512 aaf96b70583bf481537407943be18274c8aae97f9e20ecfff5971dd73d11034a5c95f5ad7218e247f880b87887180e3b0699d53b49e0aa796dc8dbc9854d787c
+DIST firefox-115.0.1-vi.xpi 631046 BLAKE2B 36daa60e5cac149f1d6103b6b5d1b130e51b15cbabb60d930bbb5092b3d58f395381d9ea7bb11821061affe4e974957386b134a2a30de50928724b563e49eb0d SHA512 06c8a1db78713c8254baca63b1c7eb01956074697c65070253192f5571e2d1d948a3be4392447ee3856dc0d07a2024bb1a791f1df5d0183931397582393b0e6f
+DIST firefox-115.0.1-xh.xpi 429453 BLAKE2B a1c2bc52401d991f81c7b87ca3a4bc65431bb4316b8b57deb8d92633e81b720de1fdde19870259b083dcb87e7c99b37fabfc850eaaaa0a948fae1ae1eb45bba2 SHA512 a13968eb1e9c5ab32e5dd5556e620a089e16d20b51552647bb090d00c3d70fc8ca63fb857efea7bbbb972d35b45ba20b40facff9f403526cd8db6703de2d1e67
+DIST firefox-115.0.1-zh-CN.xpi 629744 BLAKE2B 6085159ad2a74233386334b8842ce83e2b862d1d635f2b419fce444ba538aa33d3e517b53bc3c15b396e64c09f2efe836fe1cfee9d0a73ef757e8e7d8f75b6bd SHA512 d1468b25402d7f6baf9ddde42f2b82cdd9ab29dfca6c6555e7c38199c67ee1dd4718a593183bdb2424b3e6c9d9026d83a0bcfe36287b7b9c03fb5f6c3b8d6d23
+DIST firefox-115.0.1-zh-TW.xpi 631503 BLAKE2B 991293343fae63fb54136dc10df515b7dcb1e0a275584a295289ba432b6ceb42e19259f53207d385d5d62572375c891dde1f8a41eda6e63d3e095a07facd5fe7 SHA512 41617a84d5ffde66257de5cf3614a500198d09798f7bcb4bf87419d4e984ef4281ac0735bed22eaf5a1aaa62e2b7e831da30e6eeebe977655655e9ce78b979aa
 DIST firefox-bin_i686-102.13.0.tar.bz2 80732463 BLAKE2B 2f15e025c9c252e8d2bed2ece017795e52ad0d01e0ffa66c268a29324697dad6d4603507ced87d199fdc865b04e4f578a2e4ad7e50511228b8fceeeb8a3415ae SHA512 eff7c770b8d9c7c9e26588ad383eee1f1b3cf7bf91de7f02a8b687dcc0fff0e34dd4fd5544d94717b55a6ad68dde768ac1114601dc3576af8ea53bd97a91ebf9
-DIST firefox-bin_i686-115.0.tar.bz2 84249759 BLAKE2B 2336ecc1a057244c33b69a19589b3cfa57d27df58531dfd7f83d1c366df8a1e26d6a17799015924cd591e42744ac7ce15189d246b1e7b5c9bce2da0d1853b21b SHA512 ab2b033134bd8aeefc5f25a1a891d4717687e4f397593154107fd7d488ed4cfb802882be198b2cb4ff93abd4f3c427fcf775c553bb693600eb0026b4671d8eae
+DIST firefox-bin_i686-115.0.1.tar.bz2 84174448 BLAKE2B 71ef6b9be92bb767e107b4400ec97a494a5cc6cb7466354a641df1e401b7a41974ba45f7a5c34f35b0cf4917236cd844fd9cd18468d4a1983f45d45e82e6576e SHA512 d58f439e3283e0a6674570951291e33ed34372212763b467e131351f0e0f452a70bb05259f2b76447030eb2d4899c0340a02fae6b13230c7996bcef7d132b181
 DIST firefox-bin_x86_64-102.13.0.tar.bz2 77430471 BLAKE2B 6172d7ed6b2f3cd4f346275984e8603ad497260ea7395dc40487c908646040a293061a92955b087dfae1c63cb2d02efd7c85e7053dc46c55d7382efdab7b3ff1 SHA512 1e39f7eab85cf1981db1ceac7785355ccda73d2f60138e4ad3443dcf081caa553ce044206d945260a0efab051b6d9adae9348e39bafc6f2762a5329cf897e4d0
-DIST firefox-bin_x86_64-115.0.tar.bz2 80290354 BLAKE2B bd58711d2acd61b4769244da9d12a5c12789d9e8f20b1d7e80f6f2c2107ccb2a5f44b44a85534f392416633200dfd34c64d2897bfb3aa96ed21454dd1d3a2e4e SHA512 b5b1810d2ffa8e3631f9d373dfe86bd35fc22395b7b7b8ac6f05c2f133db46267ba626603d5d9545e111dfcf880732c13043777f9e48cd209a85df0de45e4f01
+DIST firefox-bin_x86_64-115.0.1.tar.bz2 80373250 BLAKE2B beb71054448cc2b270daa60116cb8f46ec730f25a7e266f914d5ba3471e7711bec0ae7863aaab5e299183808ddd5792734b085d5b35540155d1e9e2d54db3492 SHA512 0c60bfc79850e9ab2929c0e25b72bb78a9aa9d4557d5274a7464dface232291bbd04beb8efa07a1b8d5a0351a4d3a61aad1801914b4de14659aa3ce6ff36edf7
diff --git a/www-client/firefox-bin/firefox-bin-115.0.ebuild b/www-client/firefox-bin/firefox-bin-115.0.1.ebuild
similarity index 100%
rename from www-client/firefox-bin/firefox-bin-115.0.ebuild
rename to www-client/firefox-bin/firefox-bin-115.0.1.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ba41b76d222a..c23402978e01 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/tomcat/tomcat-10.1.10.ebuild b/www-servers/tomcat/tomcat-10.1.10.ebuild
index c8f14587bf71..8390d832f5d1 100644
--- a/www-servers/tomcat/tomcat-10.1.10.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.10.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="10.1"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.90.ebuild b/www-servers/tomcat/tomcat-8.5.90.ebuild
index ec49ff58bef9..265c9e364fe1 100644
--- a/www-servers/tomcat/tomcat-8.5.90.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.90.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.76.ebuild b/www-servers/tomcat/tomcat-9.0.76.ebuild
index a6ed6e1d03ab..40e123f3c921 100644
--- a/www-servers/tomcat/tomcat-9.0.76.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.76.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index f37faae9ad6d..ede315c7d10c 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.8-deadlock.patch b/x11-base/xorg-server/files/xorg-server-21.1.8-deadlock.patch
new file mode 100644
index 000000000000..8da824119edf
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.8-deadlock.patch
@@ -0,0 +1,97 @@
+https://bugs.gentoo.org/909643
+https://gitlab.freedesktop.org/mesa/mesa/-/issues/116
+https://gitlab.freedesktop.org/mesa/mesa/-/issues/6685
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/b98fc07d3442a289c6bef82df50dd0a2d01de71a
+
+From b98fc07d3442a289c6bef82df50dd0a2d01de71a Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 2 Feb 2023 12:26:27 -0500
+Subject: [PATCH] present: Send a PresentConfigureNotify event for destroyed
+ windows
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This enables fixing a deadlock case on the client side, where the client
+ends up blocked waiting for a Present event that will never come because
+the window was destroyed. The new PresentWindowDestroyed flag allows the
+client to avoid blocking indefinitely.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/116
+See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6685
+Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
+(cherry picked from commit 462b06033e66a32308d940eb5fc47f5e4c914dc0)
+--- a/present/present_event.c
++++ b/present/present_event.c
+@@ -102,7 +102,8 @@ present_event_swap(xGenericEvent *from, xGenericEvent *to)
+ }
+ 
+ void
+-present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling)
++present_send_config_notify(WindowPtr window, int x, int y, int w, int h,
++                           int bw, WindowPtr sibling, CARD32 flags)
+ {
+     present_window_priv_ptr window_priv = present_window_priv(window);
+ 
+@@ -122,7 +123,7 @@ present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw,
+             .off_y = 0,
+             .pixmap_width = w,
+             .pixmap_height = h,
+-            .pixmap_flags = 0
++            .pixmap_flags = flags
+         };
+         present_event_ptr event;
+ 
+--- a/present/present_priv.h
++++ b/present/present_priv.h
+@@ -43,6 +43,11 @@
+ #define DebugPresent(x)
+ #endif
+ 
++/* XXX this belongs in presentproto */
++#ifndef PresentWindowDestroyed
++#define PresentWindowDestroyed (1 << 0)
++#endif
++
+ extern int present_request;
+ 
+ extern DevPrivateKeyRec present_screen_private_key;
+@@ -307,7 +312,7 @@ void
+ present_free_events(WindowPtr window);
+ 
+ void
+-present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling);
++present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling, CARD32 flags);
+ 
+ void
+ present_send_complete_notify(WindowPtr window, CARD8 kind, CARD8 mode, CARD32 serial, uint64_t ust, uint64_t msc);
+--- a/present/present_screen.c
++++ b/present/present_screen.c
+@@ -93,6 +93,15 @@ present_destroy_window(WindowPtr window)
+     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+     present_window_priv_ptr window_priv = present_window_priv(window);
+ 
++    present_send_config_notify(window,
++                               window->drawable.x,
++                               window->drawable.y,
++                               window->drawable.width,
++                               window->drawable.height,
++                               window->borderWidth,
++                               window->nextSib,
++                               PresentWindowDestroyed);
++
+     if (window_priv) {
+         present_clear_window_notifies(window);
+         present_free_events(window);
+@@ -123,7 +132,7 @@ present_config_notify(WindowPtr window,
+     ScreenPtr screen = window->drawable.pScreen;
+     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+ 
+-    present_send_config_notify(window, x, y, w, h, bw, sibling);
++    present_send_config_notify(window, x, y, w, h, bw, sibling, 0);
+ 
+     unwrap(screen_priv, screen, ConfigNotify);
+     if (screen->ConfigNotify)
+-- 
+GitLab
diff --git a/x11-base/xorg-server/xorg-server-21.1.8-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.8-r1.ebuild
new file mode 100644
index 000000000000..654737cbf8be
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.8-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+XORG_EAUTORECONF="no"
+inherit flag-o-matic xorg-3 meson
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	media-libs/libglvnd[X]
+	dev-libs/libbsd
+	dev-libs/openssl:0=
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	xorg? (
+		>=x11-libs/libxcvt-0.1.0
+	)
+	xnest? (
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libX11-1.1.5
+	)
+	xephyr? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
+		>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	)
+	udev? ( virtual/libudev:= )
+	unwind? ( sys-libs/libunwind:= )
+	selinux? (
+		sys-process/audit
+		sys-libs/libselinux:=
+	)
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind[pam]
+		sys-auth/pambase[elogind]
+	)
+	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
+"
+DEPEND="${CDEPEND}
+	>=x11-base/xorg-proto-2021.4.99.2
+	>=x11-libs/xtrans-1.3.5
+	media-fonts/font-util
+	test? ( >=x11-libs/libxcvt-0.1.0 )
+"
+RDEPEND="${CDEPEND}
+	!systemd? ( gui-libs/display-manager-init )
+	selinux? ( sec-policy/selinux-xserver )
+	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+"
+BDEPEND="
+	sys-devel/flex
+"
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	elogind? ( udev )
+	?? ( elogind systemd )"
+
+UPSTREAMED_PATCHES=(
+	"${FILESDIR}"/${P}-deadlock.patch
+)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+src_configure() {
+	# bug #835653
+	use x86 && replace-flags -Os -O2
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	local emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+		--sysconfdir "${EPREFIX}/etc/X11"
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+		$(meson_use !minimal dri1)
+		$(meson_use !minimal dri2)
+		$(meson_use !minimal dri3)
+		$(meson_use !minimal glamor)
+		$(meson_use !minimal glx)
+		$(meson_use udev)
+		$(meson_use udev udev_kms)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use selinux xselinux)
+		$(meson_use xephyr)
+		$(meson_use xnest)
+		$(meson_use xorg)
+		$(meson_use xvfb)
+		-Ddocs=false
+		-Ddrm=true
+		-Ddtrace=false
+		-Dipv6=true
+		-Dhal=false
+		-Dlinux_acpi=false
+		-Dlinux_apm=false
+		-Dsecure-rpc=false
+		-Dsha1=libcrypto
+		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
+	)
+
+	if [[ ${PV} == 9999 ]] ; then
+		# Gone in 21.1.x, but not in master.
+		emesonargs+=( -Dxwayland=false )
+	fi
+
+	if use systemd || use elogind; then
+		emesonargs+=(
+			-Dsystemd_logind=true
+			$(meson_use suid suid_wrapper)
+		)
+	else
+		emesonargs+=(
+			-Dsystemd_logind=false
+			-Dsuid_wrapper=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# The meson build system does not support install-setuid
+	if ! use systemd && ! use elogind; then
+		if use suid; then
+			chmod u+s "${ED}"/usr/bin/Xorg
+		fi
+	fi
+
+	if ! use xorg; then
+		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x || die
+	fi
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}