summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-07-09 22:25:44 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-07-09 22:25:44 +0100
commit796e724b5ace96ff70d918765662edf62f1d8c85 (patch)
treeb09742996db0de2a2414587542b1b91d4ae5c522
parentcd7ab3ad114e9777d85ced67abdd5b25d0bd4efe (diff)
gentoo auto-resync : 09:07:2023 - 22:25:43
-rw-r--r--Manifest30
-rw-r--r--Manifest.files.gzbin29261 -> 29299 bytes
-rw-r--r--acct-group/Manifest.gzbin76159 -> 76056 bytes
-rw-r--r--acct-group/_cron-failure/Manifest2
-rw-r--r--acct-group/_cron-failure/_cron-failure-0-r1.ebuild10
-rw-r--r--acct-group/_cron-failure/_cron-failure-0.ebuild10
-rw-r--r--acct-group/adm/Manifest2
-rw-r--r--acct-group/adm/adm-0-r1.ebuild8
-rw-r--r--acct-group/adm/adm-0-r2.ebuild8
-rw-r--r--acct-group/aerospike-amc/Manifest2
-rw-r--r--acct-group/aerospike-amc/aerospike-amc-0-r1.ebuild10
-rw-r--r--acct-group/aerospike-amc/aerospike-amc-0.ebuild10
-rw-r--r--acct-group/airdcppd/Manifest2
-rw-r--r--acct-group/airdcppd/airdcppd-0-r1.ebuild9
-rw-r--r--acct-group/airdcppd/airdcppd-0-r2.ebuild9
-rw-r--r--acct-group/alertmanager/Manifest2
-rw-r--r--acct-group/alertmanager/alertmanager-0-r1.ebuild8
-rw-r--r--acct-group/alertmanager/alertmanager-0.ebuild8
-rw-r--r--acct-group/amanda/Manifest2
-rw-r--r--acct-group/amanda/amanda-0-r1.ebuild8
-rw-r--r--acct-group/amanda/amanda-0.ebuild8
-rw-r--r--acct-group/amavis/Manifest2
-rw-r--r--acct-group/amavis/amavis-0-r1.ebuild9
-rw-r--r--acct-group/amavis/amavis-0-r2.ebuild9
-rw-r--r--acct-group/amule/Manifest2
-rw-r--r--acct-group/amule/amule-0-r1.ebuild9
-rw-r--r--acct-group/amule/amule-0-r2.ebuild9
-rw-r--r--acct-group/android/Manifest2
-rw-r--r--acct-group/android/android-0-r1.ebuild10
-rw-r--r--acct-group/android/android-0.ebuild10
-rw-r--r--acct-group/anope/Manifest2
-rw-r--r--acct-group/anope/anope-0-r1.ebuild9
-rw-r--r--acct-group/anope/anope-0-r2.ebuild9
-rw-r--r--acct-group/apache/Manifest2
-rw-r--r--acct-group/apache/apache-0-r2.ebuild8
-rw-r--r--acct-group/apache/apache-0-r3.ebuild8
-rw-r--r--acct-group/apt-cacher-ng/Manifest2
-rw-r--r--acct-group/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild8
-rw-r--r--acct-group/apt-cacher-ng/apt-cacher-ng-0.ebuild8
-rw-r--r--acct-group/argus/Manifest2
-rw-r--r--acct-group/argus/argus-0-r1.ebuild10
-rw-r--r--acct-group/argus/argus-0.ebuild10
-rw-r--r--acct-group/arpwatch/Manifest2
-rw-r--r--acct-group/arpwatch/arpwatch-0-r1.ebuild10
-rw-r--r--acct-group/arpwatch/arpwatch-0.ebuild10
-rw-r--r--acct-group/artifactory/Manifest2
-rw-r--r--acct-group/artifactory/artifactory-0-r1.ebuild10
-rw-r--r--acct-group/artifactory/artifactory-0.ebuild10
-rw-r--r--acct-group/aspnet/Manifest2
-rw-r--r--acct-group/aspnet/aspnet-0-r1.ebuild8
-rw-r--r--acct-group/aspnet/aspnet-0.ebuild8
-rw-r--r--acct-group/asterisk/Manifest2
-rw-r--r--acct-group/asterisk/asterisk-0-r1.ebuild9
-rw-r--r--acct-group/asterisk/asterisk-0-r2.ebuild9
-rw-r--r--acct-group/at/Manifest2
-rw-r--r--acct-group/at/at-0-r1.ebuild8
-rw-r--r--acct-group/at/at-0.ebuild8
-rw-r--r--acct-group/atheme-services/Manifest2
-rw-r--r--acct-group/atheme-services/atheme-services-0-r1.ebuild9
-rw-r--r--acct-group/atheme-services/atheme-services-0-r2.ebuild9
-rw-r--r--acct-group/audio/Manifest2
-rw-r--r--acct-group/audio/audio-0-r1.ebuild8
-rw-r--r--acct-group/audio/audio-0-r2.ebuild8
-rw-r--r--acct-group/automatic/Manifest2
-rw-r--r--acct-group/automatic/automatic-0-r1.ebuild8
-rw-r--r--acct-group/automatic/automatic-0.ebuild8
-rw-r--r--acct-group/automx2/Manifest2
-rw-r--r--acct-group/automx2/automx2-0-r1.ebuild9
-rw-r--r--acct-group/automx2/automx2-0-r2.ebuild9
-rw-r--r--acct-group/avahi-autoipd/Manifest2
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r1.ebuild9
-rw-r--r--acct-group/avahi-autoipd/avahi-autoipd-0-r2.ebuild9
-rw-r--r--acct-group/avahi/Manifest2
-rw-r--r--acct-group/avahi/avahi-0-r1.ebuild9
-rw-r--r--acct-group/avahi/avahi-0-r2.ebuild9
-rw-r--r--acct-group/axtls/Manifest2
-rw-r--r--acct-group/axtls/axtls-0-r1.ebuild10
-rw-r--r--acct-group/axtls/axtls-0.ebuild10
-rw-r--r--acct-group/backuppc/Manifest2
-rw-r--r--acct-group/backuppc/backuppc-0-r1.ebuild10
-rw-r--r--acct-group/backuppc/backuppc-0.ebuild10
-rw-r--r--acct-group/bacula/Manifest2
-rw-r--r--acct-group/bacula/bacula-0-r1.ebuild9
-rw-r--r--acct-group/bacula/bacula-0-r2.ebuild9
-rw-r--r--acct-group/bareos/Manifest2
-rw-r--r--acct-group/bareos/bareos-0-r1.ebuild9
-rw-r--r--acct-group/bareos/bareos-0-r2.ebuild9
-rw-r--r--acct-group/beanstalk/Manifest2
-rw-r--r--acct-group/beanstalk/beanstalk-0-r1.ebuild10
-rw-r--r--acct-group/beanstalk/beanstalk-0.ebuild10
-rw-r--r--acct-group/bedrock/Manifest2
-rw-r--r--acct-group/bedrock/bedrock-0-r1.ebuild10
-rw-r--r--acct-group/bedrock/bedrock-0-r2.ebuild10
-rw-r--r--acct-group/biboumi/Manifest2
-rw-r--r--acct-group/biboumi/biboumi-0-r1.ebuild8
-rw-r--r--acct-group/biboumi/biboumi-0.ebuild8
-rw-r--r--acct-group/bind_exporter/Manifest2
-rw-r--r--acct-group/bind_exporter/bind_exporter-0-r1.ebuild8
-rw-r--r--acct-group/bind_exporter/bind_exporter-0-r2.ebuild8
-rw-r--r--acct-group/bird/Manifest2
-rw-r--r--acct-group/bird/bird-0-r1.ebuild9
-rw-r--r--acct-group/bird/bird-0.ebuild9
-rw-r--r--acct-group/bitcoin/Manifest2
-rw-r--r--acct-group/bitcoin/bitcoin-0-r1.ebuild9
-rw-r--r--acct-group/bitcoin/bitcoin-0-r2.ebuild9
-rw-r--r--acct-group/bitflu/Manifest2
-rw-r--r--acct-group/bitflu/bitflu-0-r1.ebuild10
-rw-r--r--acct-group/bitflu/bitflu-0.ebuild10
-rw-r--r--acct-group/bitlbee/Manifest2
-rw-r--r--acct-group/bitlbee/bitlbee-0-r1.ebuild8
-rw-r--r--acct-group/bitlbee/bitlbee-0-r2.ebuild8
-rw-r--r--acct-group/blackbox_exporter/Manifest2
-rw-r--r--acct-group/blackbox_exporter/blackbox_exporter-0-r1.ebuild8
-rw-r--r--acct-group/blackbox_exporter/blackbox_exporter-0.ebuild8
-rw-r--r--acct-group/boinc/Manifest2
-rw-r--r--acct-group/boinc/boinc-0-r1.ebuild9
-rw-r--r--acct-group/boinc/boinc-0.ebuild9
-rw-r--r--acct-group/brlapi/Manifest2
-rw-r--r--acct-group/brlapi/brlapi-0-r1.ebuild8
-rw-r--r--acct-group/brlapi/brlapi-0.ebuild8
-rw-r--r--acct-group/brltty/Manifest2
-rw-r--r--acct-group/brltty/brltty-0-r1.ebuild8
-rw-r--r--acct-group/brltty/brltty-0.ebuild8
-rw-r--r--acct-group/buildbot/Manifest2
-rw-r--r--acct-group/buildbot/buildbot-0-r1.ebuild10
-rw-r--r--acct-group/buildbot/buildbot-0-r2.ebuild10
-rw-r--r--acct-group/bumblebee/Manifest2
-rw-r--r--acct-group/bumblebee/bumblebee-0-r1.ebuild8
-rw-r--r--acct-group/bumblebee/bumblebee-0.ebuild8
-rw-r--r--acct-group/burp/Manifest2
-rw-r--r--acct-group/burp/burp-0-r1.ebuild9
-rw-r--r--acct-group/burp/burp-0-r2.ebuild9
-rw-r--r--acct-group/burrow_exporter/Manifest2
-rw-r--r--acct-group/burrow_exporter/burrow_exporter-0-r1.ebuild10
-rw-r--r--acct-group/burrow_exporter/burrow_exporter-0-r2.ebuild10
-rw-r--r--acct-group/cadvisor/Manifest2
-rw-r--r--acct-group/cadvisor/cadvisor-0-r1.ebuild8
-rw-r--r--acct-group/cadvisor/cadvisor-0-r2.ebuild8
-rw-r--r--acct-group/cancd/Manifest2
-rw-r--r--acct-group/cancd/cancd-0-r1.ebuild10
-rw-r--r--acct-group/cancd/cancd-0.ebuild10
-rw-r--r--acct-group/carbon/Manifest2
-rw-r--r--acct-group/carbon/carbon-0-r1.ebuild8
-rw-r--r--acct-group/carbon/carbon-0-r2.ebuild8
-rw-r--r--acct-group/cdrom/Manifest2
-rw-r--r--acct-group/cdrom/cdrom-0-r1.ebuild8
-rw-r--r--acct-group/cdrom/cdrom-0-r2.ebuild8
-rw-r--r--acct-group/ceph/Manifest2
-rw-r--r--acct-group/ceph/ceph-0-r1.ebuild8
-rw-r--r--acct-group/ceph/ceph-0-r2.ebuild8
-rw-r--r--acct-group/cgit/Manifest2
-rw-r--r--acct-group/cgit/cgit-0-r1.ebuild8
-rw-r--r--acct-group/cgit/cgit-0.ebuild8
-rw-r--r--acct-group/chronograf/Manifest2
-rw-r--r--acct-group/chronograf/chronograf-0-r1.ebuild8
-rw-r--r--acct-group/chronograf/chronograf-0-r2.ebuild8
-rw-r--r--acct-group/cinder/Manifest2
-rw-r--r--acct-group/cinder/cinder-0-r1.ebuild8
-rw-r--r--acct-group/cinder/cinder-0-r2.ebuild8
-rw-r--r--acct-group/clair/Manifest2
-rw-r--r--acct-group/clair/clair-0-r1.ebuild8
-rw-r--r--acct-group/clair/clair-0-r2.ebuild8
-rw-r--r--acct-group/clamav/Manifest2
-rw-r--r--acct-group/clamav/clamav-0-r1.ebuild8
-rw-r--r--acct-group/clamav/clamav-0-r2.ebuild8
-rw-r--r--acct-group/cntlm/Manifest2
-rw-r--r--acct-group/cntlm/cntlm-0-r1.ebuild10
-rw-r--r--acct-group/cntlm/cntlm-0.ebuild10
-rw-r--r--acct-group/cockroach/Manifest2
-rw-r--r--acct-group/cockroach/cockroach-0-r1.ebuild10
-rw-r--r--acct-group/cockroach/cockroach-0.ebuild10
-rw-r--r--acct-group/collectd/Manifest2
-rw-r--r--acct-group/collectd/collectd-0-r1.ebuild10
-rw-r--r--acct-group/collectd/collectd-0.ebuild10
-rw-r--r--acct-group/colord/Manifest2
-rw-r--r--acct-group/colord/colord-0-r1.ebuild8
-rw-r--r--acct-group/colord/colord-0.ebuild8
-rw-r--r--acct-group/consul-template/Manifest2
-rw-r--r--acct-group/consul-template/consul-template-0-r1.ebuild8
-rw-r--r--acct-group/consul-template/consul-template-0-r2.ebuild8
-rw-r--r--acct-group/consul/Manifest2
-rw-r--r--acct-group/consul/consul-0-r1.ebuild8
-rw-r--r--acct-group/consul/consul-0-r2.ebuild8
-rw-r--r--acct-group/consul_exporter/Manifest2
-rw-r--r--acct-group/consul_exporter/consul_exporter-0-r1.ebuild8
-rw-r--r--acct-group/consul_exporter/consul_exporter-0.ebuild8
-rw-r--r--acct-group/coredns/Manifest2
-rw-r--r--acct-group/coredns/coredns-0-r1.ebuild10
-rw-r--r--acct-group/coredns/coredns-0.ebuild10
-rw-r--r--acct-group/croc/Manifest2
-rw-r--r--acct-group/croc/croc-0-r1.ebuild9
-rw-r--r--acct-group/croc/croc-0.ebuild9
-rw-r--r--acct-group/cron/Manifest2
-rw-r--r--acct-group/cron/cron-0-r1.ebuild10
-rw-r--r--acct-group/cron/cron-0.ebuild10
-rw-r--r--acct-group/crontab/Manifest2
-rw-r--r--acct-group/crontab/crontab-0-r1.ebuild8
-rw-r--r--acct-group/crontab/crontab-0.ebuild8
-rw-r--r--acct-group/cvmfs/Manifest2
-rw-r--r--acct-group/cvmfs/cvmfs-0-r1.ebuild9
-rw-r--r--acct-group/cvmfs/cvmfs-0-r2.ebuild9
-rw-r--r--acct-group/davfs2/Manifest2
-rw-r--r--acct-group/davfs2/davfs2-0-r1.ebuild8
-rw-r--r--acct-group/davfs2/davfs2-0-r2.ebuild8
-rw-r--r--acct-group/dbmail/Manifest2
-rw-r--r--acct-group/dbmail/dbmail-0-r1.ebuild8
-rw-r--r--acct-group/dbmail/dbmail-0.ebuild8
-rw-r--r--acct-group/dbskkd/Manifest2
-rw-r--r--acct-group/dbskkd/dbskkd-0-r1.ebuild10
-rw-r--r--acct-group/dbskkd/dbskkd-0.ebuild10
-rw-r--r--acct-group/ddclient/Manifest2
-rw-r--r--acct-group/ddclient/ddclient-0-r1.ebuild10
-rw-r--r--acct-group/ddclient/ddclient-0-r2.ebuild10
-rw-r--r--acct-group/defang/Manifest2
-rw-r--r--acct-group/defang/defang-0-r1.ebuild10
-rw-r--r--acct-group/defang/defang-0.ebuild10
-rw-r--r--acct-group/dehydrated/Manifest2
-rw-r--r--acct-group/dehydrated/dehydrated-0-r1.ebuild10
-rw-r--r--acct-group/dehydrated/dehydrated-0.ebuild10
-rw-r--r--acct-group/deluge/Manifest2
-rw-r--r--acct-group/deluge/deluge-0-r1.ebuild8
-rw-r--r--acct-group/deluge/deluge-0-r2.ebuild8
-rw-r--r--acct-group/dhcp/Manifest2
-rw-r--r--acct-group/dhcp/dhcp-0-r1.ebuild8
-rw-r--r--acct-group/dhcp/dhcp-0-r2.ebuild8
-rw-r--r--acct-group/dhcpcd/Manifest2
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r1.ebuild8
-rw-r--r--acct-group/dhcpcd/dhcpcd-0-r2.ebuild8
-rw-r--r--acct-group/dialout/Manifest2
-rw-r--r--acct-group/dialout/dialout-0-r1.ebuild8
-rw-r--r--acct-group/dialout/dialout-0-r2.ebuild8
-rw-r--r--acct-group/dictd/Manifest2
-rw-r--r--acct-group/dictd/dictd-0-r1.ebuild10
-rw-r--r--acct-group/dictd/dictd-0.ebuild10
-rw-r--r--acct-group/dirsrv/Manifest2
-rw-r--r--acct-group/dirsrv/dirsrv-0-r1.ebuild9
-rw-r--r--acct-group/dirsrv/dirsrv-0.ebuild9
-rw-r--r--acct-group/disk/Manifest2
-rw-r--r--acct-group/disk/disk-0-r1.ebuild8
-rw-r--r--acct-group/disk/disk-0-r2.ebuild8
-rw-r--r--acct-group/distcc/Manifest2
-rw-r--r--acct-group/distcc/distcc-1-r1.ebuild8
-rw-r--r--acct-group/distcc/distcc-1.ebuild8
-rw-r--r--acct-group/dnrd/Manifest2
-rw-r--r--acct-group/dnrd/dnrd-0-r1.ebuild10
-rw-r--r--acct-group/dnrd/dnrd-0.ebuild10
-rw-r--r--acct-group/dnscrypt-proxy/Manifest2
-rw-r--r--acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild9
-rw-r--r--acct-group/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild9
-rw-r--r--acct-group/dnsdist/Manifest2
-rw-r--r--acct-group/dnsdist/dnsdist-0-r1.ebuild10
-rw-r--r--acct-group/dnsdist/dnsdist-0-r2.ebuild10
-rw-r--r--acct-group/dnsmasq/Manifest2
-rw-r--r--acct-group/dnsmasq/dnsmasq-0-r1.ebuild8
-rw-r--r--acct-group/dnsmasq/dnsmasq-0-r2.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/Manifest2
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild8
-rw-r--r--acct-group/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild8
-rw-r--r--acct-group/docker/Manifest2
-rw-r--r--acct-group/docker/docker-0-r1.ebuild8
-rw-r--r--acct-group/docker/docker-0-r2.ebuild8
-rw-r--r--acct-group/docker_auth/Manifest2
-rw-r--r--acct-group/docker_auth/docker_auth-0-r1.ebuild8
-rw-r--r--acct-group/docker_auth/docker_auth-0-r2.ebuild8
-rw-r--r--acct-group/dovecot/Manifest2
-rw-r--r--acct-group/dovecot/dovecot-0-r1.ebuild8
-rw-r--r--acct-group/dovecot/dovecot-0-r2.ebuild8
-rw-r--r--acct-group/dovenull/Manifest2
-rw-r--r--acct-group/dovenull/dovenull-0-r1.ebuild8
-rw-r--r--acct-group/dovenull/dovenull-0-r2.ebuild8
-rw-r--r--acct-group/drone/Manifest2
-rw-r--r--acct-group/drone/drone-0-r1.ebuild10
-rw-r--r--acct-group/drone/drone-0.ebuild10
-rw-r--r--acct-group/ejabberd/Manifest2
-rw-r--r--acct-group/ejabberd/ejabberd-0-r1.ebuild10
-rw-r--r--acct-group/ejabberd/ejabberd-0.ebuild10
-rw-r--r--acct-group/elasticsearch/Manifest2
-rw-r--r--acct-group/elasticsearch/elasticsearch-0-r1.ebuild9
-rw-r--r--acct-group/elasticsearch/elasticsearch-0-r2.ebuild9
-rw-r--r--acct-group/elasticsearch_exporter/Manifest2
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild10
-rw-r--r--acct-group/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild10
-rw-r--r--acct-group/energi3/Manifest2
-rw-r--r--acct-group/energi3/energi3-0-r1.ebuild9
-rw-r--r--acct-group/energi3/energi3-0.ebuild9
-rw-r--r--acct-group/epam/Manifest2
-rw-r--r--acct-group/epam/epam-0-r1.ebuild9
-rw-r--r--acct-group/epam/epam-0.ebuild9
-rw-r--r--acct-group/epmd/Manifest2
-rw-r--r--acct-group/epmd/epmd-0-r1.ebuild9
-rw-r--r--acct-group/epmd/epmd-0-r2.ebuild9
-rw-r--r--acct-group/err/Manifest2
-rw-r--r--acct-group/err/err-0-r1.ebuild8
-rw-r--r--acct-group/err/err-0.ebuild8
-rw-r--r--acct-group/etcd/Manifest2
-rw-r--r--acct-group/etcd/etcd-0-r1.ebuild8
-rw-r--r--acct-group/etcd/etcd-0-r2.ebuild8
-rw-r--r--acct-group/exabgp/Manifest2
-rw-r--r--acct-group/exabgp/exabgp-0-r1.ebuild8
-rw-r--r--acct-group/exabgp/exabgp-0-r2.ebuild8
-rw-r--r--acct-group/ez-ipupd/Manifest2
-rw-r--r--acct-group/ez-ipupd/ez-ipupd-0-r1.ebuild10
-rw-r--r--acct-group/ez-ipupd/ez-ipupd-0.ebuild10
-rw-r--r--acct-group/fax/Manifest2
-rw-r--r--acct-group/fax/fax-0-r1.ebuild10
-rw-r--r--acct-group/fax/fax-0.ebuild10
-rw-r--r--acct-group/fcron/Manifest2
-rw-r--r--acct-group/fcron/fcron-0-r1.ebuild10
-rw-r--r--acct-group/fcron/fcron-0.ebuild10
-rw-r--r--acct-group/fdm/Manifest2
-rw-r--r--acct-group/fdm/fdm-0-r1.ebuild10
-rw-r--r--acct-group/fdm/fdm-0.ebuild10
-rw-r--r--acct-group/fetchmail/Manifest2
-rw-r--r--acct-group/fetchmail/fetchmail-0-r1.ebuild9
-rw-r--r--acct-group/fetchmail/fetchmail-0-r2.ebuild9
-rw-r--r--acct-group/fhem/Manifest2
-rw-r--r--acct-group/fhem/fhem-0-r1.ebuild10
-rw-r--r--acct-group/fhem/fhem-0-r2.ebuild10
-rw-r--r--acct-group/fingerprint/Manifest2
-rw-r--r--acct-group/fingerprint/fingerprint-0-r1.ebuild8
-rw-r--r--acct-group/fingerprint/fingerprint-0-r2.ebuild8
-rw-r--r--acct-group/firebird/Manifest2
-rw-r--r--acct-group/firebird/firebird-0-r1.ebuild10
-rw-r--r--acct-group/firebird/firebird-0-r2.ebuild10
-rw-r--r--acct-group/flatpak/Manifest2
-rw-r--r--acct-group/flatpak/flatpak-0-r1.ebuild8
-rw-r--r--acct-group/flatpak/flatpak-0.ebuild8
-rw-r--r--acct-group/floppy/Manifest2
-rw-r--r--acct-group/floppy/floppy-0-r1.ebuild (renamed from acct-group/floppy/floppy-0.ebuild)0
-rw-r--r--acct-group/flows/Manifest2
-rw-r--r--acct-group/flows/flows-0-r1.ebuild10
-rw-r--r--acct-group/flows/flows-0.ebuild10
-rw-r--r--acct-group/fluentd/Manifest2
-rw-r--r--acct-group/fluentd/fluentd-0-r1.ebuild10
-rw-r--r--acct-group/fluentd/fluentd-0-r2.ebuild10
-rw-r--r--acct-group/foldingathome/Manifest2
-rw-r--r--acct-group/foldingathome/foldingathome-0-r1.ebuild10
-rw-r--r--acct-group/foldingathome/foldingathome-0.ebuild10
-rw-r--r--acct-group/fp-multiuser/Manifest2
-rw-r--r--acct-group/fp-multiuser/fp-multiuser-0-r1.ebuild10
-rw-r--r--acct-group/fp-multiuser/fp-multiuser-0.ebuild10
-rw-r--r--acct-group/freenet/Manifest2
-rw-r--r--acct-group/freenet/freenet-0-r1.ebuild9
-rw-r--r--acct-group/freenet/freenet-0.ebuild9
-rw-r--r--acct-group/fritzbox_smarthome_exporter/Manifest2
-rw-r--r--acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild8
-rw-r--r--acct-group/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild8
-rw-r--r--acct-group/frr/Manifest2
-rw-r--r--acct-group/frr/frr-0-r1.ebuild8
-rw-r--r--acct-group/frr/frr-0.ebuild8
-rw-r--r--acct-group/ftp/Manifest2
-rw-r--r--acct-group/ftp/ftp-0-r1.ebuild9
-rw-r--r--acct-group/ftp/ftp-0-r2.ebuild9
-rw-r--r--acct-group/ftpproxy/Manifest2
-rw-r--r--acct-group/ftpproxy/ftpproxy-0-r1.ebuild10
-rw-r--r--acct-group/ftpproxy/ftpproxy-0.ebuild10
-rw-r--r--acct-group/fvwm-crystal/Manifest2
-rw-r--r--acct-group/fvwm-crystal/fvwm-crystal-0-r1.ebuild8
-rw-r--r--acct-group/fvwm-crystal/fvwm-crystal-0-r2.ebuild8
-rw-r--r--acct-group/gamemode/Manifest2
-rw-r--r--acct-group/gamemode/gamemode-0-r1.ebuild9
-rw-r--r--acct-group/gamemode/gamemode-0.ebuild9
-rw-r--r--acct-group/gamestat/Manifest2
-rw-r--r--acct-group/gamestat/gamestat-0-r1.ebuild9
-rw-r--r--acct-group/gamestat/gamestat-0-r2.ebuild9
-rw-r--r--acct-group/gatling/Manifest2
-rw-r--r--acct-group/gatling/gatling-0-r1.ebuild8
-rw-r--r--acct-group/gatling/gatling-0-r2.ebuild8
-rw-r--r--acct-group/gauth/Manifest2
-rw-r--r--acct-group/gauth/gauth-0-r1.ebuild10
-rw-r--r--acct-group/gauth/gauth-0.ebuild10
-rw-r--r--acct-group/gdm/Manifest2
-rw-r--r--acct-group/gdm/gdm-0-r1.ebuild8
-rw-r--r--acct-group/gdm/gdm-0.ebuild8
-rw-r--r--acct-group/geneweb/Manifest2
-rw-r--r--acct-group/geneweb/geneweb-0-r1.ebuild10
-rw-r--r--acct-group/geneweb/geneweb-0-r2.ebuild10
-rw-r--r--acct-group/geoclue/Manifest2
-rw-r--r--acct-group/geoclue/geoclue-0-r1.ebuild8
-rw-r--r--acct-group/geoclue/geoclue-0.ebuild8
-rw-r--r--acct-group/gerbera/Manifest2
-rw-r--r--acct-group/gerbera/gerbera-0-r1.ebuild9
-rw-r--r--acct-group/gerbera/gerbera-0-r2.ebuild9
-rw-r--r--acct-group/git/Manifest2
-rw-r--r--acct-group/git/git-0-r1.ebuild8
-rw-r--r--acct-group/git/git-0-r2.ebuild8
-rw-r--r--acct-group/github-exporter/Manifest2
-rw-r--r--acct-group/github-exporter/github-exporter-0-r1.ebuild8
-rw-r--r--acct-group/github-exporter/github-exporter-0.ebuild8
-rw-r--r--acct-group/gitlab-runner/Manifest2
-rw-r--r--acct-group/gitlab-runner/gitlab-runner-1-r1.ebuild8
-rw-r--r--acct-group/gitlab-runner/gitlab-runner-1.ebuild8
-rw-r--r--acct-group/gkrellmd/Manifest2
-rw-r--r--acct-group/gkrellmd/gkrellmd-0-r1.ebuild8
-rw-r--r--acct-group/gkrellmd/gkrellmd-0-r2.ebuild8
-rw-r--r--acct-group/glance/Manifest2
-rw-r--r--acct-group/glance/glance-0-r1.ebuild8
-rw-r--r--acct-group/glance/glance-0-r2.ebuild8
-rw-r--r--acct-group/gluster/Manifest2
-rw-r--r--acct-group/gluster/gluster-0-r1.ebuild8
-rw-r--r--acct-group/gluster/gluster-0-r2.ebuild8
-rw-r--r--acct-group/gns3/Manifest2
-rw-r--r--acct-group/gns3/gns3-0-r1.ebuild8
-rw-r--r--acct-group/gns3/gns3-0.ebuild8
-rw-r--r--acct-group/gnump3d/Manifest2
-rw-r--r--acct-group/gnump3d/gnump3d-0-r1.ebuild10
-rw-r--r--acct-group/gnump3d/gnump3d-0.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11-scd-proxy/Manifest2
-rw-r--r--acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11/Manifest2
-rw-r--r--acct-group/gnupg-pkcs11/gnupg-pkcs11-0-r1.ebuild10
-rw-r--r--acct-group/gnupg-pkcs11/gnupg-pkcs11-0.ebuild10
-rw-r--r--acct-group/goaccess/Manifest2
-rw-r--r--acct-group/goaccess/goaccess-0-r1.ebuild8
-rw-r--r--acct-group/goaccess/goaccess-0.ebuild8
-rw-r--r--acct-group/gopher/Manifest2
-rw-r--r--acct-group/gopher/gopher-0-r1.ebuild8
-rw-r--r--acct-group/gopher/gopher-0.ebuild8
-rw-r--r--acct-group/gopherd/Manifest2
-rw-r--r--acct-group/gopherd/gopherd-0-r1.ebuild10
-rw-r--r--acct-group/gopherd/gopherd-0.ebuild10
-rw-r--r--acct-group/gpib/Manifest2
-rw-r--r--acct-group/gpib/gpib-0-r1.ebuild8
-rw-r--r--acct-group/gpib/gpib-0-r2.ebuild8
-rw-r--r--acct-group/gpio/Manifest2
-rw-r--r--acct-group/gpio/gpio-0-r1.ebuild8
-rw-r--r--acct-group/gpio/gpio-0.ebuild8
-rw-r--r--acct-group/grafana/Manifest2
-rw-r--r--acct-group/grafana/grafana-0-r1.ebuild10
-rw-r--r--acct-group/grafana/grafana-0-r2.ebuild10
-rw-r--r--acct-group/graylog/Manifest2
-rw-r--r--acct-group/graylog/graylog-0-r1.ebuild9
-rw-r--r--acct-group/graylog/graylog-0-r2.ebuild9
-rw-r--r--acct-group/greetd/Manifest2
-rw-r--r--acct-group/greetd/greetd-0-r1.ebuild9
-rw-r--r--acct-group/greetd/greetd-0-r2.ebuild9
-rw-r--r--acct-group/grok_exporter/Manifest2
-rw-r--r--acct-group/grok_exporter/grok_exporter-0-r1.ebuild10
-rw-r--r--acct-group/grok_exporter/grok_exporter-0.ebuild10
-rw-r--r--acct-group/groonga/Manifest2
-rw-r--r--acct-group/groonga/groonga-0-r1.ebuild10
-rw-r--r--acct-group/groonga/groonga-0.ebuild10
-rw-r--r--acct-group/gvm/Manifest2
-rw-r--r--acct-group/gvm/gvm-0-r1.ebuild9
-rw-r--r--acct-group/gvm/gvm-0-r2.ebuild9
-rw-r--r--acct-group/h2o/Manifest2
-rw-r--r--acct-group/h2o/h2o-0-r1.ebuild10
-rw-r--r--acct-group/h2o/h2o-0.ebuild10
-rw-r--r--acct-group/haclient/Manifest2
-rw-r--r--acct-group/haclient/haclient-0-r1.ebuild10
-rw-r--r--acct-group/haclient/haclient-0.ebuild10
-rw-r--r--acct-group/haproxy/Manifest2
-rw-r--r--acct-group/haproxy/haproxy-0-r1.ebuild8
-rw-r--r--acct-group/haproxy/haproxy-0-r2.ebuild8
-rw-r--r--acct-group/havp/Manifest2
-rw-r--r--acct-group/havp/havp-0-r2.ebuild (renamed from acct-group/havp/havp-0-r1.ebuild)0
-rw-r--r--acct-group/headscale/Manifest2
-rw-r--r--acct-group/headscale/headscale-0-r1.ebuild8
-rw-r--r--acct-group/headscale/headscale-0.ebuild8
-rw-r--r--acct-group/heat/Manifest2
-rw-r--r--acct-group/heat/heat-0-r1.ebuild8
-rw-r--r--acct-group/heat/heat-0-r2.ebuild8
-rw-r--r--acct-group/hsqldb/Manifest2
-rw-r--r--acct-group/hsqldb/hsqldb-0-r1.ebuild9
-rw-r--r--acct-group/hsqldb/hsqldb-0.ebuild9
-rw-r--r--acct-group/http/Manifest2
-rw-r--r--acct-group/http/http-0-r1.ebuild8
-rw-r--r--acct-group/http/http-0.ebuild8
-rw-r--r--acct-group/i2c/Manifest2
-rw-r--r--acct-group/i2c/i2c-0-r1.ebuild8
-rw-r--r--acct-group/i2c/i2c-0.ebuild8
-rw-r--r--acct-group/i2p/Manifest2
-rw-r--r--acct-group/i2p/i2p-0-r1.ebuild9
-rw-r--r--acct-group/i2p/i2p-0-r2.ebuild9
-rw-r--r--acct-group/i2pd/Manifest2
-rw-r--r--acct-group/i2pd/i2pd-0-r1.ebuild9
-rw-r--r--acct-group/i2pd/i2pd-0-r2.ebuild9
-rw-r--r--acct-group/icecast/Manifest2
-rw-r--r--acct-group/icecast/icecast-0-r1.ebuild10
-rw-r--r--acct-group/icecast/icecast-0.ebuild10
-rw-r--r--acct-group/icecream/Manifest2
-rw-r--r--acct-group/icecream/icecream-0-r1.ebuild10
-rw-r--r--acct-group/icecream/icecream-0.ebuild10
-rw-r--r--acct-group/ices/Manifest2
-rw-r--r--acct-group/ices/ices-0-r1.ebuild10
-rw-r--r--acct-group/ices/ices-0.ebuild10
-rw-r--r--acct-group/icinga/Manifest2
-rw-r--r--acct-group/icinga/icinga-0-r1.ebuild8
-rw-r--r--acct-group/icinga/icinga-0-r2.ebuild8
-rw-r--r--acct-group/icingacmd/Manifest2
-rw-r--r--acct-group/icingacmd/icingacmd-0-r1.ebuild8
-rw-r--r--acct-group/icingacmd/icingacmd-0-r2.ebuild8
-rw-r--r--acct-group/icingaweb2/Manifest2
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r1.ebuild8
-rw-r--r--acct-group/icingaweb2/icingaweb2-0-r2.ebuild8
-rw-r--r--acct-group/inadyn/Manifest2
-rw-r--r--acct-group/inadyn/inadyn-0-r1.ebuild (renamed from acct-group/inadyn/inadyn-0.ebuild)0
-rw-r--r--acct-group/influxdb/Manifest2
-rw-r--r--acct-group/influxdb/influxdb-0-r1.ebuild8
-rw-r--r--acct-group/influxdb/influxdb-0-r2.ebuild8
-rw-r--r--acct-group/input/Manifest2
-rw-r--r--acct-group/input/input-0-r1.ebuild8
-rw-r--r--acct-group/input/input-0-r2.ebuild8
-rw-r--r--acct-group/inspircd/Manifest2
-rw-r--r--acct-group/inspircd/inspircd-0-r1.ebuild9
-rw-r--r--acct-group/inspircd/inspircd-0-r2.ebuild9
-rw-r--r--acct-group/ipfs/Manifest2
-rw-r--r--acct-group/ipfs/ipfs-0-r1.ebuild9
-rw-r--r--acct-group/ipfs/ipfs-0-r2.ebuild9
-rw-r--r--acct-group/ipsec/Manifest2
-rw-r--r--acct-group/ipsec/ipsec-0-r1.ebuild10
-rw-r--r--acct-group/ipsec/ipsec-0.ebuild10
-rw-r--r--acct-group/ipsentinel/Manifest2
-rw-r--r--acct-group/ipsentinel/ipsentinel-0-r1.ebuild10
-rw-r--r--acct-group/ipsentinel/ipsentinel-0.ebuild10
-rw-r--r--acct-group/iroffer/Manifest2
-rw-r--r--acct-group/iroffer/iroffer-0-r1.ebuild8
-rw-r--r--acct-group/iroffer/iroffer-0.ebuild8
-rw-r--r--acct-group/jellyfin/Manifest2
-rw-r--r--acct-group/jellyfin/jellyfin-0-r1.ebuild8
-rw-r--r--acct-group/jellyfin/jellyfin-0.ebuild8
-rw-r--r--acct-group/jenkins/Manifest2
-rw-r--r--acct-group/jenkins/jenkins-0-r1.ebuild10
-rw-r--r--acct-group/jenkins/jenkins-0.ebuild10
-rw-r--r--acct-group/kafka/Manifest2
-rw-r--r--acct-group/kafka/kafka-0-r1.ebuild8
-rw-r--r--acct-group/kafka/kafka-0-r2.ebuild8
-rw-r--r--acct-group/kapacitor/Manifest2
-rw-r--r--acct-group/kapacitor/kapacitor-0-r1.ebuild8
-rw-r--r--acct-group/kapacitor/kapacitor-0-r2.ebuild8
-rw-r--r--acct-group/karma/Manifest2
-rw-r--r--acct-group/karma/karma-0-r1.ebuild10
-rw-r--r--acct-group/karma/karma-0.ebuild10
-rw-r--r--acct-group/keystone/Manifest2
-rw-r--r--acct-group/keystone/keystone-0-r1.ebuild8
-rw-r--r--acct-group/keystone/keystone-0-r2.ebuild8
-rw-r--r--acct-group/kibana/Manifest2
-rw-r--r--acct-group/kibana/kibana-0-r1.ebuild9
-rw-r--r--acct-group/kibana/kibana-0-r2.ebuild9
-rw-r--r--acct-group/kismet/Manifest2
-rw-r--r--acct-group/kismet/kismet-0-r1.ebuild9
-rw-r--r--acct-group/kismet/kismet-0-r2.ebuild9
-rw-r--r--acct-group/kmem/Manifest2
-rw-r--r--acct-group/kmem/kmem-0-r1.ebuild8
-rw-r--r--acct-group/kmem/kmem-0-r2.ebuild8
-rw-r--r--acct-group/knot-resolver/Manifest2
-rw-r--r--acct-group/knot-resolver/knot-resolver-0-r1.ebuild8
-rw-r--r--acct-group/knot-resolver/knot-resolver-0.ebuild8
-rw-r--r--acct-group/knot/Manifest2
-rw-r--r--acct-group/knot/knot-0-r1.ebuild8
-rw-r--r--acct-group/knot/knot-0-r2.ebuild8
-rw-r--r--acct-group/kube-apiserver/Manifest2
-rw-r--r--acct-group/kube-apiserver/kube-apiserver-0-r1.ebuild8
-rw-r--r--acct-group/kube-apiserver/kube-apiserver-0-r2.ebuild8
-rw-r--r--acct-group/kube-controller-manager/Manifest2
-rw-r--r--acct-group/kube-controller-manager/kube-controller-manager-0-r1.ebuild8
-rw-r--r--acct-group/kube-controller-manager/kube-controller-manager-0-r2.ebuild8
-rw-r--r--acct-group/kube-scheduler/Manifest2
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r1.ebuild8
-rw-r--r--acct-group/kube-scheduler/kube-scheduler-0-r2.ebuild8
-rw-r--r--acct-group/kvm/Manifest2
-rw-r--r--acct-group/kvm/kvm-0-r1.ebuild8
-rw-r--r--acct-group/kvm/kvm-0-r2.ebuild8
-rw-r--r--acct-group/ldap/Manifest2
-rw-r--r--acct-group/ldap/ldap-0-r1.ebuild8
-rw-r--r--acct-group/ldap/ldap-0.ebuild8
-rw-r--r--acct-group/libreoffice/Manifest2
-rw-r--r--acct-group/libreoffice/libreoffice-0-r1.ebuild8
-rw-r--r--acct-group/libreoffice/libreoffice-0.ebuild8
-rw-r--r--acct-group/libvirt/Manifest2
-rw-r--r--acct-group/libvirt/libvirt-0-r1.ebuild8
-rw-r--r--acct-group/libvirt/libvirt-0-r2.ebuild8
-rw-r--r--acct-group/lightdm/Manifest2
-rw-r--r--acct-group/lightdm/lightdm-0-r1.ebuild10
-rw-r--r--acct-group/lightdm/lightdm-0-r2.ebuild10
-rw-r--r--acct-group/lighttpd/Manifest2
-rw-r--r--acct-group/lighttpd/lighttpd-0-r1.ebuild8
-rw-r--r--acct-group/lighttpd/lighttpd-0-r2.ebuild8
-rw-r--r--acct-group/litecoin/Manifest2
-rw-r--r--acct-group/litecoin/litecoin-0-r1.ebuild10
-rw-r--r--acct-group/litecoin/litecoin-0.ebuild10
-rw-r--r--acct-group/lldpd/Manifest2
-rw-r--r--acct-group/lldpd/lldpd-0-r1.ebuild8
-rw-r--r--acct-group/lldpd/lldpd-0-r2.ebuild8
-rw-r--r--acct-group/locate/Manifest2
-rw-r--r--acct-group/locate/locate-0-r1.ebuild8
-rw-r--r--acct-group/locate/locate-0-r2.ebuild8
-rw-r--r--acct-group/logcheck/Manifest2
-rw-r--r--acct-group/logcheck/logcheck-0-r1.ebuild10
-rw-r--r--acct-group/logcheck/logcheck-0.ebuild10
-rw-r--r--acct-group/logstash/Manifest2
-rw-r--r--acct-group/logstash/logstash-0-r1.ebuild9
-rw-r--r--acct-group/logstash/logstash-0-r2.ebuild9
-rw-r--r--acct-group/logsurfer/Manifest2
-rw-r--r--acct-group/logsurfer/logsurfer-0-r1.ebuild10
-rw-r--r--acct-group/logsurfer/logsurfer-0.ebuild10
-rw-r--r--acct-group/lp/Manifest2
-rw-r--r--acct-group/lp/lp-0-r1.ebuild8
-rw-r--r--acct-group/lp/lp-0-r2.ebuild8
-rw-r--r--acct-group/lpadmin/Manifest2
-rw-r--r--acct-group/lpadmin/lpadmin-0-r1.ebuild8
-rw-r--r--acct-group/lpadmin/lpadmin-0-r2.ebuild8
-rw-r--r--acct-group/lxc/Manifest2
-rw-r--r--acct-group/lxc/lxc-0-r1.ebuild9
-rw-r--r--acct-group/lxc/lxc-0.ebuild9
-rw-r--r--acct-group/lxd/Manifest2
-rw-r--r--acct-group/lxd/lxd-0-r1.ebuild9
-rw-r--r--acct-group/lxd/lxd-0-r2.ebuild9
-rw-r--r--acct-group/mail/Manifest2
-rw-r--r--acct-group/mail/mail-0-r1.ebuild9
-rw-r--r--acct-group/mail/mail-0-r2.ebuild9
-rw-r--r--acct-group/man/Manifest2
-rw-r--r--acct-group/man/man-0-r1.ebuild8
-rw-r--r--acct-group/man/man-0-r2.ebuild8
-rw-r--r--acct-group/maradns/Manifest2
-rw-r--r--acct-group/maradns/maradns-0-r1.ebuild8
-rw-r--r--acct-group/maradns/maradns-0-r2.ebuild8
-rw-r--r--acct-group/memcached/Manifest2
-rw-r--r--acct-group/memcached/memcached-0-r1.ebuild8
-rw-r--r--acct-group/memcached/memcached-0-r2.ebuild8
-rw-r--r--acct-group/memcached_exporter/Manifest2
-rw-r--r--acct-group/memcached_exporter/memcached_exporter-0-r1.ebuild8
-rw-r--r--acct-group/memcached_exporter/memcached_exporter-0.ebuild8
-rw-r--r--acct-group/messagebus/Manifest2
-rw-r--r--acct-group/messagebus/messagebus-0-r1.ebuild8
-rw-r--r--acct-group/messagebus/messagebus-0-r2.ebuild8
-rw-r--r--acct-group/mgraph/Manifest2
-rw-r--r--acct-group/mgraph/mgraph-0-r1.ebuild9
-rw-r--r--acct-group/mgraph/mgraph-0.ebuild9
-rw-r--r--acct-group/milter-regex/Manifest2
-rw-r--r--acct-group/milter-regex/milter-regex-0-r1.ebuild9
-rw-r--r--acct-group/milter-regex/milter-regex-0-r2.ebuild9
-rw-r--r--acct-group/minbif/Manifest2
-rw-r--r--acct-group/minbif/minbif-0-r1.ebuild10
-rw-r--r--acct-group/minbif/minbif-0.ebuild10
-rw-r--r--acct-group/minecraft/Manifest2
-rw-r--r--acct-group/minecraft/minecraft-0-r1.ebuild10
-rw-r--r--acct-group/minecraft/minecraft-0-r2.ebuild10
-rw-r--r--acct-group/minetest/Manifest2
-rw-r--r--acct-group/minetest/minetest-0-r1.ebuild10
-rw-r--r--acct-group/minetest/minetest-0-r2.ebuild10
-rw-r--r--acct-group/minidlna/Manifest2
-rw-r--r--acct-group/minidlna/minidlna-0-r1.ebuild8
-rw-r--r--acct-group/minidlna/minidlna-0.ebuild8
-rw-r--r--acct-group/minio/Manifest2
-rw-r--r--acct-group/minio/minio-0-r1.ebuild8
-rw-r--r--acct-group/minio/minio-0.ebuild8
-rw-r--r--acct-group/mogile/Manifest2
-rw-r--r--acct-group/mogile/mogile-0-r1.ebuild9
-rw-r--r--acct-group/mogile/mogile-0.ebuild9
-rw-r--r--acct-group/mongodb/Manifest2
-rw-r--r--acct-group/mongodb/mongodb-0-r1.ebuild9
-rw-r--r--acct-group/mongodb/mongodb-0-r2.ebuild9
-rw-r--r--acct-group/mongodb_exporter/Manifest2
-rw-r--r--acct-group/mongodb_exporter/mongodb_exporter-0-r1.ebuild8
-rw-r--r--acct-group/mongodb_exporter/mongodb_exporter-0.ebuild8
-rw-r--r--acct-group/monitorix/Manifest2
-rw-r--r--acct-group/monitorix/monitorix-0-r1.ebuild9
-rw-r--r--acct-group/monitorix/monitorix-0-r2.ebuild9
-rw-r--r--acct-group/monkeyd/Manifest2
-rw-r--r--acct-group/monkeyd/monkeyd-0-r1.ebuild10
-rw-r--r--acct-group/monkeyd/monkeyd-0.ebuild10
-rw-r--r--acct-group/monkeysphere/Manifest2
-rw-r--r--acct-group/monkeysphere/monkeysphere-0-r1.ebuild10
-rw-r--r--acct-group/monkeysphere/monkeysphere-0-r2.ebuild10
-rw-r--r--acct-group/mosquitto/Manifest2
-rw-r--r--acct-group/mosquitto/mosquitto-0-r1.ebuild9
-rw-r--r--acct-group/mosquitto/mosquitto-0-r2.ebuild9
-rw-r--r--acct-group/motion/Manifest2
-rw-r--r--acct-group/motion/motion-0-r1.ebuild8
-rw-r--r--acct-group/motion/motion-0-r2.ebuild8
-rw-r--r--acct-group/msmtpd/Manifest2
-rw-r--r--acct-group/msmtpd/msmtpd-0-r1.ebuild8
-rw-r--r--acct-group/msmtpd/msmtpd-0-r2.ebuild8
-rw-r--r--acct-group/munge/Manifest2
-rw-r--r--acct-group/munge/munge-0-r1.ebuild10
-rw-r--r--acct-group/munge/munge-0.ebuild10
-rw-r--r--acct-group/munin/Manifest2
-rw-r--r--acct-group/munin/munin-0-r1.ebuild8
-rw-r--r--acct-group/munin/munin-0-r2.ebuild8
-rw-r--r--acct-group/murmur/Manifest2
-rw-r--r--acct-group/murmur/murmur-0-r1.ebuild8
-rw-r--r--acct-group/murmur/murmur-0-r2.ebuild8
-rw-r--r--acct-group/mysql/Manifest2
-rw-r--r--acct-group/mysql/mysql-0-r1.ebuild10
-rw-r--r--acct-group/mysql/mysql-0-r2.ebuild10
-rw-r--r--acct-group/mysqld_exporter/Manifest2
-rw-r--r--acct-group/mysqld_exporter/mysqld_exporter-0-r1.ebuild8
-rw-r--r--acct-group/mysqld_exporter/mysqld_exporter-0-r2.ebuild8
-rw-r--r--acct-group/mythtv/Manifest2
-rw-r--r--acct-group/mythtv/mythtv-0-r1.ebuild10
-rw-r--r--acct-group/mythtv/mythtv-0-r2.ebuild10
-rw-r--r--acct-group/nagios/Manifest2
-rw-r--r--acct-group/nagios/nagios-0-r1.ebuild8
-rw-r--r--acct-group/nagios/nagios-0-r2.ebuild8
-rw-r--r--acct-group/named/Manifest2
-rw-r--r--acct-group/named/named-0-r1.ebuild8
-rw-r--r--acct-group/named/named-0-r2.ebuild8
-rw-r--r--acct-group/netbox/Manifest2
-rw-r--r--acct-group/netbox/netbox-0-r1.ebuild8
-rw-r--r--acct-group/netbox/netbox-0-r2.ebuild8
-rw-r--r--acct-group/netdata/Manifest2
-rw-r--r--acct-group/netdata/netdata-0-r1.ebuild8
-rw-r--r--acct-group/netdata/netdata-0-r2.ebuild8
-rw-r--r--acct-group/netdev/Manifest2
-rw-r--r--acct-group/netdev/netdev-0-r1.ebuild9
-rw-r--r--acct-group/netdev/netdev-0-r2.ebuild9
-rw-r--r--acct-group/netperf/Manifest2
-rw-r--r--acct-group/netperf/netperf-0-r1.ebuild10
-rw-r--r--acct-group/netperf/netperf-0.ebuild10
-rw-r--r--acct-group/neutron/Manifest2
-rw-r--r--acct-group/neutron/neutron-0-r1.ebuild8
-rw-r--r--acct-group/neutron/neutron-0-r2.ebuild8
-rw-r--r--acct-group/nginx-unit/Manifest2
-rw-r--r--acct-group/nginx-unit/nginx-unit-0-r1.ebuild (renamed from acct-group/nginx-unit/nginx-unit-0.ebuild)0
-rw-r--r--acct-group/nginx-vts-exporter/Manifest2
-rw-r--r--acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild8
-rw-r--r--acct-group/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild8
-rw-r--r--acct-group/nginx/Manifest2
-rw-r--r--acct-group/nginx/nginx-0-r1.ebuild10
-rw-r--r--acct-group/nginx/nginx-0-r2.ebuild10
-rw-r--r--acct-group/ngircd/Manifest2
-rw-r--r--acct-group/ngircd/ngircd-0-r1.ebuild9
-rw-r--r--acct-group/ngircd/ngircd-0-r2.ebuild9
-rw-r--r--acct-group/ngrep/Manifest2
-rw-r--r--acct-group/ngrep/ngrep-0-r1.ebuild10
-rw-r--r--acct-group/ngrep/ngrep-0-r2.ebuild10
-rw-r--r--acct-group/nm-openconnect/Manifest2
-rw-r--r--acct-group/nm-openconnect/nm-openconnect-0-r1.ebuild10
-rw-r--r--acct-group/nm-openconnect/nm-openconnect-0.ebuild10
-rw-r--r--acct-group/nm-openvpn/Manifest2
-rw-r--r--acct-group/nm-openvpn/nm-openvpn-0-r1.ebuild10
-rw-r--r--acct-group/nm-openvpn/nm-openvpn-0.ebuild10
-rw-r--r--acct-group/nobody/Manifest2
-rw-r--r--acct-group/nobody/nobody-0-r1.ebuild9
-rw-r--r--acct-group/nobody/nobody-0.ebuild9
-rw-r--r--acct-group/node_exporter/Manifest2
-rw-r--r--acct-group/node_exporter/node_exporter-0-r1.ebuild8
-rw-r--r--acct-group/node_exporter/node_exporter-0-r2.ebuild8
-rw-r--r--acct-group/nofiles/Manifest2
-rw-r--r--acct-group/nofiles/nofiles-0-r1.ebuild8
-rw-r--r--acct-group/nofiles/nofiles-0-r2.ebuild8
-rw-r--r--acct-group/notary/Manifest2
-rw-r--r--acct-group/notary/notary-0-r1.ebuild10
-rw-r--r--acct-group/notary/notary-0.ebuild10
-rw-r--r--acct-group/nova/Manifest2
-rw-r--r--acct-group/nova/nova-0-r1.ebuild8
-rw-r--r--acct-group/nova/nova-0-r2.ebuild8
-rw-r--r--acct-group/nsd/Manifest2
-rw-r--r--acct-group/nsd/nsd-0-r1.ebuild8
-rw-r--r--acct-group/nsd/nsd-0-r2.ebuild8
-rw-r--r--acct-group/nslcd/Manifest2
-rw-r--r--acct-group/nslcd/nslcd-0-r1.ebuild8
-rw-r--r--acct-group/nslcd/nslcd-0-r2.ebuild8
-rw-r--r--acct-group/ntopng/Manifest2
-rw-r--r--acct-group/ntopng/ntopng-0-r1.ebuild8
-rw-r--r--acct-group/ntopng/ntopng-0.ebuild8
-rw-r--r--acct-group/ntp/Manifest2
-rw-r--r--acct-group/ntp/ntp-0-r1.ebuild8
-rw-r--r--acct-group/ntp/ntp-0-r2.ebuild8
-rw-r--r--acct-group/nullmail/Manifest2
-rw-r--r--acct-group/nullmail/nullmail-0-r1.ebuild10
-rw-r--r--acct-group/nullmail/nullmail-0.ebuild10
-rw-r--r--acct-group/nut/Manifest2
-rw-r--r--acct-group/nut/nut-0-r1.ebuild10
-rw-r--r--acct-group/nut/nut-0.ebuild10
-rw-r--r--acct-group/nzbget/Manifest2
-rw-r--r--acct-group/nzbget/nzbget-0-r1.ebuild9
-rw-r--r--acct-group/nzbget/nzbget-0.ebuild9
-rw-r--r--acct-group/oidentd/Manifest2
-rw-r--r--acct-group/oidentd/oidentd-0-r1.ebuild8
-rw-r--r--acct-group/oidentd/oidentd-0-r2.ebuild8
-rw-r--r--acct-group/openct/Manifest2
-rw-r--r--acct-group/openct/openct-0-r1.ebuild8
-rw-r--r--acct-group/openct/openct-0-r2.ebuild8
-rw-r--r--acct-group/opendkim/Manifest2
-rw-r--r--acct-group/opendkim/opendkim-0-r1.ebuild9
-rw-r--r--acct-group/opendkim/opendkim-0-r2.ebuild9
-rw-r--r--acct-group/opendmarc/Manifest2
-rw-r--r--acct-group/opendmarc/opendmarc-1-r1.ebuild9
-rw-r--r--acct-group/opendmarc/opendmarc-1.ebuild9
-rw-r--r--acct-group/opendnssec/Manifest2
-rw-r--r--acct-group/opendnssec/opendnssec-0-r1.ebuild10
-rw-r--r--acct-group/opendnssec/opendnssec-0.ebuild10
-rw-r--r--acct-group/openntpd/Manifest2
-rw-r--r--acct-group/openntpd/openntpd-0-r1.ebuild8
-rw-r--r--acct-group/openntpd/openntpd-0-r2.ebuild8
-rw-r--r--acct-group/openrct2/Manifest2
-rw-r--r--acct-group/openrct2/openrct2-0-r1.ebuild10
-rw-r--r--acct-group/openrct2/openrct2-0-r2.ebuild10
-rw-r--r--acct-group/openttd/Manifest2
-rw-r--r--acct-group/openttd/openttd-0-r1.ebuild10
-rw-r--r--acct-group/openttd/openttd-0.ebuild10
-rw-r--r--acct-group/openvpn/Manifest2
-rw-r--r--acct-group/openvpn/openvpn-0-r1.ebuild8
-rw-r--r--acct-group/openvpn/openvpn-0-r2.ebuild8
-rw-r--r--acct-group/openvpn_exporter/Manifest2
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r1.ebuild8
-rw-r--r--acct-group/openvpn_exporter/openvpn_exporter-0-r2.ebuild8
-rw-r--r--acct-group/opm/Manifest2
-rw-r--r--acct-group/opm/opm-0-r1.ebuild9
-rw-r--r--acct-group/opm/opm-0.ebuild9
-rw-r--r--acct-group/oprofile/Manifest2
-rw-r--r--acct-group/oprofile/oprofile-0-r1.ebuild9
-rw-r--r--acct-group/oprofile/oprofile-0-r2.ebuild9
-rw-r--r--acct-group/oragono/Manifest2
-rw-r--r--acct-group/oragono/oragono-0-r1.ebuild9
-rw-r--r--acct-group/oragono/oragono-0.ebuild9
-rw-r--r--acct-group/ossec/Manifest2
-rw-r--r--acct-group/ossec/ossec-0-r1.ebuild9
-rw-r--r--acct-group/ossec/ossec-0-r2.ebuild9
-rw-r--r--acct-group/owntracks/Manifest2
-rw-r--r--acct-group/owntracks/owntracks-0-r1.ebuild9
-rw-r--r--acct-group/owntracks/owntracks-0.ebuild9
-rw-r--r--acct-group/p2p/Manifest2
-rw-r--r--acct-group/p2p/p2p-0-r1.ebuild9
-rw-r--r--acct-group/p2p/p2p-0.ebuild9
-rw-r--r--acct-group/partimag/Manifest2
-rw-r--r--acct-group/partimag/partimag-0-r1.ebuild10
-rw-r--r--acct-group/partimag/partimag-0-r2.ebuild10
-rw-r--r--acct-group/pcap/Manifest2
-rw-r--r--acct-group/pcap/pcap-0-r1.ebuild9
-rw-r--r--acct-group/pcap/pcap-0.ebuild9
-rw-r--r--acct-group/pcscd/Manifest2
-rw-r--r--acct-group/pcscd/pcscd-0-r1.ebuild8
-rw-r--r--acct-group/pcscd/pcscd-0-r2.ebuild8
-rw-r--r--acct-group/pdns/Manifest2
-rw-r--r--acct-group/pdns/pdns-0-r1.ebuild8
-rw-r--r--acct-group/pdns/pdns-0-r2.ebuild8
-rw-r--r--acct-group/pdnsd/Manifest2
-rw-r--r--acct-group/pdnsd/pdnsd-0-r1.ebuild8
-rw-r--r--acct-group/pdnsd/pdnsd-0-r2.ebuild8
-rw-r--r--acct-group/pgagent/Manifest2
-rw-r--r--acct-group/pgagent/pgagent-0-r1.ebuild10
-rw-r--r--acct-group/pgagent/pgagent-0.ebuild10
-rw-r--r--acct-group/pipewire/Manifest2
-rw-r--r--acct-group/pipewire/pipewire-0-r1.ebuild8
-rw-r--r--acct-group/pipewire/pipewire-0.ebuild8
-rw-r--r--acct-group/pkcs11/Manifest2
-rw-r--r--acct-group/pkcs11/pkcs11-0-r1.ebuild10
-rw-r--r--acct-group/pkcs11/pkcs11-0.ebuild10
-rw-r--r--acct-group/placement/Manifest2
-rw-r--r--acct-group/placement/placement-0-r1.ebuild8
-rw-r--r--acct-group/placement/placement-0-r2.ebuild8
-rw-r--r--acct-group/plex/Manifest2
-rw-r--r--acct-group/plex/plex-0-r1.ebuild9
-rw-r--r--acct-group/plex/plex-0-r2.ebuild9
-rw-r--r--acct-group/plugdev/Manifest2
-rw-r--r--acct-group/plugdev/plugdev-0-r1.ebuild9
-rw-r--r--acct-group/plugdev/plugdev-0-r2.ebuild9
-rw-r--r--acct-group/polkitd/Manifest2
-rw-r--r--acct-group/polkitd/polkitd-0-r1.ebuild8
-rw-r--r--acct-group/polkitd/polkitd-0-r2.ebuild8
-rw-r--r--acct-group/polw/Manifest2
-rw-r--r--acct-group/polw/polw-0-r1.ebuild10
-rw-r--r--acct-group/polw/polw-0.ebuild10
-rw-r--r--acct-group/popa3d/Manifest2
-rw-r--r--acct-group/popa3d/popa3d-0-r1.ebuild9
-rw-r--r--acct-group/popa3d/popa3d-0.ebuild9
-rw-r--r--acct-group/portage/Manifest2
-rw-r--r--acct-group/portage/portage-0-r1.ebuild8
-rw-r--r--acct-group/portage/portage-0.ebuild8
-rw-r--r--acct-group/postdrop/Manifest2
-rw-r--r--acct-group/postdrop/postdrop-0-r1.ebuild8
-rw-r--r--acct-group/postdrop/postdrop-0-r2.ebuild8
-rw-r--r--acct-group/postfix/Manifest2
-rw-r--r--acct-group/postfix/postfix-0-r1.ebuild8
-rw-r--r--acct-group/postfix/postfix-0-r2.ebuild8
-rw-r--r--acct-group/postfix_exporter/Manifest2
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r1.ebuild8
-rw-r--r--acct-group/postfix_exporter/postfix_exporter-0-r2.ebuild8
-rw-r--r--acct-group/postfwd/Manifest2
-rw-r--r--acct-group/postfwd/postfwd-0-r1.ebuild10
-rw-r--r--acct-group/postfwd/postfwd-0.ebuild10
-rw-r--r--acct-group/postgres/Manifest2
-rw-r--r--acct-group/postgres/postgres-0-r1.ebuild10
-rw-r--r--acct-group/postgres/postgres-0-r2.ebuild10
-rw-r--r--acct-group/postgres_exporter/Manifest2
-rw-r--r--acct-group/postgres_exporter/postgres_exporter-0-r1.ebuild8
-rw-r--r--acct-group/postgres_exporter/postgres_exporter-0.ebuild8
-rw-r--r--acct-group/postgrey/Manifest2
-rw-r--r--acct-group/postgrey/postgrey-0-r1.ebuild9
-rw-r--r--acct-group/postgrey/postgrey-0.ebuild9
-rw-r--r--acct-group/privoxy/Manifest2
-rw-r--r--acct-group/privoxy/privoxy-0-r1.ebuild9
-rw-r--r--acct-group/privoxy/privoxy-0-r2.ebuild9
-rw-r--r--acct-group/prometheus/Manifest2
-rw-r--r--acct-group/prometheus/prometheus-0-r1.ebuild8
-rw-r--r--acct-group/prometheus/prometheus-0-r2.ebuild8
-rw-r--r--acct-group/prosody/Manifest2
-rw-r--r--acct-group/prosody/prosody-0-r1.ebuild10
-rw-r--r--acct-group/prosody/prosody-0.ebuild10
-rw-r--r--acct-group/prowlarr/Manifest2
-rw-r--r--acct-group/prowlarr/prowlarr-0-r1.ebuild8
-rw-r--r--acct-group/prowlarr/prowlarr-0.ebuild8
-rw-r--r--acct-group/psybnc/Manifest2
-rw-r--r--acct-group/psybnc/psybnc-0-r1.ebuild10
-rw-r--r--acct-group/psybnc/psybnc-0.ebuild10
-rw-r--r--acct-group/pulse-access/Manifest2
-rw-r--r--acct-group/pulse-access/pulse-access-0-r1.ebuild8
-rw-r--r--acct-group/pulse-access/pulse-access-0.ebuild8
-rw-r--r--acct-group/pulse/Manifest2
-rw-r--r--acct-group/pulse/pulse-0-r1.ebuild8
-rw-r--r--acct-group/pulse/pulse-0.ebuild8
-rw-r--r--acct-group/puppet/Manifest2
-rw-r--r--acct-group/puppet/puppet-0-r1.ebuild8
-rw-r--r--acct-group/puppet/puppet-0-r2.ebuild8
-rw-r--r--acct-group/puppetdb/Manifest2
-rw-r--r--acct-group/puppetdb/puppetdb-0-r1.ebuild8
-rw-r--r--acct-group/puppetdb/puppetdb-0-r2.ebuild8
-rw-r--r--acct-group/pushgateway/Manifest2
-rw-r--r--acct-group/pushgateway/pushgateway-0-r1.ebuild10
-rw-r--r--acct-group/pushgateway/pushgateway-0.ebuild10
-rw-r--r--acct-group/pvpgn/Manifest2
-rw-r--r--acct-group/pvpgn/pvpgn-0-r1.ebuild9
-rw-r--r--acct-group/pvpgn/pvpgn-0.ebuild9
-rw-r--r--acct-group/qemu/Manifest2
-rw-r--r--acct-group/qemu/qemu-0-r1.ebuild8
-rw-r--r--acct-group/qemu/qemu-0-r2.ebuild8
-rw-r--r--acct-group/qmail/Manifest2
-rw-r--r--acct-group/qmail/qmail-0-r1.ebuild8
-rw-r--r--acct-group/qmail/qmail-0-r2.ebuild8
-rw-r--r--acct-group/quagga/Manifest2
-rw-r--r--acct-group/quagga/quagga-0-r1.ebuild8
-rw-r--r--acct-group/quagga/quagga-0-r2.ebuild8
-rw-r--r--acct-group/quassel/Manifest2
-rw-r--r--acct-group/quassel/quassel-0-r1.ebuild8
-rw-r--r--acct-group/quassel/quassel-0-r2.ebuild8
-rw-r--r--acct-group/rabbitmq/Manifest2
-rw-r--r--acct-group/rabbitmq/rabbitmq-0-r1.ebuild10
-rw-r--r--acct-group/rabbitmq/rabbitmq-0.ebuild10
-rw-r--r--acct-group/rabbitmq_exporter/Manifest2
-rw-r--r--acct-group/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild10
-rw-r--r--acct-group/rabbitmq_exporter/rabbitmq_exporter-0.ebuild10
-rw-r--r--acct-group/radarr/Manifest2
-rw-r--r--acct-group/radarr/radarr-0-r1.ebuild8
-rw-r--r--acct-group/radarr/radarr-0.ebuild8
-rw-r--r--acct-group/radicale/Manifest2
-rw-r--r--acct-group/radicale/radicale-0-r1.ebuild9
-rw-r--r--acct-group/radicale/radicale-0-r2.ebuild9
-rw-r--r--acct-group/radius/Manifest2
-rw-r--r--acct-group/radius/radius-0-r1.ebuild9
-rw-r--r--acct-group/radius/radius-0-r2.ebuild9
-rw-r--r--acct-group/radvd/Manifest2
-rw-r--r--acct-group/radvd/radvd-0-r1.ebuild10
-rw-r--r--acct-group/radvd/radvd-0.ebuild10
-rw-r--r--acct-group/rbldns/Manifest2
-rw-r--r--acct-group/rbldns/rbldns-0-r1.ebuild8
-rw-r--r--acct-group/rbldns/rbldns-0-r2.ebuild8
-rw-r--r--acct-group/rbot/Manifest2
-rw-r--r--acct-group/rbot/rbot-0-r1.ebuild10
-rw-r--r--acct-group/rbot/rbot-0.ebuild10
-rw-r--r--acct-group/readarr/Manifest2
-rw-r--r--acct-group/readarr/readarr-0-r1.ebuild8
-rw-r--r--acct-group/readarr/readarr-0.ebuild8
-rw-r--r--acct-group/realtime/Manifest2
-rw-r--r--acct-group/realtime/realtime-0-r1.ebuild10
-rw-r--r--acct-group/realtime/realtime-0.ebuild10
-rw-r--r--acct-group/redis/Manifest2
-rw-r--r--acct-group/redis/redis-0-r1.ebuild9
-rw-r--r--acct-group/redis/redis-0-r2.ebuild9
-rw-r--r--acct-group/redis_exporter/Manifest2
-rw-r--r--acct-group/redis_exporter/redis_exporter-0-r1.ebuild8
-rw-r--r--acct-group/redis_exporter/redis_exporter-0.ebuild8
-rw-r--r--acct-group/redmine/Manifest2
-rw-r--r--acct-group/redmine/redmine-0-r1.ebuild8
-rw-r--r--acct-group/redmine/redmine-0-r2.ebuild8
-rw-r--r--acct-group/redsocks/Manifest2
-rw-r--r--acct-group/redsocks/redsocks-0-r1.ebuild10
-rw-r--r--acct-group/redsocks/redsocks-0-r2.ebuild10
-rw-r--r--acct-group/reg/Manifest2
-rw-r--r--acct-group/reg/reg-0-r1.ebuild10
-rw-r--r--acct-group/reg/reg-0-r2.ebuild10
-rw-r--r--acct-group/registry/Manifest2
-rw-r--r--acct-group/registry/registry-0-r1.ebuild10
-rw-r--r--acct-group/registry/registry-0.ebuild10
-rw-r--r--acct-group/render/Manifest2
-rw-r--r--acct-group/render/render-0-r1.ebuild8
-rw-r--r--acct-group/render/render-0-r2.ebuild8
-rw-r--r--acct-group/roccat/Manifest2
-rw-r--r--acct-group/roccat/roccat-0-r1.ebuild10
-rw-r--r--acct-group/roccat/roccat-0.ebuild10
-rw-r--r--acct-group/root/Manifest2
-rw-r--r--acct-group/root/root-0-r1.ebuild9
-rw-r--r--acct-group/root/root-0.ebuild9
-rw-r--r--acct-group/rplayd/Manifest2
-rw-r--r--acct-group/rplayd/rplayd-0-r1.ebuild10
-rw-r--r--acct-group/rplayd/rplayd-0.ebuild10
-rw-r--r--acct-group/rrdcached/Manifest2
-rw-r--r--acct-group/rrdcached/rrdcached-0-r1.ebuild8
-rw-r--r--acct-group/rrdcached/rrdcached-0.ebuild8
-rw-r--r--acct-group/rslsync/Manifest2
-rw-r--r--acct-group/rslsync/rslsync-0-r1.ebuild10
-rw-r--r--acct-group/rslsync/rslsync-0.ebuild10
-rw-r--r--acct-group/rspamd/Manifest2
-rw-r--r--acct-group/rspamd/rspamd-0-r1.ebuild9
-rw-r--r--acct-group/rspamd/rspamd-0-r2.ebuild9
-rw-r--r--acct-group/rstudio-server/Manifest2
-rw-r--r--acct-group/rstudio-server/rstudio-server-0-r1.ebuild9
-rw-r--r--acct-group/rstudio-server/rstudio-server-0-r2.ebuild9
-rw-r--r--acct-group/rt/Manifest2
-rw-r--r--acct-group/rt/rt-0-r1.ebuild10
-rw-r--r--acct-group/rt/rt-0-r2.ebuild10
-rw-r--r--acct-group/rtkit/Manifest2
-rw-r--r--acct-group/rtkit/rtkit-0-r1.ebuild9
-rw-r--r--acct-group/rtkit/rtkit-0-r2.ebuild9
-rw-r--r--acct-group/rundeck/Manifest2
-rw-r--r--acct-group/rundeck/rundeck-0-r1.ebuild10
-rw-r--r--acct-group/rundeck/rundeck-0.ebuild10
-rw-r--r--acct-group/rwhoisd/Manifest2
-rw-r--r--acct-group/rwhoisd/rwhoisd-0-r1.ebuild10
-rw-r--r--acct-group/rwhoisd/rwhoisd-0.ebuild10
-rw-r--r--acct-group/sabnzbd/Manifest2
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r1.ebuild10
-rw-r--r--acct-group/sabnzbd/sabnzbd-0-r2.ebuild10
-rw-r--r--acct-group/sagan/Manifest2
-rw-r--r--acct-group/sagan/sagan-0-r1.ebuild9
-rw-r--r--acct-group/sagan/sagan-0.ebuild9
-rw-r--r--acct-group/samplicator/Manifest2
-rw-r--r--acct-group/samplicator/samplicator-0-r1.ebuild10
-rw-r--r--acct-group/samplicator/samplicator-0.ebuild10
-rw-r--r--acct-group/sancp/Manifest2
-rw-r--r--acct-group/sancp/sancp-0-r1.ebuild10
-rw-r--r--acct-group/sancp/sancp-0.ebuild10
-rw-r--r--acct-group/sanlock/Manifest2
-rw-r--r--acct-group/sanlock/sanlock-0-r1.ebuild9
-rw-r--r--acct-group/sanlock/sanlock-0-r2.ebuild9
-rw-r--r--acct-group/sauerbraten/Manifest2
-rw-r--r--acct-group/sauerbraten/sauerbraten-0-r1.ebuild9
-rw-r--r--acct-group/sauerbraten/sauerbraten-0-r2.ebuild9
-rw-r--r--acct-group/scanlogd/Manifest2
-rw-r--r--acct-group/scanlogd/scanlogd-0-r1.ebuild10
-rw-r--r--acct-group/scanlogd/scanlogd-0.ebuild10
-rw-r--r--acct-group/scanner/Manifest2
-rw-r--r--acct-group/scanner/scanner-0-r1.ebuild10
-rw-r--r--acct-group/scanner/scanner-0.ebuild10
-rw-r--r--acct-group/scponly/Manifest2
-rw-r--r--acct-group/scponly/scponly-0-r1.ebuild9
-rw-r--r--acct-group/scponly/scponly-0-r2.ebuild9
-rw-r--r--acct-group/scsi/Manifest2
-rw-r--r--acct-group/scsi/scsi-0-r1.ebuild8
-rw-r--r--acct-group/scsi/scsi-0.ebuild8
-rw-r--r--acct-group/sddm/Manifest2
-rw-r--r--acct-group/sddm/sddm-0-r1.ebuild10
-rw-r--r--acct-group/sddm/sddm-0.ebuild10
-rw-r--r--acct-group/seat/Manifest2
-rw-r--r--acct-group/seat/seat-0-r1.ebuild9
-rw-r--r--acct-group/seat/seat-0.ebuild9
-rw-r--r--acct-group/serf/Manifest2
-rw-r--r--acct-group/serf/serf-0-r1.ebuild10
-rw-r--r--acct-group/serf/serf-0.ebuild10
-rw-r--r--acct-group/sguil/Manifest2
-rw-r--r--acct-group/sguil/sguil-0-r1.ebuild10
-rw-r--r--acct-group/sguil/sguil-0.ebuild10
-rw-r--r--acct-group/sgx/Manifest2
-rw-r--r--acct-group/sgx/sgx-0-r1.ebuild10
-rw-r--r--acct-group/sgx/sgx-0.ebuild10
-rw-r--r--acct-group/sigh/Manifest2
-rw-r--r--acct-group/sigh/sigh-0-r1.ebuild8
-rw-r--r--acct-group/sigh/sigh-0.ebuild8
-rw-r--r--acct-group/simplevirt/Manifest2
-rw-r--r--acct-group/simplevirt/simplevirt-0-r1.ebuild8
-rw-r--r--acct-group/simplevirt/simplevirt-0-r2.ebuild8
-rw-r--r--acct-group/sispmctl/Manifest2
-rw-r--r--acct-group/sispmctl/sispmctl-0-r1.ebuild10
-rw-r--r--acct-group/sispmctl/sispmctl-0.ebuild10
-rw-r--r--acct-group/sks/Manifest2
-rw-r--r--acct-group/sks/sks-0-r1.ebuild9
-rw-r--r--acct-group/sks/sks-0.ebuild9
-rw-r--r--acct-group/slurm/Manifest2
-rw-r--r--acct-group/slurm/slurm-0-r1.ebuild9
-rw-r--r--acct-group/slurm/slurm-0-r2.ebuild9
-rw-r--r--acct-group/smmsp/Manifest2
-rw-r--r--acct-group/smmsp/smmsp-0-r1.ebuild8
-rw-r--r--acct-group/smmsp/smmsp-0-r2.ebuild8
-rw-r--r--acct-group/smokeping/Manifest2
-rw-r--r--acct-group/smokeping/smokeping-0-r1.ebuild10
-rw-r--r--acct-group/smokeping/smokeping-0.ebuild10
-rw-r--r--acct-group/sms/Manifest2
-rw-r--r--acct-group/sms/sms-0-r1.ebuild8
-rw-r--r--acct-group/sms/sms-0.ebuild8
-rw-r--r--acct-group/smtpd/Manifest2
-rw-r--r--acct-group/smtpd/smtpd-0-r1.ebuild9
-rw-r--r--acct-group/smtpd/smtpd-0-r2.ebuild9
-rw-r--r--acct-group/smtpq/Manifest2
-rw-r--r--acct-group/smtpq/smtpq-0-r1.ebuild9
-rw-r--r--acct-group/smtpq/smtpq-0-r2.ebuild9
-rw-r--r--acct-group/snapserver/Manifest2
-rw-r--r--acct-group/snapserver/snapserver-0-r1.ebuild9
-rw-r--r--acct-group/snapserver/snapserver-0.ebuild9
-rw-r--r--acct-group/sniproxy/Manifest2
-rw-r--r--acct-group/sniproxy/sniproxy-0-r1.ebuild8
-rw-r--r--acct-group/sniproxy/sniproxy-0.ebuild8
-rw-r--r--acct-group/snmp_exporter/Manifest2
-rw-r--r--acct-group/snmp_exporter/snmp_exporter-0-r1.ebuild10
-rw-r--r--acct-group/snmp_exporter/snmp_exporter-0.ebuild10
-rw-r--r--acct-group/snort/Manifest2
-rw-r--r--acct-group/snort/snort-0-r1.ebuild8
-rw-r--r--acct-group/snort/snort-0.ebuild8
-rw-r--r--acct-group/sobby/Manifest2
-rw-r--r--acct-group/sobby/sobby-0-r1.ebuild8
-rw-r--r--acct-group/sobby/sobby-0.ebuild8
-rw-r--r--acct-group/sobexsrv/Manifest2
-rw-r--r--acct-group/sobexsrv/sobexsrv-0-r1.ebuild9
-rw-r--r--acct-group/sobexsrv/sobexsrv-0.ebuild9
-rw-r--r--acct-group/sockd/Manifest2
-rw-r--r--acct-group/sockd/sockd-0-r1.ebuild10
-rw-r--r--acct-group/sockd/sockd-0.ebuild10
-rw-r--r--acct-group/sogo/Manifest2
-rw-r--r--acct-group/sogo/sogo-0-r1.ebuild9
-rw-r--r--acct-group/sogo/sogo-0-r2.ebuild9
-rw-r--r--acct-group/soju/Manifest2
-rw-r--r--acct-group/soju/soju-0-r1.ebuild9
-rw-r--r--acct-group/soju/soju-0.ebuild9
-rw-r--r--acct-group/sonarr/Manifest2
-rw-r--r--acct-group/sonarr/sonarr-0-r1.ebuild8
-rw-r--r--acct-group/sonarr/sonarr-0.ebuild8
-rw-r--r--acct-group/spamd/Manifest2
-rw-r--r--acct-group/spamd/spamd-0-r1.ebuild9
-rw-r--r--acct-group/spamd/spamd-0-r2.ebuild9
-rw-r--r--acct-group/spectrum/Manifest2
-rw-r--r--acct-group/spectrum/spectrum-0-r1.ebuild10
-rw-r--r--acct-group/spectrum/spectrum-0-r2.ebuild10
-rw-r--r--acct-group/spi/Manifest2
-rw-r--r--acct-group/spi/spi-0-r1.ebuild8
-rw-r--r--acct-group/spi/spi-0.ebuild8
-rw-r--r--acct-group/spire/Manifest2
-rw-r--r--acct-group/spire/spire-0-r1.ebuild8
-rw-r--r--acct-group/spire/spire-0-r2.ebuild8
-rw-r--r--acct-group/spread/Manifest2
-rw-r--r--acct-group/spread/spread-0-r1.ebuild10
-rw-r--r--acct-group/spread/spread-0.ebuild10
-rw-r--r--acct-group/sqlgrey/Manifest2
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r1.ebuild9
-rw-r--r--acct-group/sqlgrey/sqlgrey-0-r2.ebuild9
-rw-r--r--acct-group/squid/Manifest2
-rw-r--r--acct-group/squid/squid-0-r1.ebuild8
-rw-r--r--acct-group/squid/squid-0-r2.ebuild8
-rw-r--r--acct-group/sshd/Manifest2
-rw-r--r--acct-group/sshd/sshd-0-r1.ebuild8
-rw-r--r--acct-group/sshd/sshd-0-r2.ebuild8
-rw-r--r--acct-group/ssmtp/Manifest2
-rw-r--r--acct-group/ssmtp/ssmtp-0-r1.ebuild10
-rw-r--r--acct-group/ssmtp/ssmtp-0.ebuild10
-rw-r--r--acct-group/sstpc/Manifest2
-rw-r--r--acct-group/sstpc/sstpc-0-r1.ebuild10
-rw-r--r--acct-group/sstpc/sstpc-0.ebuild10
-rw-r--r--acct-group/stapdev/Manifest2
-rw-r--r--acct-group/stapdev/stapdev-0-r1.ebuild8
-rw-r--r--acct-group/stapdev/stapdev-0.ebuild8
-rw-r--r--acct-group/stapsys/Manifest2
-rw-r--r--acct-group/stapsys/stapsys-0-r1.ebuild8
-rw-r--r--acct-group/stapsys/stapsys-0.ebuild8
-rw-r--r--acct-group/stapusr/Manifest2
-rw-r--r--acct-group/stapusr/stapusr-0-r1.ebuild8
-rw-r--r--acct-group/stapusr/stapusr-0.ebuild8
-rw-r--r--acct-group/steamcmd/Manifest2
-rw-r--r--acct-group/steamcmd/steamcmd-0-r1.ebuild10
-rw-r--r--acct-group/steamcmd/steamcmd-0-r2.ebuild10
-rw-r--r--acct-group/stg/Manifest2
-rw-r--r--acct-group/stg/stg-0-r1.ebuild10
-rw-r--r--acct-group/stg/stg-0.ebuild10
-rw-r--r--acct-group/stubby/Manifest2
-rw-r--r--acct-group/stubby/stubby-0-r1.ebuild9
-rw-r--r--acct-group/stubby/stubby-0-r2.ebuild9
-rw-r--r--acct-group/stunnel/Manifest2
-rw-r--r--acct-group/stunnel/stunnel-0-r1.ebuild9
-rw-r--r--acct-group/stunnel/stunnel-0-r2.ebuild9
-rw-r--r--acct-group/subsonic/Manifest2
-rw-r--r--acct-group/subsonic/subsonic-0-r1.ebuild10
-rw-r--r--acct-group/subsonic/subsonic-0.ebuild10
-rw-r--r--acct-group/supervisor/Manifest2
-rw-r--r--acct-group/supervisor/supervisor-0-r1.ebuild9
-rw-r--r--acct-group/supervisor/supervisor-0-r2.ebuild9
-rw-r--r--acct-group/suricata/Manifest2
-rw-r--r--acct-group/suricata/suricata-0-r1.ebuild9
-rw-r--r--acct-group/suricata/suricata-0-r2.ebuild9
-rw-r--r--acct-group/svnusers/Manifest2
-rw-r--r--acct-group/svnusers/svnusers-0-r1.ebuild8
-rw-r--r--acct-group/svnusers/svnusers-0-r2.ebuild8
-rw-r--r--acct-group/svxlink/Manifest2
-rw-r--r--acct-group/svxlink/svxlink-0-r1.ebuild9
-rw-r--r--acct-group/svxlink/svxlink-0.ebuild9
-rw-r--r--acct-group/swift/Manifest2
-rw-r--r--acct-group/swift/swift-0-r1.ebuild8
-rw-r--r--acct-group/swift/swift-0-r2.ebuild8
-rw-r--r--acct-group/synapse/Manifest2
-rw-r--r--acct-group/synapse/synapse-0-r1.ebuild9
-rw-r--r--acct-group/synapse/synapse-0.ebuild9
-rw-r--r--acct-group/syncthing/Manifest2
-rw-r--r--acct-group/syncthing/syncthing-0-r1.ebuild9
-rw-r--r--acct-group/syncthing/syncthing-0-r2.ebuild9
-rw-r--r--acct-group/systemd-coredump/Manifest2
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r1.ebuild8
-rw-r--r--acct-group/systemd-coredump/systemd-coredump-0-r2.ebuild8
-rw-r--r--acct-group/systemd-hostname/Manifest2
-rw-r--r--acct-group/systemd-hostname/systemd-hostname-0-r1.ebuild8
-rw-r--r--acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild8
-rw-r--r--acct-group/systemd-journal-remote/Manifest2
-rw-r--r--acct-group/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild8
-rw-r--r--acct-group/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild8
-rw-r--r--acct-group/systemd-journal/Manifest2
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r1.ebuild8
-rw-r--r--acct-group/systemd-journal/systemd-journal-0-r2.ebuild8
-rw-r--r--acct-group/systemd-network/Manifest2
-rw-r--r--acct-group/systemd-network/systemd-network-0-r1.ebuild8
-rw-r--r--acct-group/systemd-network/systemd-network-0-r2.ebuild8
-rw-r--r--acct-group/systemd-oom/Manifest2
-rw-r--r--acct-group/systemd-oom/systemd-oom-0-r1.ebuild8
-rw-r--r--acct-group/systemd-oom/systemd-oom-0.ebuild8
-rw-r--r--acct-group/systemd-resolve/Manifest2
-rw-r--r--acct-group/systemd-resolve/systemd-resolve-0-r1.ebuild8
-rw-r--r--acct-group/systemd-resolve/systemd-resolve-0-r2.ebuild8
-rw-r--r--acct-group/systemd-timesync/Manifest2
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r1.ebuild8
-rw-r--r--acct-group/systemd-timesync/systemd-timesync-0-r2.ebuild8
-rw-r--r--acct-group/tape/Manifest2
-rw-r--r--acct-group/tape/tape-0-r1.ebuild8
-rw-r--r--acct-group/tape/tape-0-r2.ebuild8
-rw-r--r--acct-group/taskd/Manifest2
-rw-r--r--acct-group/taskd/taskd-0-r1.ebuild10
-rw-r--r--acct-group/taskd/taskd-0.ebuild10
-rw-r--r--acct-group/teamspeak/Manifest2
-rw-r--r--acct-group/teamspeak/teamspeak-0-r1.ebuild10
-rw-r--r--acct-group/teamspeak/teamspeak-0-r2.ebuild10
-rw-r--r--acct-group/telegraf/Manifest2
-rw-r--r--acct-group/telegraf/telegraf-0-r1.ebuild8
-rw-r--r--acct-group/telegraf/telegraf-0-r2.ebuild8
-rw-r--r--acct-group/tenshi/Manifest2
-rw-r--r--acct-group/tenshi/tenshi-0-r1.ebuild10
-rw-r--r--acct-group/tenshi/tenshi-0.ebuild10
-rw-r--r--acct-group/thttpd/Manifest2
-rw-r--r--acct-group/thttpd/thttpd-0-r1.ebuild10
-rw-r--r--acct-group/thttpd/thttpd-0.ebuild10
-rw-r--r--acct-group/tinyproxy/Manifest2
-rw-r--r--acct-group/tinyproxy/tinyproxy-0-r1.ebuild10
-rw-r--r--acct-group/tinyproxy/tinyproxy-0.ebuild10
-rw-r--r--acct-group/tomcat/Manifest2
-rw-r--r--acct-group/tomcat/tomcat-0-r1.ebuild9
-rw-r--r--acct-group/tomcat/tomcat-0.ebuild9
-rw-r--r--acct-group/tor/Manifest2
-rw-r--r--acct-group/tor/tor-0-r1.ebuild9
-rw-r--r--acct-group/tor/tor-0-r2.ebuild9
-rw-r--r--acct-group/tox/Manifest2
-rw-r--r--acct-group/tox/tox-0-r1.ebuild7
-rw-r--r--acct-group/tox/tox-0-r2.ebuild7
-rw-r--r--acct-group/tpm/Manifest2
-rw-r--r--acct-group/tpm/tpm-0-r1.ebuild8
-rw-r--r--acct-group/tpm/tpm-0.ebuild8
-rw-r--r--acct-group/transmission/Manifest2
-rw-r--r--acct-group/transmission/transmission-0-r1.ebuild8
-rw-r--r--acct-group/transmission/transmission-0-r2.ebuild8
-rw-r--r--acct-group/trickster/Manifest2
-rw-r--r--acct-group/trickster/trickster-0-r1.ebuild10
-rw-r--r--acct-group/trickster/trickster-0.ebuild10
-rw-r--r--acct-group/trojan/Manifest2
-rw-r--r--acct-group/trojan/trojan-0-r1.ebuild8
-rw-r--r--acct-group/trojan/trojan-0.ebuild8
-rw-r--r--acct-group/tsm/Manifest2
-rw-r--r--acct-group/tsm/tsm-0-r1.ebuild8
-rw-r--r--acct-group/tsm/tsm-0-r2.ebuild8
-rw-r--r--acct-group/tss/Manifest2
-rw-r--r--acct-group/tss/tss-0-r1.ebuild9
-rw-r--r--acct-group/tss/tss-0-r2.ebuild9
-rw-r--r--acct-group/ttrssd/Manifest2
-rw-r--r--acct-group/ttrssd/ttrssd-0-r1.ebuild9
-rw-r--r--acct-group/ttrssd/ttrssd-0.ebuild9
-rw-r--r--acct-group/tty/Manifest2
-rw-r--r--acct-group/tty/tty-0-r1.ebuild8
-rw-r--r--acct-group/tty/tty-0-r2.ebuild8
-rw-r--r--acct-group/turnserver/Manifest2
-rw-r--r--acct-group/turnserver/turnserver-0-r1.ebuild10
-rw-r--r--acct-group/turnserver/turnserver-0-r2.ebuild10
-rw-r--r--acct-group/ubridge/Manifest2
-rw-r--r--acct-group/ubridge/ubridge-0-r1.ebuild9
-rw-r--r--acct-group/ubridge/ubridge-0-r2.ebuild9
-rw-r--r--acct-group/ulogd/Manifest2
-rw-r--r--acct-group/ulogd/ulogd-0-r1.ebuild9
-rw-r--r--acct-group/ulogd/ulogd-0.ebuild9
-rw-r--r--acct-group/ultimaker/Manifest2
-rw-r--r--acct-group/ultimaker/ultimaker-0-r1.ebuild9
-rw-r--r--acct-group/ultimaker/ultimaker-0-r2.ebuild9
-rw-r--r--acct-group/unbound-telemetry/Manifest2
-rw-r--r--acct-group/unbound-telemetry/unbound-telemetry-0-r1.ebuild8
-rw-r--r--acct-group/unbound-telemetry/unbound-telemetry-0.ebuild8
-rw-r--r--acct-group/unbound/Manifest2
-rw-r--r--acct-group/unbound/unbound-0-r1.ebuild10
-rw-r--r--acct-group/unbound/unbound-0-r2.ebuild10
-rw-r--r--acct-group/unifi-video/Manifest2
-rw-r--r--acct-group/unifi-video/unifi-video-0-r1.ebuild9
-rw-r--r--acct-group/unifi-video/unifi-video-0.ebuild9
-rw-r--r--acct-group/unifi/Manifest2
-rw-r--r--acct-group/unifi/unifi-0-r1.ebuild10
-rw-r--r--acct-group/unifi/unifi-0-r2.ebuild10
-rw-r--r--acct-group/unrealircd/Manifest2
-rw-r--r--acct-group/unrealircd/unrealircd-0-r1.ebuild8
-rw-r--r--acct-group/unrealircd/unrealircd-0-r2.ebuild8
-rw-r--r--acct-group/upmpdcli/Manifest2
-rw-r--r--acct-group/upmpdcli/upmpdcli-0-r1.ebuild9
-rw-r--r--acct-group/upmpdcli/upmpdcli-0.ebuild9
-rw-r--r--acct-group/uptimed/Manifest2
-rw-r--r--acct-group/uptimed/uptimed-0-r2.ebuild8
-rw-r--r--acct-group/uptimed/uptimed-0-r3.ebuild8
-rw-r--r--acct-group/usb/Manifest2
-rw-r--r--acct-group/usb/usb-0-r1.ebuild8
-rw-r--r--acct-group/usb/usb-0-r2.ebuild8
-rw-r--r--acct-group/users/Manifest2
-rw-r--r--acct-group/users/users-0-r1.ebuild8
-rw-r--r--acct-group/users/users-0.ebuild8
-rw-r--r--acct-group/ushare/Manifest2
-rw-r--r--acct-group/ushare/ushare-0-r1.ebuild9
-rw-r--r--acct-group/ushare/ushare-0.ebuild9
-rw-r--r--acct-group/utmp/Manifest2
-rw-r--r--acct-group/utmp/utmp-0-r1.ebuild8
-rw-r--r--acct-group/utmp/utmp-0-r2.ebuild8
-rw-r--r--acct-group/uucp/Manifest2
-rw-r--r--acct-group/uucp/uucp-0-r1.ebuild8
-rw-r--r--acct-group/uucp/uucp-0-r2.ebuild8
-rw-r--r--acct-group/uwsgi_exporter/Manifest2
-rw-r--r--acct-group/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild10
-rw-r--r--acct-group/uwsgi_exporter/uwsgi_exporter-0.ebuild10
-rw-r--r--acct-group/vacation/Manifest2
-rw-r--r--acct-group/vacation/vacation-0-r1.ebuild10
-rw-r--r--acct-group/vacation/vacation-0.ebuild10
-rw-r--r--acct-group/varnish/Manifest2
-rw-r--r--acct-group/varnish/varnish-0-r1.ebuild9
-rw-r--r--acct-group/varnish/varnish-0-r2.ebuild9
-rw-r--r--acct-group/vault/Manifest2
-rw-r--r--acct-group/vault/vault-0-r1.ebuild8
-rw-r--r--acct-group/vault/vault-0-r2.ebuild8
-rw-r--r--acct-group/vault_exporter/Manifest2
-rw-r--r--acct-group/vault_exporter/vault_exporter-0-r1.ebuild10
-rw-r--r--acct-group/vault_exporter/vault_exporter-0.ebuild10
-rw-r--r--acct-group/vboxguest/Manifest2
-rw-r--r--acct-group/vboxguest/vboxguest-0-r1.ebuild8
-rw-r--r--acct-group/vboxguest/vboxguest-0-r2.ebuild8
-rw-r--r--acct-group/vboxsf/Manifest2
-rw-r--r--acct-group/vboxsf/vboxsf-0-r1.ebuild8
-rw-r--r--acct-group/vboxsf/vboxsf-0-r2.ebuild8
-rw-r--r--acct-group/vboxusers/Manifest2
-rw-r--r--acct-group/vboxusers/vboxusers-0-r1.ebuild8
-rw-r--r--acct-group/vboxusers/vboxusers-0-r2.ebuild8
-rw-r--r--acct-group/vdr/Manifest2
-rw-r--r--acct-group/vdr/vdr-0-r1.ebuild10
-rw-r--r--acct-group/vdr/vdr-0-r2.ebuild10
-rw-r--r--acct-group/vdradmin/Manifest2
-rw-r--r--acct-group/vdradmin/vdradmin-0-r1.ebuild10
-rw-r--r--acct-group/vdradmin/vdradmin-0-r2.ebuild10
-rw-r--r--acct-group/video/Manifest2
-rw-r--r--acct-group/video/video-0-r1.ebuild8
-rw-r--r--acct-group/video/video-0-r2.ebuild8
-rw-r--r--acct-group/vlock/Manifest2
-rw-r--r--acct-group/vlock/vlock-0-r1.ebuild10
-rw-r--r--acct-group/vlock/vlock-0.ebuild10
-rw-r--r--acct-group/vnstat/Manifest2
-rw-r--r--acct-group/vnstat/vnstat-0-r1.ebuild9
-rw-r--r--acct-group/vnstat/vnstat-0.ebuild9
-rw-r--r--acct-group/vpopmail/Manifest2
-rw-r--r--acct-group/vpopmail/vpopmail-0-r1.ebuild8
-rw-r--r--acct-group/vpopmail/vpopmail-0-r2.ebuild8
-rw-r--r--acct-group/wesnoth/Manifest2
-rw-r--r--acct-group/wesnoth/wesnoth-0-r1.ebuild8
-rw-r--r--acct-group/wesnoth/wesnoth-0-r2.ebuild8
-rw-r--r--acct-group/wheel/Manifest2
-rw-r--r--acct-group/wheel/wheel-0-r1.ebuild8
-rw-r--r--acct-group/wheel/wheel-0-r2.ebuild8
-rw-r--r--acct-group/wwwoffle/Manifest2
-rw-r--r--acct-group/wwwoffle/wwwoffle-0-r1.ebuild10
-rw-r--r--acct-group/wwwoffle/wwwoffle-0.ebuild10
-rw-r--r--acct-group/x2goprint/Manifest2
-rw-r--r--acct-group/x2goprint/x2goprint-0-r1.ebuild9
-rw-r--r--acct-group/x2goprint/x2goprint-0-r2.ebuild9
-rw-r--r--acct-group/x2gouser/Manifest2
-rw-r--r--acct-group/x2gouser/x2gouser-0-r1.ebuild9
-rw-r--r--acct-group/x2gouser/x2gouser-0-r2.ebuild9
-rw-r--r--acct-group/xpra/Manifest2
-rw-r--r--acct-group/xpra/xpra-0-r1.ebuild9
-rw-r--r--acct-group/xpra/xpra-0.ebuild9
-rw-r--r--acct-group/xrootd/Manifest2
-rw-r--r--acct-group/xrootd/xrootd-0-r1.ebuild9
-rw-r--r--acct-group/xrootd/xrootd-0-r2.ebuild9
-rw-r--r--acct-group/xwax/Manifest2
-rw-r--r--acct-group/xwax/xwax-0-r1.ebuild10
-rw-r--r--acct-group/xwax/xwax-0.ebuild10
-rw-r--r--acct-group/yubihsm-connector/Manifest2
-rw-r--r--acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild (renamed from acct-group/yubihsm-connector/yubihsm-connector-0.ebuild)0
-rw-r--r--acct-group/zabbix/Manifest2
-rw-r--r--acct-group/zabbix/zabbix-0-r1.ebuild9
-rw-r--r--acct-group/zabbix/zabbix-0.ebuild9
-rw-r--r--acct-group/zeppelin/Manifest2
-rw-r--r--acct-group/zeppelin/zeppelin-0-r1.ebuild9
-rw-r--r--acct-group/zeppelin/zeppelin-0-r2.ebuild9
-rw-r--r--acct-group/zetcd/Manifest2
-rw-r--r--acct-group/zetcd/zetcd-0-r1.ebuild10
-rw-r--r--acct-group/zetcd/zetcd-0.ebuild10
-rw-r--r--acct-group/ziproxy/Manifest2
-rw-r--r--acct-group/ziproxy/ziproxy-0-r1.ebuild8
-rw-r--r--acct-group/ziproxy/ziproxy-0.ebuild8
-rw-r--r--acct-group/znc/Manifest2
-rw-r--r--acct-group/znc/znc-0-r1.ebuild9
-rw-r--r--acct-group/znc/znc-0-r2.ebuild9
-rw-r--r--acct-group/zookeeper/Manifest2
-rw-r--r--acct-group/zookeeper/zookeeper-0-r1.ebuild10
-rw-r--r--acct-group/zookeeper/zookeeper-0.ebuild10
-rw-r--r--acct-user/Manifest.gzbin70859 -> 70799 bytes
-rw-r--r--acct-user/_cron-failure/Manifest2
-rw-r--r--acct-user/_cron-failure/_cron-failure-0-r1.ebuild12
-rw-r--r--acct-user/_cron-failure/_cron-failure-0.ebuild12
-rw-r--r--acct-user/aerospike-amc/Manifest2
-rw-r--r--acct-user/aerospike-amc/aerospike-amc-0-r1.ebuild13
-rw-r--r--acct-user/aerospike-amc/aerospike-amc-0.ebuild13
-rw-r--r--acct-user/airdcppd/Manifest2
-rw-r--r--acct-user/airdcppd/airdcppd-0-r1.ebuild16
-rw-r--r--acct-user/airdcppd/airdcppd-0-r2.ebuild16
-rw-r--r--acct-user/alertmanager/Manifest2
-rw-r--r--acct-user/alertmanager/alertmanager-0-r1.ebuild12
-rw-r--r--acct-user/alertmanager/alertmanager-0.ebuild12
-rw-r--r--acct-user/alias/Manifest2
-rw-r--r--acct-user/alias/alias-0-r1.ebuild18
-rw-r--r--acct-user/alias/alias-0-r2.ebuild18
-rw-r--r--acct-user/amanda/Manifest2
-rw-r--r--acct-user/amanda/amanda-0-r1.ebuild12
-rw-r--r--acct-user/amanda/amanda-0.ebuild12
-rw-r--r--acct-user/amavis/Manifest2
-rw-r--r--acct-user/amavis/amavis-0-r1.ebuild13
-rw-r--r--acct-user/amavis/amavis-0-r2.ebuild13
-rw-r--r--acct-user/amule/Manifest2
-rw-r--r--acct-user/amule/amule-0-r2.ebuild14
-rw-r--r--acct-user/amule/amule-0-r3.ebuild14
-rw-r--r--acct-user/anope/Manifest2
-rw-r--r--acct-user/anope/anope-0-r1.ebuild12
-rw-r--r--acct-user/anope/anope-0-r2.ebuild12
-rw-r--r--acct-user/apache/Manifest2
-rw-r--r--acct-user/apache/apache-0-r2.ebuild12
-rw-r--r--acct-user/apache/apache-0-r3.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/Manifest2
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0-r1.ebuild12
-rw-r--r--acct-user/apt-cacher-ng/apt-cacher-ng-0.ebuild12
-rw-r--r--acct-user/argus/Manifest2
-rw-r--r--acct-user/argus/argus-0-r1.ebuild13
-rw-r--r--acct-user/argus/argus-0.ebuild13
-rw-r--r--acct-user/arpwatch/Manifest2
-rw-r--r--acct-user/arpwatch/arpwatch-0-r1.ebuild13
-rw-r--r--acct-user/arpwatch/arpwatch-0.ebuild13
-rw-r--r--acct-user/artifactory/Manifest2
-rw-r--r--acct-user/artifactory/artifactory-0-r1.ebuild14
-rw-r--r--acct-user/artifactory/artifactory-0.ebuild14
-rw-r--r--acct-user/aspnet/Manifest2
-rw-r--r--acct-user/aspnet/aspnet-0-r1.ebuild13
-rw-r--r--acct-user/aspnet/aspnet-0.ebuild13
-rw-r--r--acct-user/asterisk/Manifest2
-rw-r--r--acct-user/asterisk/asterisk-0-r1.ebuild12
-rw-r--r--acct-user/asterisk/asterisk-0-r2.ebuild12
-rw-r--r--acct-user/at/Manifest2
-rw-r--r--acct-user/at/at-0-r1.ebuild12
-rw-r--r--acct-user/at/at-0.ebuild12
-rw-r--r--acct-user/atheme-services/Manifest2
-rw-r--r--acct-user/atheme-services/atheme-services-0-r1.ebuild12
-rw-r--r--acct-user/atheme-services/atheme-services-0-r2.ebuild12
-rw-r--r--acct-user/automatic/Manifest2
-rw-r--r--acct-user/automatic/automatic-0-r1.ebuild (renamed from acct-user/automatic/automatic-0.ebuild)0
-rw-r--r--acct-user/automx2/Manifest2
-rw-r--r--acct-user/automx2/automx2-0-r1.ebuild14
-rw-r--r--acct-user/automx2/automx2-0-r2.ebuild14
-rw-r--r--acct-user/avahi-autoipd/Manifest2
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r1.ebuild12
-rw-r--r--acct-user/avahi-autoipd/avahi-autoipd-0-r2.ebuild12
-rw-r--r--acct-user/avahi/Manifest2
-rw-r--r--acct-user/avahi/avahi-0-r1.ebuild12
-rw-r--r--acct-user/avahi/avahi-0-r2.ebuild12
-rw-r--r--acct-user/axtls/Manifest2
-rw-r--r--acct-user/axtls/axtls-0-r1.ebuild13
-rw-r--r--acct-user/axtls/axtls-0.ebuild13
-rw-r--r--acct-user/backuppc/Manifest2
-rw-r--r--acct-user/backuppc/backuppc-0-r1.ebuild15
-rw-r--r--acct-user/backuppc/backuppc-0.ebuild15
-rw-r--r--acct-user/bacula/Manifest2
-rw-r--r--acct-user/bacula/bacula-0-r1.ebuild13
-rw-r--r--acct-user/bacula/bacula-0-r2.ebuild13
-rw-r--r--acct-user/bareos/Manifest2
-rw-r--r--acct-user/bareos/bareos-0-r1.ebuild13
-rw-r--r--acct-user/bareos/bareos-0-r2.ebuild13
-rw-r--r--acct-user/beanstalk/Manifest2
-rw-r--r--acct-user/beanstalk/beanstalk-0-r1.ebuild14
-rw-r--r--acct-user/beanstalk/beanstalk-0.ebuild14
-rw-r--r--acct-user/bedrock/Manifest2
-rw-r--r--acct-user/bedrock/bedrock-0-r1.ebuild13
-rw-r--r--acct-user/bedrock/bedrock-0-r2.ebuild13
-rw-r--r--acct-user/biboumi/Manifest2
-rw-r--r--acct-user/biboumi/biboumi-0-r1.ebuild12
-rw-r--r--acct-user/biboumi/biboumi-0.ebuild12
-rw-r--r--acct-user/bind_exporter/Manifest2
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r1.ebuild12
-rw-r--r--acct-user/bind_exporter/bind_exporter-0-r2.ebuild12
-rw-r--r--acct-user/bird/Manifest2
-rw-r--r--acct-user/bird/bird-0-r1.ebuild13
-rw-r--r--acct-user/bird/bird-0.ebuild13
-rw-r--r--acct-user/bitcoin/Manifest2
-rw-r--r--acct-user/bitcoin/bitcoin-0-r1.ebuild12
-rw-r--r--acct-user/bitcoin/bitcoin-0-r2.ebuild12
-rw-r--r--acct-user/bitflu/Manifest2
-rw-r--r--acct-user/bitflu/bitflu-0-r1.ebuild14
-rw-r--r--acct-user/bitflu/bitflu-0.ebuild14
-rw-r--r--acct-user/bitlbee/Manifest2
-rw-r--r--acct-user/bitlbee/bitlbee-0-r1.ebuild12
-rw-r--r--acct-user/bitlbee/bitlbee-0-r2.ebuild12
-rw-r--r--acct-user/blackbox_exporter/Manifest2
-rw-r--r--acct-user/blackbox_exporter/blackbox_exporter-0-r1.ebuild12
-rw-r--r--acct-user/blackbox_exporter/blackbox_exporter-0.ebuild12
-rw-r--r--acct-user/boinc/Manifest2
-rw-r--r--acct-user/boinc/boinc-0-r1.ebuild14
-rw-r--r--acct-user/boinc/boinc-0.ebuild14
-rw-r--r--acct-user/brltty/Manifest2
-rw-r--r--acct-user/brltty/brltty-0-r1.ebuild13
-rw-r--r--acct-user/brltty/brltty-0.ebuild13
-rw-r--r--acct-user/buildbot/Manifest2
-rw-r--r--acct-user/buildbot/buildbot-0-r1.ebuild12
-rw-r--r--acct-user/buildbot/buildbot-0-r2.ebuild12
-rw-r--r--acct-user/burp/Manifest2
-rw-r--r--acct-user/burp/burp-0-r1.ebuild12
-rw-r--r--acct-user/burp/burp-0-r2.ebuild12
-rw-r--r--acct-user/burrow_exporter/Manifest2
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild12
-rw-r--r--acct-user/burrow_exporter/burrow_exporter-0-r2.ebuild12
-rw-r--r--acct-user/cadvisor/Manifest2
-rw-r--r--acct-user/cadvisor/cadvisor-0-r1.ebuild12
-rw-r--r--acct-user/cadvisor/cadvisor-0-r2.ebuild12
-rw-r--r--acct-user/cancd/Manifest2
-rw-r--r--acct-user/cancd/cancd-0-r1.ebuild13
-rw-r--r--acct-user/cancd/cancd-0-r2.ebuild13
-rw-r--r--acct-user/carbon/Manifest2
-rw-r--r--acct-user/carbon/carbon-0-r1.ebuild12
-rw-r--r--acct-user/carbon/carbon-0-r2.ebuild12
-rw-r--r--acct-user/ceph/Manifest2
-rw-r--r--acct-user/ceph/ceph-0-r2.ebuild (renamed from acct-user/ceph/ceph-0-r1.ebuild)0
-rw-r--r--acct-user/cgit/Manifest2
-rw-r--r--acct-user/cgit/cgit-0-r1.ebuild13
-rw-r--r--acct-user/cgit/cgit-0.ebuild13
-rw-r--r--acct-user/chronograf/Manifest2
-rw-r--r--acct-user/chronograf/chronograf-0-r1.ebuild13
-rw-r--r--acct-user/chronograf/chronograf-0-r2.ebuild13
-rw-r--r--acct-user/cinder/Manifest2
-rw-r--r--acct-user/cinder/cinder-0-r1.ebuild14
-rw-r--r--acct-user/cinder/cinder-0-r2.ebuild14
-rw-r--r--acct-user/clair/Manifest2
-rw-r--r--acct-user/clair/clair-0-r1.ebuild12
-rw-r--r--acct-user/clair/clair-0-r2.ebuild12
-rw-r--r--acct-user/clamav/Manifest2
-rw-r--r--acct-user/clamav/clamav-0-r1.ebuild11
-rw-r--r--acct-user/clamav/clamav-0-r2.ebuild11
-rw-r--r--acct-user/cntlm/Manifest2
-rw-r--r--acct-user/cntlm/cntlm-0-r1.ebuild13
-rw-r--r--acct-user/cntlm/cntlm-0.ebuild13
-rw-r--r--acct-user/cockroach/Manifest2
-rw-r--r--acct-user/cockroach/cockroach-0-r1.ebuild15
-rw-r--r--acct-user/cockroach/cockroach-0.ebuild15
-rw-r--r--acct-user/collectd/Manifest2
-rw-r--r--acct-user/collectd/collectd-0-r1.ebuild14
-rw-r--r--acct-user/collectd/collectd-0.ebuild14
-rw-r--r--acct-user/colord/Manifest2
-rw-r--r--acct-user/colord/colord-0-r1.ebuild13
-rw-r--r--acct-user/colord/colord-0.ebuild13
-rw-r--r--acct-user/consul-template/Manifest2
-rw-r--r--acct-user/consul-template/consul-template-0-r1.ebuild12
-rw-r--r--acct-user/consul-template/consul-template-0-r2.ebuild12
-rw-r--r--acct-user/consul/Manifest2
-rw-r--r--acct-user/consul/consul-0-r1.ebuild13
-rw-r--r--acct-user/consul/consul-0-r2.ebuild13
-rw-r--r--acct-user/consul_exporter/Manifest2
-rw-r--r--acct-user/consul_exporter/consul_exporter-0-r1.ebuild12
-rw-r--r--acct-user/consul_exporter/consul_exporter-0.ebuild12
-rw-r--r--acct-user/coredns/Manifest2
-rw-r--r--acct-user/coredns/coredns-0-r1.ebuild14
-rw-r--r--acct-user/coredns/coredns-0.ebuild14
-rw-r--r--acct-user/croc/Manifest2
-rw-r--r--acct-user/croc/croc-0-r1.ebuild12
-rw-r--r--acct-user/croc/croc-0.ebuild12
-rw-r--r--acct-user/cron/Manifest2
-rw-r--r--acct-user/cron/cron-0-r1.ebuild14
-rw-r--r--acct-user/cron/cron-0.ebuild14
-rw-r--r--acct-user/cvmfs/Manifest2
-rw-r--r--acct-user/cvmfs/cvmfs-0-r1.ebuild12
-rw-r--r--acct-user/cvmfs/cvmfs-0-r2.ebuild12
-rw-r--r--acct-user/cyrus/Manifest2
-rw-r--r--acct-user/cyrus/cyrus-0-r2.ebuild12
-rw-r--r--acct-user/cyrus/cyrus-0-r3.ebuild12
-rw-r--r--acct-user/darkstat/Manifest2
-rw-r--r--acct-user/darkstat/darkstat-0-r1.ebuild12
-rw-r--r--acct-user/darkstat/darkstat-0.ebuild12
-rw-r--r--acct-user/davfs2/Manifest2
-rw-r--r--acct-user/davfs2/davfs2-0-r1.ebuild11
-rw-r--r--acct-user/davfs2/davfs2-0-r2.ebuild11
-rw-r--r--acct-user/dbmail/Manifest2
-rw-r--r--acct-user/dbmail/dbmail-0-r1.ebuild11
-rw-r--r--acct-user/dbmail/dbmail-0.ebuild11
-rw-r--r--acct-user/dbskkd/Manifest2
-rw-r--r--acct-user/dbskkd/dbskkd-0-r1.ebuild13
-rw-r--r--acct-user/dbskkd/dbskkd-0.ebuild13
-rw-r--r--acct-user/ddclient/Manifest2
-rw-r--r--acct-user/ddclient/ddclient-0-r1.ebuild13
-rw-r--r--acct-user/ddclient/ddclient-0-r2.ebuild13
-rw-r--r--acct-user/defang/Manifest2
-rw-r--r--acct-user/defang/defang-0-r1.ebuild13
-rw-r--r--acct-user/defang/defang-0.ebuild13
-rw-r--r--acct-user/dehydrated/Manifest2
-rw-r--r--acct-user/dehydrated/dehydrated-0-r1.ebuild14
-rw-r--r--acct-user/dehydrated/dehydrated-0.ebuild14
-rw-r--r--acct-user/deluge/Manifest2
-rw-r--r--acct-user/deluge/deluge-0-r2.ebuild (renamed from acct-user/deluge/deluge-0-r1.ebuild)0
-rw-r--r--acct-user/dhcp/Manifest2
-rw-r--r--acct-user/dhcp/dhcp-0-r1.ebuild12
-rw-r--r--acct-user/dhcp/dhcp-0-r2.ebuild12
-rw-r--r--acct-user/dhcpcd/Manifest2
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r1.ebuild13
-rw-r--r--acct-user/dhcpcd/dhcpcd-0-r2.ebuild13
-rw-r--r--acct-user/dictd/Manifest2
-rw-r--r--acct-user/dictd/dictd-0-r1.ebuild12
-rw-r--r--acct-user/dictd/dictd-0.ebuild12
-rw-r--r--acct-user/dirsrv/Manifest2
-rw-r--r--acct-user/dirsrv/dirsrv-0-r1.ebuild12
-rw-r--r--acct-user/dirsrv/dirsrv-0.ebuild12
-rw-r--r--acct-user/distcc/Manifest2
-rw-r--r--acct-user/distcc/distcc-1-r1.ebuild12
-rw-r--r--acct-user/distcc/distcc-1.ebuild12
-rw-r--r--acct-user/dnrd/Manifest2
-rw-r--r--acct-user/dnrd/dnrd-0-r1.ebuild13
-rw-r--r--acct-user/dnrd/dnrd-0.ebuild13
-rw-r--r--acct-user/dnscache/Manifest2
-rw-r--r--acct-user/dnscache/dnscache-0-r1.ebuild11
-rw-r--r--acct-user/dnscache/dnscache-0.ebuild11
-rw-r--r--acct-user/dnscrypt-proxy/Manifest2
-rw-r--r--acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r1.ebuild12
-rw-r--r--acct-user/dnscrypt-proxy/dnscrypt-proxy-0-r2.ebuild12
-rw-r--r--acct-user/dnsdist/Manifest2
-rw-r--r--acct-user/dnsdist/dnsdist-0-r1.ebuild13
-rw-r--r--acct-user/dnsdist/dnsdist-0-r2.ebuild13
-rw-r--r--acct-user/dnslog/Manifest2
-rw-r--r--acct-user/dnslog/dnslog-0-r1.ebuild11
-rw-r--r--acct-user/dnslog/dnslog-0.ebuild11
-rw-r--r--acct-user/dnsmasq/Manifest2
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r1.ebuild13
-rw-r--r--acct-user/dnsmasq/dnsmasq-0-r2.ebuild13
-rw-r--r--acct-user/dnsmasq_exporter/Manifest2
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r1.ebuild12
-rw-r--r--acct-user/dnsmasq_exporter/dnsmasq_exporter-0-r2.ebuild12
-rw-r--r--acct-user/docker_auth/Manifest2
-rw-r--r--acct-user/docker_auth/docker_auth-0-r1.ebuild12
-rw-r--r--acct-user/docker_auth/docker_auth-0-r2.ebuild12
-rw-r--r--acct-user/dovecot/Manifest2
-rw-r--r--acct-user/dovecot/dovecot-0-r1.ebuild12
-rw-r--r--acct-user/dovecot/dovecot-0-r2.ebuild12
-rw-r--r--acct-user/dovenull/Manifest2
-rw-r--r--acct-user/dovenull/dovenull-0-r1.ebuild12
-rw-r--r--acct-user/dovenull/dovenull-0-r2.ebuild12
-rw-r--r--acct-user/drone/Manifest2
-rw-r--r--acct-user/drone/drone-0-r1.ebuild14
-rw-r--r--acct-user/drone/drone-0.ebuild14
-rw-r--r--acct-user/duende/Manifest2
-rw-r--r--acct-user/duende/duende-0-r1.ebuild14
-rw-r--r--acct-user/duende/duende-0-r2.ebuild14
-rw-r--r--acct-user/ejabberd/Manifest2
-rw-r--r--acct-user/ejabberd/ejabberd-2-r1.ebuild22
-rw-r--r--acct-user/ejabberd/ejabberd-2.ebuild22
-rw-r--r--acct-user/elasticsearch/Manifest2
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r1.ebuild13
-rw-r--r--acct-user/elasticsearch/elasticsearch-0-r2.ebuild13
-rw-r--r--acct-user/elasticsearch_exporter/Manifest2
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild12
-rw-r--r--acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r2.ebuild12
-rw-r--r--acct-user/energi3/Manifest2
-rw-r--r--acct-user/energi3/energi3-0-r1.ebuild12
-rw-r--r--acct-user/energi3/energi3-0.ebuild12
-rw-r--r--acct-user/epmd/Manifest2
-rw-r--r--acct-user/epmd/epmd-0-r1.ebuild12
-rw-r--r--acct-user/epmd/epmd-0-r2.ebuild12
-rw-r--r--acct-user/err/Manifest2
-rw-r--r--acct-user/err/err-0-r1.ebuild11
-rw-r--r--acct-user/err/err-0.ebuild11
-rw-r--r--acct-user/etcd/Manifest2
-rw-r--r--acct-user/etcd/etcd-0-r1.ebuild14
-rw-r--r--acct-user/etcd/etcd-0-r2.ebuild14
-rw-r--r--acct-user/exabgp/Manifest2
-rw-r--r--acct-user/exabgp/exabgp-0-r1.ebuild13
-rw-r--r--acct-user/exabgp/exabgp-0-r2.ebuild13
-rw-r--r--acct-user/ez-ipupd/Manifest2
-rw-r--r--acct-user/ez-ipupd/ez-ipupd-0-r1.ebuild14
-rw-r--r--acct-user/ez-ipupd/ez-ipupd-0.ebuild14
-rw-r--r--acct-user/fax/Manifest2
-rw-r--r--acct-user/fax/fax-0-r1.ebuild13
-rw-r--r--acct-user/fax/fax-0.ebuild13
-rw-r--r--acct-user/fcron/Manifest2
-rw-r--r--acct-user/fcron/fcron-0-r1.ebuild13
-rw-r--r--acct-user/fcron/fcron-0.ebuild13
-rw-r--r--acct-user/fdm/Manifest2
-rw-r--r--acct-user/fdm/fdm-0-r1.ebuild13
-rw-r--r--acct-user/fdm/fdm-0.ebuild13
-rw-r--r--acct-user/fetchmail/Manifest2
-rw-r--r--acct-user/fetchmail/fetchmail-0-r1.ebuild14
-rw-r--r--acct-user/fetchmail/fetchmail-0-r2.ebuild14
-rw-r--r--acct-user/fhem/Manifest2
-rw-r--r--acct-user/fhem/fhem-0-r1.ebuild14
-rw-r--r--acct-user/fhem/fhem-0-r2.ebuild14
-rw-r--r--acct-user/firebird/Manifest2
-rw-r--r--acct-user/firebird/firebird-0-r2.ebuild18
-rw-r--r--acct-user/firebird/firebird-0-r3.ebuild18
-rw-r--r--acct-user/flatpak/Manifest2
-rw-r--r--acct-user/flatpak/flatpak-0-r1.ebuild10
-rw-r--r--acct-user/flatpak/flatpak-0.ebuild10
-rw-r--r--acct-user/flows/Manifest2
-rw-r--r--acct-user/flows/flows-0-r1.ebuild13
-rw-r--r--acct-user/flows/flows-0.ebuild13
-rw-r--r--acct-user/fluentd/Manifest2
-rw-r--r--acct-user/fluentd/fluentd-0-r1.ebuild12
-rw-r--r--acct-user/fluentd/fluentd-0-r2.ebuild12
-rw-r--r--acct-user/fnord/Manifest2
-rw-r--r--acct-user/fnord/fnord-0-r1.ebuild14
-rw-r--r--acct-user/fnord/fnord-0.ebuild14
-rw-r--r--acct-user/fnordlog/Manifest2
-rw-r--r--acct-user/fnordlog/fnordlog-0-r1.ebuild14
-rw-r--r--acct-user/fnordlog/fnordlog-0.ebuild14
-rw-r--r--acct-user/foldingathome/Manifest2
-rw-r--r--acct-user/foldingathome/foldingathome-0-r1.ebuild14
-rw-r--r--acct-user/foldingathome/foldingathome-0.ebuild14
-rw-r--r--acct-user/fp-multiuser/Manifest2
-rw-r--r--acct-user/fp-multiuser/fp-multiuser-0-r1.ebuild14
-rw-r--r--acct-user/fp-multiuser/fp-multiuser-0.ebuild14
-rw-r--r--acct-user/freenet/Manifest2
-rw-r--r--acct-user/freenet/freenet-0-r1.ebuild14
-rw-r--r--acct-user/freenet/freenet-0.ebuild14
-rw-r--r--acct-user/fritzbox_smarthome_exporter/Manifest2
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0-r1.ebuild13
-rw-r--r--acct-user/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.ebuild13
-rw-r--r--acct-user/frr/Manifest2
-rw-r--r--acct-user/frr/frr-0-r1.ebuild11
-rw-r--r--acct-user/frr/frr-0.ebuild11
-rw-r--r--acct-user/ftp/Manifest2
-rw-r--r--acct-user/ftp/ftp-0-r3.ebuild15
-rw-r--r--acct-user/ftp/ftp-0-r4.ebuild15
-rw-r--r--acct-user/ftpproxy/Manifest2
-rw-r--r--acct-user/ftpproxy/ftpproxy-0-r1.ebuild15
-rw-r--r--acct-user/ftpproxy/ftpproxy-0.ebuild15
-rw-r--r--acct-user/gatling/Manifest2
-rw-r--r--acct-user/gatling/gatling-0-r1.ebuild12
-rw-r--r--acct-user/gatling/gatling-0-r2.ebuild12
-rw-r--r--acct-user/gauth/Manifest2
-rw-r--r--acct-user/gauth/gauth-0-r1.ebuild13
-rw-r--r--acct-user/gauth/gauth-0.ebuild13
-rw-r--r--acct-user/gdm/Manifest2
-rw-r--r--acct-user/gdm/gdm-0-r1.ebuild13
-rw-r--r--acct-user/gdm/gdm-0.ebuild13
-rw-r--r--acct-user/geneweb/Manifest2
-rw-r--r--acct-user/geneweb/geneweb-0-r1.ebuild14
-rw-r--r--acct-user/geneweb/geneweb-0-r2.ebuild14
-rw-r--r--acct-user/geoclue/Manifest2
-rw-r--r--acct-user/geoclue/geoclue-0-r1.ebuild13
-rw-r--r--acct-user/geoclue/geoclue-0.ebuild13
-rw-r--r--acct-user/gerbera/Manifest2
-rw-r--r--acct-user/gerbera/gerbera-0-r1.ebuild13
-rw-r--r--acct-user/gerbera/gerbera-0-r2.ebuild13
-rw-r--r--acct-user/git/Manifest2
-rw-r--r--acct-user/git/git-0-r3.ebuild (renamed from acct-user/git/git-0-r2.ebuild)0
-rw-r--r--acct-user/github-exporter/Manifest2
-rw-r--r--acct-user/github-exporter/github-exporter-0-r1.ebuild12
-rw-r--r--acct-user/github-exporter/github-exporter-0.ebuild12
-rw-r--r--acct-user/gitlab-runner/Manifest2
-rw-r--r--acct-user/gitlab-runner/gitlab-runner-1-r1.ebuild16
-rw-r--r--acct-user/gitlab-runner/gitlab-runner-1.ebuild16
-rw-r--r--acct-user/gkrellmd/Manifest2
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r1.ebuild12
-rw-r--r--acct-user/gkrellmd/gkrellmd-0-r2.ebuild12
-rw-r--r--acct-user/glance/Manifest2
-rw-r--r--acct-user/glance/glance-0-r1.ebuild14
-rw-r--r--acct-user/glance/glance-0-r2.ebuild14
-rw-r--r--acct-user/gluster/Manifest2
-rw-r--r--acct-user/gluster/gluster-0-r1.ebuild14
-rw-r--r--acct-user/gluster/gluster-0-r2.ebuild14
-rw-r--r--acct-user/gns3/Manifest2
-rw-r--r--acct-user/gns3/gns3-0-r1.ebuild12
-rw-r--r--acct-user/gns3/gns3-0.ebuild12
-rw-r--r--acct-user/gnump3d/Manifest2
-rw-r--r--acct-user/gnump3d/gnump3d-0-r1.ebuild13
-rw-r--r--acct-user/gnump3d/gnump3d-0.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/Manifest2
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0-r1.ebuild13
-rw-r--r--acct-user/gnupg-pkcs11-scd-proxy/gnupg-pkcs11-scd-proxy-0.ebuild13
-rw-r--r--acct-user/goaccess/Manifest2
-rw-r--r--acct-user/goaccess/goaccess-0-r1.ebuild (renamed from acct-user/goaccess/goaccess-0.ebuild)0
-rw-r--r--acct-user/gopher/Manifest2
-rw-r--r--acct-user/gopher/gopher-0-r1.ebuild12
-rw-r--r--acct-user/gopher/gopher-0.ebuild12
-rw-r--r--acct-user/gopherd/Manifest2
-rw-r--r--acct-user/gopherd/gopherd-0-r1.ebuild14
-rw-r--r--acct-user/gopherd/gopherd-0.ebuild14
-rw-r--r--acct-user/gpsd/Manifest2
-rw-r--r--acct-user/gpsd/gpsd-0-r2.ebuild13
-rw-r--r--acct-user/gpsd/gpsd-0-r3.ebuild13
-rw-r--r--acct-user/grafana/Manifest2
-rw-r--r--acct-user/grafana/grafana-0-r1.ebuild13
-rw-r--r--acct-user/grafana/grafana-0-r2.ebuild13
-rw-r--r--acct-user/graylog/Manifest2
-rw-r--r--acct-user/graylog/graylog-0-r1.ebuild11
-rw-r--r--acct-user/graylog/graylog-0-r2.ebuild11
-rw-r--r--acct-user/greetd/Manifest2
-rw-r--r--acct-user/greetd/greetd-0-r1.ebuild12
-rw-r--r--acct-user/greetd/greetd-0-r2.ebuild12
-rw-r--r--acct-user/grok_exporter/Manifest2
-rw-r--r--acct-user/grok_exporter/grok_exporter-0-r1.ebuild12
-rw-r--r--acct-user/grok_exporter/grok_exporter-0.ebuild12
-rw-r--r--acct-user/groonga/Manifest2
-rw-r--r--acct-user/groonga/groonga-0-r1.ebuild13
-rw-r--r--acct-user/groonga/groonga-0.ebuild13
-rw-r--r--acct-user/gvm/Manifest2
-rw-r--r--acct-user/gvm/gvm-0-r1.ebuild13
-rw-r--r--acct-user/gvm/gvm-0-r2.ebuild13
-rw-r--r--acct-user/h2o/Manifest2
-rw-r--r--acct-user/h2o/h2o-0-r1.ebuild13
-rw-r--r--acct-user/h2o/h2o-0.ebuild13
-rw-r--r--acct-user/hacluster/Manifest2
-rw-r--r--acct-user/hacluster/hacluster-0-r1.ebuild14
-rw-r--r--acct-user/hacluster/hacluster-0.ebuild14
-rw-r--r--acct-user/haproxy/Manifest2
-rw-r--r--acct-user/haproxy/haproxy-0-r1.ebuild11
-rw-r--r--acct-user/haproxy/haproxy-0-r2.ebuild11
-rw-r--r--acct-user/havp/Manifest2
-rw-r--r--acct-user/havp/havp-0-r2.ebuild (renamed from acct-user/havp/havp-0-r1.ebuild)0
-rw-r--r--acct-user/headscale/Manifest2
-rw-r--r--acct-user/headscale/headscale-0-r1.ebuild (renamed from acct-user/headscale/headscale-0.ebuild)0
-rw-r--r--acct-user/heat/Manifest2
-rw-r--r--acct-user/heat/heat-0-r1.ebuild14
-rw-r--r--acct-user/heat/heat-0-r2.ebuild14
-rw-r--r--acct-user/hsqldb/Manifest2
-rw-r--r--acct-user/hsqldb/hsqldb-0-r1.ebuild12
-rw-r--r--acct-user/hsqldb/hsqldb-0.ebuild12
-rw-r--r--acct-user/http/Manifest2
-rw-r--r--acct-user/http/http-0-r1.ebuild14
-rw-r--r--acct-user/http/http-0.ebuild14
-rw-r--r--acct-user/i2p/Manifest2
-rw-r--r--acct-user/i2p/i2p-0-r1.ebuild13
-rw-r--r--acct-user/i2p/i2p-0-r2.ebuild13
-rw-r--r--acct-user/i2pd/Manifest2
-rw-r--r--acct-user/i2pd/i2pd-0-r1.ebuild14
-rw-r--r--acct-user/i2pd/i2pd-0-r2.ebuild14
-rw-r--r--acct-user/icecast/Manifest2
-rw-r--r--acct-user/icecast/icecast-0-r1.ebuild13
-rw-r--r--acct-user/icecast/icecast-0.ebuild13
-rw-r--r--acct-user/icecream/Manifest2
-rw-r--r--acct-user/icecream/icecream-0-r1.ebuild14
-rw-r--r--acct-user/icecream/icecream-0.ebuild14
-rw-r--r--acct-user/ices/Manifest2
-rw-r--r--acct-user/ices/ices-0-r1.ebuild13
-rw-r--r--acct-user/ices/ices-0.ebuild13
-rw-r--r--acct-user/icinga/Manifest2
-rw-r--r--acct-user/icinga/icinga-0-r1.ebuild13
-rw-r--r--acct-user/icinga/icinga-0-r2.ebuild13
-rw-r--r--acct-user/icingadirector/Manifest2
-rw-r--r--acct-user/icingadirector/icingadirector-0-r1.ebuild13
-rw-r--r--acct-user/icingadirector/icingadirector-0.ebuild13
-rw-r--r--acct-user/inadyn/Manifest2
-rw-r--r--acct-user/inadyn/inadyn-0-r1.ebuild (renamed from acct-user/inadyn/inadyn-0.ebuild)0
-rw-r--r--acct-user/influxdb/Manifest2
-rw-r--r--acct-user/influxdb/influxdb-0-r1.ebuild13
-rw-r--r--acct-user/influxdb/influxdb-0-r2.ebuild13
-rw-r--r--acct-user/inspircd/Manifest2
-rw-r--r--acct-user/inspircd/inspircd-0-r1.ebuild12
-rw-r--r--acct-user/inspircd/inspircd-0-r2.ebuild12
-rw-r--r--acct-user/ipfs/Manifest2
-rw-r--r--acct-user/ipfs/ipfs-0-r1.ebuild14
-rw-r--r--acct-user/ipfs/ipfs-0-r2.ebuild14
-rw-r--r--acct-user/ippl/Manifest2
-rw-r--r--acct-user/ippl/ippl-0-r1.ebuild12
-rw-r--r--acct-user/ippl/ippl-0-r2.ebuild12
-rw-r--r--acct-user/ipsec/Manifest2
-rw-r--r--acct-user/ipsec/ipsec-0-r1.ebuild13
-rw-r--r--acct-user/ipsec/ipsec-0.ebuild13
-rw-r--r--acct-user/ipsentinel/Manifest2
-rw-r--r--acct-user/ipsentinel/ipsentinel-0-r1.ebuild13
-rw-r--r--acct-user/ipsentinel/ipsentinel-0.ebuild13
-rw-r--r--acct-user/iroffer/Manifest2
-rw-r--r--acct-user/iroffer/iroffer-0-r1.ebuild11
-rw-r--r--acct-user/iroffer/iroffer-0.ebuild11
-rw-r--r--acct-user/jellyfin/Manifest2
-rw-r--r--acct-user/jellyfin/jellyfin-0-r1.ebuild12
-rw-r--r--acct-user/jellyfin/jellyfin-0-r2.ebuild12
-rw-r--r--acct-user/jenkins/Manifest2
-rw-r--r--acct-user/jenkins/jenkins-0-r1.ebuild14
-rw-r--r--acct-user/jenkins/jenkins-0.ebuild14
-rw-r--r--acct-user/kafka/Manifest2
-rw-r--r--acct-user/kafka/kafka-0-r1.ebuild15
-rw-r--r--acct-user/kafka/kafka-0-r2.ebuild15
-rw-r--r--acct-user/kapacitor/Manifest2
-rw-r--r--acct-user/kapacitor/kapacitor-0-r1.ebuild13
-rw-r--r--acct-user/kapacitor/kapacitor-0-r2.ebuild13
-rw-r--r--acct-user/karma/Manifest2
-rw-r--r--acct-user/karma/karma-0-r1.ebuild13
-rw-r--r--acct-user/karma/karma-0.ebuild13
-rw-r--r--acct-user/keystone/Manifest2
-rw-r--r--acct-user/keystone/keystone-0-r1.ebuild14
-rw-r--r--acct-user/keystone/keystone-0-r2.ebuild14
-rw-r--r--acct-user/kibana/Manifest2
-rw-r--r--acct-user/kibana/kibana-0-r1.ebuild13
-rw-r--r--acct-user/kibana/kibana-0-r2.ebuild13
-rw-r--r--acct-user/kismet/Manifest2
-rw-r--r--acct-user/kismet/kismet-0-r1.ebuild15
-rw-r--r--acct-user/kismet/kismet-0-r2.ebuild15
-rw-r--r--acct-user/knot-resolver/Manifest2
-rw-r--r--acct-user/knot-resolver/knot-resolver-0-r1.ebuild12
-rw-r--r--acct-user/knot-resolver/knot-resolver-0.ebuild12
-rw-r--r--acct-user/knot/Manifest2
-rw-r--r--acct-user/knot/knot-0-r1.ebuild13
-rw-r--r--acct-user/knot/knot-0-r2.ebuild13
-rw-r--r--acct-user/kube-apiserver/Manifest2
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r1.ebuild12
-rw-r--r--acct-user/kube-apiserver/kube-apiserver-0-r2.ebuild12
-rw-r--r--acct-user/kube-controller-manager/Manifest2
-rw-r--r--acct-user/kube-controller-manager/kube-controller-manager-0-r1.ebuild12
-rw-r--r--acct-user/kube-controller-manager/kube-controller-manager-0-r2.ebuild12
-rw-r--r--acct-user/kube-scheduler/Manifest2
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r1.ebuild12
-rw-r--r--acct-user/kube-scheduler/kube-scheduler-0-r2.ebuild12
-rw-r--r--acct-user/ldap/Manifest2
-rw-r--r--acct-user/ldap/ldap-0-r1.ebuild16
-rw-r--r--acct-user/ldap/ldap-0.ebuild16
-rw-r--r--acct-user/libreoffice/Manifest2
-rw-r--r--acct-user/libreoffice/libreoffice-0-r1.ebuild14
-rw-r--r--acct-user/libreoffice/libreoffice-0.ebuild14
-rw-r--r--acct-user/lightdm/Manifest2
-rw-r--r--acct-user/lightdm/lightdm-0-r1.ebuild14
-rw-r--r--acct-user/lightdm/lightdm-0.ebuild14
-rw-r--r--acct-user/lighttpd/Manifest2
-rw-r--r--acct-user/lighttpd/lighttpd-0-r1.ebuild12
-rw-r--r--acct-user/lighttpd/lighttpd-0-r2.ebuild12
-rw-r--r--acct-user/litecoin/Manifest2
-rw-r--r--acct-user/litecoin/litecoin-0-r1.ebuild14
-rw-r--r--acct-user/litecoin/litecoin-0.ebuild14
-rw-r--r--acct-user/lldpd/Manifest2
-rw-r--r--acct-user/lldpd/lldpd-0-r1.ebuild13
-rw-r--r--acct-user/lldpd/lldpd-0-r2.ebuild13
-rw-r--r--acct-user/logcheck/Manifest2
-rw-r--r--acct-user/logcheck/logcheck-0-r1.ebuild13
-rw-r--r--acct-user/logcheck/logcheck-0.ebuild13
-rw-r--r--acct-user/logstash/Manifest2
-rw-r--r--acct-user/logstash/logstash-0-r1.ebuild13
-rw-r--r--acct-user/logstash/logstash-0-r2.ebuild13
-rw-r--r--acct-user/logsurfer/Manifest2
-rw-r--r--acct-user/logsurfer/logsurfer-0-r1.ebuild13
-rw-r--r--acct-user/logsurfer/logsurfer-0.ebuild13
-rw-r--r--acct-user/lxc/Manifest2
-rw-r--r--acct-user/lxc/lxc-0-r1.ebuild12
-rw-r--r--acct-user/lxc/lxc-0.ebuild12
-rw-r--r--acct-user/mail/Manifest2
-rw-r--r--acct-user/mail/mail-0-r1.ebuild15
-rw-r--r--acct-user/mail/mail-0-r2.ebuild15
-rw-r--r--acct-user/man/Manifest2
-rw-r--r--acct-user/man/man-1-r1.ebuild11
-rw-r--r--acct-user/man/man-1-r2.ebuild11
-rw-r--r--acct-user/maradns/Manifest2
-rw-r--r--acct-user/maradns/maradns-0-r1.ebuild11
-rw-r--r--acct-user/maradns/maradns-0-r2.ebuild11
-rw-r--r--acct-user/memcached/Manifest2
-rw-r--r--acct-user/memcached/memcached-0-r1.ebuild12
-rw-r--r--acct-user/memcached/memcached-0-r2.ebuild12
-rw-r--r--acct-user/memcached_exporter/Manifest2
-rw-r--r--acct-user/memcached_exporter/memcached_exporter-0-r1.ebuild12
-rw-r--r--acct-user/memcached_exporter/memcached_exporter-0.ebuild12
-rw-r--r--acct-user/messagebus/Manifest2
-rw-r--r--acct-user/messagebus/messagebus-0-r1.ebuild11
-rw-r--r--acct-user/messagebus/messagebus-0-r2.ebuild11
-rw-r--r--acct-user/mgraph/Manifest2
-rw-r--r--acct-user/mgraph/mgraph-0-r1.ebuild14
-rw-r--r--acct-user/mgraph/mgraph-0.ebuild14
-rw-r--r--acct-user/milter-regex/Manifest2
-rw-r--r--acct-user/milter-regex/milter-regex-0-r1.ebuild13
-rw-r--r--acct-user/milter-regex/milter-regex-0-r2.ebuild13
-rw-r--r--acct-user/minbif/Manifest2
-rw-r--r--acct-user/minbif/minbif-0-r1.ebuild14
-rw-r--r--acct-user/minbif/minbif-0.ebuild14
-rw-r--r--acct-user/minecraft/Manifest2
-rw-r--r--acct-user/minecraft/minecraft-0-r1.ebuild14
-rw-r--r--acct-user/minecraft/minecraft-0-r2.ebuild14
-rw-r--r--acct-user/minetest/Manifest2
-rw-r--r--acct-user/minetest/minetest-1-r1.ebuild14
-rw-r--r--acct-user/minetest/minetest-1-r2.ebuild14
-rw-r--r--acct-user/minidlna/Manifest2
-rw-r--r--acct-user/minidlna/minidlna-0-r1.ebuild11
-rw-r--r--acct-user/minidlna/minidlna-0.ebuild11
-rw-r--r--acct-user/miniflux/Manifest2
-rw-r--r--acct-user/miniflux/miniflux-0-r1.ebuild12
-rw-r--r--acct-user/miniflux/miniflux-0.ebuild12
-rw-r--r--acct-user/minio/Manifest2
-rw-r--r--acct-user/minio/minio-0-r1.ebuild13
-rw-r--r--acct-user/minio/minio-0.ebuild13
-rw-r--r--acct-user/mogile/Manifest2
-rw-r--r--acct-user/mogile/mogile-0-r1.ebuild13
-rw-r--r--acct-user/mogile/mogile-0.ebuild13
-rw-r--r--acct-user/mongodb/Manifest2
-rw-r--r--acct-user/mongodb/mongodb-0-r1.ebuild13
-rw-r--r--acct-user/mongodb/mongodb-0-r2.ebuild13
-rw-r--r--acct-user/mongodb_exporter/Manifest2
-rw-r--r--acct-user/mongodb_exporter/mongodb_exporter-0-r1.ebuild12
-rw-r--r--acct-user/mongodb_exporter/mongodb_exporter-0.ebuild12
-rw-r--r--acct-user/monitorix/Manifest2
-rw-r--r--acct-user/monitorix/monitorix-0-r1.ebuild12
-rw-r--r--acct-user/monitorix/monitorix-0-r2.ebuild12
-rw-r--r--acct-user/monkeyd/Manifest2
-rw-r--r--acct-user/monkeyd/monkeyd-0-r1.ebuild15
-rw-r--r--acct-user/monkeyd/monkeyd-0.ebuild15
-rw-r--r--acct-user/monkeysphere/Manifest2
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r1.ebuild16
-rw-r--r--acct-user/monkeysphere/monkeysphere-0-r2.ebuild16
-rw-r--r--acct-user/mosquitto/Manifest2
-rw-r--r--acct-user/mosquitto/mosquitto-0-r1.ebuild12
-rw-r--r--acct-user/mosquitto/mosquitto-0-r2.ebuild12
-rw-r--r--acct-user/motion/Manifest2
-rw-r--r--acct-user/motion/motion-0-r1.ebuild12
-rw-r--r--acct-user/motion/motion-0-r2.ebuild12
-rw-r--r--acct-user/mpd/Manifest2
-rw-r--r--acct-user/mpd/mpd-0-r1.ebuild13
-rw-r--r--acct-user/mpd/mpd-0-r2.ebuild13
-rw-r--r--acct-user/msmtpd/Manifest2
-rw-r--r--acct-user/msmtpd/msmtpd-0-r1.ebuild12
-rw-r--r--acct-user/msmtpd/msmtpd-0-r2.ebuild12
-rw-r--r--acct-user/munge/Manifest2
-rw-r--r--acct-user/munge/munge-0-r1.ebuild14
-rw-r--r--acct-user/munge/munge-0.ebuild14
-rw-r--r--acct-user/munin-async/Manifest2
-rw-r--r--acct-user/munin-async/munin-async-0-r2.ebuild (renamed from acct-user/munin-async/munin-async-0-r1.ebuild)0
-rw-r--r--acct-user/munin/Manifest2
-rw-r--r--acct-user/munin/munin-0-r2.ebuild (renamed from acct-user/munin/munin-0-r1.ebuild)0
-rw-r--r--acct-user/murmur/Manifest2
-rw-r--r--acct-user/murmur/murmur-0-r1.ebuild15
-rw-r--r--acct-user/murmur/murmur-0-r2.ebuild15
-rw-r--r--acct-user/mysql/Manifest2
-rw-r--r--acct-user/mysql/mysql-0-r1.ebuild12
-rw-r--r--acct-user/mysql/mysql-0-r2.ebuild12
-rw-r--r--acct-user/mysqld_exporter/Manifest2
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r1.ebuild14
-rw-r--r--acct-user/mysqld_exporter/mysqld_exporter-0-r2.ebuild14
-rw-r--r--acct-user/mythtv/Manifest2
-rw-r--r--acct-user/mythtv/mythtv-0-r1.ebuild14
-rw-r--r--acct-user/mythtv/mythtv-0-r2.ebuild14
-rw-r--r--acct-user/nagios/Manifest2
-rw-r--r--acct-user/nagios/nagios-0-r1.ebuild11
-rw-r--r--acct-user/nagios/nagios-0-r2.ebuild11
-rw-r--r--acct-user/named/Manifest2
-rw-r--r--acct-user/named/named-0-r2.ebuild (renamed from acct-user/named/named-0-r1.ebuild)0
-rw-r--r--acct-user/netbox/Manifest2
-rw-r--r--acct-user/netbox/netbox-0-r1.ebuild13
-rw-r--r--acct-user/netbox/netbox-0-r2.ebuild13
-rw-r--r--acct-user/netdata/Manifest2
-rw-r--r--acct-user/netdata/netdata-1-r1.ebuild13
-rw-r--r--acct-user/netdata/netdata-1.ebuild13
-rw-r--r--acct-user/netperf/Manifest2
-rw-r--r--acct-user/netperf/netperf-0-r1.ebuild13
-rw-r--r--acct-user/netperf/netperf-0.ebuild13
-rw-r--r--acct-user/neutron/Manifest2
-rw-r--r--acct-user/neutron/neutron-0-r1.ebuild14
-rw-r--r--acct-user/neutron/neutron-0-r2.ebuild14
-rw-r--r--acct-user/nginx-unit/Manifest2
-rw-r--r--acct-user/nginx-unit/nginx-unit-0-r1.ebuild (renamed from acct-user/nginx-unit/nginx-unit-0.ebuild)0
-rw-r--r--acct-user/nginx-vts-exporter/Manifest2
-rw-r--r--acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r1.ebuild12
-rw-r--r--acct-user/nginx-vts-exporter/nginx-vts-exporter-0-r2.ebuild12
-rw-r--r--acct-user/nginx/Manifest2
-rw-r--r--acct-user/nginx/nginx-0-r1.ebuild12
-rw-r--r--acct-user/nginx/nginx-0.ebuild12
-rw-r--r--acct-user/ngircd/Manifest2
-rw-r--r--acct-user/ngircd/ngircd-0-r1.ebuild12
-rw-r--r--acct-user/ngircd/ngircd-0-r2.ebuild12
-rw-r--r--acct-user/ngrep/Manifest2
-rw-r--r--acct-user/ngrep/ngrep-0-r1.ebuild13
-rw-r--r--acct-user/ngrep/ngrep-0-r2.ebuild13
-rw-r--r--acct-user/nm-openconnect/Manifest2
-rw-r--r--acct-user/nm-openconnect/nm-openconnect-0-r1.ebuild13
-rw-r--r--acct-user/nm-openconnect/nm-openconnect-0.ebuild13
-rw-r--r--acct-user/nm-openvpn/Manifest2
-rw-r--r--acct-user/nm-openvpn/nm-openvpn-0-r1.ebuild13
-rw-r--r--acct-user/nm-openvpn/nm-openvpn-0.ebuild13
-rw-r--r--acct-user/nobody/Manifest2
-rw-r--r--acct-user/nobody/nobody-0-r1.ebuild17
-rw-r--r--acct-user/nobody/nobody-0.ebuild17
-rw-r--r--acct-user/node_exporter/Manifest2
-rw-r--r--acct-user/node_exporter/node_exporter-0-r1.ebuild12
-rw-r--r--acct-user/node_exporter/node_exporter-0-r2.ebuild12
-rw-r--r--acct-user/notary/Manifest2
-rw-r--r--acct-user/notary/notary-0-r1.ebuild13
-rw-r--r--acct-user/notary/notary-0.ebuild13
-rw-r--r--acct-user/nova/Manifest2
-rw-r--r--acct-user/nova/nova-0-r1.ebuild14
-rw-r--r--acct-user/nova/nova-0-r2.ebuild14
-rw-r--r--acct-user/nsd/Manifest2
-rw-r--r--acct-user/nsd/nsd-0-r1.ebuild12
-rw-r--r--acct-user/nsd/nsd-0-r2.ebuild12
-rw-r--r--acct-user/nslcd/Manifest2
-rw-r--r--acct-user/nslcd/nslcd-0-r1.ebuild13
-rw-r--r--acct-user/nslcd/nslcd-0-r2.ebuild13
-rw-r--r--acct-user/ntopng/Manifest2
-rw-r--r--acct-user/ntopng/ntopng-0-r1.ebuild12
-rw-r--r--acct-user/ntopng/ntopng-0.ebuild12
-rw-r--r--acct-user/ntp/Manifest2
-rw-r--r--acct-user/ntp/ntp-0-r1.ebuild12
-rw-r--r--acct-user/ntp/ntp-0-r2.ebuild12
-rw-r--r--acct-user/nullmail/Manifest2
-rw-r--r--acct-user/nullmail/nullmail-0-r1.ebuild14
-rw-r--r--acct-user/nullmail/nullmail-0.ebuild14
-rw-r--r--acct-user/nut/Manifest2
-rw-r--r--acct-user/nut/nut-0-r1.ebuild14
-rw-r--r--acct-user/nut/nut-0-r2.ebuild14
-rw-r--r--acct-user/nvpd/Manifest2
-rw-r--r--acct-user/nvpd/nvpd-0-r1.ebuild12
-rw-r--r--acct-user/nvpd/nvpd-0.ebuild12
-rw-r--r--acct-user/nzbget/Manifest2
-rw-r--r--acct-user/nzbget/nzbget-0-r1.ebuild16
-rw-r--r--acct-user/nzbget/nzbget-0.ebuild16
-rw-r--r--acct-user/oidentd/Manifest2
-rw-r--r--acct-user/oidentd/oidentd-0-r1.ebuild11
-rw-r--r--acct-user/oidentd/oidentd-0-r2.ebuild11
-rw-r--r--acct-user/openctd/Manifest2
-rw-r--r--acct-user/openctd/openctd-0-r1.ebuild13
-rw-r--r--acct-user/openctd/openctd-0.ebuild13
-rw-r--r--acct-user/opendkim/Manifest2
-rw-r--r--acct-user/opendkim/opendkim-0-r1.ebuild13
-rw-r--r--acct-user/opendkim/opendkim-0-r2.ebuild13
-rw-r--r--acct-user/opendmarc/Manifest2
-rw-r--r--acct-user/opendmarc/opendmarc-0-r1.ebuild16
-rw-r--r--acct-user/opendmarc/opendmarc-0.ebuild16
-rw-r--r--acct-user/opendnssec/Manifest2
-rw-r--r--acct-user/opendnssec/opendnssec-0-r1.ebuild13
-rw-r--r--acct-user/opendnssec/opendnssec-0.ebuild13
-rw-r--r--acct-user/openntpd/Manifest2
-rw-r--r--acct-user/openntpd/openntpd-0-r1.ebuild14
-rw-r--r--acct-user/openntpd/openntpd-0-r2.ebuild14
-rw-r--r--acct-user/openrct2/Manifest2
-rw-r--r--acct-user/openrct2/openrct2-0-r1.ebuild13
-rw-r--r--acct-user/openrct2/openrct2-0-r2.ebuild13
-rw-r--r--acct-user/openttd/Manifest2
-rw-r--r--acct-user/openttd/openttd-0-r1.ebuild14
-rw-r--r--acct-user/openttd/openttd-0.ebuild14
-rw-r--r--acct-user/openvpn/Manifest2
-rw-r--r--acct-user/openvpn/openvpn-0-r1.ebuild13
-rw-r--r--acct-user/openvpn/openvpn-0-r2.ebuild13
-rw-r--r--acct-user/openvpn_exporter/Manifest2
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r1.ebuild13
-rw-r--r--acct-user/openvpn_exporter/openvpn_exporter-0-r2.ebuild13
-rw-r--r--acct-user/opm/Manifest2
-rw-r--r--acct-user/opm/opm-0-r1.ebuild12
-rw-r--r--acct-user/opm/opm-0-r2.ebuild12
-rw-r--r--acct-user/oprofile/Manifest2
-rw-r--r--acct-user/oprofile/oprofile-0-r1.ebuild12
-rw-r--r--acct-user/oprofile/oprofile-0-r2.ebuild12
-rw-r--r--acct-user/oragono/Manifest2
-rw-r--r--acct-user/oragono/oragono-0-r1.ebuild12
-rw-r--r--acct-user/oragono/oragono-0.ebuild12
-rw-r--r--acct-user/ossec/Manifest2
-rw-r--r--acct-user/ossec/ossec-0-r1.ebuild13
-rw-r--r--acct-user/ossec/ossec-0-r2.ebuild13
-rw-r--r--acct-user/ossecm/Manifest2
-rw-r--r--acct-user/ossecm/ossecm-0-r1.ebuild12
-rw-r--r--acct-user/ossecm/ossecm-0-r2.ebuild12
-rw-r--r--acct-user/ossecr/Manifest2
-rw-r--r--acct-user/ossecr/ossecr-0-r1.ebuild12
-rw-r--r--acct-user/ossecr/ossecr-0-r2.ebuild12
-rw-r--r--acct-user/owntracks/Manifest2
-rw-r--r--acct-user/owntracks/owntracks-0-r1.ebuild12
-rw-r--r--acct-user/owntracks/owntracks-0.ebuild12
-rw-r--r--acct-user/p2p/Manifest2
-rw-r--r--acct-user/p2p/p2p-0-r1.ebuild12
-rw-r--r--acct-user/p2p/p2p-0.ebuild12
-rw-r--r--acct-user/partimag/Manifest2
-rw-r--r--acct-user/partimag/partimag-0-r1.ebuild14
-rw-r--r--acct-user/partimag/partimag-0.ebuild14
-rw-r--r--acct-user/pcap/Manifest2
-rw-r--r--acct-user/pcap/pcap-0-r1.ebuild12
-rw-r--r--acct-user/pcap/pcap-0.ebuild12
-rw-r--r--acct-user/pcscd/Manifest2
-rw-r--r--acct-user/pcscd/pcscd-0-r1.ebuild12
-rw-r--r--acct-user/pcscd/pcscd-0-r2.ebuild12
-rw-r--r--acct-user/pdns/Manifest2
-rw-r--r--acct-user/pdns/pdns-0-r1.ebuild11
-rw-r--r--acct-user/pdns/pdns-0-r2.ebuild11
-rw-r--r--acct-user/pdnsd/Manifest2
-rw-r--r--acct-user/pdnsd/pdnsd-0-r1.ebuild14
-rw-r--r--acct-user/pdnsd/pdnsd-0-r2.ebuild14
-rw-r--r--acct-user/pgagent/Manifest2
-rw-r--r--acct-user/pgagent/pgagent-0-r1.ebuild22
-rw-r--r--acct-user/pgagent/pgagent-0.ebuild22
-rw-r--r--acct-user/pgbouncer/Manifest2
-rw-r--r--acct-user/pgbouncer/pgbouncer-0-r1.ebuild12
-rw-r--r--acct-user/pgbouncer/pgbouncer-0.ebuild12
-rw-r--r--acct-user/pgpool/Manifest2
-rw-r--r--acct-user/pgpool/pgpool-0-r1.ebuild13
-rw-r--r--acct-user/pgpool/pgpool-0.ebuild13
-rw-r--r--acct-user/pipewire/Manifest4
-rw-r--r--acct-user/pipewire/pipewire-0-r1.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-0.ebuild13
-rw-r--r--acct-user/pipewire/pipewire-1-r1.ebuild (renamed from acct-user/pipewire/pipewire-1.ebuild)0
-rw-r--r--acct-user/placement/Manifest2
-rw-r--r--acct-user/placement/placement-0-r1.ebuild14
-rw-r--r--acct-user/placement/placement-0-r2.ebuild14
-rw-r--r--acct-user/plex/Manifest2
-rw-r--r--acct-user/plex/plex-0-r1.ebuild13
-rw-r--r--acct-user/plex/plex-0-r2.ebuild13
-rw-r--r--acct-user/polkitd/Manifest2
-rw-r--r--acct-user/polkitd/polkitd-0-r1.ebuild12
-rw-r--r--acct-user/polkitd/polkitd-0-r2.ebuild12
-rw-r--r--acct-user/polw/Manifest2
-rw-r--r--acct-user/polw/polw-0-r1.ebuild13
-rw-r--r--acct-user/polw/polw-0.ebuild13
-rw-r--r--acct-user/popa3d/Manifest2
-rw-r--r--acct-user/popa3d/popa3d-0-r1.ebuild12
-rw-r--r--acct-user/popa3d/popa3d-0.ebuild12
-rw-r--r--acct-user/portage/Manifest2
-rw-r--r--acct-user/portage/portage-0-r2.ebuild (renamed from acct-user/portage/portage-0-r1.ebuild)0
-rw-r--r--acct-user/postfix/Manifest2
-rw-r--r--acct-user/postfix/postfix-0-r1.ebuild12
-rw-r--r--acct-user/postfix/postfix-0-r2.ebuild12
-rw-r--r--acct-user/postfix_exporter/Manifest2
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r1.ebuild13
-rw-r--r--acct-user/postfix_exporter/postfix_exporter-0-r2.ebuild13
-rw-r--r--acct-user/postfwd/Manifest2
-rw-r--r--acct-user/postfwd/postfwd-0-r1.ebuild13
-rw-r--r--acct-user/postfwd/postfwd-0.ebuild13
-rw-r--r--acct-user/postgres/Manifest2
-rw-r--r--acct-user/postgres/postgres-0-r1.ebuild15
-rw-r--r--acct-user/postgres/postgres-0-r2.ebuild15
-rw-r--r--acct-user/postgres_exporter/Manifest2
-rw-r--r--acct-user/postgres_exporter/postgres_exporter-0-r1.ebuild12
-rw-r--r--acct-user/postgres_exporter/postgres_exporter-0.ebuild12
-rw-r--r--acct-user/postgrey/Manifest2
-rw-r--r--acct-user/postgrey/postgrey-0-r1.ebuild12
-rw-r--r--acct-user/postgrey/postgrey-0.ebuild12
-rw-r--r--acct-user/postmaster/Manifest2
-rw-r--r--acct-user/postmaster/postmaster-0-r1.ebuild15
-rw-r--r--acct-user/postmaster/postmaster-0-r2.ebuild15
-rw-r--r--acct-user/privoxy/Manifest2
-rw-r--r--acct-user/privoxy/privoxy-0-r1.ebuild12
-rw-r--r--acct-user/privoxy/privoxy-0-r2.ebuild12
-rw-r--r--acct-user/prometheus/Manifest2
-rw-r--r--acct-user/prometheus/prometheus-0-r1.ebuild13
-rw-r--r--acct-user/prometheus/prometheus-0-r2.ebuild13
-rw-r--r--acct-user/prosody/Manifest2
-rw-r--r--acct-user/prosody/prosody-0-r1.ebuild13
-rw-r--r--acct-user/prosody/prosody-0.ebuild13
-rw-r--r--acct-user/prowlarr/Manifest2
-rw-r--r--acct-user/prowlarr/prowlarr-0-r1.ebuild13
-rw-r--r--acct-user/prowlarr/prowlarr-0.ebuild13
-rw-r--r--acct-user/psybnc/Manifest2
-rw-r--r--acct-user/psybnc/psybnc-0-r1.ebuild14
-rw-r--r--acct-user/psybnc/psybnc-0.ebuild14
-rw-r--r--acct-user/pulse/Manifest2
-rw-r--r--acct-user/pulse/pulse-0-r1.ebuild13
-rw-r--r--acct-user/pulse/pulse-0.ebuild13
-rw-r--r--acct-user/puppet/Manifest2
-rw-r--r--acct-user/puppet/puppet-0-r1.ebuild14
-rw-r--r--acct-user/puppet/puppet-0-r2.ebuild14
-rw-r--r--acct-user/puppetdb/Manifest2
-rw-r--r--acct-user/puppetdb/puppetdb-0-r1.ebuild14
-rw-r--r--acct-user/puppetdb/puppetdb-0-r2.ebuild14
-rw-r--r--acct-user/pushgateway/Manifest2
-rw-r--r--acct-user/pushgateway/pushgateway-0-r1.ebuild13
-rw-r--r--acct-user/pushgateway/pushgateway-0.ebuild13
-rw-r--r--acct-user/pvpgn/Manifest2
-rw-r--r--acct-user/pvpgn/pvpgn-0-r1.ebuild12
-rw-r--r--acct-user/pvpgn/pvpgn-0.ebuild12
-rw-r--r--acct-user/qemu/Manifest2
-rw-r--r--acct-user/qemu/qemu-0-r1.ebuild11
-rw-r--r--acct-user/qemu/qemu-0-r2.ebuild11
-rw-r--r--acct-user/qmaild/Manifest2
-rw-r--r--acct-user/qmaild/qmaild-0-r1.ebuild12
-rw-r--r--acct-user/qmaild/qmaild-0-r2.ebuild12
-rw-r--r--acct-user/qmaill/Manifest2
-rw-r--r--acct-user/qmaill/qmaill-0-r1.ebuild12
-rw-r--r--acct-user/qmaill/qmaill-0-r2.ebuild12
-rw-r--r--acct-user/qmailp/Manifest2
-rw-r--r--acct-user/qmailp/qmailp-0-r1.ebuild12
-rw-r--r--acct-user/qmailp/qmailp-0-r2.ebuild12
-rw-r--r--acct-user/qmailq/Manifest2
-rw-r--r--acct-user/qmailq/qmailq-0-r1.ebuild12
-rw-r--r--acct-user/qmailq/qmailq-0-r2.ebuild12
-rw-r--r--acct-user/qmailr/Manifest2
-rw-r--r--acct-user/qmailr/qmailr-0-r1.ebuild12
-rw-r--r--acct-user/qmailr/qmailr-0-r2.ebuild12
-rw-r--r--acct-user/qmails/Manifest2
-rw-r--r--acct-user/qmails/qmails-0-r1.ebuild12
-rw-r--r--acct-user/qmails/qmails-0-r2.ebuild12
-rw-r--r--acct-user/quagga/Manifest2
-rw-r--r--acct-user/quagga/quagga-0-r1.ebuild11
-rw-r--r--acct-user/quagga/quagga-0-r2.ebuild11
-rw-r--r--acct-user/quassel/Manifest2
-rw-r--r--acct-user/quassel/quassel-0-r1.ebuild12
-rw-r--r--acct-user/quassel/quassel-0-r2.ebuild12
-rw-r--r--acct-user/rabbitmq/Manifest2
-rw-r--r--acct-user/rabbitmq/rabbitmq-0-r1.ebuild15
-rw-r--r--acct-user/rabbitmq/rabbitmq-0.ebuild15
-rw-r--r--acct-user/rabbitmq_exporter/Manifest2
-rw-r--r--acct-user/rabbitmq_exporter/rabbitmq_exporter-0-r1.ebuild12
-rw-r--r--acct-user/rabbitmq_exporter/rabbitmq_exporter-0.ebuild12
-rw-r--r--acct-user/radarr/Manifest2
-rw-r--r--acct-user/radarr/radarr-0-r1.ebuild13
-rw-r--r--acct-user/radarr/radarr-0.ebuild13
-rw-r--r--acct-user/radicale/Manifest2
-rw-r--r--acct-user/radicale/radicale-0-r2.ebuild13
-rw-r--r--acct-user/radicale/radicale-0-r3.ebuild13
-rw-r--r--acct-user/radius/Manifest2
-rw-r--r--acct-user/radius/radius-0-r1.ebuild11
-rw-r--r--acct-user/radius/radius-0-r2.ebuild11
-rw-r--r--acct-user/radvd/Manifest2
-rw-r--r--acct-user/radvd/radvd-0-r1.ebuild13
-rw-r--r--acct-user/radvd/radvd-0.ebuild13
-rw-r--r--acct-user/rbldns/Manifest2
-rw-r--r--acct-user/rbldns/rbldns-0-r1.ebuild11
-rw-r--r--acct-user/rbldns/rbldns-0-r2.ebuild11
-rw-r--r--acct-user/rbot/Manifest2
-rw-r--r--acct-user/rbot/rbot-0-r1.ebuild14
-rw-r--r--acct-user/rbot/rbot-0.ebuild14
-rw-r--r--acct-user/readarr/Manifest2
-rw-r--r--acct-user/readarr/readarr-0-r1.ebuild13
-rw-r--r--acct-user/readarr/readarr-0.ebuild13
-rw-r--r--acct-user/redis/Manifest2
-rw-r--r--acct-user/redis/redis-0-r1.ebuild11
-rw-r--r--acct-user/redis/redis-0-r2.ebuild11
-rw-r--r--acct-user/redis_exporter/Manifest2
-rw-r--r--acct-user/redis_exporter/redis_exporter-0-r1.ebuild14
-rw-r--r--acct-user/redis_exporter/redis_exporter-0.ebuild14
-rw-r--r--acct-user/redmine/Manifest2
-rw-r--r--acct-user/redmine/redmine-0-r1.ebuild11
-rw-r--r--acct-user/redmine/redmine-0-r2.ebuild11
-rw-r--r--acct-user/redsocks/Manifest2
-rw-r--r--acct-user/redsocks/redsocks-0-r1.ebuild13
-rw-r--r--acct-user/redsocks/redsocks-0-r2.ebuild13
-rw-r--r--acct-user/reg/Manifest2
-rw-r--r--acct-user/reg/reg-0-r1.ebuild13
-rw-r--r--acct-user/reg/reg-0-r2.ebuild13
-rw-r--r--acct-user/registry/Manifest2
-rw-r--r--acct-user/registry/registry-0-r1.ebuild13
-rw-r--r--acct-user/registry/registry-0.ebuild13
-rw-r--r--acct-user/root/Manifest2
-rw-r--r--acct-user/root/root-0-r1.ebuild24
-rw-r--r--acct-user/root/root-0-r2.ebuild24
-rw-r--r--acct-user/rplayd/Manifest2
-rw-r--r--acct-user/rplayd/rplayd-0-r1.ebuild13
-rw-r--r--acct-user/rplayd/rplayd-0.ebuild13
-rw-r--r--acct-user/rrdcached/Manifest2
-rw-r--r--acct-user/rrdcached/rrdcached-0-r1.ebuild14
-rw-r--r--acct-user/rrdcached/rrdcached-0.ebuild14
-rw-r--r--acct-user/rslsync/Manifest2
-rw-r--r--acct-user/rslsync/rslsync-0-r1.ebuild15
-rw-r--r--acct-user/rslsync/rslsync-0.ebuild15
-rw-r--r--acct-user/rspamd/Manifest2
-rw-r--r--acct-user/rspamd/rspamd-0-r1.ebuild12
-rw-r--r--acct-user/rspamd/rspamd-0-r2.ebuild12
-rw-r--r--acct-user/rstudio-server/Manifest2
-rw-r--r--acct-user/rstudio-server/rstudio-server-0-r1.ebuild12
-rw-r--r--acct-user/rstudio-server/rstudio-server-0-r2.ebuild12
-rw-r--r--acct-user/rt/Manifest2
-rw-r--r--acct-user/rt/rt-0-r1.ebuild13
-rw-r--r--acct-user/rt/rt-0.ebuild13
-rw-r--r--acct-user/rtkit/Manifest2
-rw-r--r--acct-user/rtkit/rtkit-0-r1.ebuild12
-rw-r--r--acct-user/rtkit/rtkit-0-r2.ebuild12
-rw-r--r--acct-user/rundeck/Manifest2
-rw-r--r--acct-user/rundeck/rundeck-0-r1.ebuild14
-rw-r--r--acct-user/rundeck/rundeck-0.ebuild14
-rw-r--r--acct-user/rwhoisd/Manifest2
-rw-r--r--acct-user/rwhoisd/rwhoisd-0-r1.ebuild14
-rw-r--r--acct-user/rwhoisd/rwhoisd-0.ebuild14
-rw-r--r--acct-user/sabnzbd/Manifest2
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r1.ebuild15
-rw-r--r--acct-user/sabnzbd/sabnzbd-0-r2.ebuild15
-rw-r--r--acct-user/sagan/Manifest2
-rw-r--r--acct-user/sagan/sagan-0-r1.ebuild12
-rw-r--r--acct-user/sagan/sagan-0-r2.ebuild12
-rw-r--r--acct-user/samplicator/Manifest2
-rw-r--r--acct-user/samplicator/samplicator-0-r1.ebuild14
-rw-r--r--acct-user/samplicator/samplicator-0.ebuild14
-rw-r--r--acct-user/sancp/Manifest2
-rw-r--r--acct-user/sancp/sancp-0-r1.ebuild12
-rw-r--r--acct-user/sancp/sancp-0.ebuild12
-rw-r--r--acct-user/saned/Manifest2
-rw-r--r--acct-user/saned/saned-0-r1.ebuild13
-rw-r--r--acct-user/saned/saned-0.ebuild13
-rw-r--r--acct-user/sanlock/Manifest2
-rw-r--r--acct-user/sanlock/sanlock-0-r1.ebuild13
-rw-r--r--acct-user/sanlock/sanlock-0-r2.ebuild13
-rw-r--r--acct-user/sauerbraten/Manifest2
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r1.ebuild12
-rw-r--r--acct-user/sauerbraten/sauerbraten-0-r2.ebuild12
-rw-r--r--acct-user/scanlogd/Manifest2
-rw-r--r--acct-user/scanlogd/scanlogd-0-r1.ebuild13
-rw-r--r--acct-user/scanlogd/scanlogd-0.ebuild13
-rw-r--r--acct-user/scponly/Manifest2
-rw-r--r--acct-user/scponly/scponly-0-r1.ebuild15
-rw-r--r--acct-user/scponly/scponly-0-r2.ebuild15
-rw-r--r--acct-user/sddm/Manifest2
-rw-r--r--acct-user/sddm/sddm-0-r1.ebuild14
-rw-r--r--acct-user/sddm/sddm-0.ebuild14
-rw-r--r--acct-user/sendpage/Manifest2
-rw-r--r--acct-user/sendpage/sendpage-0-r1.ebuild13
-rw-r--r--acct-user/sendpage/sendpage-0.ebuild13
-rw-r--r--acct-user/serf/Manifest2
-rw-r--r--acct-user/serf/serf-0-r1.ebuild14
-rw-r--r--acct-user/serf/serf-0.ebuild14
-rw-r--r--acct-user/sguil/Manifest2
-rw-r--r--acct-user/sguil/sguil-0-r1.ebuild14
-rw-r--r--acct-user/sguil/sguil-0.ebuild14
-rw-r--r--acct-user/sigh/Manifest2
-rw-r--r--acct-user/sigh/sigh-0-r1.ebuild11
-rw-r--r--acct-user/sigh/sigh-0.ebuild11
-rw-r--r--acct-user/sks/Manifest2
-rw-r--r--acct-user/sks/sks-0-r1.ebuild12
-rw-r--r--acct-user/sks/sks-0.ebuild12
-rw-r--r--acct-user/slurm/Manifest2
-rw-r--r--acct-user/slurm/slurm-0-r1.ebuild14
-rw-r--r--acct-user/slurm/slurm-0-r2.ebuild14
-rw-r--r--acct-user/smmsp/Manifest2
-rw-r--r--acct-user/smmsp/smmsp-0-r2.ebuild12
-rw-r--r--acct-user/smmsp/smmsp-0-r3.ebuild12
-rw-r--r--acct-user/smokeping/Manifest2
-rw-r--r--acct-user/smokeping/smokeping-0-r1.ebuild14
-rw-r--r--acct-user/smokeping/smokeping-0.ebuild14
-rw-r--r--acct-user/smsd/Manifest2
-rw-r--r--acct-user/smsd/smsd-0-r1.ebuild12
-rw-r--r--acct-user/smsd/smsd-0.ebuild12
-rw-r--r--acct-user/smtpd/Manifest2
-rw-r--r--acct-user/smtpd/smtpd-0-r1.ebuild13
-rw-r--r--acct-user/smtpd/smtpd-0-r2.ebuild13
-rw-r--r--acct-user/smtpq/Manifest2
-rw-r--r--acct-user/smtpq/smtpq-0-r1.ebuild13
-rw-r--r--acct-user/smtpq/smtpq-0-r2.ebuild13
-rw-r--r--acct-user/snapclient/Manifest2
-rw-r--r--acct-user/snapclient/snapclient-0-r1.ebuild15
-rw-r--r--acct-user/snapclient/snapclient-0.ebuild15
-rw-r--r--acct-user/snapserver/Manifest2
-rw-r--r--acct-user/snapserver/snapserver-0-r1.ebuild (renamed from acct-user/snapserver/snapserver-0.ebuild)0
-rw-r--r--acct-user/sndiod/Manifest2
-rw-r--r--acct-user/sndiod/sndiod-0-r1.ebuild12
-rw-r--r--acct-user/sndiod/sndiod-0.ebuild12
-rw-r--r--acct-user/sniproxy/Manifest2
-rw-r--r--acct-user/sniproxy/sniproxy-0-r1.ebuild11
-rw-r--r--acct-user/sniproxy/sniproxy-0.ebuild11
-rw-r--r--acct-user/snmp_exporter/Manifest2
-rw-r--r--acct-user/snmp_exporter/snmp_exporter-0-r1.ebuild12
-rw-r--r--acct-user/snmp_exporter/snmp_exporter-0.ebuild12
-rw-r--r--acct-user/snort/Manifest2
-rw-r--r--acct-user/snort/snort-0-r1.ebuild12
-rw-r--r--acct-user/snort/snort-0.ebuild12
-rw-r--r--acct-user/sobby/Manifest2
-rw-r--r--acct-user/sobby/sobby-0-r1.ebuild14
-rw-r--r--acct-user/sobby/sobby-0.ebuild14
-rw-r--r--acct-user/sobexsrv/Manifest2
-rw-r--r--acct-user/sobexsrv/sobexsrv-0-r1.ebuild13
-rw-r--r--acct-user/sobexsrv/sobexsrv-0.ebuild13
-rw-r--r--acct-user/sockd/Manifest2
-rw-r--r--acct-user/sockd/sockd-0-r1.ebuild13
-rw-r--r--acct-user/sockd/sockd-0-r2.ebuild13
-rw-r--r--acct-user/sogo/Manifest2
-rw-r--r--acct-user/sogo/sogo-0-r1.ebuild14
-rw-r--r--acct-user/sogo/sogo-0-r2.ebuild14
-rw-r--r--acct-user/soju/Manifest2
-rw-r--r--acct-user/soju/soju-0-r1.ebuild14
-rw-r--r--acct-user/soju/soju-0.ebuild14
-rw-r--r--acct-user/sonarr/Manifest2
-rw-r--r--acct-user/sonarr/sonarr-0-r1.ebuild13
-rw-r--r--acct-user/sonarr/sonarr-0.ebuild13
-rw-r--r--acct-user/spamd/Manifest2
-rw-r--r--acct-user/spamd/spamd-0-r1.ebuild25
-rw-r--r--acct-user/spamd/spamd-0-r2.ebuild25
-rw-r--r--acct-user/spectrum/Manifest2
-rw-r--r--acct-user/spectrum/spectrum-0-r1.ebuild14
-rw-r--r--acct-user/spectrum/spectrum-0-r2.ebuild14
-rw-r--r--acct-user/spire/Manifest2
-rw-r--r--acct-user/spire/spire-0-r1.ebuild12
-rw-r--r--acct-user/spire/spire-0-r2.ebuild12
-rw-r--r--acct-user/spread/Manifest2
-rw-r--r--acct-user/spread/spread-0-r1.ebuild13
-rw-r--r--acct-user/spread/spread-0.ebuild13
-rw-r--r--acct-user/sqlgrey/Manifest2
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r1.ebuild14
-rw-r--r--acct-user/sqlgrey/sqlgrey-0-r2.ebuild14
-rw-r--r--acct-user/squid/Manifest2
-rw-r--r--acct-user/squid/squid-0-r1.ebuild13
-rw-r--r--acct-user/squid/squid-0-r2.ebuild13
-rw-r--r--acct-user/sshd/Manifest2
-rw-r--r--acct-user/sshd/sshd-0-r1.ebuild15
-rw-r--r--acct-user/sshd/sshd-0-r2.ebuild15
-rw-r--r--acct-user/sstpc/Manifest2
-rw-r--r--acct-user/sstpc/sstpc-0-r1.ebuild13
-rw-r--r--acct-user/sstpc/sstpc-0.ebuild13
-rw-r--r--acct-user/stdiscosrv/Manifest2
-rw-r--r--acct-user/stdiscosrv/stdiscosrv-1-r1.ebuild27
-rw-r--r--acct-user/stdiscosrv/stdiscosrv-1.ebuild27
-rw-r--r--acct-user/steamcmd/Manifest2
-rw-r--r--acct-user/steamcmd/steamcmd-0-r1.ebuild14
-rw-r--r--acct-user/steamcmd/steamcmd-0-r2.ebuild14
-rw-r--r--acct-user/stg/Manifest2
-rw-r--r--acct-user/stg/stg-0-r1.ebuild13
-rw-r--r--acct-user/stg/stg-0.ebuild13
-rw-r--r--acct-user/strelaysrv/Manifest2
-rw-r--r--acct-user/strelaysrv/strelaysrv-1-r1.ebuild27
-rw-r--r--acct-user/strelaysrv/strelaysrv-1.ebuild27
-rw-r--r--acct-user/stubby/Manifest2
-rw-r--r--acct-user/stubby/stubby-0-r1.ebuild12
-rw-r--r--acct-user/stubby/stubby-0-r2.ebuild12
-rw-r--r--acct-user/stunnel/Manifest2
-rw-r--r--acct-user/stunnel/stunnel-0-r1.ebuild12
-rw-r--r--acct-user/stunnel/stunnel-0-r2.ebuild12
-rw-r--r--acct-user/subsonic/Manifest2
-rw-r--r--acct-user/subsonic/subsonic-0-r1.ebuild14
-rw-r--r--acct-user/subsonic/subsonic-0-r2.ebuild14
-rw-r--r--acct-user/suricata/Manifest2
-rw-r--r--acct-user/suricata/suricata-0-r1.ebuild12
-rw-r--r--acct-user/suricata/suricata-0-r2.ebuild12
-rw-r--r--acct-user/svn/Manifest2
-rw-r--r--acct-user/svn/svn-0-r1.ebuild11
-rw-r--r--acct-user/svn/svn-0-r2.ebuild11
-rw-r--r--acct-user/svxlink/Manifest2
-rw-r--r--acct-user/svxlink/svxlink-0-r1.ebuild12
-rw-r--r--acct-user/svxlink/svxlink-0.ebuild12
-rw-r--r--acct-user/swift/Manifest2
-rw-r--r--acct-user/swift/swift-0-r1.ebuild12
-rw-r--r--acct-user/swift/swift-0-r2.ebuild12
-rw-r--r--acct-user/synapse/Manifest2
-rw-r--r--acct-user/synapse/synapse-0-r1.ebuild12
-rw-r--r--acct-user/synapse/synapse-0.ebuild12
-rw-r--r--acct-user/syncthing/Manifest2
-rw-r--r--acct-user/syncthing/syncthing-0-r1.ebuild14
-rw-r--r--acct-user/syncthing/syncthing-0-r2.ebuild14
-rw-r--r--acct-user/systemd-coredump/Manifest2
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r1.ebuild11
-rw-r--r--acct-user/systemd-coredump/systemd-coredump-0-r2.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/Manifest2
-rw-r--r--acct-user/systemd-journal-remote/systemd-journal-remote-0-r1.ebuild11
-rw-r--r--acct-user/systemd-journal-remote/systemd-journal-remote-0-r2.ebuild11
-rw-r--r--acct-user/systemd-network/Manifest2
-rw-r--r--acct-user/systemd-network/systemd-network-0-r1.ebuild11
-rw-r--r--acct-user/systemd-network/systemd-network-0-r2.ebuild11
-rw-r--r--acct-user/systemd-oom/Manifest2
-rw-r--r--acct-user/systemd-oom/systemd-oom-0-r1.ebuild11
-rw-r--r--acct-user/systemd-oom/systemd-oom-0.ebuild11
-rw-r--r--acct-user/systemd-resolve/Manifest2
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r1.ebuild11
-rw-r--r--acct-user/systemd-resolve/systemd-resolve-0-r2.ebuild11
-rw-r--r--acct-user/systemd-timesync/Manifest2
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r1.ebuild11
-rw-r--r--acct-user/systemd-timesync/systemd-timesync-0-r2.ebuild11
-rw-r--r--acct-user/taskd/Manifest2
-rw-r--r--acct-user/taskd/taskd-0-r1.ebuild15
-rw-r--r--acct-user/taskd/taskd-0.ebuild15
-rw-r--r--acct-user/teamspeak/Manifest2
-rw-r--r--acct-user/teamspeak/teamspeak-0-r1.ebuild14
-rw-r--r--acct-user/teamspeak/teamspeak-0-r2.ebuild14
-rw-r--r--acct-user/telegraf/Manifest2
-rw-r--r--acct-user/telegraf/telegraf-0-r1.ebuild12
-rw-r--r--acct-user/telegraf/telegraf-0-r2.ebuild12
-rw-r--r--acct-user/tenshi/Manifest2
-rw-r--r--acct-user/tenshi/tenshi-0-r1.ebuild14
-rw-r--r--acct-user/tenshi/tenshi-0.ebuild14
-rw-r--r--acct-user/thttpd/Manifest2
-rw-r--r--acct-user/thttpd/thttpd-0-r1.ebuild13
-rw-r--r--acct-user/thttpd/thttpd-0.ebuild13
-rw-r--r--acct-user/timidity/Manifest2
-rw-r--r--acct-user/timidity/timidity-0-r1.ebuild15
-rw-r--r--acct-user/timidity/timidity-0.ebuild15
-rw-r--r--acct-user/tinydns/Manifest2
-rw-r--r--acct-user/tinydns/tinydns-0-r1.ebuild11
-rw-r--r--acct-user/tinydns/tinydns-0.ebuild11
-rw-r--r--acct-user/tinyproxy/Manifest2
-rw-r--r--acct-user/tinyproxy/tinyproxy-0-r1.ebuild12
-rw-r--r--acct-user/tinyproxy/tinyproxy-0.ebuild12
-rw-r--r--acct-user/tomcat/Manifest2
-rw-r--r--acct-user/tomcat/tomcat-0-r1.ebuild12
-rw-r--r--acct-user/tomcat/tomcat-0.ebuild12
-rw-r--r--acct-user/tor/Manifest2
-rw-r--r--acct-user/tor/tor-0-r1.ebuild12
-rw-r--r--acct-user/tor/tor-0-r2.ebuild12
-rw-r--r--acct-user/tox/Manifest2
-rw-r--r--acct-user/tox/tox-0-r1.ebuild13
-rw-r--r--acct-user/tox/tox-0-r2.ebuild13
-rw-r--r--acct-user/tpm/Manifest2
-rw-r--r--acct-user/tpm/tpm-0-r1.ebuild12
-rw-r--r--acct-user/tpm/tpm-0.ebuild12
-rw-r--r--acct-user/transmission/Manifest2
-rw-r--r--acct-user/transmission/transmission-1-r1.ebuild11
-rw-r--r--acct-user/transmission/transmission-1-r2.ebuild11
-rw-r--r--acct-user/trickster/Manifest2
-rw-r--r--acct-user/trickster/trickster-0-r1.ebuild13
-rw-r--r--acct-user/trickster/trickster-0.ebuild13
-rw-r--r--acct-user/trojan/Manifest2
-rw-r--r--acct-user/trojan/trojan-0-r1.ebuild12
-rw-r--r--acct-user/trojan/trojan-0.ebuild12
-rw-r--r--acct-user/tss/Manifest2
-rw-r--r--acct-user/tss/tss-0-r1.ebuild12
-rw-r--r--acct-user/tss/tss-0-r2.ebuild12
-rw-r--r--acct-user/ttrssd/Manifest2
-rw-r--r--acct-user/ttrssd/ttrssd-0-r1.ebuild12
-rw-r--r--acct-user/ttrssd/ttrssd-0.ebuild12
-rw-r--r--acct-user/turnserver/Manifest2
-rw-r--r--acct-user/turnserver/turnserver-0-r1.ebuild13
-rw-r--r--acct-user/turnserver/turnserver-0-r2.ebuild13
-rw-r--r--acct-user/tvheadend/Manifest2
-rw-r--r--acct-user/tvheadend/tvheadend-0-r1.ebuild14
-rw-r--r--acct-user/tvheadend/tvheadend-0-r2.ebuild14
-rw-r--r--acct-user/ulogd/Manifest2
-rw-r--r--acct-user/ulogd/ulogd-0-r1.ebuild12
-rw-r--r--acct-user/ulogd/ulogd-0.ebuild12
-rw-r--r--acct-user/ultimaker/Manifest2
-rw-r--r--acct-user/ultimaker/ultimaker-0-r1.ebuild12
-rw-r--r--acct-user/ultimaker/ultimaker-0-r2.ebuild12
-rw-r--r--acct-user/unbound-telemetry/Manifest2
-rw-r--r--acct-user/unbound-telemetry/unbound-telemetry-1-r1.ebuild12
-rw-r--r--acct-user/unbound-telemetry/unbound-telemetry-1.ebuild12
-rw-r--r--acct-user/unbound/Manifest2
-rw-r--r--acct-user/unbound/unbound-0-r1.ebuild16
-rw-r--r--acct-user/unbound/unbound-0-r2.ebuild16
-rw-r--r--acct-user/unifi-video/Manifest2
-rw-r--r--acct-user/unifi-video/unifi-video-0-r1.ebuild12
-rw-r--r--acct-user/unifi-video/unifi-video-0.ebuild12
-rw-r--r--acct-user/unifi/Manifest2
-rw-r--r--acct-user/unifi/unifi-0-r2.ebuild (renamed from acct-user/unifi/unifi-0-r1.ebuild)0
-rw-r--r--acct-user/unrealircd/Manifest2
-rw-r--r--acct-user/unrealircd/unrealircd-0-r1.ebuild11
-rw-r--r--acct-user/unrealircd/unrealircd-0-r2.ebuild11
-rw-r--r--acct-user/upmpdcli/Manifest2
-rw-r--r--acct-user/upmpdcli/upmpdcli-0-r1.ebuild12
-rw-r--r--acct-user/upmpdcli/upmpdcli-0.ebuild12
-rw-r--r--acct-user/uptimed/Manifest2
-rw-r--r--acct-user/uptimed/uptimed-0-r2.ebuild13
-rw-r--r--acct-user/uptimed/uptimed-0-r3.ebuild13
-rw-r--r--acct-user/usbmux/Manifest2
-rw-r--r--acct-user/usbmux/usbmux-0-r1.ebuild12
-rw-r--r--acct-user/usbmux/usbmux-0-r2.ebuild12
-rw-r--r--acct-user/ushare/Manifest2
-rw-r--r--acct-user/ushare/ushare-0-r1.ebuild12
-rw-r--r--acct-user/ushare/ushare-0.ebuild12
-rw-r--r--acct-user/uwsgi_exporter/Manifest2
-rw-r--r--acct-user/uwsgi_exporter/uwsgi_exporter-0-r1.ebuild13
-rw-r--r--acct-user/uwsgi_exporter/uwsgi_exporter-0.ebuild13
-rw-r--r--acct-user/vacation/Manifest2
-rw-r--r--acct-user/vacation/vacation-0-r1.ebuild13
-rw-r--r--acct-user/vacation/vacation-0.ebuild13
-rw-r--r--acct-user/varnish/Manifest2
-rw-r--r--acct-user/varnish/varnish-0-r1.ebuild14
-rw-r--r--acct-user/varnish/varnish-0-r2.ebuild14
-rw-r--r--acct-user/vault/Manifest2
-rw-r--r--acct-user/vault/vault-0-r1.ebuild12
-rw-r--r--acct-user/vault/vault-0-r2.ebuild12
-rw-r--r--acct-user/vault_exporter/Manifest2
-rw-r--r--acct-user/vault_exporter/vault_exporter-0-r1.ebuild13
-rw-r--r--acct-user/vault_exporter/vault_exporter-0.ebuild13
-rw-r--r--acct-user/vboxguest/Manifest2
-rw-r--r--acct-user/vboxguest/vboxguest-0-r1.ebuild13
-rw-r--r--acct-user/vboxguest/vboxguest-0-r2.ebuild13
-rw-r--r--acct-user/vdr/Manifest2
-rw-r--r--acct-user/vdr/vdr-0-r1.ebuild63
-rw-r--r--acct-user/vdr/vdr-0-r2.ebuild63
-rw-r--r--acct-user/vdradmin/Manifest2
-rw-r--r--acct-user/vdradmin/vdradmin-0-r1.ebuild16
-rw-r--r--acct-user/vdradmin/vdradmin-0-r2.ebuild16
-rw-r--r--acct-user/vnstat/Manifest2
-rw-r--r--acct-user/vnstat/vnstat-0-r1.ebuild12
-rw-r--r--acct-user/vnstat/vnstat-0.ebuild12
-rw-r--r--acct-user/vpopmail/Manifest2
-rw-r--r--acct-user/vpopmail/vpopmail-0-r1.ebuild13
-rw-r--r--acct-user/vpopmail/vpopmail-0-r2.ebuild13
-rw-r--r--acct-user/wesnoth/Manifest2
-rw-r--r--acct-user/wesnoth/wesnoth-0-r1.ebuild13
-rw-r--r--acct-user/wesnoth/wesnoth-0-r2.ebuild13
-rw-r--r--acct-user/wwwoffle/Manifest2
-rw-r--r--acct-user/wwwoffle/wwwoffle-0-r1.ebuild14
-rw-r--r--acct-user/wwwoffle/wwwoffle-0.ebuild14
-rw-r--r--acct-user/x2goprint/Manifest2
-rw-r--r--acct-user/x2goprint/x2goprint-0-r1.ebuild13
-rw-r--r--acct-user/x2goprint/x2goprint-0-r2.ebuild13
-rw-r--r--acct-user/x2gouser/Manifest2
-rw-r--r--acct-user/x2gouser/x2gouser-0-r1.ebuild13
-rw-r--r--acct-user/x2gouser/x2gouser-0-r2.ebuild13
-rw-r--r--acct-user/xrootd/Manifest2
-rw-r--r--acct-user/xrootd/xrootd-0-r1.ebuild12
-rw-r--r--acct-user/xrootd/xrootd-0-r2.ebuild12
-rw-r--r--acct-user/yubihsm-connector/Manifest2
-rw-r--r--acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild (renamed from acct-user/yubihsm-connector/yubihsm-connector-0.ebuild)0
-rw-r--r--acct-user/zabbix/Manifest2
-rw-r--r--acct-user/zabbix/zabbix-0-r1.ebuild15
-rw-r--r--acct-user/zabbix/zabbix-0.ebuild15
-rw-r--r--acct-user/zeppelin/Manifest2
-rw-r--r--acct-user/zeppelin/zeppelin-0-r1.ebuild14
-rw-r--r--acct-user/zeppelin/zeppelin-0-r2.ebuild14
-rw-r--r--acct-user/zetcd/Manifest2
-rw-r--r--acct-user/zetcd/zetcd-0-r1.ebuild13
-rw-r--r--acct-user/zetcd/zetcd-0.ebuild13
-rw-r--r--acct-user/ziproxy/Manifest2
-rw-r--r--acct-user/ziproxy/ziproxy-0-r1.ebuild11
-rw-r--r--acct-user/ziproxy/ziproxy-0.ebuild11
-rw-r--r--acct-user/znc/Manifest2
-rw-r--r--acct-user/znc/znc-0-r1.ebuild16
-rw-r--r--acct-user/znc/znc-0-r2.ebuild16
-rw-r--r--acct-user/zookeeper/Manifest2
-rw-r--r--acct-user/zookeeper/zookeeper-0-r1.ebuild14
-rw-r--r--acct-user/zookeeper/zookeeper-0.ebuild14
-rw-r--r--app-emulation/Manifest.gzbin15338 -> 15336 bytes
-rw-r--r--app-emulation/diskimage-builder/Manifest3
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-3.30.0-r1.ebuild41
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-9999.ebuild3
-rw-r--r--app-misc/Manifest.gzbin49765 -> 49764 bytes
-rw-r--r--app-misc/broot/Manifest6
-rw-r--r--app-misc/broot/broot-1.23.0.ebuild370
-rw-r--r--dev-libs/Manifest.gzbin97951 -> 97942 bytes
-rw-r--r--dev-libs/apache-arrow/Manifest4
-rw-r--r--dev-libs/apache-arrow/apache-arrow-12.0.1.ebuild120
-rw-r--r--dev-libs/libxml2/Manifest2
-rw-r--r--dev-libs/libxml2/libxml2-2.11.4.ebuild2
-rw-r--r--dev-libs/libxslt/Manifest2
-rw-r--r--dev-libs/libxslt/libxslt-1.1.38.ebuild2
-rw-r--r--dev-libs/opensc/Manifest2
-rw-r--r--dev-libs/opensc/opensc-0.23.0-r1.ebuild2
-rw-r--r--dev-ml/Manifest.gzbin38145 -> 38154 bytes
-rw-r--r--dev-ml/timezone/Manifest2
-rw-r--r--dev-ml/timezone/timezone-0.16.0-r1.ebuild22
-rw-r--r--dev-ml/timezone/timezone-0.16.0.ebuild22
-rw-r--r--dev-php/Manifest.gzbin38204 -> 38208 bytes
-rw-r--r--dev-php/recaptcha/Manifest2
-rw-r--r--dev-php/recaptcha/recaptcha-1.2.4.ebuild4
-rw-r--r--dev-python/Arpeggio/Arpeggio-2.0.2.ebuild28
-rw-r--r--dev-python/Arpeggio/Manifest2
-rw-r--r--dev-python/Faker/Faker-18.11.2.ebuild2
-rw-r--r--dev-python/Faker/Manifest2
-rw-r--r--dev-python/Manifest.gzbin264462 -> 264555 bytes
-rw-r--r--dev-python/PyQt-builder/Manifest2
-rw-r--r--dev-python/PyQt-builder/PyQt-builder-1.15.1.ebuild2
-rw-r--r--dev-python/arrow/Manifest2
-rw-r--r--dev-python/arrow/arrow-1.2.3.ebuild2
-rw-r--r--dev-python/attrs/Manifest2
-rw-r--r--dev-python/attrs/attrs-23.1.0.ebuild2
-rw-r--r--dev-python/cffi/Manifest2
-rw-r--r--dev-python/cffi/cffi-1.15.1-r3.ebuild2
-rw-r--r--dev-python/cfn-lint/Manifest2
-rw-r--r--dev-python/cfn-lint/cfn-lint-0.77.10.ebuild2
-rw-r--r--dev-python/cryptography/Manifest2
-rw-r--r--dev-python/cryptography/cryptography-41.0.1.ebuild2
-rw-r--r--dev-python/denonavr/Manifest2
-rw-r--r--dev-python/denonavr/denonavr-0.11.3.ebuild40
-rw-r--r--dev-python/deprecation/Manifest2
-rw-r--r--dev-python/deprecation/deprecation-2.1.0-r1.ebuild2
-rw-r--r--dev-python/docker/Manifest2
-rw-r--r--dev-python/docker/docker-6.1.3.ebuild2
-rw-r--r--dev-python/eradicate/Manifest2
-rw-r--r--dev-python/eradicate/eradicate-2.3.0.ebuild2
-rw-r--r--dev-python/filelock/Manifest2
-rw-r--r--dev-python/filelock/filelock-3.12.2.ebuild2
-rw-r--r--dev-python/fqdn/Manifest2
-rw-r--r--dev-python/fqdn/fqdn-1.5.1-r2.ebuild2
-rw-r--r--dev-python/fritzconnection/Manifest2
-rw-r--r--dev-python/fritzconnection/fritzconnection-1.12.2.ebuild45
-rw-r--r--dev-python/h5py/Manifest2
-rw-r--r--dev-python/h5py/h5py-3.9.0.ebuild2
-rw-r--r--dev-python/hatch-fancy-pypi-readme/Manifest2
-rw-r--r--dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild2
-rw-r--r--dev-python/hatch-vcs/Manifest2
-rw-r--r--dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild2
-rw-r--r--dev-python/idna/Manifest2
-rw-r--r--dev-python/idna/idna-3.4.ebuild2
-rw-r--r--dev-python/ipython/Manifest2
-rw-r--r--dev-python/ipython/ipython-8.14.0.ebuild2
-rw-r--r--dev-python/iso8601/Manifest2
-rw-r--r--dev-python/iso8601/iso8601-2.0.0.ebuild2
-rw-r--r--dev-python/isoduration/Manifest2
-rw-r--r--dev-python/isoduration/isoduration-20.11.0-r1.ebuild2
-rw-r--r--dev-python/jsonpointer/Manifest2
-rw-r--r--dev-python/jsonpointer/jsonpointer-2.4.ebuild2
-rw-r--r--dev-python/jsonschema-specifications/Manifest2
-rw-r--r--dev-python/jsonschema-specifications/jsonschema-specifications-2023.6.1.ebuild2
-rw-r--r--dev-python/jsonschema/Manifest4
-rw-r--r--dev-python/jsonschema/jsonschema-4.17.3.ebuild2
-rw-r--r--dev-python/jsonschema/jsonschema-4.18.0.ebuild2
-rw-r--r--dev-python/kaptan/Manifest2
-rw-r--r--dev-python/kaptan/kaptan-0.5.12-r4.ebuild2
-rw-r--r--dev-python/lark/Manifest2
-rw-r--r--dev-python/lark/lark-1.1.5.ebuild2
-rw-r--r--dev-python/mdit-py-plugins/Manifest2
-rw-r--r--dev-python/mdit-py-plugins/mdit-py-plugins-0.4.0.ebuild2
-rw-r--r--dev-python/mergedeep/Manifest2
-rw-r--r--dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild2
-rw-r--r--dev-python/moto/Manifest2
-rw-r--r--dev-python/moto/moto-4.1.12.ebuild2
-rw-r--r--dev-python/munch/Manifest2
-rw-r--r--dev-python/munch/munch-3.0.0.ebuild2
-rw-r--r--dev-python/nbformat/Manifest2
-rw-r--r--dev-python/nbformat/nbformat-5.9.0.ebuild2
-rw-r--r--dev-python/nodeenv/Manifest2
-rw-r--r--dev-python/nodeenv/nodeenv-1.8.0.ebuild2
-rw-r--r--dev-python/numpy/Manifest2
-rw-r--r--dev-python/numpy/numpy-1.24.4-r1.ebuild2
-rw-r--r--dev-python/openapi-schema-validator/Manifest2
-rw-r--r--dev-python/openapi-schema-validator/openapi-schema-validator-0.6.0.ebuild33
-rw-r--r--dev-python/pallets-sphinx-themes/Manifest2
-rw-r--r--dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.1.ebuild2
-rw-r--r--dev-python/phonenumbers/Manifest2
-rw-r--r--dev-python/phonenumbers/phonenumbers-8.13.15.ebuild2
-rw-r--r--dev-python/pkgconfig/Manifest2
-rw-r--r--dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild2
-rw-r--r--dev-python/poetry-core/Manifest2
-rw-r--r--dev-python/poetry-core/poetry-core-1.6.1.ebuild2
-rw-r--r--dev-python/pygraphviz/Manifest2
-rw-r--r--dev-python/pygraphviz/pygraphviz-1.11.ebuild2
-rw-r--r--dev-python/pylast/Manifest2
-rw-r--r--dev-python/pylast/pylast-5.2.0.ebuild2
-rw-r--r--dev-python/pyopenssl/Manifest2
-rw-r--r--dev-python/pyopenssl/pyopenssl-23.2.0.ebuild2
-rw-r--r--dev-python/pyproject-api/Manifest2
-rw-r--r--dev-python/pyproject-api/pyproject-api-1.5.3.ebuild2
-rw-r--r--dev-python/pyroute2/Manifest2
-rw-r--r--dev-python/pyroute2/pyroute2-0.7.9.ebuild2
-rw-r--r--dev-python/pyrsistent/Manifest2
-rw-r--r--dev-python/pyrsistent/pyrsistent-0.19.3.ebuild2
-rw-r--r--dev-python/pytest-check/Manifest2
-rw-r--r--dev-python/pytest-check/pytest-check-2.1.5.ebuild2
-rw-r--r--dev-python/pytest-mock/Manifest2
-rw-r--r--dev-python/pytest-mock/pytest-mock-3.11.1.ebuild2
-rw-r--r--dev-python/python-dateutil/Manifest2
-rw-r--r--dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild2
-rw-r--r--dev-python/python-lsp-jsonrpc/Manifest1
-rw-r--r--dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0-r1.ebuild35
-rw-r--r--dev-python/python-mimeparse/Manifest2
-rw-r--r--dev-python/python-mimeparse/python-mimeparse-1.6.0-r4.ebuild2
-rw-r--r--dev-python/python-utils/Manifest2
-rw-r--r--dev-python/python-utils/python-utils-3.7.0.ebuild2
-rw-r--r--dev-python/readthedocs-sphinx-ext/Manifest2
-rw-r--r--dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.2.ebuild2
-rw-r--r--dev-python/referencing/Manifest2
-rw-r--r--dev-python/referencing/referencing-0.29.1.ebuild2
-rw-r--r--dev-python/regex/Manifest2
-rw-r--r--dev-python/regex/regex-2023.6.3.ebuild2
-rw-r--r--dev-python/requests-mock/Manifest2
-rw-r--r--dev-python/requests-mock/requests-mock-1.11.0.ebuild2
-rw-r--r--dev-python/rfc3339-validator/Manifest2
-rw-r--r--dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild2
-rw-r--r--dev-python/rfc3986-validator/Manifest2
-rw-r--r--dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild2
-rw-r--r--dev-python/rfc3987/Manifest2
-rw-r--r--dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild2
-rw-r--r--dev-python/rpds-py/Manifest2
-rw-r--r--dev-python/rpds-py/rpds-py-0.8.10.ebuild2
-rw-r--r--dev-python/selenium/Manifest2
-rw-r--r--dev-python/selenium/selenium-4.10.0.ebuild2
-rw-r--r--dev-python/sentry-sdk/Manifest2
-rw-r--r--dev-python/sentry-sdk/sentry-sdk-1.26.0.ebuild2
-rw-r--r--dev-python/six/Manifest2
-rw-r--r--dev-python/six/six-1.16.0-r1.ebuild2
-rw-r--r--dev-python/smmap/Manifest2
-rw-r--r--dev-python/smmap/smmap-5.0.0-r1.ebuild2
-rw-r--r--dev-python/sphinx-multiversion/Manifest4
-rw-r--r--dev-python/sphinx-multiversion/metadata.xml1
-rw-r--r--dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4-r1.ebuild23
-rw-r--r--dev-python/sphinx-panels/Manifest4
-rw-r--r--dev-python/sphinx-panels/metadata.xml1
-rw-r--r--dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild26
-rw-r--r--dev-python/sphinx-pytest/Manifest2
-rw-r--r--dev-python/sphinx-pytest/sphinx-pytest-0.1.1.ebuild2
-rw-r--r--dev-python/sphinx-rtd-theme/Manifest2
-rw-r--r--dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.2-r1.ebuild2
-rw-r--r--dev-python/sphinxcontrib-jsmath/Manifest2
-rw-r--r--dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r3.ebuild2
-rw-r--r--dev-python/sphinxcontrib-qthelp/Manifest2
-rw-r--r--dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r2.ebuild2
-rw-r--r--dev-python/sphinxcontrib-trio/Manifest1
-rw-r--r--dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild38
-rw-r--r--dev-python/starlette/Manifest2
-rw-r--r--dev-python/starlette/starlette-0.28.0.ebuild2
-rw-r--r--dev-python/stdio-mgr/Manifest2
-rw-r--r--dev-python/stdio-mgr/stdio-mgr-1.0.1-r1.ebuild2
-rw-r--r--dev-python/stevedore/Manifest2
-rw-r--r--dev-python/stevedore/stevedore-5.1.0.ebuild2
-rw-r--r--dev-python/strict-rfc3339/Manifest2
-rw-r--r--dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild2
-rw-r--r--dev-python/tavern/Manifest2
-rw-r--r--dev-python/tavern/tavern-2.2.0.ebuild2
-rw-r--r--dev-python/tempest/Manifest2
-rw-r--r--dev-python/tempest/tempest-35.0.0.ebuild2
-rw-r--r--dev-python/testresources/Manifest2
-rw-r--r--dev-python/testresources/testresources-2.0.1-r3.ebuild2
-rw-r--r--dev-python/testtools/Manifest2
-rw-r--r--dev-python/testtools/testtools-2.6.0-r1.ebuild2
-rw-r--r--dev-python/three-merge/Manifest2
-rw-r--r--dev-python/three-merge/three-merge-0.1.1-r1.ebuild2
-rw-r--r--dev-python/time-machine/Manifest2
-rw-r--r--dev-python/time-machine/time-machine-2.10.0.ebuild2
-rw-r--r--dev-python/tiny-proxy/Manifest2
-rw-r--r--dev-python/tiny-proxy/tiny-proxy-0.2.0.ebuild2
-rw-r--r--dev-python/tornado/Manifest2
-rw-r--r--dev-python/tornado/tornado-6.3.2-r1.ebuild2
-rw-r--r--dev-python/towncrier/Manifest2
-rw-r--r--dev-python/towncrier/towncrier-23.6.0.ebuild2
-rw-r--r--dev-python/trio-websocket/Manifest2
-rw-r--r--dev-python/trio-websocket/trio-websocket-0.10.3.ebuild2
-rw-r--r--dev-python/trio/Manifest2
-rw-r--r--dev-python/trio/trio-0.22.0_p20230530-r1.ebuild2
-rw-r--r--dev-python/uri_template/Manifest2
-rw-r--r--dev-python/uri_template/uri_template-1.3.0.ebuild2
-rw-r--r--dev-python/virtualenv/Manifest2
-rw-r--r--dev-python/virtualenv/virtualenv-20.23.1.ebuild2
-rw-r--r--dev-python/webcolors/Manifest2
-rw-r--r--dev-python/webcolors/webcolors-1.13.ebuild2
-rw-r--r--dev-python/websocket-client/Manifest2
-rw-r--r--dev-python/websocket-client/websocket-client-1.6.1.ebuild2
-rw-r--r--dev-python/werkzeug/Manifest2
-rw-r--r--dev-python/werkzeug/werkzeug-2.3.6.ebuild2
-rw-r--r--dev-qt/Manifest.gzbin11191 -> 11213 bytes
-rw-r--r--dev-qt/assistant/Manifest2
-rw-r--r--dev-qt/assistant/assistant-5.15.10.ebuild2
-rw-r--r--dev-qt/designer/Manifest2
-rw-r--r--dev-qt/designer/designer-5.15.10.ebuild2
-rw-r--r--dev-qt/linguist-tools/Manifest2
-rw-r--r--dev-qt/linguist-tools/linguist-tools-5.15.10.ebuild2
-rw-r--r--dev-qt/linguist/Manifest2
-rw-r--r--dev-qt/linguist/linguist-5.15.10.ebuild2
-rw-r--r--dev-qt/pixeltool/Manifest2
-rw-r--r--dev-qt/pixeltool/pixeltool-5.15.10.ebuild2
-rw-r--r--dev-qt/qdbus/Manifest2
-rw-r--r--dev-qt/qdbus/qdbus-5.15.10.ebuild2
-rw-r--r--dev-qt/qdbusviewer/Manifest2
-rw-r--r--dev-qt/qdbusviewer/qdbusviewer-5.15.10.ebuild2
-rw-r--r--dev-qt/qdoc/Manifest2
-rw-r--r--dev-qt/qdoc/qdoc-5.15.10.ebuild2
-rw-r--r--dev-qt/qt3d/Manifest2
-rw-r--r--dev-qt/qt3d/qt3d-5.15.10.ebuild2
-rw-r--r--dev-qt/qtbluetooth/Manifest2
-rw-r--r--dev-qt/qtbluetooth/qtbluetooth-5.15.10.ebuild2
-rw-r--r--dev-qt/qtcharts/Manifest2
-rw-r--r--dev-qt/qtcharts/qtcharts-5.15.10.ebuild2
-rw-r--r--dev-qt/qtconcurrent/Manifest2
-rw-r--r--dev-qt/qtconcurrent/qtconcurrent-5.15.10.ebuild2
-rw-r--r--dev-qt/qtcore/Manifest2
-rw-r--r--dev-qt/qtcore/qtcore-5.15.10.ebuild2
-rw-r--r--dev-qt/qtdatavis3d/Manifest2
-rw-r--r--dev-qt/qtdatavis3d/qtdatavis3d-5.15.10.ebuild2
-rw-r--r--dev-qt/qtdbus/Manifest2
-rw-r--r--dev-qt/qtdbus/qtdbus-5.15.10.ebuild2
-rw-r--r--dev-qt/qtdeclarative/Manifest2
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.15.10-r2.ebuild2
-rw-r--r--dev-qt/qtdiag/Manifest2
-rw-r--r--dev-qt/qtdiag/qtdiag-5.15.10.ebuild2
-rw-r--r--dev-qt/qtgamepad/Manifest2
-rw-r--r--dev-qt/qtgamepad/qtgamepad-5.15.10.ebuild2
-rw-r--r--dev-qt/qtgraphicaleffects/Manifest2
-rw-r--r--dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.10.ebuild2
-rw-r--r--dev-qt/qtgui/Manifest2
-rw-r--r--dev-qt/qtgui/qtgui-5.15.10.ebuild2
-rw-r--r--dev-qt/qthelp/Manifest2
-rw-r--r--dev-qt/qthelp/qthelp-5.15.10.ebuild2
-rw-r--r--dev-qt/qtimageformats/Manifest2
-rw-r--r--dev-qt/qtimageformats/qtimageformats-5.15.10.ebuild2
-rw-r--r--dev-qt/qtlocation/Manifest2
-rw-r--r--dev-qt/qtlocation/qtlocation-5.15.10.ebuild2
-rw-r--r--dev-qt/qtmultimedia/Manifest2
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-5.15.10.ebuild2
-rw-r--r--dev-qt/qtnetwork/Manifest2
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild2
-rw-r--r--dev-qt/qtnetworkauth/Manifest2
-rw-r--r--dev-qt/qtnetworkauth/qtnetworkauth-5.15.10.ebuild2
-rw-r--r--dev-qt/qtopengl/Manifest2
-rw-r--r--dev-qt/qtopengl/qtopengl-5.15.10.ebuild2
-rw-r--r--dev-qt/qtpaths/Manifest2
-rw-r--r--dev-qt/qtpaths/qtpaths-5.15.10.ebuild2
-rw-r--r--dev-qt/qtpositioning/Manifest2
-rw-r--r--dev-qt/qtpositioning/qtpositioning-5.15.10.ebuild2
-rw-r--r--dev-qt/qtprintsupport/Manifest2
-rw-r--r--dev-qt/qtprintsupport/qtprintsupport-5.15.10.ebuild2
-rw-r--r--dev-qt/qtquickcontrols/Manifest2
-rw-r--r--dev-qt/qtquickcontrols/qtquickcontrols-5.15.10.ebuild2
-rw-r--r--dev-qt/qtquickcontrols2/Manifest2
-rw-r--r--dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.10.ebuild2
-rw-r--r--dev-qt/qtscript/Manifest2
-rw-r--r--dev-qt/qtscript/qtscript-5.15.10.ebuild2
-rw-r--r--dev-qt/qtscxml/Manifest2
-rw-r--r--dev-qt/qtscxml/qtscxml-5.15.10.ebuild2
-rw-r--r--dev-qt/qtsensors/Manifest2
-rw-r--r--dev-qt/qtsensors/qtsensors-5.15.10.ebuild2
-rw-r--r--dev-qt/qtserialport/Manifest2
-rw-r--r--dev-qt/qtserialport/qtserialport-5.15.10.ebuild2
-rw-r--r--dev-qt/qtspeech/Manifest2
-rw-r--r--dev-qt/qtspeech/qtspeech-5.15.10.ebuild2
-rw-r--r--dev-qt/qtsql/Manifest2
-rw-r--r--dev-qt/qtsql/qtsql-5.15.10.ebuild2
-rw-r--r--dev-qt/qtsvg/Manifest2
-rw-r--r--dev-qt/qtsvg/qtsvg-5.15.10.ebuild2
-rw-r--r--dev-qt/qttest/Manifest2
-rw-r--r--dev-qt/qttest/qttest-5.15.10.ebuild2
-rw-r--r--dev-qt/qttranslations/Manifest2
-rw-r--r--dev-qt/qttranslations/qttranslations-5.15.10.ebuild2
-rw-r--r--dev-qt/qtvirtualkeyboard/Manifest2
-rw-r--r--dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.10.ebuild2
-rw-r--r--dev-qt/qtwayland/Manifest2
-rw-r--r--dev-qt/qtwayland/qtwayland-5.15.10.ebuild2
-rw-r--r--dev-qt/qtwaylandscanner/Manifest2
-rw-r--r--dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.10.ebuild2
-rw-r--r--dev-qt/qtwebchannel/Manifest2
-rw-r--r--dev-qt/qtwebchannel/qtwebchannel-5.15.10.ebuild2
-rw-r--r--dev-qt/qtwebengine/Manifest2
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild2
-rw-r--r--dev-qt/qtwebsockets/Manifest2
-rw-r--r--dev-qt/qtwebsockets/qtwebsockets-5.15.10.ebuild2
-rw-r--r--dev-qt/qtwebview/Manifest2
-rw-r--r--dev-qt/qtwebview/qtwebview-5.15.10.ebuild2
-rw-r--r--dev-qt/qtwidgets/Manifest2
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.15.10-r1.ebuild2
-rw-r--r--dev-qt/qtx11extras/Manifest2
-rw-r--r--dev-qt/qtx11extras/qtx11extras-5.15.10.ebuild2
-rw-r--r--dev-qt/qtxml/Manifest2
-rw-r--r--dev-qt/qtxml/qtxml-5.15.10.ebuild2
-rw-r--r--dev-qt/qtxmlpatterns/Manifest2
-rw-r--r--dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.10.ebuild2
-rw-r--r--dev-ruby/Manifest.gzbin106428 -> 106419 bytes
-rw-r--r--dev-ruby/sus/Manifest6
-rw-r--r--dev-ruby/sus/sus-0.15.2.ebuild32
-rw-r--r--dev-ruby/sus/sus-0.16.0.ebuild32
-rw-r--r--dev-ruby/sus/sus-0.18.0.ebuild32
-rw-r--r--dev-ruby/syslogger/Manifest2
-rw-r--r--dev-ruby/syslogger/syslogger-1.6.6-r2.ebuild2
-rw-r--r--dev-ruby/temple/Manifest2
-rw-r--r--dev-ruby/temple/temple-0.9.1.ebuild22
-rw-r--r--dev-ruby/tilt/Manifest2
-rw-r--r--dev-ruby/tilt/tilt-2.2.0.ebuild41
-rw-r--r--dev-util/Manifest.gzbin68467 -> 68463 bytes
-rw-r--r--dev-util/jenkins-bin/Manifest8
-rw-r--r--dev-util/jenkins-bin/files/jenkins-bin-r1.confd4
-rw-r--r--dev-util/jenkins-bin/files/jenkins-bin-r3.init1
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.401.2.ebuild4
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.410.ebuild4
-rw-r--r--eclass/Manifest.gzbin37981 -> 37981 bytes
-rw-r--r--eclass/user-info.eclass4
-rw-r--r--media-gfx/Manifest.gzbin37988 -> 37985 bytes
-rw-r--r--media-gfx/graphviz/Manifest2
-rw-r--r--media-gfx/graphviz/graphviz-8.1.0.ebuild213
-rw-r--r--media-libs/Manifest.gzbin68430 -> 68422 bytes
-rw-r--r--media-libs/dav1d/Manifest2
-rw-r--r--media-libs/dav1d/dav1d-1.2.1.ebuild2
-rw-r--r--media-sound/Manifest.gzbin57400 -> 57401 bytes
-rw-r--r--media-sound/mixxx/Manifest2
-rw-r--r--media-sound/mixxx/mixxx-2.3.5-r1.ebuild2
-rw-r--r--media-video/Manifest.gzbin25355 -> 25354 bytes
-rw-r--r--media-video/vlc/Manifest2
-rw-r--r--media-video/vlc/vlc-3.0.18-r3.ebuild2
-rw-r--r--metadata/Manifest.gzbin3512 -> 3506 bytes
-rw-r--r--metadata/dtd/timestamp.chk2
-rw-r--r--metadata/glsa/Manifest28
-rw-r--r--metadata/glsa/timestamp.chk2
-rw-r--r--metadata/md5-cache/Manifest.gzbin27904 -> 27919 bytes
-rw-r--r--metadata/md5-cache/acct-group/Manifest.gzbin76100 -> 76066 bytes
-rw-r--r--metadata/md5-cache/acct-group/_cron-failure-08
-rw-r--r--metadata/md5-cache/acct-group/_cron-failure-0-r18
-rw-r--r--metadata/md5-cache/acct-group/adm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/adm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/aerospike-amc-08
-rw-r--r--metadata/md5-cache/acct-group/aerospike-amc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/airdcppd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/airdcppd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/alertmanager-08
-rw-r--r--metadata/md5-cache/acct-group/alertmanager-0-r18
-rw-r--r--metadata/md5-cache/acct-group/amanda-08
-rw-r--r--metadata/md5-cache/acct-group/amanda-0-r18
-rw-r--r--metadata/md5-cache/acct-group/amavis-0-r18
-rw-r--r--metadata/md5-cache/acct-group/amavis-0-r28
-rw-r--r--metadata/md5-cache/acct-group/amule-0-r18
-rw-r--r--metadata/md5-cache/acct-group/amule-0-r28
-rw-r--r--metadata/md5-cache/acct-group/android-08
-rw-r--r--metadata/md5-cache/acct-group/android-0-r18
-rw-r--r--metadata/md5-cache/acct-group/anope-0-r18
-rw-r--r--metadata/md5-cache/acct-group/anope-0-r28
-rw-r--r--metadata/md5-cache/acct-group/apache-0-r28
-rw-r--r--metadata/md5-cache/acct-group/apache-0-r38
-rw-r--r--metadata/md5-cache/acct-group/apt-cacher-ng-08
-rw-r--r--metadata/md5-cache/acct-group/apt-cacher-ng-0-r18
-rw-r--r--metadata/md5-cache/acct-group/argus-08
-rw-r--r--metadata/md5-cache/acct-group/argus-0-r18
-rw-r--r--metadata/md5-cache/acct-group/arpwatch-08
-rw-r--r--metadata/md5-cache/acct-group/arpwatch-0-r18
-rw-r--r--metadata/md5-cache/acct-group/artifactory-08
-rw-r--r--metadata/md5-cache/acct-group/artifactory-0-r18
-rw-r--r--metadata/md5-cache/acct-group/aspnet-08
-rw-r--r--metadata/md5-cache/acct-group/aspnet-0-r18
-rw-r--r--metadata/md5-cache/acct-group/asterisk-0-r18
-rw-r--r--metadata/md5-cache/acct-group/asterisk-0-r28
-rw-r--r--metadata/md5-cache/acct-group/at-08
-rw-r--r--metadata/md5-cache/acct-group/at-0-r18
-rw-r--r--metadata/md5-cache/acct-group/atheme-services-0-r18
-rw-r--r--metadata/md5-cache/acct-group/atheme-services-0-r28
-rw-r--r--metadata/md5-cache/acct-group/audio-0-r18
-rw-r--r--metadata/md5-cache/acct-group/audio-0-r28
-rw-r--r--metadata/md5-cache/acct-group/automatic-08
-rw-r--r--metadata/md5-cache/acct-group/automatic-0-r18
-rw-r--r--metadata/md5-cache/acct-group/automx2-0-r18
-rw-r--r--metadata/md5-cache/acct-group/automx2-0-r28
-rw-r--r--metadata/md5-cache/acct-group/avahi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/avahi-0-r28
-rw-r--r--metadata/md5-cache/acct-group/avahi-autoipd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/avahi-autoipd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/axtls-08
-rw-r--r--metadata/md5-cache/acct-group/axtls-0-r18
-rw-r--r--metadata/md5-cache/acct-group/backuppc-08
-rw-r--r--metadata/md5-cache/acct-group/backuppc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bacula-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bacula-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bareos-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bareos-0-r28
-rw-r--r--metadata/md5-cache/acct-group/beanstalk-08
-rw-r--r--metadata/md5-cache/acct-group/beanstalk-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bedrock-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bedrock-0-r28
-rw-r--r--metadata/md5-cache/acct-group/biboumi-08
-rw-r--r--metadata/md5-cache/acct-group/biboumi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bind_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bind_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bird-08
-rw-r--r--metadata/md5-cache/acct-group/bird-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bitcoin-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bitcoin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bitflu-08
-rw-r--r--metadata/md5-cache/acct-group/bitflu-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bitlbee-0-r18
-rw-r--r--metadata/md5-cache/acct-group/bitlbee-0-r28
-rw-r--r--metadata/md5-cache/acct-group/blackbox_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/blackbox_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/boinc-08
-rw-r--r--metadata/md5-cache/acct-group/boinc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/brlapi-08
-rw-r--r--metadata/md5-cache/acct-group/brlapi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/brltty-08
-rw-r--r--metadata/md5-cache/acct-group/brltty-0-r18
-rw-r--r--metadata/md5-cache/acct-group/buildbot-0-r18
-rw-r--r--metadata/md5-cache/acct-group/buildbot-0-r28
-rw-r--r--metadata/md5-cache/acct-group/bumblebee-08
-rw-r--r--metadata/md5-cache/acct-group/bumblebee-0-r18
-rw-r--r--metadata/md5-cache/acct-group/burp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/burp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/burrow_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/burrow_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cadvisor-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cadvisor-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cancd-08
-rw-r--r--metadata/md5-cache/acct-group/cancd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/carbon-0-r18
-rw-r--r--metadata/md5-cache/acct-group/carbon-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cdrom-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cdrom-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ceph-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ceph-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cgit-08
-rw-r--r--metadata/md5-cache/acct-group/cgit-0-r18
-rw-r--r--metadata/md5-cache/acct-group/chronograf-0-r18
-rw-r--r--metadata/md5-cache/acct-group/chronograf-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cinder-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cinder-0-r28
-rw-r--r--metadata/md5-cache/acct-group/clair-0-r18
-rw-r--r--metadata/md5-cache/acct-group/clair-0-r28
-rw-r--r--metadata/md5-cache/acct-group/clamav-0-r18
-rw-r--r--metadata/md5-cache/acct-group/clamav-0-r28
-rw-r--r--metadata/md5-cache/acct-group/cntlm-08
-rw-r--r--metadata/md5-cache/acct-group/cntlm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cockroach-08
-rw-r--r--metadata/md5-cache/acct-group/cockroach-0-r18
-rw-r--r--metadata/md5-cache/acct-group/collectd-08
-rw-r--r--metadata/md5-cache/acct-group/collectd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/colord-08
-rw-r--r--metadata/md5-cache/acct-group/colord-0-r18
-rw-r--r--metadata/md5-cache/acct-group/consul-0-r18
-rw-r--r--metadata/md5-cache/acct-group/consul-0-r28
-rw-r--r--metadata/md5-cache/acct-group/consul-template-0-r18
-rw-r--r--metadata/md5-cache/acct-group/consul-template-0-r28
-rw-r--r--metadata/md5-cache/acct-group/consul_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/consul_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/coredns-08
-rw-r--r--metadata/md5-cache/acct-group/coredns-0-r18
-rw-r--r--metadata/md5-cache/acct-group/croc-08
-rw-r--r--metadata/md5-cache/acct-group/croc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cron-08
-rw-r--r--metadata/md5-cache/acct-group/cron-0-r18
-rw-r--r--metadata/md5-cache/acct-group/crontab-08
-rw-r--r--metadata/md5-cache/acct-group/crontab-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cvmfs-0-r18
-rw-r--r--metadata/md5-cache/acct-group/cvmfs-0-r28
-rw-r--r--metadata/md5-cache/acct-group/davfs2-0-r18
-rw-r--r--metadata/md5-cache/acct-group/davfs2-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dbmail-08
-rw-r--r--metadata/md5-cache/acct-group/dbmail-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dbskkd-08
-rw-r--r--metadata/md5-cache/acct-group/dbskkd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ddclient-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ddclient-0-r28
-rw-r--r--metadata/md5-cache/acct-group/defang-08
-rw-r--r--metadata/md5-cache/acct-group/defang-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dehydrated-08
-rw-r--r--metadata/md5-cache/acct-group/dehydrated-0-r18
-rw-r--r--metadata/md5-cache/acct-group/deluge-0-r18
-rw-r--r--metadata/md5-cache/acct-group/deluge-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dhcp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dhcp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dhcpcd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dhcpcd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dialout-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dialout-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dictd-08
-rw-r--r--metadata/md5-cache/acct-group/dictd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dirsrv-08
-rw-r--r--metadata/md5-cache/acct-group/dirsrv-0-r18
-rw-r--r--metadata/md5-cache/acct-group/disk-0-r18
-rw-r--r--metadata/md5-cache/acct-group/disk-0-r28
-rw-r--r--metadata/md5-cache/acct-group/distcc-18
-rw-r--r--metadata/md5-cache/acct-group/distcc-1-r18
-rw-r--r--metadata/md5-cache/acct-group/dnrd-08
-rw-r--r--metadata/md5-cache/acct-group/dnrd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dnscrypt-proxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dnscrypt-proxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dnsdist-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dnsdist-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dnsmasq-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dnsmasq-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dnsmasq_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dnsmasq_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/docker-0-r18
-rw-r--r--metadata/md5-cache/acct-group/docker-0-r28
-rw-r--r--metadata/md5-cache/acct-group/docker_auth-0-r18
-rw-r--r--metadata/md5-cache/acct-group/docker_auth-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dovecot-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dovecot-0-r28
-rw-r--r--metadata/md5-cache/acct-group/dovenull-0-r18
-rw-r--r--metadata/md5-cache/acct-group/dovenull-0-r28
-rw-r--r--metadata/md5-cache/acct-group/drone-08
-rw-r--r--metadata/md5-cache/acct-group/drone-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ejabberd-08
-rw-r--r--metadata/md5-cache/acct-group/ejabberd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/elasticsearch-0-r18
-rw-r--r--metadata/md5-cache/acct-group/elasticsearch-0-r28
-rw-r--r--metadata/md5-cache/acct-group/elasticsearch_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/elasticsearch_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/energi3-08
-rw-r--r--metadata/md5-cache/acct-group/energi3-0-r18
-rw-r--r--metadata/md5-cache/acct-group/epam-08
-rw-r--r--metadata/md5-cache/acct-group/epam-0-r18
-rw-r--r--metadata/md5-cache/acct-group/epmd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/epmd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/err-08
-rw-r--r--metadata/md5-cache/acct-group/err-0-r18
-rw-r--r--metadata/md5-cache/acct-group/etcd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/etcd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/exabgp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/exabgp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ez-ipupd-08
-rw-r--r--metadata/md5-cache/acct-group/ez-ipupd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fax-08
-rw-r--r--metadata/md5-cache/acct-group/fax-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fcron-08
-rw-r--r--metadata/md5-cache/acct-group/fcron-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fdm-08
-rw-r--r--metadata/md5-cache/acct-group/fdm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fetchmail-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fetchmail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fhem-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fhem-0-r28
-rw-r--r--metadata/md5-cache/acct-group/fingerprint-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fingerprint-0-r28
-rw-r--r--metadata/md5-cache/acct-group/firebird-0-r18
-rw-r--r--metadata/md5-cache/acct-group/firebird-0-r28
-rw-r--r--metadata/md5-cache/acct-group/flatpak-08
-rw-r--r--metadata/md5-cache/acct-group/flatpak-0-r18
-rw-r--r--metadata/md5-cache/acct-group/floppy-08
-rw-r--r--metadata/md5-cache/acct-group/floppy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/flows-08
-rw-r--r--metadata/md5-cache/acct-group/flows-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fluentd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fluentd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/foldingathome-08
-rw-r--r--metadata/md5-cache/acct-group/foldingathome-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fp-multiuser-08
-rw-r--r--metadata/md5-cache/acct-group/fp-multiuser-0-r18
-rw-r--r--metadata/md5-cache/acct-group/freenet-08
-rw-r--r--metadata/md5-cache/acct-group/freenet-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/fritzbox_smarthome_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/frr-08
-rw-r--r--metadata/md5-cache/acct-group/frr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ftp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ftp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ftpproxy-08
-rw-r--r--metadata/md5-cache/acct-group/ftpproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fvwm-crystal-0-r18
-rw-r--r--metadata/md5-cache/acct-group/fvwm-crystal-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gamemode-08
-rw-r--r--metadata/md5-cache/acct-group/gamemode-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gamestat-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gamestat-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gatling-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gatling-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gauth-08
-rw-r--r--metadata/md5-cache/acct-group/gauth-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gdm-08
-rw-r--r--metadata/md5-cache/acct-group/gdm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/geneweb-0-r18
-rw-r--r--metadata/md5-cache/acct-group/geneweb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/geoclue-08
-rw-r--r--metadata/md5-cache/acct-group/geoclue-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gerbera-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gerbera-0-r28
-rw-r--r--metadata/md5-cache/acct-group/git-0-r18
-rw-r--r--metadata/md5-cache/acct-group/git-0-r28
-rw-r--r--metadata/md5-cache/acct-group/github-exporter-08
-rw-r--r--metadata/md5-cache/acct-group/github-exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gitlab-runner-18
-rw-r--r--metadata/md5-cache/acct-group/gitlab-runner-1-r18
-rw-r--r--metadata/md5-cache/acct-group/gkrellmd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gkrellmd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/glance-0-r18
-rw-r--r--metadata/md5-cache/acct-group/glance-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gluster-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gluster-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gns3-08
-rw-r--r--metadata/md5-cache/acct-group/gns3-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gnump3d-08
-rw-r--r--metadata/md5-cache/acct-group/gnump3d-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gnupg-pkcs11-08
-rw-r--r--metadata/md5-cache/acct-group/gnupg-pkcs11-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-08
-rw-r--r--metadata/md5-cache/acct-group/gnupg-pkcs11-scd-proxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/goaccess-08
-rw-r--r--metadata/md5-cache/acct-group/goaccess-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gopher-08
-rw-r--r--metadata/md5-cache/acct-group/gopher-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gopherd-08
-rw-r--r--metadata/md5-cache/acct-group/gopherd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gpib-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gpib-0-r28
-rw-r--r--metadata/md5-cache/acct-group/gpio-08
-rw-r--r--metadata/md5-cache/acct-group/gpio-0-r18
-rw-r--r--metadata/md5-cache/acct-group/grafana-0-r18
-rw-r--r--metadata/md5-cache/acct-group/grafana-0-r28
-rw-r--r--metadata/md5-cache/acct-group/graylog-0-r18
-rw-r--r--metadata/md5-cache/acct-group/graylog-0-r28
-rw-r--r--metadata/md5-cache/acct-group/greetd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/greetd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/grok_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/grok_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/groonga-08
-rw-r--r--metadata/md5-cache/acct-group/groonga-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gvm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/gvm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/h2o-08
-rw-r--r--metadata/md5-cache/acct-group/h2o-0-r18
-rw-r--r--metadata/md5-cache/acct-group/haclient-08
-rw-r--r--metadata/md5-cache/acct-group/haclient-0-r18
-rw-r--r--metadata/md5-cache/acct-group/haproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/haproxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/havp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/havp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/headscale-08
-rw-r--r--metadata/md5-cache/acct-group/headscale-0-r18
-rw-r--r--metadata/md5-cache/acct-group/heat-0-r18
-rw-r--r--metadata/md5-cache/acct-group/heat-0-r28
-rw-r--r--metadata/md5-cache/acct-group/hsqldb-08
-rw-r--r--metadata/md5-cache/acct-group/hsqldb-0-r18
-rw-r--r--metadata/md5-cache/acct-group/http-08
-rw-r--r--metadata/md5-cache/acct-group/http-0-r18
-rw-r--r--metadata/md5-cache/acct-group/i2c-08
-rw-r--r--metadata/md5-cache/acct-group/i2c-0-r18
-rw-r--r--metadata/md5-cache/acct-group/i2p-0-r18
-rw-r--r--metadata/md5-cache/acct-group/i2p-0-r28
-rw-r--r--metadata/md5-cache/acct-group/i2pd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/i2pd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/icecast-08
-rw-r--r--metadata/md5-cache/acct-group/icecast-0-r18
-rw-r--r--metadata/md5-cache/acct-group/icecream-08
-rw-r--r--metadata/md5-cache/acct-group/icecream-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ices-08
-rw-r--r--metadata/md5-cache/acct-group/ices-0-r18
-rw-r--r--metadata/md5-cache/acct-group/icinga-0-r18
-rw-r--r--metadata/md5-cache/acct-group/icinga-0-r28
-rw-r--r--metadata/md5-cache/acct-group/icingacmd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/icingacmd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/icingaweb2-0-r18
-rw-r--r--metadata/md5-cache/acct-group/icingaweb2-0-r28
-rw-r--r--metadata/md5-cache/acct-group/inadyn-08
-rw-r--r--metadata/md5-cache/acct-group/inadyn-0-r18
-rw-r--r--metadata/md5-cache/acct-group/influxdb-0-r18
-rw-r--r--metadata/md5-cache/acct-group/influxdb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/input-0-r18
-rw-r--r--metadata/md5-cache/acct-group/input-0-r28
-rw-r--r--metadata/md5-cache/acct-group/inspircd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/inspircd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ipfs-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ipfs-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ipsec-08
-rw-r--r--metadata/md5-cache/acct-group/ipsec-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ipsentinel-08
-rw-r--r--metadata/md5-cache/acct-group/ipsentinel-0-r18
-rw-r--r--metadata/md5-cache/acct-group/iroffer-08
-rw-r--r--metadata/md5-cache/acct-group/iroffer-0-r18
-rw-r--r--metadata/md5-cache/acct-group/jellyfin-08
-rw-r--r--metadata/md5-cache/acct-group/jellyfin-0-r18
-rw-r--r--metadata/md5-cache/acct-group/jenkins-08
-rw-r--r--metadata/md5-cache/acct-group/jenkins-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kafka-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kafka-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kapacitor-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kapacitor-0-r28
-rw-r--r--metadata/md5-cache/acct-group/karma-08
-rw-r--r--metadata/md5-cache/acct-group/karma-0-r18
-rw-r--r--metadata/md5-cache/acct-group/keystone-0-r18
-rw-r--r--metadata/md5-cache/acct-group/keystone-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kibana-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kibana-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kismet-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kismet-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kmem-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kmem-0-r28
-rw-r--r--metadata/md5-cache/acct-group/knot-0-r18
-rw-r--r--metadata/md5-cache/acct-group/knot-0-r28
-rw-r--r--metadata/md5-cache/acct-group/knot-resolver-08
-rw-r--r--metadata/md5-cache/acct-group/knot-resolver-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kube-apiserver-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kube-apiserver-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kube-controller-manager-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kube-controller-manager-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kube-scheduler-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kube-scheduler-0-r28
-rw-r--r--metadata/md5-cache/acct-group/kvm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/kvm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ldap-08
-rw-r--r--metadata/md5-cache/acct-group/ldap-0-r18
-rw-r--r--metadata/md5-cache/acct-group/libreoffice-08
-rw-r--r--metadata/md5-cache/acct-group/libreoffice-0-r18
-rw-r--r--metadata/md5-cache/acct-group/libvirt-0-r18
-rw-r--r--metadata/md5-cache/acct-group/libvirt-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lightdm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lightdm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lighttpd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lighttpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/litecoin-08
-rw-r--r--metadata/md5-cache/acct-group/litecoin-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lldpd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lldpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/locate-0-r18
-rw-r--r--metadata/md5-cache/acct-group/locate-0-r28
-rw-r--r--metadata/md5-cache/acct-group/logcheck-08
-rw-r--r--metadata/md5-cache/acct-group/logcheck-0-r18
-rw-r--r--metadata/md5-cache/acct-group/logstash-0-r18
-rw-r--r--metadata/md5-cache/acct-group/logstash-0-r28
-rw-r--r--metadata/md5-cache/acct-group/logsurfer-08
-rw-r--r--metadata/md5-cache/acct-group/logsurfer-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lpadmin-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lpadmin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/lxc-08
-rw-r--r--metadata/md5-cache/acct-group/lxc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lxd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/lxd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mail-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/man-0-r18
-rw-r--r--metadata/md5-cache/acct-group/man-0-r28
-rw-r--r--metadata/md5-cache/acct-group/maradns-0-r18
-rw-r--r--metadata/md5-cache/acct-group/maradns-0-r28
-rw-r--r--metadata/md5-cache/acct-group/memcached-0-r18
-rw-r--r--metadata/md5-cache/acct-group/memcached-0-r28
-rw-r--r--metadata/md5-cache/acct-group/memcached_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/memcached_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/messagebus-0-r18
-rw-r--r--metadata/md5-cache/acct-group/messagebus-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mgraph-08
-rw-r--r--metadata/md5-cache/acct-group/mgraph-0-r18
-rw-r--r--metadata/md5-cache/acct-group/milter-regex-0-r18
-rw-r--r--metadata/md5-cache/acct-group/milter-regex-0-r28
-rw-r--r--metadata/md5-cache/acct-group/minbif-08
-rw-r--r--metadata/md5-cache/acct-group/minbif-0-r18
-rw-r--r--metadata/md5-cache/acct-group/minecraft-0-r18
-rw-r--r--metadata/md5-cache/acct-group/minecraft-0-r28
-rw-r--r--metadata/md5-cache/acct-group/minetest-0-r18
-rw-r--r--metadata/md5-cache/acct-group/minetest-0-r28
-rw-r--r--metadata/md5-cache/acct-group/minidlna-08
-rw-r--r--metadata/md5-cache/acct-group/minidlna-0-r18
-rw-r--r--metadata/md5-cache/acct-group/minio-08
-rw-r--r--metadata/md5-cache/acct-group/minio-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mogile-08
-rw-r--r--metadata/md5-cache/acct-group/mogile-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mongodb-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mongodb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mongodb_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/mongodb_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/monitorix-0-r18
-rw-r--r--metadata/md5-cache/acct-group/monitorix-0-r28
-rw-r--r--metadata/md5-cache/acct-group/monkeyd-08
-rw-r--r--metadata/md5-cache/acct-group/monkeyd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/monkeysphere-0-r18
-rw-r--r--metadata/md5-cache/acct-group/monkeysphere-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mosquitto-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mosquitto-0-r28
-rw-r--r--metadata/md5-cache/acct-group/motion-0-r18
-rw-r--r--metadata/md5-cache/acct-group/motion-0-r28
-rw-r--r--metadata/md5-cache/acct-group/msmtpd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/msmtpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/munge-08
-rw-r--r--metadata/md5-cache/acct-group/munge-0-r18
-rw-r--r--metadata/md5-cache/acct-group/munin-0-r18
-rw-r--r--metadata/md5-cache/acct-group/munin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/murmur-0-r18
-rw-r--r--metadata/md5-cache/acct-group/murmur-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mysql-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mysql-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mysqld_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mysqld_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/mythtv-0-r18
-rw-r--r--metadata/md5-cache/acct-group/mythtv-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nagios-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nagios-0-r28
-rw-r--r--metadata/md5-cache/acct-group/named-0-r18
-rw-r--r--metadata/md5-cache/acct-group/named-0-r28
-rw-r--r--metadata/md5-cache/acct-group/netbox-0-r18
-rw-r--r--metadata/md5-cache/acct-group/netbox-0-r28
-rw-r--r--metadata/md5-cache/acct-group/netdata-0-r18
-rw-r--r--metadata/md5-cache/acct-group/netdata-0-r28
-rw-r--r--metadata/md5-cache/acct-group/netdev-0-r18
-rw-r--r--metadata/md5-cache/acct-group/netdev-0-r28
-rw-r--r--metadata/md5-cache/acct-group/netperf-08
-rw-r--r--metadata/md5-cache/acct-group/netperf-0-r18
-rw-r--r--metadata/md5-cache/acct-group/neutron-0-r18
-rw-r--r--metadata/md5-cache/acct-group/neutron-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nginx-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nginx-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nginx-unit-08
-rw-r--r--metadata/md5-cache/acct-group/nginx-unit-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nginx-vts-exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nginx-vts-exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ngircd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ngircd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ngrep-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ngrep-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nm-openconnect-08
-rw-r--r--metadata/md5-cache/acct-group/nm-openconnect-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nm-openvpn-08
-rw-r--r--metadata/md5-cache/acct-group/nm-openvpn-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nobody-08
-rw-r--r--metadata/md5-cache/acct-group/nobody-0-r18
-rw-r--r--metadata/md5-cache/acct-group/node_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/node_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nofiles-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nofiles-0-r28
-rw-r--r--metadata/md5-cache/acct-group/notary-08
-rw-r--r--metadata/md5-cache/acct-group/notary-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nova-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nova-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nsd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nsd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nslcd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nslcd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ntopng-08
-rw-r--r--metadata/md5-cache/acct-group/ntopng-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ntp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ntp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/nullmail-08
-rw-r--r--metadata/md5-cache/acct-group/nullmail-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nut-08
-rw-r--r--metadata/md5-cache/acct-group/nut-0-r18
-rw-r--r--metadata/md5-cache/acct-group/nzbget-08
-rw-r--r--metadata/md5-cache/acct-group/nzbget-0-r18
-rw-r--r--metadata/md5-cache/acct-group/oidentd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/oidentd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openct-0-r18
-rw-r--r--metadata/md5-cache/acct-group/openct-0-r28
-rw-r--r--metadata/md5-cache/acct-group/opendkim-0-r18
-rw-r--r--metadata/md5-cache/acct-group/opendkim-0-r28
-rw-r--r--metadata/md5-cache/acct-group/opendmarc-18
-rw-r--r--metadata/md5-cache/acct-group/opendmarc-1-r18
-rw-r--r--metadata/md5-cache/acct-group/opendnssec-08
-rw-r--r--metadata/md5-cache/acct-group/opendnssec-0-r18
-rw-r--r--metadata/md5-cache/acct-group/openntpd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/openntpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openrct2-0-r18
-rw-r--r--metadata/md5-cache/acct-group/openrct2-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openttd-08
-rw-r--r--metadata/md5-cache/acct-group/openttd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/openvpn-0-r18
-rw-r--r--metadata/md5-cache/acct-group/openvpn-0-r28
-rw-r--r--metadata/md5-cache/acct-group/openvpn_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/openvpn_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/opm-08
-rw-r--r--metadata/md5-cache/acct-group/opm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/oprofile-0-r18
-rw-r--r--metadata/md5-cache/acct-group/oprofile-0-r28
-rw-r--r--metadata/md5-cache/acct-group/oragono-08
-rw-r--r--metadata/md5-cache/acct-group/oragono-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ossec-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ossec-0-r28
-rw-r--r--metadata/md5-cache/acct-group/owntracks-08
-rw-r--r--metadata/md5-cache/acct-group/owntracks-0-r18
-rw-r--r--metadata/md5-cache/acct-group/p2p-08
-rw-r--r--metadata/md5-cache/acct-group/p2p-0-r18
-rw-r--r--metadata/md5-cache/acct-group/partimag-0-r18
-rw-r--r--metadata/md5-cache/acct-group/partimag-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pcap-08
-rw-r--r--metadata/md5-cache/acct-group/pcap-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pcscd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pcscd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pdns-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pdns-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pdnsd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pdnsd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pgagent-08
-rw-r--r--metadata/md5-cache/acct-group/pgagent-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pipewire-08
-rw-r--r--metadata/md5-cache/acct-group/pipewire-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pkcs11-08
-rw-r--r--metadata/md5-cache/acct-group/pkcs11-0-r18
-rw-r--r--metadata/md5-cache/acct-group/placement-0-r18
-rw-r--r--metadata/md5-cache/acct-group/placement-0-r28
-rw-r--r--metadata/md5-cache/acct-group/plex-0-r18
-rw-r--r--metadata/md5-cache/acct-group/plex-0-r28
-rw-r--r--metadata/md5-cache/acct-group/plugdev-0-r18
-rw-r--r--metadata/md5-cache/acct-group/plugdev-0-r28
-rw-r--r--metadata/md5-cache/acct-group/polkitd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/polkitd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/polw-08
-rw-r--r--metadata/md5-cache/acct-group/polw-0-r18
-rw-r--r--metadata/md5-cache/acct-group/popa3d-08
-rw-r--r--metadata/md5-cache/acct-group/popa3d-0-r18
-rw-r--r--metadata/md5-cache/acct-group/portage-08
-rw-r--r--metadata/md5-cache/acct-group/portage-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postdrop-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postdrop-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postfix-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postfix-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postfix_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postfix_exporter-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postfwd-08
-rw-r--r--metadata/md5-cache/acct-group/postfwd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postgres-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postgres-0-r28
-rw-r--r--metadata/md5-cache/acct-group/postgres_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/postgres_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/postgrey-08
-rw-r--r--metadata/md5-cache/acct-group/postgrey-0-r18
-rw-r--r--metadata/md5-cache/acct-group/privoxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/privoxy-0-r28
-rw-r--r--metadata/md5-cache/acct-group/prometheus-0-r18
-rw-r--r--metadata/md5-cache/acct-group/prometheus-0-r28
-rw-r--r--metadata/md5-cache/acct-group/prosody-08
-rw-r--r--metadata/md5-cache/acct-group/prosody-0-r18
-rw-r--r--metadata/md5-cache/acct-group/prowlarr-08
-rw-r--r--metadata/md5-cache/acct-group/prowlarr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/psybnc-08
-rw-r--r--metadata/md5-cache/acct-group/psybnc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pulse-08
-rw-r--r--metadata/md5-cache/acct-group/pulse-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pulse-access-08
-rw-r--r--metadata/md5-cache/acct-group/pulse-access-0-r18
-rw-r--r--metadata/md5-cache/acct-group/puppet-0-r18
-rw-r--r--metadata/md5-cache/acct-group/puppet-0-r28
-rw-r--r--metadata/md5-cache/acct-group/puppetdb-0-r18
-rw-r--r--metadata/md5-cache/acct-group/puppetdb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/pushgateway-08
-rw-r--r--metadata/md5-cache/acct-group/pushgateway-0-r18
-rw-r--r--metadata/md5-cache/acct-group/pvpgn-08
-rw-r--r--metadata/md5-cache/acct-group/pvpgn-0-r18
-rw-r--r--metadata/md5-cache/acct-group/qemu-0-r18
-rw-r--r--metadata/md5-cache/acct-group/qemu-0-r28
-rw-r--r--metadata/md5-cache/acct-group/qmail-0-r18
-rw-r--r--metadata/md5-cache/acct-group/qmail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/quagga-0-r18
-rw-r--r--metadata/md5-cache/acct-group/quagga-0-r28
-rw-r--r--metadata/md5-cache/acct-group/quassel-0-r18
-rw-r--r--metadata/md5-cache/acct-group/quassel-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rabbitmq-08
-rw-r--r--metadata/md5-cache/acct-group/rabbitmq-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rabbitmq_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/rabbitmq_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/radarr-08
-rw-r--r--metadata/md5-cache/acct-group/radarr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/radicale-0-r18
-rw-r--r--metadata/md5-cache/acct-group/radicale-0-r28
-rw-r--r--metadata/md5-cache/acct-group/radius-0-r18
-rw-r--r--metadata/md5-cache/acct-group/radius-0-r28
-rw-r--r--metadata/md5-cache/acct-group/radvd-08
-rw-r--r--metadata/md5-cache/acct-group/radvd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rbldns-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rbldns-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rbot-08
-rw-r--r--metadata/md5-cache/acct-group/rbot-0-r18
-rw-r--r--metadata/md5-cache/acct-group/readarr-08
-rw-r--r--metadata/md5-cache/acct-group/readarr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/realtime-08
-rw-r--r--metadata/md5-cache/acct-group/realtime-0-r18
-rw-r--r--metadata/md5-cache/acct-group/redis-0-r18
-rw-r--r--metadata/md5-cache/acct-group/redis-0-r28
-rw-r--r--metadata/md5-cache/acct-group/redis_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/redis_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/redmine-0-r18
-rw-r--r--metadata/md5-cache/acct-group/redmine-0-r28
-rw-r--r--metadata/md5-cache/acct-group/redsocks-0-r18
-rw-r--r--metadata/md5-cache/acct-group/redsocks-0-r28
-rw-r--r--metadata/md5-cache/acct-group/reg-0-r18
-rw-r--r--metadata/md5-cache/acct-group/reg-0-r28
-rw-r--r--metadata/md5-cache/acct-group/registry-08
-rw-r--r--metadata/md5-cache/acct-group/registry-0-r18
-rw-r--r--metadata/md5-cache/acct-group/render-0-r18
-rw-r--r--metadata/md5-cache/acct-group/render-0-r28
-rw-r--r--metadata/md5-cache/acct-group/roccat-08
-rw-r--r--metadata/md5-cache/acct-group/roccat-0-r18
-rw-r--r--metadata/md5-cache/acct-group/root-08
-rw-r--r--metadata/md5-cache/acct-group/root-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rplayd-08
-rw-r--r--metadata/md5-cache/acct-group/rplayd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rrdcached-08
-rw-r--r--metadata/md5-cache/acct-group/rrdcached-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rslsync-08
-rw-r--r--metadata/md5-cache/acct-group/rslsync-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rspamd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rspamd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rstudio-server-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rstudio-server-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rt-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rt-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rtkit-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rtkit-0-r28
-rw-r--r--metadata/md5-cache/acct-group/rundeck-08
-rw-r--r--metadata/md5-cache/acct-group/rundeck-0-r18
-rw-r--r--metadata/md5-cache/acct-group/rwhoisd-08
-rw-r--r--metadata/md5-cache/acct-group/rwhoisd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sabnzbd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sabnzbd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sagan-08
-rw-r--r--metadata/md5-cache/acct-group/sagan-0-r18
-rw-r--r--metadata/md5-cache/acct-group/samplicator-08
-rw-r--r--metadata/md5-cache/acct-group/samplicator-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sancp-08
-rw-r--r--metadata/md5-cache/acct-group/sancp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sanlock-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sanlock-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sauerbraten-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sauerbraten-0-r28
-rw-r--r--metadata/md5-cache/acct-group/scanlogd-08
-rw-r--r--metadata/md5-cache/acct-group/scanlogd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/scanner-08
-rw-r--r--metadata/md5-cache/acct-group/scanner-0-r18
-rw-r--r--metadata/md5-cache/acct-group/scponly-0-r18
-rw-r--r--metadata/md5-cache/acct-group/scponly-0-r28
-rw-r--r--metadata/md5-cache/acct-group/scsi-08
-rw-r--r--metadata/md5-cache/acct-group/scsi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sddm-08
-rw-r--r--metadata/md5-cache/acct-group/sddm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/seat-08
-rw-r--r--metadata/md5-cache/acct-group/seat-0-r18
-rw-r--r--metadata/md5-cache/acct-group/serf-08
-rw-r--r--metadata/md5-cache/acct-group/serf-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sguil-08
-rw-r--r--metadata/md5-cache/acct-group/sguil-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sgx-08
-rw-r--r--metadata/md5-cache/acct-group/sgx-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sigh-08
-rw-r--r--metadata/md5-cache/acct-group/sigh-0-r18
-rw-r--r--metadata/md5-cache/acct-group/simplevirt-0-r18
-rw-r--r--metadata/md5-cache/acct-group/simplevirt-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sispmctl-08
-rw-r--r--metadata/md5-cache/acct-group/sispmctl-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sks-08
-rw-r--r--metadata/md5-cache/acct-group/sks-0-r18
-rw-r--r--metadata/md5-cache/acct-group/slurm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/slurm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/smmsp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/smmsp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/smokeping-08
-rw-r--r--metadata/md5-cache/acct-group/smokeping-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sms-08
-rw-r--r--metadata/md5-cache/acct-group/sms-0-r18
-rw-r--r--metadata/md5-cache/acct-group/smtpd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/smtpd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/smtpq-0-r18
-rw-r--r--metadata/md5-cache/acct-group/smtpq-0-r28
-rw-r--r--metadata/md5-cache/acct-group/snapserver-08
-rw-r--r--metadata/md5-cache/acct-group/snapserver-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sniproxy-08
-rw-r--r--metadata/md5-cache/acct-group/sniproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/snmp_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/snmp_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/snort-08
-rw-r--r--metadata/md5-cache/acct-group/snort-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sobby-08
-rw-r--r--metadata/md5-cache/acct-group/sobby-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sobexsrv-08
-rw-r--r--metadata/md5-cache/acct-group/sobexsrv-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sockd-08
-rw-r--r--metadata/md5-cache/acct-group/sockd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sogo-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sogo-0-r28
-rw-r--r--metadata/md5-cache/acct-group/soju-08
-rw-r--r--metadata/md5-cache/acct-group/soju-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sonarr-08
-rw-r--r--metadata/md5-cache/acct-group/sonarr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/spamd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/spamd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/spectrum-0-r18
-rw-r--r--metadata/md5-cache/acct-group/spectrum-0-r28
-rw-r--r--metadata/md5-cache/acct-group/spi-08
-rw-r--r--metadata/md5-cache/acct-group/spi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/spire-0-r18
-rw-r--r--metadata/md5-cache/acct-group/spire-0-r28
-rw-r--r--metadata/md5-cache/acct-group/spread-08
-rw-r--r--metadata/md5-cache/acct-group/spread-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sqlgrey-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sqlgrey-0-r28
-rw-r--r--metadata/md5-cache/acct-group/squid-0-r18
-rw-r--r--metadata/md5-cache/acct-group/squid-0-r28
-rw-r--r--metadata/md5-cache/acct-group/sshd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sshd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ssmtp-08
-rw-r--r--metadata/md5-cache/acct-group/ssmtp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/sstpc-08
-rw-r--r--metadata/md5-cache/acct-group/sstpc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stapdev-08
-rw-r--r--metadata/md5-cache/acct-group/stapdev-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stapsys-08
-rw-r--r--metadata/md5-cache/acct-group/stapsys-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stapusr-08
-rw-r--r--metadata/md5-cache/acct-group/stapusr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/steamcmd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/steamcmd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/stg-08
-rw-r--r--metadata/md5-cache/acct-group/stg-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stubby-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stubby-0-r28
-rw-r--r--metadata/md5-cache/acct-group/stunnel-0-r18
-rw-r--r--metadata/md5-cache/acct-group/stunnel-0-r28
-rw-r--r--metadata/md5-cache/acct-group/subsonic-08
-rw-r--r--metadata/md5-cache/acct-group/subsonic-0-r18
-rw-r--r--metadata/md5-cache/acct-group/supervisor-0-r18
-rw-r--r--metadata/md5-cache/acct-group/supervisor-0-r28
-rw-r--r--metadata/md5-cache/acct-group/suricata-0-r18
-rw-r--r--metadata/md5-cache/acct-group/suricata-0-r28
-rw-r--r--metadata/md5-cache/acct-group/svnusers-0-r18
-rw-r--r--metadata/md5-cache/acct-group/svnusers-0-r28
-rw-r--r--metadata/md5-cache/acct-group/svxlink-08
-rw-r--r--metadata/md5-cache/acct-group/svxlink-0-r18
-rw-r--r--metadata/md5-cache/acct-group/swift-0-r18
-rw-r--r--metadata/md5-cache/acct-group/swift-0-r28
-rw-r--r--metadata/md5-cache/acct-group/synapse-08
-rw-r--r--metadata/md5-cache/acct-group/synapse-0-r18
-rw-r--r--metadata/md5-cache/acct-group/syncthing-0-r18
-rw-r--r--metadata/md5-cache/acct-group/syncthing-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-coredump-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-coredump-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-hostname-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-hostname-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-journal-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-journal-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-journal-remote-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-journal-remote-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-network-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-network-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-oom-08
-rw-r--r--metadata/md5-cache/acct-group/systemd-oom-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-resolve-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-resolve-0-r28
-rw-r--r--metadata/md5-cache/acct-group/systemd-timesync-0-r18
-rw-r--r--metadata/md5-cache/acct-group/systemd-timesync-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tape-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tape-0-r28
-rw-r--r--metadata/md5-cache/acct-group/taskd-08
-rw-r--r--metadata/md5-cache/acct-group/taskd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/teamspeak-0-r18
-rw-r--r--metadata/md5-cache/acct-group/teamspeak-0-r28
-rw-r--r--metadata/md5-cache/acct-group/telegraf-0-r18
-rw-r--r--metadata/md5-cache/acct-group/telegraf-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tenshi-08
-rw-r--r--metadata/md5-cache/acct-group/tenshi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/thttpd-08
-rw-r--r--metadata/md5-cache/acct-group/thttpd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tinyproxy-08
-rw-r--r--metadata/md5-cache/acct-group/tinyproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tomcat-08
-rw-r--r--metadata/md5-cache/acct-group/tomcat-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tor-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tor-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tox-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tox-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tpm-08
-rw-r--r--metadata/md5-cache/acct-group/tpm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/transmission-0-r18
-rw-r--r--metadata/md5-cache/acct-group/transmission-0-r28
-rw-r--r--metadata/md5-cache/acct-group/trickster-08
-rw-r--r--metadata/md5-cache/acct-group/trickster-0-r18
-rw-r--r--metadata/md5-cache/acct-group/trojan-08
-rw-r--r--metadata/md5-cache/acct-group/trojan-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tsm-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tsm-0-r28
-rw-r--r--metadata/md5-cache/acct-group/tss-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tss-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ttrssd-08
-rw-r--r--metadata/md5-cache/acct-group/ttrssd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tty-0-r18
-rw-r--r--metadata/md5-cache/acct-group/tty-0-r28
-rw-r--r--metadata/md5-cache/acct-group/turnserver-0-r18
-rw-r--r--metadata/md5-cache/acct-group/turnserver-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ubridge-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ubridge-0-r28
-rw-r--r--metadata/md5-cache/acct-group/ulogd-08
-rw-r--r--metadata/md5-cache/acct-group/ulogd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ultimaker-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ultimaker-0-r28
-rw-r--r--metadata/md5-cache/acct-group/unbound-0-r18
-rw-r--r--metadata/md5-cache/acct-group/unbound-0-r28
-rw-r--r--metadata/md5-cache/acct-group/unbound-telemetry-08
-rw-r--r--metadata/md5-cache/acct-group/unbound-telemetry-0-r18
-rw-r--r--metadata/md5-cache/acct-group/unifi-0-r18
-rw-r--r--metadata/md5-cache/acct-group/unifi-0-r28
-rw-r--r--metadata/md5-cache/acct-group/unifi-video-08
-rw-r--r--metadata/md5-cache/acct-group/unifi-video-0-r18
-rw-r--r--metadata/md5-cache/acct-group/unrealircd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/unrealircd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/upmpdcli-08
-rw-r--r--metadata/md5-cache/acct-group/upmpdcli-0-r18
-rw-r--r--metadata/md5-cache/acct-group/uptimed-0-r28
-rw-r--r--metadata/md5-cache/acct-group/uptimed-0-r38
-rw-r--r--metadata/md5-cache/acct-group/usb-0-r18
-rw-r--r--metadata/md5-cache/acct-group/usb-0-r28
-rw-r--r--metadata/md5-cache/acct-group/users-08
-rw-r--r--metadata/md5-cache/acct-group/users-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ushare-08
-rw-r--r--metadata/md5-cache/acct-group/ushare-0-r18
-rw-r--r--metadata/md5-cache/acct-group/utmp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/utmp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/uucp-0-r18
-rw-r--r--metadata/md5-cache/acct-group/uucp-0-r28
-rw-r--r--metadata/md5-cache/acct-group/uwsgi_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/uwsgi_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vacation-08
-rw-r--r--metadata/md5-cache/acct-group/vacation-0-r18
-rw-r--r--metadata/md5-cache/acct-group/varnish-0-r18
-rw-r--r--metadata/md5-cache/acct-group/varnish-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vault-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vault-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vault_exporter-08
-rw-r--r--metadata/md5-cache/acct-group/vault_exporter-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vboxguest-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vboxguest-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vboxsf-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vboxsf-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vboxusers-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vboxusers-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vdr-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vdr-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vdradmin-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vdradmin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/video-0-r18
-rw-r--r--metadata/md5-cache/acct-group/video-0-r28
-rw-r--r--metadata/md5-cache/acct-group/vlock-08
-rw-r--r--metadata/md5-cache/acct-group/vlock-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vnstat-08
-rw-r--r--metadata/md5-cache/acct-group/vnstat-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vpopmail-0-r18
-rw-r--r--metadata/md5-cache/acct-group/vpopmail-0-r28
-rw-r--r--metadata/md5-cache/acct-group/wesnoth-0-r18
-rw-r--r--metadata/md5-cache/acct-group/wesnoth-0-r28
-rw-r--r--metadata/md5-cache/acct-group/wheel-0-r18
-rw-r--r--metadata/md5-cache/acct-group/wheel-0-r28
-rw-r--r--metadata/md5-cache/acct-group/wwwoffle-08
-rw-r--r--metadata/md5-cache/acct-group/wwwoffle-0-r18
-rw-r--r--metadata/md5-cache/acct-group/x2goprint-0-r18
-rw-r--r--metadata/md5-cache/acct-group/x2goprint-0-r28
-rw-r--r--metadata/md5-cache/acct-group/x2gouser-0-r18
-rw-r--r--metadata/md5-cache/acct-group/x2gouser-0-r28
-rw-r--r--metadata/md5-cache/acct-group/xpra-08
-rw-r--r--metadata/md5-cache/acct-group/xpra-0-r18
-rw-r--r--metadata/md5-cache/acct-group/xrootd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/xrootd-0-r28
-rw-r--r--metadata/md5-cache/acct-group/xwax-08
-rw-r--r--metadata/md5-cache/acct-group/xwax-0-r18
-rw-r--r--metadata/md5-cache/acct-group/yubihsm-connector-08
-rw-r--r--metadata/md5-cache/acct-group/yubihsm-connector-0-r18
-rw-r--r--metadata/md5-cache/acct-group/zabbix-08
-rw-r--r--metadata/md5-cache/acct-group/zabbix-0-r18
-rw-r--r--metadata/md5-cache/acct-group/zeppelin-0-r18
-rw-r--r--metadata/md5-cache/acct-group/zeppelin-0-r28
-rw-r--r--metadata/md5-cache/acct-group/zetcd-08
-rw-r--r--metadata/md5-cache/acct-group/zetcd-0-r18
-rw-r--r--metadata/md5-cache/acct-group/ziproxy-08
-rw-r--r--metadata/md5-cache/acct-group/ziproxy-0-r18
-rw-r--r--metadata/md5-cache/acct-group/znc-0-r18
-rw-r--r--metadata/md5-cache/acct-group/znc-0-r28
-rw-r--r--metadata/md5-cache/acct-group/zookeeper-08
-rw-r--r--metadata/md5-cache/acct-group/zookeeper-0-r18
-rw-r--r--metadata/md5-cache/acct-user/Manifest.gzbin71041 -> 71063 bytes
-rw-r--r--metadata/md5-cache/acct-user/_cron-failure-09
-rw-r--r--metadata/md5-cache/acct-user/_cron-failure-0-r19
-rw-r--r--metadata/md5-cache/acct-user/aerospike-amc-09
-rw-r--r--metadata/md5-cache/acct-user/aerospike-amc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/airdcppd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/airdcppd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/alertmanager-09
-rw-r--r--metadata/md5-cache/acct-user/alertmanager-0-r19
-rw-r--r--metadata/md5-cache/acct-user/alias-0-r110
-rw-r--r--metadata/md5-cache/acct-user/alias-0-r210
-rw-r--r--metadata/md5-cache/acct-user/amanda-09
-rw-r--r--metadata/md5-cache/acct-user/amanda-0-r19
-rw-r--r--metadata/md5-cache/acct-user/amavis-0-r19
-rw-r--r--metadata/md5-cache/acct-user/amavis-0-r29
-rw-r--r--metadata/md5-cache/acct-user/amule-0-r29
-rw-r--r--metadata/md5-cache/acct-user/amule-0-r39
-rw-r--r--metadata/md5-cache/acct-user/anope-0-r19
-rw-r--r--metadata/md5-cache/acct-user/anope-0-r29
-rw-r--r--metadata/md5-cache/acct-user/apache-0-r29
-rw-r--r--metadata/md5-cache/acct-user/apache-0-r39
-rw-r--r--metadata/md5-cache/acct-user/apt-cacher-ng-09
-rw-r--r--metadata/md5-cache/acct-user/apt-cacher-ng-0-r19
-rw-r--r--metadata/md5-cache/acct-user/argus-09
-rw-r--r--metadata/md5-cache/acct-user/argus-0-r19
-rw-r--r--metadata/md5-cache/acct-user/arpwatch-09
-rw-r--r--metadata/md5-cache/acct-user/arpwatch-0-r19
-rw-r--r--metadata/md5-cache/acct-user/artifactory-09
-rw-r--r--metadata/md5-cache/acct-user/artifactory-0-r19
-rw-r--r--metadata/md5-cache/acct-user/aspnet-09
-rw-r--r--metadata/md5-cache/acct-user/aspnet-0-r19
-rw-r--r--metadata/md5-cache/acct-user/asterisk-0-r19
-rw-r--r--metadata/md5-cache/acct-user/asterisk-0-r29
-rw-r--r--metadata/md5-cache/acct-user/at-09
-rw-r--r--metadata/md5-cache/acct-user/at-0-r19
-rw-r--r--metadata/md5-cache/acct-user/atheme-services-0-r19
-rw-r--r--metadata/md5-cache/acct-user/atheme-services-0-r29
-rw-r--r--metadata/md5-cache/acct-user/automatic-09
-rw-r--r--metadata/md5-cache/acct-user/automatic-0-r19
-rw-r--r--metadata/md5-cache/acct-user/automx2-0-r19
-rw-r--r--metadata/md5-cache/acct-user/automx2-0-r29
-rw-r--r--metadata/md5-cache/acct-user/avahi-0-r19
-rw-r--r--metadata/md5-cache/acct-user/avahi-0-r29
-rw-r--r--metadata/md5-cache/acct-user/avahi-autoipd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/avahi-autoipd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/axtls-09
-rw-r--r--metadata/md5-cache/acct-user/axtls-0-r19
-rw-r--r--metadata/md5-cache/acct-user/backuppc-09
-rw-r--r--metadata/md5-cache/acct-user/backuppc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bacula-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bacula-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bareos-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bareos-0-r29
-rw-r--r--metadata/md5-cache/acct-user/beanstalk-09
-rw-r--r--metadata/md5-cache/acct-user/beanstalk-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bedrock-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bedrock-0-r29
-rw-r--r--metadata/md5-cache/acct-user/biboumi-09
-rw-r--r--metadata/md5-cache/acct-user/biboumi-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bind_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bind_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bird-09
-rw-r--r--metadata/md5-cache/acct-user/bird-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bitcoin-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bitcoin-0-r29
-rw-r--r--metadata/md5-cache/acct-user/bitflu-09
-rw-r--r--metadata/md5-cache/acct-user/bitflu-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bitlbee-0-r19
-rw-r--r--metadata/md5-cache/acct-user/bitlbee-0-r29
-rw-r--r--metadata/md5-cache/acct-user/blackbox_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/blackbox_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/boinc-09
-rw-r--r--metadata/md5-cache/acct-user/boinc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/brltty-09
-rw-r--r--metadata/md5-cache/acct-user/brltty-0-r19
-rw-r--r--metadata/md5-cache/acct-user/buildbot-0-r19
-rw-r--r--metadata/md5-cache/acct-user/buildbot-0-r29
-rw-r--r--metadata/md5-cache/acct-user/burp-0-r19
-rw-r--r--metadata/md5-cache/acct-user/burp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/burrow_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/burrow_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cadvisor-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cadvisor-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cancd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cancd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/carbon-0-r19
-rw-r--r--metadata/md5-cache/acct-user/carbon-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ceph-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ceph-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cgit-09
-rw-r--r--metadata/md5-cache/acct-user/cgit-0-r19
-rw-r--r--metadata/md5-cache/acct-user/chronograf-0-r19
-rw-r--r--metadata/md5-cache/acct-user/chronograf-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cinder-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cinder-0-r29
-rw-r--r--metadata/md5-cache/acct-user/clair-0-r19
-rw-r--r--metadata/md5-cache/acct-user/clair-0-r29
-rw-r--r--metadata/md5-cache/acct-user/clamav-0-r19
-rw-r--r--metadata/md5-cache/acct-user/clamav-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cntlm-09
-rw-r--r--metadata/md5-cache/acct-user/cntlm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cockroach-09
-rw-r--r--metadata/md5-cache/acct-user/cockroach-0-r19
-rw-r--r--metadata/md5-cache/acct-user/collectd-09
-rw-r--r--metadata/md5-cache/acct-user/collectd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/colord-09
-rw-r--r--metadata/md5-cache/acct-user/colord-0-r19
-rw-r--r--metadata/md5-cache/acct-user/consul-0-r19
-rw-r--r--metadata/md5-cache/acct-user/consul-0-r29
-rw-r--r--metadata/md5-cache/acct-user/consul-template-0-r19
-rw-r--r--metadata/md5-cache/acct-user/consul-template-0-r29
-rw-r--r--metadata/md5-cache/acct-user/consul_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/consul_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/coredns-09
-rw-r--r--metadata/md5-cache/acct-user/coredns-0-r19
-rw-r--r--metadata/md5-cache/acct-user/croc-09
-rw-r--r--metadata/md5-cache/acct-user/croc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cron-09
-rw-r--r--metadata/md5-cache/acct-user/cron-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cvmfs-0-r19
-rw-r--r--metadata/md5-cache/acct-user/cvmfs-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cyrus-0-r29
-rw-r--r--metadata/md5-cache/acct-user/cyrus-0-r39
-rw-r--r--metadata/md5-cache/acct-user/darkstat-09
-rw-r--r--metadata/md5-cache/acct-user/darkstat-0-r19
-rw-r--r--metadata/md5-cache/acct-user/davfs2-0-r19
-rw-r--r--metadata/md5-cache/acct-user/davfs2-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dbmail-09
-rw-r--r--metadata/md5-cache/acct-user/dbmail-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dbskkd-09
-rw-r--r--metadata/md5-cache/acct-user/dbskkd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ddclient-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ddclient-0-r29
-rw-r--r--metadata/md5-cache/acct-user/defang-09
-rw-r--r--metadata/md5-cache/acct-user/defang-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dehydrated-09
-rw-r--r--metadata/md5-cache/acct-user/dehydrated-0-r19
-rw-r--r--metadata/md5-cache/acct-user/deluge-0-r19
-rw-r--r--metadata/md5-cache/acct-user/deluge-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dhcp-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dhcp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dhcpcd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dhcpcd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dictd-09
-rw-r--r--metadata/md5-cache/acct-user/dictd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dirsrv-09
-rw-r--r--metadata/md5-cache/acct-user/dirsrv-0-r19
-rw-r--r--metadata/md5-cache/acct-user/distcc-19
-rw-r--r--metadata/md5-cache/acct-user/distcc-1-r19
-rw-r--r--metadata/md5-cache/acct-user/dnrd-09
-rw-r--r--metadata/md5-cache/acct-user/dnrd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnscache-09
-rw-r--r--metadata/md5-cache/acct-user/dnscache-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnscrypt-proxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnscrypt-proxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnsdist-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnsdist-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnslog-09
-rw-r--r--metadata/md5-cache/acct-user/dnslog-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnsmasq-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnsmasq-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dnsmasq_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dnsmasq_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/docker_auth-0-r19
-rw-r--r--metadata/md5-cache/acct-user/docker_auth-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dovecot-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dovecot-0-r29
-rw-r--r--metadata/md5-cache/acct-user/dovenull-0-r19
-rw-r--r--metadata/md5-cache/acct-user/dovenull-0-r29
-rw-r--r--metadata/md5-cache/acct-user/drone-09
-rw-r--r--metadata/md5-cache/acct-user/drone-0-r19
-rw-r--r--metadata/md5-cache/acct-user/duende-0-r110
-rw-r--r--metadata/md5-cache/acct-user/duende-0-r210
-rw-r--r--metadata/md5-cache/acct-user/ejabberd-210
-rw-r--r--metadata/md5-cache/acct-user/ejabberd-2-r110
-rw-r--r--metadata/md5-cache/acct-user/elasticsearch-0-r19
-rw-r--r--metadata/md5-cache/acct-user/elasticsearch-0-r29
-rw-r--r--metadata/md5-cache/acct-user/elasticsearch_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/elasticsearch_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/energi3-09
-rw-r--r--metadata/md5-cache/acct-user/energi3-0-r19
-rw-r--r--metadata/md5-cache/acct-user/epmd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/epmd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/err-09
-rw-r--r--metadata/md5-cache/acct-user/err-0-r19
-rw-r--r--metadata/md5-cache/acct-user/etcd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/etcd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/exabgp-0-r19
-rw-r--r--metadata/md5-cache/acct-user/exabgp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ez-ipupd-09
-rw-r--r--metadata/md5-cache/acct-user/ez-ipupd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fax-09
-rw-r--r--metadata/md5-cache/acct-user/fax-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fcron-09
-rw-r--r--metadata/md5-cache/acct-user/fcron-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fdm-09
-rw-r--r--metadata/md5-cache/acct-user/fdm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fetchmail-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fetchmail-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fhem-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fhem-0-r29
-rw-r--r--metadata/md5-cache/acct-user/firebird-0-r29
-rw-r--r--metadata/md5-cache/acct-user/firebird-0-r39
-rw-r--r--metadata/md5-cache/acct-user/flatpak-09
-rw-r--r--metadata/md5-cache/acct-user/flatpak-0-r19
-rw-r--r--metadata/md5-cache/acct-user/flows-09
-rw-r--r--metadata/md5-cache/acct-user/flows-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fluentd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fluentd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/fnord-09
-rw-r--r--metadata/md5-cache/acct-user/fnord-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fnordlog-09
-rw-r--r--metadata/md5-cache/acct-user/fnordlog-0-r19
-rw-r--r--metadata/md5-cache/acct-user/foldingathome-09
-rw-r--r--metadata/md5-cache/acct-user/foldingathome-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fp-multiuser-09
-rw-r--r--metadata/md5-cache/acct-user/fp-multiuser-0-r19
-rw-r--r--metadata/md5-cache/acct-user/freenet-09
-rw-r--r--metadata/md5-cache/acct-user/freenet-0-r19
-rw-r--r--metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/fritzbox_smarthome_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/frr-09
-rw-r--r--metadata/md5-cache/acct-user/frr-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ftp-0-r39
-rw-r--r--metadata/md5-cache/acct-user/ftp-0-r49
-rw-r--r--metadata/md5-cache/acct-user/ftpproxy-09
-rw-r--r--metadata/md5-cache/acct-user/ftpproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gatling-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gatling-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gauth-09
-rw-r--r--metadata/md5-cache/acct-user/gauth-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gdm-09
-rw-r--r--metadata/md5-cache/acct-user/gdm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/geneweb-0-r19
-rw-r--r--metadata/md5-cache/acct-user/geneweb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/geoclue-09
-rw-r--r--metadata/md5-cache/acct-user/geoclue-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gerbera-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gerbera-0-r29
-rw-r--r--metadata/md5-cache/acct-user/git-0-r211
-rw-r--r--metadata/md5-cache/acct-user/git-0-r311
-rw-r--r--metadata/md5-cache/acct-user/github-exporter-09
-rw-r--r--metadata/md5-cache/acct-user/github-exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gitlab-runner-19
-rw-r--r--metadata/md5-cache/acct-user/gitlab-runner-1-r19
-rw-r--r--metadata/md5-cache/acct-user/gkrellmd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gkrellmd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/glance-0-r19
-rw-r--r--metadata/md5-cache/acct-user/glance-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gluster-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gluster-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gns3-09
-rw-r--r--metadata/md5-cache/acct-user/gns3-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gnump3d-09
-rw-r--r--metadata/md5-cache/acct-user/gnump3d-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-09
-rw-r--r--metadata/md5-cache/acct-user/gnupg-pkcs11-scd-proxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/goaccess-09
-rw-r--r--metadata/md5-cache/acct-user/goaccess-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gopher-09
-rw-r--r--metadata/md5-cache/acct-user/gopher-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gopherd-09
-rw-r--r--metadata/md5-cache/acct-user/gopherd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gpsd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/gpsd-0-r39
-rw-r--r--metadata/md5-cache/acct-user/grafana-0-r19
-rw-r--r--metadata/md5-cache/acct-user/grafana-0-r29
-rw-r--r--metadata/md5-cache/acct-user/graylog-0-r19
-rw-r--r--metadata/md5-cache/acct-user/graylog-0-r29
-rw-r--r--metadata/md5-cache/acct-user/greetd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/greetd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/grok_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/grok_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/groonga-09
-rw-r--r--metadata/md5-cache/acct-user/groonga-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gvm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/gvm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/h2o-09
-rw-r--r--metadata/md5-cache/acct-user/h2o-0-r19
-rw-r--r--metadata/md5-cache/acct-user/hacluster-09
-rw-r--r--metadata/md5-cache/acct-user/hacluster-0-r19
-rw-r--r--metadata/md5-cache/acct-user/haproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/haproxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/havp-0-r19
-rw-r--r--metadata/md5-cache/acct-user/havp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/headscale-09
-rw-r--r--metadata/md5-cache/acct-user/headscale-0-r19
-rw-r--r--metadata/md5-cache/acct-user/heat-0-r19
-rw-r--r--metadata/md5-cache/acct-user/heat-0-r29
-rw-r--r--metadata/md5-cache/acct-user/hsqldb-09
-rw-r--r--metadata/md5-cache/acct-user/hsqldb-0-r19
-rw-r--r--metadata/md5-cache/acct-user/http-09
-rw-r--r--metadata/md5-cache/acct-user/http-0-r19
-rw-r--r--metadata/md5-cache/acct-user/i2p-0-r19
-rw-r--r--metadata/md5-cache/acct-user/i2p-0-r29
-rw-r--r--metadata/md5-cache/acct-user/i2pd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/i2pd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/icecast-09
-rw-r--r--metadata/md5-cache/acct-user/icecast-0-r19
-rw-r--r--metadata/md5-cache/acct-user/icecream-09
-rw-r--r--metadata/md5-cache/acct-user/icecream-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ices-09
-rw-r--r--metadata/md5-cache/acct-user/ices-0-r19
-rw-r--r--metadata/md5-cache/acct-user/icinga-0-r19
-rw-r--r--metadata/md5-cache/acct-user/icinga-0-r29
-rw-r--r--metadata/md5-cache/acct-user/icingadirector-09
-rw-r--r--metadata/md5-cache/acct-user/icingadirector-0-r19
-rw-r--r--metadata/md5-cache/acct-user/inadyn-09
-rw-r--r--metadata/md5-cache/acct-user/inadyn-0-r19
-rw-r--r--metadata/md5-cache/acct-user/influxdb-0-r19
-rw-r--r--metadata/md5-cache/acct-user/influxdb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/inspircd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/inspircd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ipfs-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ipfs-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ippl-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ippl-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ipsec-09
-rw-r--r--metadata/md5-cache/acct-user/ipsec-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ipsentinel-09
-rw-r--r--metadata/md5-cache/acct-user/ipsentinel-0-r19
-rw-r--r--metadata/md5-cache/acct-user/iroffer-09
-rw-r--r--metadata/md5-cache/acct-user/iroffer-0-r19
-rw-r--r--metadata/md5-cache/acct-user/jellyfin-0-r19
-rw-r--r--metadata/md5-cache/acct-user/jellyfin-0-r29
-rw-r--r--metadata/md5-cache/acct-user/jenkins-09
-rw-r--r--metadata/md5-cache/acct-user/jenkins-0-r19
-rw-r--r--metadata/md5-cache/acct-user/kafka-0-r19
-rw-r--r--metadata/md5-cache/acct-user/kafka-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kapacitor-0-r19
-rw-r--r--metadata/md5-cache/acct-user/kapacitor-0-r29
-rw-r--r--metadata/md5-cache/acct-user/karma-09
-rw-r--r--metadata/md5-cache/acct-user/karma-0-r19
-rw-r--r--metadata/md5-cache/acct-user/keystone-0-r19
-rw-r--r--metadata/md5-cache/acct-user/keystone-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kibana-0-r19
-rw-r--r--metadata/md5-cache/acct-user/kibana-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kismet-0-r110
-rw-r--r--metadata/md5-cache/acct-user/kismet-0-r210
-rw-r--r--metadata/md5-cache/acct-user/knot-0-r19
-rw-r--r--metadata/md5-cache/acct-user/knot-0-r29
-rw-r--r--metadata/md5-cache/acct-user/knot-resolver-09
-rw-r--r--metadata/md5-cache/acct-user/knot-resolver-0-r19
-rw-r--r--metadata/md5-cache/acct-user/kube-apiserver-0-r19
-rw-r--r--metadata/md5-cache/acct-user/kube-apiserver-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kube-controller-manager-0-r19
-rw-r--r--metadata/md5-cache/acct-user/kube-controller-manager-0-r29
-rw-r--r--metadata/md5-cache/acct-user/kube-scheduler-0-r19
-rw-r--r--metadata/md5-cache/acct-user/kube-scheduler-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ldap-09
-rw-r--r--metadata/md5-cache/acct-user/ldap-0-r19
-rw-r--r--metadata/md5-cache/acct-user/libreoffice-09
-rw-r--r--metadata/md5-cache/acct-user/libreoffice-0-r19
-rw-r--r--metadata/md5-cache/acct-user/lightdm-09
-rw-r--r--metadata/md5-cache/acct-user/lightdm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/lighttpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/lighttpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/litecoin-09
-rw-r--r--metadata/md5-cache/acct-user/litecoin-0-r19
-rw-r--r--metadata/md5-cache/acct-user/lldpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/lldpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/logcheck-09
-rw-r--r--metadata/md5-cache/acct-user/logcheck-0-r19
-rw-r--r--metadata/md5-cache/acct-user/logstash-0-r19
-rw-r--r--metadata/md5-cache/acct-user/logstash-0-r29
-rw-r--r--metadata/md5-cache/acct-user/logsurfer-09
-rw-r--r--metadata/md5-cache/acct-user/logsurfer-0-r19
-rw-r--r--metadata/md5-cache/acct-user/lxc-09
-rw-r--r--metadata/md5-cache/acct-user/lxc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mail-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mail-0-r29
-rw-r--r--metadata/md5-cache/acct-user/man-1-r19
-rw-r--r--metadata/md5-cache/acct-user/man-1-r29
-rw-r--r--metadata/md5-cache/acct-user/maradns-0-r19
-rw-r--r--metadata/md5-cache/acct-user/maradns-0-r29
-rw-r--r--metadata/md5-cache/acct-user/memcached-0-r19
-rw-r--r--metadata/md5-cache/acct-user/memcached-0-r29
-rw-r--r--metadata/md5-cache/acct-user/memcached_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/memcached_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/messagebus-0-r19
-rw-r--r--metadata/md5-cache/acct-user/messagebus-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mgraph-09
-rw-r--r--metadata/md5-cache/acct-user/mgraph-0-r19
-rw-r--r--metadata/md5-cache/acct-user/milter-regex-0-r19
-rw-r--r--metadata/md5-cache/acct-user/milter-regex-0-r29
-rw-r--r--metadata/md5-cache/acct-user/minbif-09
-rw-r--r--metadata/md5-cache/acct-user/minbif-0-r19
-rw-r--r--metadata/md5-cache/acct-user/minecraft-0-r19
-rw-r--r--metadata/md5-cache/acct-user/minecraft-0-r29
-rw-r--r--metadata/md5-cache/acct-user/minetest-1-r19
-rw-r--r--metadata/md5-cache/acct-user/minetest-1-r29
-rw-r--r--metadata/md5-cache/acct-user/minidlna-09
-rw-r--r--metadata/md5-cache/acct-user/minidlna-0-r19
-rw-r--r--metadata/md5-cache/acct-user/miniflux-09
-rw-r--r--metadata/md5-cache/acct-user/miniflux-0-r19
-rw-r--r--metadata/md5-cache/acct-user/minio-09
-rw-r--r--metadata/md5-cache/acct-user/minio-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mogile-09
-rw-r--r--metadata/md5-cache/acct-user/mogile-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mongodb-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mongodb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mongodb_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/mongodb_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/monitorix-0-r19
-rw-r--r--metadata/md5-cache/acct-user/monitorix-0-r29
-rw-r--r--metadata/md5-cache/acct-user/monkeyd-09
-rw-r--r--metadata/md5-cache/acct-user/monkeyd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/monkeysphere-0-r19
-rw-r--r--metadata/md5-cache/acct-user/monkeysphere-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mosquitto-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mosquitto-0-r29
-rw-r--r--metadata/md5-cache/acct-user/motion-0-r19
-rw-r--r--metadata/md5-cache/acct-user/motion-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/msmtpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/msmtpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/munge-09
-rw-r--r--metadata/md5-cache/acct-user/munge-0-r19
-rw-r--r--metadata/md5-cache/acct-user/munin-0-r19
-rw-r--r--metadata/md5-cache/acct-user/munin-0-r29
-rw-r--r--metadata/md5-cache/acct-user/munin-async-0-r19
-rw-r--r--metadata/md5-cache/acct-user/munin-async-0-r29
-rw-r--r--metadata/md5-cache/acct-user/murmur-0-r19
-rw-r--r--metadata/md5-cache/acct-user/murmur-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mysql-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mysql-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mysqld_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mysqld_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/mythtv-0-r19
-rw-r--r--metadata/md5-cache/acct-user/mythtv-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nagios-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nagios-0-r29
-rw-r--r--metadata/md5-cache/acct-user/named-0-r19
-rw-r--r--metadata/md5-cache/acct-user/named-0-r29
-rw-r--r--metadata/md5-cache/acct-user/netbox-0-r19
-rw-r--r--metadata/md5-cache/acct-user/netbox-0-r29
-rw-r--r--metadata/md5-cache/acct-user/netdata-19
-rw-r--r--metadata/md5-cache/acct-user/netdata-1-r19
-rw-r--r--metadata/md5-cache/acct-user/netperf-09
-rw-r--r--metadata/md5-cache/acct-user/netperf-0-r19
-rw-r--r--metadata/md5-cache/acct-user/neutron-0-r19
-rw-r--r--metadata/md5-cache/acct-user/neutron-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nginx-09
-rw-r--r--metadata/md5-cache/acct-user/nginx-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nginx-unit-09
-rw-r--r--metadata/md5-cache/acct-user/nginx-unit-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nginx-vts-exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nginx-vts-exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ngircd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ngircd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ngrep-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ngrep-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nm-openconnect-09
-rw-r--r--metadata/md5-cache/acct-user/nm-openconnect-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nm-openvpn-09
-rw-r--r--metadata/md5-cache/acct-user/nm-openvpn-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nobody-09
-rw-r--r--metadata/md5-cache/acct-user/nobody-0-r19
-rw-r--r--metadata/md5-cache/acct-user/node_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/node_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/notary-09
-rw-r--r--metadata/md5-cache/acct-user/notary-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nova-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nova-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nsd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nsd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nslcd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nslcd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ntopng-09
-rw-r--r--metadata/md5-cache/acct-user/ntopng-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ntp-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ntp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nullmail-09
-rw-r--r--metadata/md5-cache/acct-user/nullmail-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nut-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nut-0-r29
-rw-r--r--metadata/md5-cache/acct-user/nvpd-09
-rw-r--r--metadata/md5-cache/acct-user/nvpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/nzbget-09
-rw-r--r--metadata/md5-cache/acct-user/nzbget-0-r19
-rw-r--r--metadata/md5-cache/acct-user/oidentd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/oidentd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openctd-09
-rw-r--r--metadata/md5-cache/acct-user/openctd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/opendkim-0-r19
-rw-r--r--metadata/md5-cache/acct-user/opendkim-0-r29
-rw-r--r--metadata/md5-cache/acct-user/opendmarc-09
-rw-r--r--metadata/md5-cache/acct-user/opendmarc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/opendnssec-09
-rw-r--r--metadata/md5-cache/acct-user/opendnssec-0-r19
-rw-r--r--metadata/md5-cache/acct-user/openntpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/openntpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openrct2-0-r19
-rw-r--r--metadata/md5-cache/acct-user/openrct2-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openttd-09
-rw-r--r--metadata/md5-cache/acct-user/openttd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/openvpn-0-r19
-rw-r--r--metadata/md5-cache/acct-user/openvpn-0-r29
-rw-r--r--metadata/md5-cache/acct-user/openvpn_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/openvpn_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/opm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/opm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/oprofile-0-r19
-rw-r--r--metadata/md5-cache/acct-user/oprofile-0-r29
-rw-r--r--metadata/md5-cache/acct-user/oragono-09
-rw-r--r--metadata/md5-cache/acct-user/oragono-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ossec-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ossec-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ossecm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ossecm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ossecr-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ossecr-0-r29
-rw-r--r--metadata/md5-cache/acct-user/owntracks-09
-rw-r--r--metadata/md5-cache/acct-user/owntracks-0-r19
-rw-r--r--metadata/md5-cache/acct-user/p2p-09
-rw-r--r--metadata/md5-cache/acct-user/p2p-0-r19
-rw-r--r--metadata/md5-cache/acct-user/partimag-09
-rw-r--r--metadata/md5-cache/acct-user/partimag-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pcap-09
-rw-r--r--metadata/md5-cache/acct-user/pcap-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pcscd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pcscd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pdns-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pdns-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pdnsd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pdnsd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pgagent-09
-rw-r--r--metadata/md5-cache/acct-user/pgagent-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pgbouncer-09
-rw-r--r--metadata/md5-cache/acct-user/pgbouncer-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pgpool-09
-rw-r--r--metadata/md5-cache/acct-user/pgpool-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pipewire-09
-rw-r--r--metadata/md5-cache/acct-user/pipewire-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pipewire-19
-rw-r--r--metadata/md5-cache/acct-user/pipewire-1-r19
-rw-r--r--metadata/md5-cache/acct-user/placement-0-r19
-rw-r--r--metadata/md5-cache/acct-user/placement-0-r29
-rw-r--r--metadata/md5-cache/acct-user/plex-0-r19
-rw-r--r--metadata/md5-cache/acct-user/plex-0-r29
-rw-r--r--metadata/md5-cache/acct-user/polkitd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/polkitd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/polw-09
-rw-r--r--metadata/md5-cache/acct-user/polw-0-r19
-rw-r--r--metadata/md5-cache/acct-user/popa3d-09
-rw-r--r--metadata/md5-cache/acct-user/popa3d-0-r19
-rw-r--r--metadata/md5-cache/acct-user/portage-0-r19
-rw-r--r--metadata/md5-cache/acct-user/portage-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postfix-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postfix-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postfix_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postfix_exporter-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postfwd-09
-rw-r--r--metadata/md5-cache/acct-user/postfwd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postgres-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postgres-0-r29
-rw-r--r--metadata/md5-cache/acct-user/postgres_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/postgres_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postgrey-09
-rw-r--r--metadata/md5-cache/acct-user/postgrey-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postmaster-0-r19
-rw-r--r--metadata/md5-cache/acct-user/postmaster-0-r29
-rw-r--r--metadata/md5-cache/acct-user/privoxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/privoxy-0-r29
-rw-r--r--metadata/md5-cache/acct-user/prometheus-0-r19
-rw-r--r--metadata/md5-cache/acct-user/prometheus-0-r29
-rw-r--r--metadata/md5-cache/acct-user/prosody-09
-rw-r--r--metadata/md5-cache/acct-user/prosody-0-r19
-rw-r--r--metadata/md5-cache/acct-user/prowlarr-09
-rw-r--r--metadata/md5-cache/acct-user/prowlarr-0-r19
-rw-r--r--metadata/md5-cache/acct-user/psybnc-09
-rw-r--r--metadata/md5-cache/acct-user/psybnc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pulse-09
-rw-r--r--metadata/md5-cache/acct-user/pulse-0-r19
-rw-r--r--metadata/md5-cache/acct-user/puppet-0-r19
-rw-r--r--metadata/md5-cache/acct-user/puppet-0-r29
-rw-r--r--metadata/md5-cache/acct-user/puppetdb-0-r19
-rw-r--r--metadata/md5-cache/acct-user/puppetdb-0-r29
-rw-r--r--metadata/md5-cache/acct-user/pushgateway-09
-rw-r--r--metadata/md5-cache/acct-user/pushgateway-0-r19
-rw-r--r--metadata/md5-cache/acct-user/pvpgn-09
-rw-r--r--metadata/md5-cache/acct-user/pvpgn-0-r19
-rw-r--r--metadata/md5-cache/acct-user/qemu-0-r19
-rw-r--r--metadata/md5-cache/acct-user/qemu-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmaild-0-r19
-rw-r--r--metadata/md5-cache/acct-user/qmaild-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmaill-0-r19
-rw-r--r--metadata/md5-cache/acct-user/qmaill-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmailp-0-r19
-rw-r--r--metadata/md5-cache/acct-user/qmailp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmailq-0-r19
-rw-r--r--metadata/md5-cache/acct-user/qmailq-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmailr-0-r19
-rw-r--r--metadata/md5-cache/acct-user/qmailr-0-r29
-rw-r--r--metadata/md5-cache/acct-user/qmails-0-r19
-rw-r--r--metadata/md5-cache/acct-user/qmails-0-r29
-rw-r--r--metadata/md5-cache/acct-user/quagga-0-r19
-rw-r--r--metadata/md5-cache/acct-user/quagga-0-r29
-rw-r--r--metadata/md5-cache/acct-user/quassel-0-r19
-rw-r--r--metadata/md5-cache/acct-user/quassel-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rabbitmq-09
-rw-r--r--metadata/md5-cache/acct-user/rabbitmq-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rabbitmq_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/rabbitmq_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/radarr-09
-rw-r--r--metadata/md5-cache/acct-user/radarr-0-r19
-rw-r--r--metadata/md5-cache/acct-user/radicale-0-r29
-rw-r--r--metadata/md5-cache/acct-user/radicale-0-r39
-rw-r--r--metadata/md5-cache/acct-user/radius-0-r19
-rw-r--r--metadata/md5-cache/acct-user/radius-0-r29
-rw-r--r--metadata/md5-cache/acct-user/radvd-09
-rw-r--r--metadata/md5-cache/acct-user/radvd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rbldns-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rbldns-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rbot-09
-rw-r--r--metadata/md5-cache/acct-user/rbot-0-r19
-rw-r--r--metadata/md5-cache/acct-user/readarr-09
-rw-r--r--metadata/md5-cache/acct-user/readarr-0-r19
-rw-r--r--metadata/md5-cache/acct-user/redis-0-r19
-rw-r--r--metadata/md5-cache/acct-user/redis-0-r29
-rw-r--r--metadata/md5-cache/acct-user/redis_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/redis_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/redmine-0-r19
-rw-r--r--metadata/md5-cache/acct-user/redmine-0-r29
-rw-r--r--metadata/md5-cache/acct-user/redsocks-0-r19
-rw-r--r--metadata/md5-cache/acct-user/redsocks-0-r29
-rw-r--r--metadata/md5-cache/acct-user/reg-0-r19
-rw-r--r--metadata/md5-cache/acct-user/reg-0-r29
-rw-r--r--metadata/md5-cache/acct-user/registry-09
-rw-r--r--metadata/md5-cache/acct-user/registry-0-r19
-rw-r--r--metadata/md5-cache/acct-user/root-0-r19
-rw-r--r--metadata/md5-cache/acct-user/root-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rplayd-09
-rw-r--r--metadata/md5-cache/acct-user/rplayd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rrdcached-09
-rw-r--r--metadata/md5-cache/acct-user/rrdcached-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rslsync-09
-rw-r--r--metadata/md5-cache/acct-user/rslsync-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rspamd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rspamd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rstudio-server-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rstudio-server-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rt-09
-rw-r--r--metadata/md5-cache/acct-user/rt-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rtkit-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rtkit-0-r29
-rw-r--r--metadata/md5-cache/acct-user/rundeck-09
-rw-r--r--metadata/md5-cache/acct-user/rundeck-0-r19
-rw-r--r--metadata/md5-cache/acct-user/rwhoisd-09
-rw-r--r--metadata/md5-cache/acct-user/rwhoisd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sabnzbd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sabnzbd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sagan-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sagan-0-r29
-rw-r--r--metadata/md5-cache/acct-user/samplicator-09
-rw-r--r--metadata/md5-cache/acct-user/samplicator-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sancp-09
-rw-r--r--metadata/md5-cache/acct-user/sancp-0-r19
-rw-r--r--metadata/md5-cache/acct-user/saned-09
-rw-r--r--metadata/md5-cache/acct-user/saned-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sanlock-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sanlock-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sauerbraten-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sauerbraten-0-r29
-rw-r--r--metadata/md5-cache/acct-user/scanlogd-09
-rw-r--r--metadata/md5-cache/acct-user/scanlogd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/scponly-0-r19
-rw-r--r--metadata/md5-cache/acct-user/scponly-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sddm-09
-rw-r--r--metadata/md5-cache/acct-user/sddm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sendpage-09
-rw-r--r--metadata/md5-cache/acct-user/sendpage-0-r19
-rw-r--r--metadata/md5-cache/acct-user/serf-09
-rw-r--r--metadata/md5-cache/acct-user/serf-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sguil-09
-rw-r--r--metadata/md5-cache/acct-user/sguil-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sigh-09
-rw-r--r--metadata/md5-cache/acct-user/sigh-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sks-09
-rw-r--r--metadata/md5-cache/acct-user/sks-0-r19
-rw-r--r--metadata/md5-cache/acct-user/slurm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/slurm-0-r29
-rw-r--r--metadata/md5-cache/acct-user/smmsp-0-r29
-rw-r--r--metadata/md5-cache/acct-user/smmsp-0-r39
-rw-r--r--metadata/md5-cache/acct-user/smokeping-09
-rw-r--r--metadata/md5-cache/acct-user/smokeping-0-r19
-rw-r--r--metadata/md5-cache/acct-user/smsd-09
-rw-r--r--metadata/md5-cache/acct-user/smsd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/smtpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/smtpd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/smtpq-0-r19
-rw-r--r--metadata/md5-cache/acct-user/smtpq-0-r29
-rw-r--r--metadata/md5-cache/acct-user/snapclient-09
-rw-r--r--metadata/md5-cache/acct-user/snapclient-0-r19
-rw-r--r--metadata/md5-cache/acct-user/snapserver-09
-rw-r--r--metadata/md5-cache/acct-user/snapserver-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sndiod-09
-rw-r--r--metadata/md5-cache/acct-user/sndiod-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sniproxy-09
-rw-r--r--metadata/md5-cache/acct-user/sniproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/snmp_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/snmp_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/snort-09
-rw-r--r--metadata/md5-cache/acct-user/snort-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sobby-09
-rw-r--r--metadata/md5-cache/acct-user/sobby-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sobexsrv-09
-rw-r--r--metadata/md5-cache/acct-user/sobexsrv-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sockd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sockd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sogo-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sogo-0-r29
-rw-r--r--metadata/md5-cache/acct-user/soju-09
-rw-r--r--metadata/md5-cache/acct-user/soju-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sonarr-09
-rw-r--r--metadata/md5-cache/acct-user/sonarr-0-r19
-rw-r--r--metadata/md5-cache/acct-user/spamd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/spamd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/spectrum-0-r19
-rw-r--r--metadata/md5-cache/acct-user/spectrum-0-r29
-rw-r--r--metadata/md5-cache/acct-user/spire-0-r19
-rw-r--r--metadata/md5-cache/acct-user/spire-0-r29
-rw-r--r--metadata/md5-cache/acct-user/spread-09
-rw-r--r--metadata/md5-cache/acct-user/spread-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sqlgrey-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sqlgrey-0-r29
-rw-r--r--metadata/md5-cache/acct-user/squid-0-r19
-rw-r--r--metadata/md5-cache/acct-user/squid-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sshd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/sshd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/sstpc-09
-rw-r--r--metadata/md5-cache/acct-user/sstpc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/stdiscosrv-19
-rw-r--r--metadata/md5-cache/acct-user/stdiscosrv-1-r19
-rw-r--r--metadata/md5-cache/acct-user/steamcmd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/steamcmd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/stg-09
-rw-r--r--metadata/md5-cache/acct-user/stg-0-r19
-rw-r--r--metadata/md5-cache/acct-user/strelaysrv-19
-rw-r--r--metadata/md5-cache/acct-user/strelaysrv-1-r19
-rw-r--r--metadata/md5-cache/acct-user/stubby-0-r19
-rw-r--r--metadata/md5-cache/acct-user/stubby-0-r29
-rw-r--r--metadata/md5-cache/acct-user/stunnel-0-r19
-rw-r--r--metadata/md5-cache/acct-user/stunnel-0-r29
-rw-r--r--metadata/md5-cache/acct-user/subsonic-0-r19
-rw-r--r--metadata/md5-cache/acct-user/subsonic-0-r29
-rw-r--r--metadata/md5-cache/acct-user/suricata-0-r19
-rw-r--r--metadata/md5-cache/acct-user/suricata-0-r29
-rw-r--r--metadata/md5-cache/acct-user/svn-0-r19
-rw-r--r--metadata/md5-cache/acct-user/svn-0-r29
-rw-r--r--metadata/md5-cache/acct-user/svxlink-09
-rw-r--r--metadata/md5-cache/acct-user/svxlink-0-r19
-rw-r--r--metadata/md5-cache/acct-user/swift-0-r19
-rw-r--r--metadata/md5-cache/acct-user/swift-0-r29
-rw-r--r--metadata/md5-cache/acct-user/synapse-09
-rw-r--r--metadata/md5-cache/acct-user/synapse-0-r19
-rw-r--r--metadata/md5-cache/acct-user/syncthing-0-r19
-rw-r--r--metadata/md5-cache/acct-user/syncthing-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-coredump-0-r19
-rw-r--r--metadata/md5-cache/acct-user/systemd-coredump-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-journal-remote-0-r19
-rw-r--r--metadata/md5-cache/acct-user/systemd-journal-remote-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-network-0-r19
-rw-r--r--metadata/md5-cache/acct-user/systemd-network-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-oom-09
-rw-r--r--metadata/md5-cache/acct-user/systemd-oom-0-r19
-rw-r--r--metadata/md5-cache/acct-user/systemd-resolve-0-r19
-rw-r--r--metadata/md5-cache/acct-user/systemd-resolve-0-r29
-rw-r--r--metadata/md5-cache/acct-user/systemd-timesync-0-r19
-rw-r--r--metadata/md5-cache/acct-user/systemd-timesync-0-r29
-rw-r--r--metadata/md5-cache/acct-user/taskd-09
-rw-r--r--metadata/md5-cache/acct-user/taskd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/teamspeak-0-r19
-rw-r--r--metadata/md5-cache/acct-user/teamspeak-0-r29
-rw-r--r--metadata/md5-cache/acct-user/telegraf-0-r19
-rw-r--r--metadata/md5-cache/acct-user/telegraf-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tenshi-09
-rw-r--r--metadata/md5-cache/acct-user/tenshi-0-r19
-rw-r--r--metadata/md5-cache/acct-user/thttpd-09
-rw-r--r--metadata/md5-cache/acct-user/thttpd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/timidity-09
-rw-r--r--metadata/md5-cache/acct-user/timidity-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tinydns-09
-rw-r--r--metadata/md5-cache/acct-user/tinydns-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tinyproxy-09
-rw-r--r--metadata/md5-cache/acct-user/tinyproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tomcat-09
-rw-r--r--metadata/md5-cache/acct-user/tomcat-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tor-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tor-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tox-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tox-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tpm-09
-rw-r--r--metadata/md5-cache/acct-user/tpm-0-r19
-rw-r--r--metadata/md5-cache/acct-user/transmission-1-r19
-rw-r--r--metadata/md5-cache/acct-user/transmission-1-r29
-rw-r--r--metadata/md5-cache/acct-user/trickster-09
-rw-r--r--metadata/md5-cache/acct-user/trickster-0-r19
-rw-r--r--metadata/md5-cache/acct-user/trojan-09
-rw-r--r--metadata/md5-cache/acct-user/trojan-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tss-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tss-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ttrssd-09
-rw-r--r--metadata/md5-cache/acct-user/ttrssd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/turnserver-0-r19
-rw-r--r--metadata/md5-cache/acct-user/turnserver-0-r29
-rw-r--r--metadata/md5-cache/acct-user/tvheadend-0-r19
-rw-r--r--metadata/md5-cache/acct-user/tvheadend-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ulogd-09
-rw-r--r--metadata/md5-cache/acct-user/ulogd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ultimaker-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ultimaker-0-r29
-rw-r--r--metadata/md5-cache/acct-user/unbound-0-r19
-rw-r--r--metadata/md5-cache/acct-user/unbound-0-r29
-rw-r--r--metadata/md5-cache/acct-user/unbound-telemetry-19
-rw-r--r--metadata/md5-cache/acct-user/unbound-telemetry-1-r19
-rw-r--r--metadata/md5-cache/acct-user/unifi-0-r19
-rw-r--r--metadata/md5-cache/acct-user/unifi-0-r29
-rw-r--r--metadata/md5-cache/acct-user/unifi-video-09
-rw-r--r--metadata/md5-cache/acct-user/unifi-video-0-r19
-rw-r--r--metadata/md5-cache/acct-user/unrealircd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/unrealircd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/upmpdcli-09
-rw-r--r--metadata/md5-cache/acct-user/upmpdcli-0-r19
-rw-r--r--metadata/md5-cache/acct-user/uptimed-0-r29
-rw-r--r--metadata/md5-cache/acct-user/uptimed-0-r39
-rw-r--r--metadata/md5-cache/acct-user/usbmux-0-r19
-rw-r--r--metadata/md5-cache/acct-user/usbmux-0-r29
-rw-r--r--metadata/md5-cache/acct-user/ushare-09
-rw-r--r--metadata/md5-cache/acct-user/ushare-0-r19
-rw-r--r--metadata/md5-cache/acct-user/uwsgi_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/uwsgi_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/vacation-09
-rw-r--r--metadata/md5-cache/acct-user/vacation-0-r19
-rw-r--r--metadata/md5-cache/acct-user/varnish-0-r19
-rw-r--r--metadata/md5-cache/acct-user/varnish-0-r29
-rw-r--r--metadata/md5-cache/acct-user/vault-0-r19
-rw-r--r--metadata/md5-cache/acct-user/vault-0-r29
-rw-r--r--metadata/md5-cache/acct-user/vault_exporter-09
-rw-r--r--metadata/md5-cache/acct-user/vault_exporter-0-r19
-rw-r--r--metadata/md5-cache/acct-user/vboxguest-0-r19
-rw-r--r--metadata/md5-cache/acct-user/vboxguest-0-r29
-rw-r--r--metadata/md5-cache/acct-user/vdr-0-r110
-rw-r--r--metadata/md5-cache/acct-user/vdr-0-r210
-rw-r--r--metadata/md5-cache/acct-user/vdradmin-0-r110
-rw-r--r--metadata/md5-cache/acct-user/vdradmin-0-r210
-rw-r--r--metadata/md5-cache/acct-user/vnstat-09
-rw-r--r--metadata/md5-cache/acct-user/vnstat-0-r19
-rw-r--r--metadata/md5-cache/acct-user/vpopmail-0-r19
-rw-r--r--metadata/md5-cache/acct-user/vpopmail-0-r29
-rw-r--r--metadata/md5-cache/acct-user/wesnoth-0-r19
-rw-r--r--metadata/md5-cache/acct-user/wesnoth-0-r29
-rw-r--r--metadata/md5-cache/acct-user/wwwoffle-09
-rw-r--r--metadata/md5-cache/acct-user/wwwoffle-0-r19
-rw-r--r--metadata/md5-cache/acct-user/x2goprint-0-r19
-rw-r--r--metadata/md5-cache/acct-user/x2goprint-0-r29
-rw-r--r--metadata/md5-cache/acct-user/x2gouser-0-r19
-rw-r--r--metadata/md5-cache/acct-user/x2gouser-0-r29
-rw-r--r--metadata/md5-cache/acct-user/xrootd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/xrootd-0-r29
-rw-r--r--metadata/md5-cache/acct-user/yubihsm-connector-09
-rw-r--r--metadata/md5-cache/acct-user/yubihsm-connector-0-r19
-rw-r--r--metadata/md5-cache/acct-user/zabbix-09
-rw-r--r--metadata/md5-cache/acct-user/zabbix-0-r19
-rw-r--r--metadata/md5-cache/acct-user/zeppelin-0-r19
-rw-r--r--metadata/md5-cache/acct-user/zeppelin-0-r29
-rw-r--r--metadata/md5-cache/acct-user/zetcd-09
-rw-r--r--metadata/md5-cache/acct-user/zetcd-0-r19
-rw-r--r--metadata/md5-cache/acct-user/ziproxy-09
-rw-r--r--metadata/md5-cache/acct-user/ziproxy-0-r19
-rw-r--r--metadata/md5-cache/acct-user/znc-0-r19
-rw-r--r--metadata/md5-cache/acct-user/znc-0-r29
-rw-r--r--metadata/md5-cache/acct-user/zookeeper-09
-rw-r--r--metadata/md5-cache/acct-user/zookeeper-0-r19
-rw-r--r--metadata/md5-cache/app-emulation/Manifest.gzbin31737 -> 31905 bytes
-rw-r--r--metadata/md5-cache/app-emulation/diskimage-builder-3.30.0-r116
-rw-r--r--metadata/md5-cache/app-emulation/diskimage-builder-99996
-rw-r--r--metadata/md5-cache/app-misc/Manifest.gzbin71235 -> 71398 bytes
-rw-r--r--metadata/md5-cache/app-misc/broot-1.23.015
-rw-r--r--metadata/md5-cache/dev-libs/Manifest.gzbin157002 -> 157160 bytes
-rw-r--r--metadata/md5-cache/dev-libs/apache-arrow-12.0.117
-rw-r--r--metadata/md5-cache/dev-libs/libxml2-2.11.44
-rw-r--r--metadata/md5-cache/dev-libs/libxslt-1.1.384
-rw-r--r--metadata/md5-cache/dev-libs/opensc-0.23.0-r14
-rw-r--r--metadata/md5-cache/dev-ml/Manifest.gzbin103890 -> 103896 bytes
-rw-r--r--metadata/md5-cache/dev-ml/timezone-0.16.015
-rw-r--r--metadata/md5-cache/dev-ml/timezone-0.16.0-r115
-rw-r--r--metadata/md5-cache/dev-php/Manifest.gzbin62059 -> 62058 bytes
-rw-r--r--metadata/md5-cache/dev-php/recaptcha-1.2.44
-rw-r--r--metadata/md5-cache/dev-python/Arpeggio-2.0.217
-rw-r--r--metadata/md5-cache/dev-python/Faker-18.11.24
-rw-r--r--metadata/md5-cache/dev-python/Manifest.gzbin376258 -> 377500 bytes
-rw-r--r--metadata/md5-cache/dev-python/PyQt-builder-1.15.14
-rw-r--r--metadata/md5-cache/dev-python/arrow-1.2.34
-rw-r--r--metadata/md5-cache/dev-python/attrs-23.1.04
-rw-r--r--metadata/md5-cache/dev-python/cffi-1.15.1-r34
-rw-r--r--metadata/md5-cache/dev-python/cfn-lint-0.77.104
-rw-r--r--metadata/md5-cache/dev-python/cryptography-41.0.14
-rw-r--r--metadata/md5-cache/dev-python/denonavr-0.11.316
-rw-r--r--metadata/md5-cache/dev-python/deprecation-2.1.0-r14
-rw-r--r--metadata/md5-cache/dev-python/docker-6.1.34
-rw-r--r--metadata/md5-cache/dev-python/eradicate-2.3.04
-rw-r--r--metadata/md5-cache/dev-python/filelock-3.12.24
-rw-r--r--metadata/md5-cache/dev-python/fqdn-1.5.1-r24
-rw-r--r--metadata/md5-cache/dev-python/fritzconnection-1.12.216
-rw-r--r--metadata/md5-cache/dev-python/h5py-3.9.04
-rw-r--r--metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-23.1.04
-rw-r--r--metadata/md5-cache/dev-python/hatch-vcs-0.3.04
-rw-r--r--metadata/md5-cache/dev-python/idna-3.44
-rw-r--r--metadata/md5-cache/dev-python/ipython-8.14.04
-rw-r--r--metadata/md5-cache/dev-python/iso8601-2.0.04
-rw-r--r--metadata/md5-cache/dev-python/isoduration-20.11.0-r14
-rw-r--r--metadata/md5-cache/dev-python/jsonpointer-2.44
-rw-r--r--metadata/md5-cache/dev-python/jsonschema-4.17.34
-rw-r--r--metadata/md5-cache/dev-python/jsonschema-4.18.04
-rw-r--r--metadata/md5-cache/dev-python/jsonschema-specifications-2023.6.14
-rw-r--r--metadata/md5-cache/dev-python/kaptan-0.5.12-r44
-rw-r--r--metadata/md5-cache/dev-python/lark-1.1.54
-rw-r--r--metadata/md5-cache/dev-python/mdit-py-plugins-0.4.04
-rw-r--r--metadata/md5-cache/dev-python/mergedeep-1.3.4-r14
-rw-r--r--metadata/md5-cache/dev-python/moto-4.1.124
-rw-r--r--metadata/md5-cache/dev-python/munch-3.0.04
-rw-r--r--metadata/md5-cache/dev-python/nbformat-5.9.04
-rw-r--r--metadata/md5-cache/dev-python/nodeenv-1.8.04
-rw-r--r--metadata/md5-cache/dev-python/numpy-1.24.4-r14
-rw-r--r--metadata/md5-cache/dev-python/openapi-schema-validator-0.6.016
-rw-r--r--metadata/md5-cache/dev-python/pallets-sphinx-themes-2.1.14
-rw-r--r--metadata/md5-cache/dev-python/phonenumbers-8.13.154
-rw-r--r--metadata/md5-cache/dev-python/pkgconfig-1.5.5-r14
-rw-r--r--metadata/md5-cache/dev-python/poetry-core-1.6.14
-rw-r--r--metadata/md5-cache/dev-python/pygraphviz-1.114
-rw-r--r--metadata/md5-cache/dev-python/pylast-5.2.04
-rw-r--r--metadata/md5-cache/dev-python/pyopenssl-23.2.04
-rw-r--r--metadata/md5-cache/dev-python/pyproject-api-1.5.34
-rw-r--r--metadata/md5-cache/dev-python/pyroute2-0.7.94
-rw-r--r--metadata/md5-cache/dev-python/pyrsistent-0.19.34
-rw-r--r--metadata/md5-cache/dev-python/pytest-check-2.1.54
-rw-r--r--metadata/md5-cache/dev-python/pytest-mock-3.11.14
-rw-r--r--metadata/md5-cache/dev-python/python-dateutil-2.8.2-r14
-rw-r--r--metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0-r116
-rw-r--r--metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r44
-rw-r--r--metadata/md5-cache/dev-python/python-utils-3.7.04
-rw-r--r--metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.24
-rw-r--r--metadata/md5-cache/dev-python/referencing-0.29.14
-rw-r--r--metadata/md5-cache/dev-python/regex-2023.6.34
-rw-r--r--metadata/md5-cache/dev-python/requests-mock-1.11.04
-rw-r--r--metadata/md5-cache/dev-python/rfc3339-validator-0.1.4-r14
-rw-r--r--metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r14
-rw-r--r--metadata/md5-cache/dev-python/rfc3987-1.3.8-r24
-rw-r--r--metadata/md5-cache/dev-python/rpds-py-0.8.104
-rw-r--r--metadata/md5-cache/dev-python/selenium-4.10.04
-rw-r--r--metadata/md5-cache/dev-python/sentry-sdk-1.26.04
-rw-r--r--metadata/md5-cache/dev-python/six-1.16.0-r14
-rw-r--r--metadata/md5-cache/dev-python/smmap-5.0.0-r14
-rw-r--r--metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4-r117
-rw-r--r--metadata/md5-cache/dev-python/sphinx-panels-0.6.0-r116
-rw-r--r--metadata/md5-cache/dev-python/sphinx-pytest-0.1.14
-rw-r--r--metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.2-r14
-rw-r--r--metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r34
-rw-r--r--metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r24
-rw-r--r--metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2-r116
-rw-r--r--metadata/md5-cache/dev-python/starlette-0.28.04
-rw-r--r--metadata/md5-cache/dev-python/stdio-mgr-1.0.1-r14
-rw-r--r--metadata/md5-cache/dev-python/stevedore-5.1.04
-rw-r--r--metadata/md5-cache/dev-python/strict-rfc3339-0.7-r24
-rw-r--r--metadata/md5-cache/dev-python/tavern-2.2.04
-rw-r--r--metadata/md5-cache/dev-python/tempest-35.0.04
-rw-r--r--metadata/md5-cache/dev-python/testresources-2.0.1-r34
-rw-r--r--metadata/md5-cache/dev-python/testtools-2.6.0-r14
-rw-r--r--metadata/md5-cache/dev-python/three-merge-0.1.1-r14
-rw-r--r--metadata/md5-cache/dev-python/time-machine-2.10.04
-rw-r--r--metadata/md5-cache/dev-python/tiny-proxy-0.2.04
-rw-r--r--metadata/md5-cache/dev-python/tornado-6.3.2-r14
-rw-r--r--metadata/md5-cache/dev-python/towncrier-23.6.04
-rw-r--r--metadata/md5-cache/dev-python/trio-0.22.0_p20230530-r14
-rw-r--r--metadata/md5-cache/dev-python/trio-websocket-0.10.34
-rw-r--r--metadata/md5-cache/dev-python/uri_template-1.3.04
-rw-r--r--metadata/md5-cache/dev-python/virtualenv-20.23.14
-rw-r--r--metadata/md5-cache/dev-python/webcolors-1.134
-rw-r--r--metadata/md5-cache/dev-python/websocket-client-1.6.14
-rw-r--r--metadata/md5-cache/dev-python/werkzeug-2.3.64
-rw-r--r--metadata/md5-cache/dev-qt/Manifest.gzbin23661 -> 23651 bytes
-rw-r--r--metadata/md5-cache/dev-qt/assistant-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/designer-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/linguist-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/linguist-tools-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/pixeltool-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qdbus-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qdbusviewer-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qdoc-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qt3d-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtbluetooth-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtcharts-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtconcurrent-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtcore-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtdatavis3d-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtdbus-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r24
-rw-r--r--metadata/md5-cache/dev-qt/qtdiag-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtgamepad-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtgui-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qthelp-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtimageformats-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtlocation-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtmultimedia-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r24
-rw-r--r--metadata/md5-cache/dev-qt/qtnetworkauth-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtopengl-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtpaths-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtpositioning-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtprintsupport-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtquickcontrols-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtscript-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtscxml-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtsensors-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtserialport-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtspeech-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtsql-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtsvg-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qttest-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qttranslations-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtwayland-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtwebchannel-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p202306234
-rw-r--r--metadata/md5-cache/dev-qt/qtwebsockets-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtwebview-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r14
-rw-r--r--metadata/md5-cache/dev-qt/qtx11extras-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtxml-5.15.104
-rw-r--r--metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.104
-rw-r--r--metadata/md5-cache/dev-ruby/Manifest.gzbin177156 -> 176665 bytes
-rw-r--r--metadata/md5-cache/dev-ruby/sus-0.15.217
-rw-r--r--metadata/md5-cache/dev-ruby/sus-0.16.017
-rw-r--r--metadata/md5-cache/dev-ruby/sus-0.18.017
-rw-r--r--metadata/md5-cache/dev-ruby/syslogger-1.6.6-r212
-rw-r--r--metadata/md5-cache/dev-ruby/temple-0.9.117
-rw-r--r--metadata/md5-cache/dev-ruby/tilt-2.2.017
-rw-r--r--metadata/md5-cache/dev-util/Manifest.gzbin126386 -> 126377 bytes
-rw-r--r--metadata/md5-cache/dev-util/jenkins-bin-2.401.26
-rw-r--r--metadata/md5-cache/dev-util/jenkins-bin-2.4106
-rw-r--r--metadata/md5-cache/media-gfx/Manifest.gzbin56971 -> 57126 bytes
-rw-r--r--metadata/md5-cache/media-gfx/graphviz-8.1.017
-rw-r--r--metadata/md5-cache/media-libs/Manifest.gzbin112505 -> 112502 bytes
-rw-r--r--metadata/md5-cache/media-libs/dav1d-1.2.14
-rw-r--r--metadata/md5-cache/media-plugins/Manifest.gzbin107743 -> 107745 bytes
-rw-r--r--metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.82
-rw-r--r--metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.12
-rw-r--r--metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.12
-rw-r--r--metadata/md5-cache/media-sound/Manifest.gzbin74555 -> 74564 bytes
-rw-r--r--metadata/md5-cache/media-sound/mixxx-2.3.5-r14
-rw-r--r--metadata/md5-cache/media-tv/Manifest.gzbin5159 -> 5151 bytes
-rw-r--r--metadata/md5-cache/media-tv/gentoo-vdr-scripts-3.0_rc2-r12
-rw-r--r--metadata/md5-cache/media-tv/mythtv-32.0-r42
-rw-r--r--metadata/md5-cache/media-tv/mythtv-33.12
-rw-r--r--metadata/md5-cache/media-video/Manifest.gzbin38078 -> 38092 bytes
-rw-r--r--metadata/md5-cache/media-video/vdr-2.6.32
-rw-r--r--metadata/md5-cache/media-video/vdr-2.6.42
-rw-r--r--metadata/md5-cache/media-video/vlc-3.0.18-r34
-rw-r--r--metadata/md5-cache/net-analyzer/Manifest.gzbin57603 -> 57743 bytes
-rw-r--r--metadata/md5-cache/net-analyzer/munin-2.0.73-r117
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-4.0.442
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-4.0.462
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-4.0.472
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-5.0.322
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-5.0.352
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-5.0.362
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.0.14-r12
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.0.182
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.0.192
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.4.0-r12
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.4.32
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.4.42
-rw-r--r--metadata/md5-cache/net-dns/Manifest.gzbin12101 -> 12265 bytes
-rw-r--r--metadata/md5-cache/net-dns/pdns-4.8.117
-rw-r--r--metadata/md5-cache/net-mail/Manifest.gzbin20206 -> 20201 bytes
-rw-r--r--metadata/md5-cache/net-mail/mailgraph-1.14-r32
-rw-r--r--metadata/md5-cache/net-misc/Manifest.gzbin88143 -> 88301 bytes
-rw-r--r--metadata/md5-cache/net-misc/iperf-3.144
-rw-r--r--metadata/md5-cache/net-misc/lyricwikia-0.1.11-r217
-rw-r--r--metadata/md5-cache/net-misc/openssh-9.3_p1-r12
-rw-r--r--metadata/md5-cache/net-misc/openssh-contrib-9.3_p12
-rw-r--r--metadata/md5-cache/net-print/Manifest.gzbin7466 -> 7469 bytes
-rw-r--r--metadata/md5-cache/net-print/cups-2.4.64
-rw-r--r--metadata/md5-cache/sci-chemistry/Manifest.gzbin13364 -> 13043 bytes
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2018.8-r116
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2018.8-r216
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2019.6-r216
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2019.6-r316
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2020.716
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2020.7-r116
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2021.716
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2021.7-r116
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2022.416
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2022.516
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2022.5-r116
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2022.99996
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-202316
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2023.116
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2023.1-r116
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-2023.99996
-rw-r--r--metadata/md5-cache/sci-chemistry/gromacs-99996
-rw-r--r--metadata/md5-cache/sci-libs/Manifest.gzbin63679 -> 63682 bytes
-rw-r--r--metadata/md5-cache/sci-libs/hdf5-1.14.14
-rw-r--r--metadata/md5-cache/sci-libs/openblas-0.3.236
-rw-r--r--metadata/md5-cache/sci-misc/Manifest.gzbin3740 -> 3744 bytes
-rw-r--r--metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.1.116
-rw-r--r--metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.2.116
-rw-r--r--metadata/md5-cache/sys-apps/Manifest.gzbin87054 -> 87059 bytes
-rw-r--r--metadata/md5-cache/sys-apps/locale-gen-2.23-r14
-rw-r--r--metadata/md5-cache/sys-libs/Manifest.gzbin35599 -> 35592 bytes
-rw-r--r--metadata/md5-cache/sys-libs/glibc-2.37-r34
-rw-r--r--metadata/md5-cache/sys-process/Manifest.gzbin15598 -> 15597 bytes
-rw-r--r--metadata/md5-cache/sys-process/fcron-3.3.12
-rw-r--r--metadata/md5-cache/x11-drivers/Manifest.gzbin6276 -> 6279 bytes
-rw-r--r--metadata/md5-cache/x11-drivers/nvidia-drivers-390.1572
-rw-r--r--metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.022
-rw-r--r--metadata/md5-cache/x11-drivers/nvidia-drivers-525.125.062
-rw-r--r--metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.272
-rw-r--r--metadata/md5-cache/x11-drivers/nvidia-drivers-535.54.032
-rw-r--r--metadata/news/Manifest28
-rw-r--r--metadata/news/timestamp.chk2
-rw-r--r--metadata/timestamp2
-rw-r--r--metadata/timestamp.chk2
-rw-r--r--metadata/timestamp.commit2
-rw-r--r--metadata/timestamp.x2
-rw-r--r--metadata/xml-schema/timestamp.chk2
-rw-r--r--net-analyzer/Manifest.gzbin43081 -> 43086 bytes
-rw-r--r--net-analyzer/munin/Manifest1
-rw-r--r--net-analyzer/munin/munin-2.0.73-r1.ebuild418
-rw-r--r--net-dns/Manifest.gzbin8204 -> 8204 bytes
-rw-r--r--net-dns/pdns/Manifest2
-rw-r--r--net-dns/pdns/pdns-4.8.1.ebuild165
-rw-r--r--net-misc/Manifest.gzbin54113 -> 54116 bytes
-rw-r--r--net-misc/iperf/Manifest2
-rw-r--r--net-misc/iperf/iperf-3.14.ebuild2
-rw-r--r--net-misc/lyricwikia/Manifest3
-rw-r--r--net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild48
-rw-r--r--net-misc/lyricwikia/metadata.xml3
-rw-r--r--net-print/Manifest.gzbin5753 -> 5748 bytes
-rw-r--r--net-print/cups/Manifest2
-rw-r--r--net-print/cups/cups-2.4.6.ebuild2
-rw-r--r--profiles/Manifest.gzbin179676 -> 179675 bytes
-rw-r--r--profiles/features/wd40/package.mask2
-rw-r--r--sci-chemistry/Manifest.gzbin9510 -> 9513 bytes
-rw-r--r--sci-chemistry/gromacs/Manifest26
-rw-r--r--sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild237
-rw-r--r--sci-chemistry/gromacs/gromacs-2018.8-r2.ebuild237
-rw-r--r--sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild252
-rw-r--r--sci-chemistry/gromacs/gromacs-2019.6-r3.ebuild252
-rw-r--r--sci-chemistry/gromacs/gromacs-2020.7-r1.ebuild347
-rw-r--r--sci-chemistry/gromacs/gromacs-2020.7.ebuild347
-rw-r--r--sci-chemistry/gromacs/gromacs-2021.7-r1.ebuild355
-rw-r--r--sci-chemistry/gromacs/gromacs-2021.7.ebuild355
-rw-r--r--sci-chemistry/gromacs/gromacs-2022.4.ebuild333
-rw-r--r--sci-chemistry/gromacs/gromacs-2022.5-r1.ebuild333
-rw-r--r--sci-chemistry/gromacs/gromacs-2022.5.ebuild333
-rw-r--r--sci-chemistry/gromacs/gromacs-2022.9999.ebuild2
-rw-r--r--sci-chemistry/gromacs/gromacs-2023.1-r1.ebuild335
-rw-r--r--sci-chemistry/gromacs/gromacs-2023.1.ebuild335
-rw-r--r--sci-chemistry/gromacs/gromacs-2023.9999.ebuild2
-rw-r--r--sci-chemistry/gromacs/gromacs-2023.ebuild335
-rw-r--r--sci-chemistry/gromacs/gromacs-9999.ebuild2
-rw-r--r--sci-libs/Manifest.gzbin44814 -> 44816 bytes
-rw-r--r--sci-libs/hdf5/Manifest2
-rw-r--r--sci-libs/hdf5/hdf5-1.14.1.ebuild2
-rw-r--r--sci-libs/openblas/Manifest2
-rw-r--r--sci-libs/openblas/openblas-0.3.23.ebuild5
-rw-r--r--sci-misc/Manifest.gzbin2581 -> 2580 bytes
-rw-r--r--sci-misc/jupyterlab-desktop-bin/Manifest4
-rw-r--r--sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.2.1.ebuild (renamed from sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.1.1.ebuild)0
-rw-r--r--sys-apps/Manifest.gzbin49852 -> 49857 bytes
-rw-r--r--sys-apps/locale-gen/Manifest2
-rw-r--r--sys-apps/locale-gen/locale-gen-2.23-r1.ebuild2
-rw-r--r--sys-libs/Manifest.gzbin14729 -> 14728 bytes
-rw-r--r--sys-libs/glibc/Manifest2
-rw-r--r--sys-libs/glibc/glibc-2.37-r3.ebuild2
5167 files changed, 22972 insertions, 21886 deletions
diff --git a/Manifest b/Manifest
index cdf3bdc5698c..ae16d4056db4 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29261 BLAKE2B f384de50cf1a8bafcf672fd5cfb2209d08ee09aa58ab925f801653245c0737c9ed7088ff7e4b13b3055f5f24683e27915d1474ab3f2f8e13807310a103786155 SHA512 80100a68af694c44851ead1f66560008718fe7ca39809d48dbded9f6e0b768de44ecf766cd726c504b30e87872e5e0d083ac33477ea5df380a01dff087761679
-TIMESTAMP 2023-07-09T14:39:45Z
+MANIFEST Manifest.files.gz 29299 BLAKE2B 3c3c53862561dcac64568f5a66b21002cce733a337d0e3de669dee63b30d520102abb8f124e66392ff1ab184cb9aea6dcd70e0d5fe01fca93f92d91b09957feb SHA512 644cdc8d1968d163a7bbe2677e3245a1a4f2c975ce7d1769327456f9ee85fbb1386cb5987325c822c8936d86bf1537d9995ee766eee6a9dccc0d61e59841b323
+TIMESTAMP 2023-07-09T20:39:43Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSqxrFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSrGw9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAaYhAAq9BSuFxFrpR7Clv5hshvQtwo9ZJ1omGMt+wTpVO+OAMDYkaWnsua7+m8
-F24EQaP4/hbOtpU5JS/9OlMg/pH2pHhOfNeH34lyBeYWelmnsOzS/5kfY/+jLOuc
-YcgCSxlRCqSp4n0I5oOHh/KoofC2lVXtklAPBlMMyQ+uykyrBFgDdfW3/fzzcsYS
-f4V6ht7Z/K/XejT+xYFtS8cTtwwVm4j866lSjdNB/X4baGhd5pv4Q99Sf1JdqSkk
-36opjFMq6T1wbbdlQErSHlgj3P4ojO++/2AaANU5r8Au1fkJhVi0G5S3uEEYcU59
-ic3sIeAJyU9wh7ah9zQ8CWK9GhL28/AhuPmYoDqpV+F3NKZYA8v+Xuqm1NiB5pFS
-ZXaUnC8xMkn8kRdhDYKrlNkFaHQmaWxfhD5QTz1hxZTTLJ4It8tj/YVmZWl+6P6U
-V1tI7Mz9/q3gJbLkfSq5LaDcn1iK1Y4jRUQZwIDkZAqB2vU6o9kpgk20Dxh6rCky
-TcMRDV48LeP8m0CFF3TLhn0/i4UBX4J7o7Yk6nMowXjCsJr8d0FH3bUsb/kc3zuJ
-6w0eaRLVbrhny2C+9DXemoDylOeDL8/i9hBPvGLHdDqFmw4LqM87qe+j4BrKLBSr
-n08FRqWSowje7hycQNUHGrimeF5LFVSGzefjaH4t/pZq4oNGXXo=
-=g+Ph
+klDMbw/+LMOHui3EeD9fM18Td96Ley3QBNUXwCrTg/xvIVD4i74eym0SzyYcGxW7
+UGBPK9YEuiJS1GaPgllEVP84dZlEBacjRR8171KX0RG+61wcigCwHkJopEBrXYB2
+BZZYzM8eihFKT95lvyZDp2PfUzaPSyvOtCFMWuNyuv2rWur6b8XoYTtE0/HQ6rx2
+MIynoXAIVnxckX1K9fleeIhYOKY/uGbskT6KRQ4MKK+MZ/Z1Pu4pIk2nDGLlmt5L
+6k+mD+hrRR9HV60+r7uF0aMuvqwSblkW5e672N7HnqJmOnHWQLuQL00gbHKPT5o6
+yxOkZY7BLEO7j1QJkFi0zQNIghw3iB1jCF9slyPcoMEeyjza3zg8jhd7LOO8pIbm
+MU4A58/On54WzUWEIn7iMzlT8NMMK48/8cFP3AsGnVWB5VGbHa1be6dmtfWaoZNi
+wk+A3JByv962ZIwU+hJxIuZsFcdgwTYP1lRS11Jnzs8OwWzOmHTBXnZzbggtX2Ey
+hdvcnJkdQBMeEgFYIVGFcB8P5KzaK0MWwwdRUDsAkloL+Pj56CGjyoVPSSK5uQLv
+UCfChAeWqc9eQdVD0LnJee05hpSruBfxg/xho96+wXgMrELG+KeBBMl4/Kn31LUF
+X8ji3sAHnoDRS7jFsOI5MDapY+b+1VoPnDu1wc9Rr+TO5ttTgks=
+=47/c
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index eabfe2cda95c..04241f992554 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
Binary files differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 10d15cb32e93..ad6eb969afe2 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
Binary files differ
diff --git a/acct-group/_cron-failure/Manifest b/acct-group/_cron-failure/Manifest
index 6d1ae84d1652..224074012588 100644
--- a/acct-group/_cron-failure/Manifest
+++ b/acct-group/_cron-failure/Manifest
@@ -1,2 +1,2 @@
-EBUILD _cron-failure-0.ebuild 220 BLAKE2B 53f8c0c0b519bdbd58f3085fc489764c54d3b5c66166dd8cde151a4175057ed68e29527beed68a3496982e600b1681bf57b09c92b4ffb1cf7661e35f4ff5d3fc SHA512 bd727548f7151de8760a7c2a0b7e0520f6caa96b14bde6fc91a48e27ebbe15d3d08114d6d3e451faeac8787a480441e44577e974b0071dac087c3d2b2538670a
+EBUILD _cron-failure-0-r1.ebuild 220 BLAKE2B da8f75363ae2b6a6494f27b7f107a0d02d5221b6705c1655d0fd0388d6fe68e60ad56c22de64479ac07273301a392c2b11027ccbfe86cfc6aa55cd9c33b93a34 SHA512 f6e45417c06879bf27df2b7e2b9ea4eccbde59b589e36aab6ed3fc48c8e3cbcd1d6317bcfa1c4b5f31b71d09cc80057274d86114bae8a39e6a438b578f962135
MISC metadata.xml 248 BLAKE2B a5a7d9bcd542fe55d50fed508ef21f6a820aee11993d27e8ffb967f55cf3f8a02846c96499f1112e1b58f4a93b8b6fce596589e653fe161bb94c1b5868bd6dd5 SHA512 a45b735f6fec1b6bbce0a559869d9ac99c13b2dceb0d2b23f6fdd32fb7b6d44a2b199f47d89418784243fafafeea56094e0e0c7a90b67cad5cefcc94bf1423d4
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/Manifest b/acct-group/adm/Manifest
index e535c9ff1614..f4d17163300d 100644
--- a/acct-group/adm/Manifest
+++ b/acct-group/adm/Manifest
@@ -1,2 +1,2 @@
-EBUILD adm-0-r1.ebuild 149 BLAKE2B a91ae65de89b2fca21b378a077170039f6efd45b40988d6ff9ab12d920908653a0ed29be41ea83ff3c9f616b6d6a7c9bff60f0d9f2273f7af0dda6104bc69929 SHA512 549819f445f2b90d0fa5ee0aae0e32fb16110d49bddf20c645af26052aaf2fa3d97fb294452906fde26e23ea9efef2bb2b7a86c8528fa9b8a5f719728d8ce1db
+EBUILD adm-0-r2.ebuild 149 BLAKE2B 19d7c1b8d6957b4981c12264b8c44bfde053c1c5fa5f7b1bfac48332375b58f86b3f4173993326fe01fd4352be3406c8bdf58bc8b37011dc588a52a1dac182b6 SHA512 df0b166def375795229a0dbbb71936ee63615fd0993b617977f2d20d42d27b31edf64977600224caef38fce91a4dee07ef7535ad71ab286ed986dc2bb5287f07
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/aerospike-amc/Manifest
index d3070ebfaafa..0d9b18e713a7 100644
--- a/acct-group/aerospike-amc/Manifest
+++ b/acct-group/aerospike-amc/Manifest
@@ -1,2 +1,2 @@
-EBUILD aerospike-amc-0.ebuild 214 BLAKE2B f5de0174a6db82f7320b36ff0629ad7f4347e9a306fac50e07820a00f3d1cdad2e21e685484e287c5553b061266af8cb609deeb17cf4317057a3d5b96fbd76d9 SHA512 2da12d192a30d1cf66ab6b7ddd6e24da0b176ebea26f5b70abce70d5b9e3923df9a975c8a7839357e0179985ef95dafa5e423ed8fbead79891b7f10ae5cb6e63
+EBUILD aerospike-amc-0-r1.ebuild 214 BLAKE2B b7e324227796e67f846f3b3a2b21c93ab1051c26a1b12bf88ce41b4106ccf5a48d082a405f5388467638aa6a1081ffd7b5a5b8c6014f90da67c75e1b8284243e SHA512 b0f23eb44493ddd4a783ead334810583a71634ded4f0f6ab64d9b85d380972f4093a9e00c30117e721f5f3be0b208fe4d76da5f96eced4fa21614c0b722614db
MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
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/Manifest b/acct-group/airdcppd/Manifest
index ff967ac10480..d7b469ca99ee 100644
--- a/acct-group/airdcppd/Manifest
+++ b/acct-group/airdcppd/Manifest
@@ -1,2 +1,2 @@
-EBUILD airdcppd-0-r1.ebuild 196 BLAKE2B 9244aaa4d34e664c3ebe710afab404ad988eb74f2a7ceb6b1ea221fc49fabfd5c8c26ba96fb62efe73988501b1b6c8bee6d3aee323b54e1c508efc4dfa101c9b SHA512 9f5d5bed02d5b96cc8be8751a993da3744e545472229b39fff90071b33a3d21dcf9d2d860251925f229bcad21b8a754f9e6fcd4eb48b6cf02352e78b0143af19
+EBUILD airdcppd-0-r2.ebuild 201 BLAKE2B c59abec9bf92cd29f1558e6caaeab20b34501f53ce4989486afcbff69a9c86a82ed9ce24be69bdd57ed0c3c3c46fb79ac3331e958b53b34e0093cfe59d4d5c9c SHA512 2a2ad419f34394331456cdde5de72143caf4c5f94a5bb6c82b3faf3f661a906238f1c63f96b6c9b1ef3dd1a5eab08ae85b7d2ee29a3db47edeea0a523dc7fe08
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
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/Manifest b/acct-group/alertmanager/Manifest
index c2def7c8f5e5..dc39a75a9560 100644
--- a/acct-group/alertmanager/Manifest
+++ b/acct-group/alertmanager/Manifest
@@ -1,2 +1,2 @@
-EBUILD alertmanager-0.ebuild 146 BLAKE2B 564d0f62754dd20158bbf85908ec99086e1cb12f4c6ae09c95ba2a3d06bf8f3928276d88f2537fc8bf65d6f21423439030d8056f78b2eafe71c0036f4f46fb36 SHA512 60988af958e5c76e8961cb09b222a2e2c7146789013e36d671aae18e20020a26e7d014b9abe63da717be144c725eefbce62ee39b62183b69f43ad70933018cbd
+EBUILD alertmanager-0-r1.ebuild 151 BLAKE2B 97ede82bb42a2ee6da0306d522c10dff091374eaf1875000d6d13a79dde35786f782b2bd21edff5187e0763e8fdef5d8179e2528dd2892db8580946c42d78dca SHA512 bce247a4f0ff1f24b74aca91fab57d2a86492263809380d80e04f10e54b3c3db85e4e110ac846ee3bdb65b3de6808fdfef5715586c8f621a1f77e7bf21dd6323
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/amanda/Manifest
index 1d44fdf63461..defa15f00258 100644
--- a/acct-group/amanda/Manifest
+++ b/acct-group/amanda/Manifest
@@ -1,2 +1,2 @@
-EBUILD amanda-0.ebuild 151 BLAKE2B 7d0bda5bde34d227c754592d99bb94b066de66735d8635ee0e95e4c1928a158937eda6867c3a2d1d17550d92a7b6354143a9d0d52044abe22ba39c8e0fed9a79 SHA512 dd7d28a1c50e181632de11a36197a4d022b742c5edd54ecf7bbece0d4d1a3df536521bb4c9e75012b3a4d95673d81babac3e242aa2383fd263152fd299434db7
+EBUILD amanda-0-r1.ebuild 151 BLAKE2B c7ec000e381b37ba5c31df729e13a9917060bb7ebbec6e1160d7839ecd99b7e88c2b4b78e1bd0760ff3680c32bcc49b2ae78a69504d492fd8ba4405eb67a289d SHA512 6cbdaffaf03d30c08e2b69a2ab64b516ef70a7e266840d8ccf9fddeb6f1f26fadb90525c549e0fdf553bee09a50f26b8cf831cc0d8b9f98f2bc70a739e8d8607
MISC metadata.xml 568 BLAKE2B 27da958a42770d386d7204ee1a18b189210253e4ca7bbf150efc7f947d089bf273fa1536ef3fa7525a94c753cac43cc784f5989dc348d9a9363e38e508d495e8 SHA512 ec050ac6eafed72aff2323a015cc5a40011c7803650f26907b2787a3a53fd3943a126d7f70ac1f673dff89bbc088968fd7ae92105625abb7058d159bd9cdabc3
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/Manifest b/acct-group/amavis/Manifest
index 09fe25b432e5..0de71543db73 100644
--- a/acct-group/amavis/Manifest
+++ b/acct-group/amavis/Manifest
@@ -1,2 +1,2 @@
-EBUILD amavis-0-r1.ebuild 194 BLAKE2B d214076083bf76e9ecdd57ae1b5b7e7b481132082c0f405434605efc4c02ec4f9337c66d269693349d5ef4c8af4764d2485337bd4ac54404aa46155bc5612048 SHA512 d39918b9c9436dadb4f4641a634a466603281ca136ca3bd07c2eabcb71eb7e732c575443d0c20f919740de04546eeb1a59b8f56f9fbd693223716e95e7920b2c
+EBUILD amavis-0-r2.ebuild 199 BLAKE2B 303dbe1c1b876db93c3f30248cad3ffaedd2feb4e7bcb43c59bc59365f0a2f16b24800fe15d531f71efa120150e5581c0ffe364a83758170bfbd21588b08471d SHA512 8acc6f8290daf74b92c5b555409af38c3b550bd25af5f224e95cffbe4f26442c65f9ee92727f3229b8e356ea9c6ead6d283e2f3acff17dd2c539a0548946154d
MISC metadata.xml 262 BLAKE2B bdf88a65e34409c3f65204337925e14be06c13ab53571f864dc58309b72d50a9968dacf93110bd97acc5ae729f55207718d4ffd6ce321210e220bc6d57fc61a7 SHA512 9836f7da275ae8424e0494ee38313d62f90a180ed9fcbf7ff6391b3a5b4c3679f566668f0acd82ad0fe5f036e70a0e0a33b95df87475e4cbf8aafe1ae6974774
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/Manifest b/acct-group/amule/Manifest
index 53ad6c361f1f..45aeb89edb8b 100644
--- a/acct-group/amule/Manifest
+++ b/acct-group/amule/Manifest
@@ -1,2 +1,2 @@
-EBUILD amule-0-r1.ebuild 184 BLAKE2B df7b0029d23909369fe0580b22d10c2014bc0552ce9f7df6066f42884bb17bec353330399b53bc28bfe6676497d22238d11199c338cd815ae3c19394f9710ac5 SHA512 aef615dcca21ad7f666863197833024dbbffff41a183376b6b2fd636453aaf864ed37a07e06e1cd5e1bc2e539b9bebbe2afdd3fd43ec27ef48c95f95e48e420f
+EBUILD amule-0-r2.ebuild 189 BLAKE2B cce95d3d3f59d3704f8c25cdb670d905155f3719dbfce93ae7278d93fc9b0c25c9dcdbf0cf19c8b804511a40be5c37f969ad88436c05b4f1c48a0aa724cc7613 SHA512 b8b0dec39e249a1fb48488db961afbb3d5d33c17b87ffe3659fadbf9986ca3add3fac9b555caeaef85053955580623eefae00edf00113734e1b53b6eee58a749
MISC metadata.xml 395 BLAKE2B 676ceaef4b63cc5fd7c0ad8b28065738adf013fa4f85cb2fa70bd1cafa8ea6b76fc6ca81e36e91c839bcc55c55a8bf24b4a325e44b0830f653adc89ee09dbfc4 SHA512 30eec216eef39513374c06cc1b0be994f53deb7054f7241a55b1ccc73d58ab0b578b92096eb56daef0e7f8d1377480a00a6bbb6e0bcbffb19d53a48f081170f3
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/Manifest b/acct-group/android/Manifest
index ab05041699f2..b364b3d238b1 100644
--- a/acct-group/android/Manifest
+++ b/acct-group/android/Manifest
@@ -1,2 +1,2 @@
-EBUILD android-0.ebuild 220 BLAKE2B cfa0e01403904bed9f69befb9f243d773b057f8ffe0277f65d345e669bcd5eb006fbc6c41b73eac75af0bf934b68b3990b3ae1ed0f43b055b133ef8c95573cef SHA512 99db7caea3504aced96993e81405cfd1c837c013b5132f60fb37c15bb84373fc0a459c2b09c2a842d3f4450dec3476fadf66d9976a68ecdafd88d2cbcb88ca0a
+EBUILD android-0-r1.ebuild 220 BLAKE2B bde8081a42646faa5461618c8f10f42bb5072def7ced8146a5ce45e5dcd33550f50f34eb038637d7c69ea76f47dbec3ef051f5cd087a9d7262672168c586a35c SHA512 e678681f83a39f8b254c14094985614f55a33f15e2a41398169f97ecd3f5c8cf6a01e04c83b35e6ddcd80e96e375c79bbc836c318937ceac30c2f1f38e8a7e76
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/anope/Manifest
index 31fdcdfe6e36..b71b65bd0854 100644
--- a/acct-group/anope/Manifest
+++ b/acct-group/anope/Manifest
@@ -1,2 +1,2 @@
-EBUILD anope-0-r1.ebuild 189 BLAKE2B d8069a63714ae5ef476c44c65a44d4e0f0db6f19d2e53102bb4f2e8946a4aa2974d11e8dc047b991b9a72153d72f3a178a6dc150eaf83e4a2b21651f4987a5fa SHA512 5d25e821a65ba784a8146010d106af93e66b4acb9325574171cadd4d4f4893c84018acfec916405c0bc7a2623815bef0ad50eaaab90425b9ca5e2ed5f7c243bb
+EBUILD anope-0-r2.ebuild 194 BLAKE2B 76118adea27766a724a9441df504021ac3d56804e5b65a404f2579dad4304afb2b61d6c10ed9ba57ccd398ae710707b76a7d51f9028f374c92832e7897870c67 SHA512 31f43c2cbf54a8327aa0ebf41e699bdf9ccd4e18ea4b22d50ca6f20fe67e83bd601976a33cd24d267983f9b8b067430907fd13a8b0e6c4c74e8a978dc2a8a713
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/apache/Manifest
index ce2f0937d33b..de5e3ce2bc77 100644
--- a/acct-group/apache/Manifest
+++ b/acct-group/apache/Manifest
@@ -1,2 +1,2 @@
-EBUILD apache-0-r2.ebuild 150 BLAKE2B 2f9611a0b9c7d911a12e726cf581b49b6242ee50d811f6d562b70a54cf223347ff42fbb8614df506982196752ce3d8c336031b66c7cce7aa1684370647b61933 SHA512 5d1d6da9716e2aac2a3c662e67ccab340513c6a3b3aa98a95f2f4ffc7eed7fc160d59f4d9af1c25e472a4f0873fd5147025a4eccfdb4ed47789d28e3e93c1e2f
+EBUILD apache-0-r3.ebuild 150 BLAKE2B 1eadaf28ca6f1b33dd4790a83346f883566de47727b379761469ce342a969e9bda83755201e0198007d53dfcb983738d2b3deae0bf26103d506c89cc06812b28 SHA512 3abc6d1d10b3eaa26d8a2a1f638698fbbcaa39d1ae13ba84e636ed8eb3ecb01bdad220f95693d029f2ce0d7d36d28d678d2e6d598df8ba4c9292bf6a8bc83129
MISC metadata.xml 254 BLAKE2B 309bda95de24ec4bc4d565251f6b87ce5adc08e96bcd062c6b0cb77daf48729a08b84bbd9cf20f17e917bec6636c47c51a780dff452e45946df34088a7b80da0 SHA512 4c6b588732cb314b2a0c82d476516cb1c226f737a74934831232be6b9828e8c4636589beb8872c3df0931f6dbf37e78a47309376d3480dce7683d3ead5a63e61
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/Manifest b/acct-group/apt-cacher-ng/Manifest
index d5bd6673e44b..8de4d8f58113 100644
--- a/acct-group/apt-cacher-ng/Manifest
+++ b/acct-group/apt-cacher-ng/Manifest
@@ -1,2 +1,2 @@
-EBUILD apt-cacher-ng-0.ebuild 146 BLAKE2B c875a24ae9b150b0511404bd2d3ed0e865295818ec38b987ba4c54487b27a6144074d8470ebac686ff9f43021bec238d106acba380b6b4615dd945c0b0d12b68 SHA512 c9ac759373d640e96eecdbf536e298855c44b087f8e4c7d040ea2bd28fe9027224f13f0396f72153104e12a743d01ff458247f075168f9a867cd4cf75e6192ef
+EBUILD apt-cacher-ng-0-r1.ebuild 151 BLAKE2B 1fa6ca127c3d82422e002c7d08abc8a2a4215afb801ef569b3174120cb27c99e659abec67c5fd146d19a9fe3cf871685868e1898a76972989f3ccef1de690529 SHA512 0770ccda9996188466fbb687fe2d06abd1753f35cee0654e8e12203ba960fe00ae83a6aa0808cf3e948db25acdef0295fd70b9d090e5d4ab057e1873ee4a6693
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
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/Manifest b/acct-group/argus/Manifest
index 904e062de890..84ff92e7d3b3 100644
--- a/acct-group/argus/Manifest
+++ b/acct-group/argus/Manifest
@@ -1,2 +1,2 @@
-EBUILD argus-0.ebuild 188 BLAKE2B 0be937f804e7e6c84a8fd4f989c56148132651d0248f844f24900e78eb6bab6a91173fc4bab32c6f1f0c7ee065c271fc41437c1f55b2a81332602f2a6a1edd23 SHA512 d17d3012529af9ea3d60dfe482881aaf9181d5fffab820d21e9c3c117ac8b381e5fdde1f7c2b1fc78b36fdaedd7a673dd727b0dcb53417c50572a127a0a95231
+EBUILD argus-0-r1.ebuild 193 BLAKE2B 0be02daaa9ff181a446e671bde3439e1fcf2e1b4ba9c6c38b8700acd67f2c002c3c97b119e0c2c8cd7ff7630e4ef0785c395db310e14a7543d0d9e3512e8acb7 SHA512 8c79d1677a1b7ccbfec999868b8416e0c8e2708e3f8ef82a803dbd3d5a819704814eccf87471cc6955aa9c210de6fc51453b779282bb3d29da982c98bfeb61d8
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-group/arpwatch/Manifest
index 4f0be9d5b0a5..f260d97b2e00 100644
--- a/acct-group/arpwatch/Manifest
+++ b/acct-group/arpwatch/Manifest
@@ -1,2 +1,2 @@
-EBUILD arpwatch-0.ebuild 202 BLAKE2B 42851fd4afbaa1cc79f347c3e182e1a386bef5ffbfa05ba25dc666b4b9e3d9d0267469177b8b808eb4d5f2abe62eeb6c8c64f20022e1dfe7c31db04f8be00a33 SHA512 8f8fd154767bf076291c128a47e26ba79f5c9c3f3756c4be96397eae5a68c46c77c0724141e00b0fff79ad226b292be5b7e5a0e6c9c342ec211a8452c8027766
+EBUILD arpwatch-0-r1.ebuild 202 BLAKE2B 4bc304704b1a4c38176212f6d692b7c5ac4145569d7de81ce973f736f0a5abe6c31ab24d38240447df7f372941181dd92d05a95a2fadd210549fb8e721134625 SHA512 40484cf09cf72d4353431c62ac4634fda9f0f67045a2f46c04920d87637c6d3a4a2cc815d5662370ebcf6b4ee347229b4d3e47f0a66370359bbab9a4d1c65899
MISC metadata.xml 280 BLAKE2B c286d37bee8045783bc979f9325dd0c1684a1e63bcea60642c2ebba7b4f7c6ef2b77e5f89615e33c06d0cd12742333a2054e19f6e609d45f1c0f7de0289ca55e SHA512 6aa6da804087da932aa4223f3a8c1b26808344f28b12546e4cd7cbf91d5aed172ed298acdf08697fab96c6ed5cfb9b920801e8d56c5be439c84d4594bf02d86e
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/Manifest b/acct-group/artifactory/Manifest
index 679cdd322ad7..f594fbdcd82f 100644
--- a/acct-group/artifactory/Manifest
+++ b/acct-group/artifactory/Manifest
@@ -1,2 +1,2 @@
-EBUILD artifactory-0.ebuild 203 BLAKE2B b1dca4bed2a5b4d149afd5c5aa6a25c36aa8b1f26b830b446563026c91a042972ff366cfd084d18c421da5e71372d4e5d3ec0092e9de7e488904a8721aa198dd SHA512 c9dda9e547c1bf0ba28c4ca5d4758e6a494a32f78c427a054e376daec1fbe235973cbc5a50fe27abd1f1f3f80ab24e933aa8f23980e78c0b4d38d12a6a221802
+EBUILD artifactory-0-r1.ebuild 203 BLAKE2B 43251e11ab46c3692961a9f7a41a75e197aba44e75e4193f0345b7cda73fa84db6fe8a31d89a1596d8b31bb9a3ca03b75010b3bc694e61b5bccbe2772d4eae02 SHA512 612c9d3f575b56c0f000eae4a0be6b1edf1b48ffcd1570c7e26928e547700218fd4cb6d37c0f4f8503276c330633d22135a16d4425ef0770d6923920f7f1424f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/aspnet/Manifest
index 30edeabbc5c9..3400c8cc87de 100644
--- a/acct-group/aspnet/Manifest
+++ b/acct-group/aspnet/Manifest
@@ -1,2 +1,2 @@
-EBUILD aspnet-0.ebuild 151 BLAKE2B 50c68a055a3f4a15e773bbfdbf30e1b0755bd0114b504c2bd59d99ac5aa8ee7f9faed024ba8724e9e7538b573980566c562590de28830ad59b6bf092234fc23a SHA512 49eec5bd46fbd75c1e7dae60d238c664e588983f3d414fe0c3663d9fca8e238c515fca1db66e80a4144329f202f6f09a936ed89a9926bbddb8b1d157990d143b
+EBUILD aspnet-0-r1.ebuild 151 BLAKE2B 956ed665224c5a95ac8419b6dfd02f6d912689674a218c6849631f4380d77b51891e429d1479e70abc24b418f7aa215f401896f077205a4c6939ea6c3b7c63ec SHA512 096f13743d3729ed7fd7c04aa88dd77ddc56ed672f99d39a2269fa96cc10501b8d96ba825bcacc54c259d7431b3356b3bf912c31cfee2742989effeb2214cc05
MISC metadata.xml 169 BLAKE2B 4307ce25f2199f9cb772e7740a911318479c0a7c122eb2c91e5c908e1e51bde7c261d0c9681dcb5095d0c8d9dc97c5ae40787c13ca971f705c5b471bbb1ce6b1 SHA512 9d7035f8acb273b0b044a4d8d04b395ddef6d5eb62333af0c232b7bdc112d90d5fd88913a60d4e0e1206d113d5cea77b5ece4defa421af52b2bcf3bf7e35d7f1
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/Manifest b/acct-group/asterisk/Manifest
index 178f63411e7c..9f697c06f0e1 100644
--- a/acct-group/asterisk/Manifest
+++ b/acct-group/asterisk/Manifest
@@ -1,2 +1,2 @@
-EBUILD asterisk-0-r1.ebuild 184 BLAKE2B d4748e59cf5bfd1ca1b4411f53308dc13e98a3e332df342e258c4d628e0e3436df7aceb30c85101ae8e9052925e25c6c1f9e8a2062223a975059f2556244d0ac SHA512 042fad7aaa06ff750fda27df9e5d1dfe36a82a35514539e5d6e3918f861854b7194a48e36a512162d3cb228b9ee2437532736ff9820aa394d1c798a04f68fd82
+EBUILD asterisk-0-r2.ebuild 184 BLAKE2B 6031a817c9a956a91f592538d90efebbd8482bf671b8e592637142a68b4c03083ad1a99b17b0cbad4e5c1b1001250d8037b5c645ef643cf2924a71b63bf875bb SHA512 2a3969f048954ea1edee8539ae51f43d0164f72bc992069f46da721d16904bd0c71ddc098d35e4db4e4b06901110729677fe041c2b1617ae3a7430f018dee6b7
MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
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/Manifest b/acct-group/at/Manifest
index b42cc85f7dc5..471ddc4af2d5 100644
--- a/acct-group/at/Manifest
+++ b/acct-group/at/Manifest
@@ -1,2 +1,2 @@
-EBUILD at-0.ebuild 151 BLAKE2B 5d78739ded29cb2acb6990703fb817e1f3ac854772262f77997e165d5bf4a42e7a7c188a71c39789c15554f2ecc43e5b3b90e51586e0ad49afd7e26a18cd4dd3 SHA512 066c2618394f139ccfd2cae1eab3ec0e50a9d6b39acbea4f0d974b9920d21c1931f6b75b98a0a2200ed4184ac1fa23d66cc2694ddd99747a082f12d85210f5fb
+EBUILD at-0-r1.ebuild 151 BLAKE2B cb344fb6001f03c5dceac0823697804b619bc12c2a938cd3d179bb88f34cbfcc6fd0e545a9bfb65bd9acc25272de512afb9b8bb6b7d6675a440025905eaf652a SHA512 e50477db660851850462f6020b0c7db55f8b1ce734332b17d8b8e1b9de1737b2a42ed47f589b399d6b257aeaf118541812cb427131837d67f54d611517e3dd9e
MISC metadata.xml 398 BLAKE2B 037f58ef9b9d372a1137066db288badda6f884013296b4ea879816f539a91b5f484148ecd3c874561d24a9a3b4e336f6a73b332b30fc666f19f213b6bb37245d SHA512 c4d6086c77a47321b33e8ecfc827b51dad5f79558f1cb8845d495326d1f002e7fc5289165735fb26d1a1020e55d85f22358d313be11f5ddfb05b6580db027833
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/Manifest b/acct-group/atheme-services/Manifest
index 065be8493e28..7aeafd225c2c 100644
--- a/acct-group/atheme-services/Manifest
+++ b/acct-group/atheme-services/Manifest
@@ -1,2 +1,2 @@
-EBUILD atheme-services-0-r1.ebuild 190 BLAKE2B a34f872d9744c87a46a0ea9031d410cea9ab86b3f1923524895cbe89db38c52ade90edd6e758afe14636b16337e014dd0599a6b56e6f3b507993ef26a5d38492 SHA512 e22c67f3001aa23ea12d1bc37a4bf7d759819e720331c40806819073032baa1ea333dc1c403d624f6e33039bca1e4fb682805e068768559df9450e5d581dc9c5
+EBUILD atheme-services-0-r2.ebuild 195 BLAKE2B 1c42efb448a937e0df893cc5ba2b9f9647d38089e0f29e55f0b0d1d9530dc5bc4c006a250f86a65f3ce09f5ccad11fa11a946f007c7af829a7f994fb57eef66e SHA512 d5885fd937761f87cebb850faa6f006793d6fc591f1303659997fe6fed34017b4a62715a5ed7d31b4d2346a4a9245162f81dc79507d99551edbc8f0ec0cef87a
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
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/Manifest b/acct-group/audio/Manifest
index a648f3ffa32d..30930840ca76 100644
--- a/acct-group/audio/Manifest
+++ b/acct-group/audio/Manifest
@@ -1,2 +1,2 @@
-EBUILD audio-0-r1.ebuild 150 BLAKE2B 98ebc78abc3b3aca75b7705a7016c823897f32355d313aa71fd4b6724e1022cb53c3640bd01f7d7fba5ebe70f83d57e23285f04fa3a0053208f2e99b3e9b9214 SHA512 1431db3a0f2c0e15091c64f33c9b09f3d634b2c9fc9935bcceea3530e0b5c25b6330455ece58487d4e78a6d76191dd22c0ddd972d20fb69d412b21ae367660c6
+EBUILD audio-0-r2.ebuild 150 BLAKE2B d328ae8d617465d40e8a4d9a4422f6a1af58dbcb88d6e291861f3f9aa53a6268e16f66e633c8163e09e085204d5658a1bed16981b835f10da7a2105cc76e553d SHA512 4104cd051a8f576e73e4646144930172fe8254ac1a1d97b1a43275e1fd95728e4ccaeacccf99e7556c88daa5bde76696053428813ca465ecff7d4615dc2c8740
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/automatic/Manifest
index a127cfb2a3c8..082f05dc0c60 100644
--- a/acct-group/automatic/Manifest
+++ b/acct-group/automatic/Manifest
@@ -1,2 +1,2 @@
-EBUILD automatic-0.ebuild 151 BLAKE2B 037170834971d20853404a900d94b9609ec431c5e8479b7de9869f5c33531c063ce4640e311b088fe24fb81bea87510c895f6782a89f1a692cba3e8b50723e15 SHA512 bf6b2b457bbc9c6912518c9f103db53aa4febeadc9619e41e3c4cd4b5c12715fdf5d1e5a30ff2971064d05da3b9e28f390171a5d6e6f740ff3448da975de4e5b
+EBUILD automatic-0-r1.ebuild 151 BLAKE2B ad7475ef510d15881bb6c3b6c02cda97e16a9219c27aec23783695430d847041c7fc1479e09de79f2e89abe946b8072252279ae298fc534b0fbc6f980534d340 SHA512 7672fabaa60df72e08f3a598b9c049a0c3a2481be26d5a9a9989ed275cde88fbb7abd0378dea9d12746c3197f8467df198ce9b881919f174481f149ca07f0df0
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-group/automx2/Manifest
index 5261ae58ae19..da4a9eaac782 100644
--- a/acct-group/automx2/Manifest
+++ b/acct-group/automx2/Manifest
@@ -1,2 +1,2 @@
-EBUILD automx2-0-r1.ebuild 192 BLAKE2B 3b16574fc294388ea769db4946b567f1bb3a2e6a8d438db6afbb0c73dec33cb13a08554ca048b3a84305f7b0ed717e6a62cee6b1880dd57196ccc5a3144a0a02 SHA512 6c42f69d2c199318a7966fcbb06c0e0a30e0f9024ec827ccb7e789b19b491d5f376abe333e53a2a268ad87bfed58098305c83339c8f8173c0ec44591578f2ea5
+EBUILD automx2-0-r2.ebuild 192 BLAKE2B 413bb10a7d054d5c83406cdb8c5516bfb4ac8c5c0c337f8385895dd2234d83c387527e3a8a5f0326f300662cd30541d9066c44e6f3181ff5e631509cf57b06f9 SHA512 45eb764d89f690bedf6859d7f76dc3bcbbcdb962e4a8bf3988e030d8ccedc906a88c202fc616dfd87efb59b6947fca2139c5bfd02f0646dc75898ed8a9849dd0
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/avahi-autoipd/Manifest
index bd7938334ff4..b7e0541e75f3 100644
--- a/acct-group/avahi-autoipd/Manifest
+++ b/acct-group/avahi-autoipd/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-autoipd-0-r1.ebuild 188 BLAKE2B c1977008777676bb0b83108cdce5644e703daf2d4123f0ecafa0dc634e8e0f42fb97448390f9391aa5b66c47fbbea8ac596cb4b38d3d51087c5e6526a78724f0 SHA512 ef6e9372aea6b047f8e563fc5e55a24d4044272019431224ef20fec040478e1c2d1cfbf7d3830c769aa109c2f7cb223caae819476162be3cf0aad6a1b042fe78
+EBUILD avahi-autoipd-0-r2.ebuild 188 BLAKE2B befbf1838c860531800ef54004ce781e87c9f8e7fc2fe3895880733c10e73508f85e03a1269b5c4daf981b704639f02ebbd7053ccd5aab57107143aa0097526a SHA512 808483813e98f397478af82ac64fc89d26c21e5759107ca0aeef5e6cca35808eef09192a90c277a5321fbc847eb5474281504688d992e8eea4aa4f020b6e7cb4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/avahi/Manifest
index 4fa35fe91d75..5de3da005599 100644
--- a/acct-group/avahi/Manifest
+++ b/acct-group/avahi/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-0-r1.ebuild 180 BLAKE2B 442f889f9b7fe61aa7e62ea8887ce26dc968a6f8a04206a1945d0873e8bb686f8eb09e60e789cb60e68f285ae984e0bad91adf8a6ef65794487bdf8f612c49fe SHA512 7ebdfbb4f360433cce74c18456ab8666782289d378f6331d9b3122bdd1339a665815ed0ec36811741019ec76ecd7cc9b4a22f5afc40d370a9835bd1e3c247422
+EBUILD avahi-0-r2.ebuild 180 BLAKE2B 3cfe1ed6f96b71991945aa02c81c681ea3c21e48263400867d8785ac631c903f99d3e943f5b03d1ce79173e770e46067e650831cfa6537568d9fe0b049ebd891 SHA512 bb31dfe4bb8b8c23914bb6b5e44a6e71f7d0af16be6fd3545f4644b654fbd657f68ec98bbe055d9a2ced02eb5f7bdabe87713ef38606d22861a8774e5762c454
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/axtls/Manifest
index 938ac57aa4a1..e801b97c6939 100644
--- a/acct-group/axtls/Manifest
+++ b/acct-group/axtls/Manifest
@@ -1,2 +1,2 @@
-EBUILD axtls-0.ebuild 195 BLAKE2B f35f2407ec1ce76ca312719ea2ad58e155071e63d6b3c9a8869aa4aab0d802da9265ec355c6c0b2d3c886889b22ecaac4e7a22ee899fb1f1ba03e5381b396741 SHA512 5da2aa28b7baf4dfccff5eac2b9c28aaafac780b0f3b0f6abefc06a8a38baafe9d001614533e607b61d63695696ab97d4fe6118e251c594eb48ca163425de23c
+EBUILD axtls-0-r1.ebuild 195 BLAKE2B 6039e5bd75930ff6206595e90af27cc236d08a6240f97f29030dff6556ab2c4464a27314131ded039db6799889e9ddecd4096cc2e8011206bcb0afd6e8da6076 SHA512 be7c373ad745a0fb66f80fe7cc5254ad4739f6227e856777db7a536ae26a1b8465e73f48c068c133a5451637282461b026cdee8b5db0fdd4f63d906a929d908c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/backuppc/Manifest
index db102b26687d..bc949105020e 100644
--- a/acct-group/backuppc/Manifest
+++ b/acct-group/backuppc/Manifest
@@ -1,2 +1,2 @@
-EBUILD backuppc-0.ebuild 198 BLAKE2B 75bbc8180ef2bd76a54805c05e8bd9f7fe421731cfb2bd679059c33a6c844832dfead8d2862ecf4701ae3b9bbf95dfe748f5bb0bb69a1aaf02f25d516bfb5585 SHA512 45050972766e07a80576508c2d38f2ca68c8ccddfce1115525c3f7e281cb5bd76570e3c02dd77bf1189f6cfa0948505e9c41039f60189a282ea414549a8939aa
+EBUILD backuppc-0-r1.ebuild 198 BLAKE2B 40b35990a51b867ceccb93054bfe03d7b7a7487441857cbafbdbad07799bda6881b6758afe46acaba0ffd2b6e3e69ffdc7c74ee925d1d625e05b20afcbfaf55e SHA512 7b885587ffdfd2bff2f693cb549b88137d810a8a707fe1ff96ba2669dced9dd1b5746f817016f5ab1d010ee5bccd202cb34c398b4a33ac1469b2f3fa180fdfc1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/bacula/Manifest
index 89a8718ad156..1d8bb1341476 100644
--- a/acct-group/bacula/Manifest
+++ b/acct-group/bacula/Manifest
@@ -1,2 +1,2 @@
-EBUILD bacula-0-r1.ebuild 202 BLAKE2B 9471cb59d78dee34d13aab2ec22eaf557869da665c85f597547502653ef954418c72066778675e8880f6e38560f29371e41f8a2a431b181c86b1c3d602493101 SHA512 d4d6cccf27f9cba3527fa58b16bb0a077d438a677761d8be787484509479da7e47340d553a626fe8dc215c7a6b38124b2a326f7b9018af3559395d2eabfe3f95
+EBUILD bacula-0-r2.ebuild 202 BLAKE2B a47b25bea9be45566a529ef9aba525213dc48d8bb2b1eea1e48aa561489172ef0b12e8a014881becc893a85135d6bba875b5856ca5f6867d6aaeb801813e7649 SHA512 ca0cb37a18a4b0a48543b05314924fd5fe90295fdce78f39a82cae9854fd23d2982c7de0a8dee655c22fa37977814e4f786ccd640038ddc5d417a4e6aa00ebcd
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
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/Manifest b/acct-group/bareos/Manifest
index 32f06ddb50f5..9b3012135911 100644
--- a/acct-group/bareos/Manifest
+++ b/acct-group/bareos/Manifest
@@ -1,2 +1,2 @@
-EBUILD bareos-0-r1.ebuild 207 BLAKE2B 862774e16d6cdd97cbd089f8fbfd26ad80cebf5f783a0e62e75e2b6e4e2752e01647c4cae903938ceb5dd401242c20fabae7f9122ed95994f78c6de1d42be543 SHA512 fe3d708bdffd7e7b89ee5ab4a1ac4f3012036e712e0e82efe4e2660c6051ac764ef7c3b09dcc307c0727f3057ff1b993ac56239d977ad22f80c2bcd476c41e7e
+EBUILD bareos-0-r2.ebuild 207 BLAKE2B e635d16d53abc82b006d6b656f121f4f444d8fb87d0e3496a17b40dfefd1147fa330b9c351eb7c0da0e2d21fb3ea10c67f343c151a438b633d7b17223d1b5b5c SHA512 ffb10b12e0efa797a8f54717720972499c3cdc7d05154aa6acc4d8b811a94999963766ed2c06b68f72b1a3afd769ce0b0085f2fbadd5c381ccc06db6d97436b8
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-group/beanstalk/Manifest
index 02a804bebb8a..7a3b219ff2ee 100644
--- a/acct-group/beanstalk/Manifest
+++ b/acct-group/beanstalk/Manifest
@@ -1,2 +1,2 @@
-EBUILD beanstalk-0.ebuild 200 BLAKE2B eccf77f37a2fd17d9a82c21d80f1b20161384085ef8829c4f276492389396c91da59ac91a5b0c539d522ee87637897771aa9a5e728780b7ff691f2debdbd2329 SHA512 09ebb4c311836332456f82351ded8a6fdca1a12e0c9064d96a15387e6437aafd5fd232de95b7d05702d0ff65cb465a6dc7979be6345cd5872c8c73bda1281afe
+EBUILD beanstalk-0-r1.ebuild 200 BLAKE2B c4aae3b84896712eaf769586e0ea169686a6c00b84d8583c5916d73cd14d5f5e083577b97ad92ec0e97c4dd2deeecaea17fbeacdac1729c373e54930231323a0 SHA512 f4f1ba8ffd2632560c0cbdb2a2a974baabc88eb4c6b9fe2aec8988c6b49d4feca1e5ef2ef429750651896b2692bf4ff0b5eeb54973df6f319c2404be4ffedbdd
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/bedrock/Manifest
index 40c3e2f049a0..0aef6757381f 100644
--- a/acct-group/bedrock/Manifest
+++ b/acct-group/bedrock/Manifest
@@ -1,2 +1,2 @@
-EBUILD bedrock-0-r1.ebuild 209 BLAKE2B ea35183c2795810ef6b36433a15d934e109291acb518615da30cd8ede168c40338111dd6300a2ecbdee569e9ea7ec56df7edc486b085ee3dc451fe95f52d6a52 SHA512 352f0838fa9852c1a1fb361a210c2f5a3805604514aad1940cef32bffcd5e84acdd4fa694c21833b803a766adbc7ba8f7671fd6ae2335a726176be44305e7bf0
+EBUILD bedrock-0-r2.ebuild 209 BLAKE2B f8b5c55a70ea671fd00bd611c46999cc8c6d56c5fe4c8ea00efebb0faa6d4e3326da01304cc7bbf36436db467b7bda95ff486af6327fac16b5578974669f6dc8 SHA512 38712bff42ef9d48c877087130c179c82fa6a77c7fa4d07c65aa42d13f7c306eee4ae2c093fd087cc5c14cbc423f33334515ef76949b96c59f5698fd11816a5f
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/biboumi/Manifest
index e9da58d41b55..73092c622b5d 100644
--- a/acct-group/biboumi/Manifest
+++ b/acct-group/biboumi/Manifest
@@ -1,2 +1,2 @@
-EBUILD biboumi-0.ebuild 151 BLAKE2B f87f423bcdf9f62bc0308265ffb19739b471747be382a5753d957c6e1d2017763a8c4f73e5469b92f516330a678f5f3f66b11b67e5e5f0f52c4c51e88d0d3b83 SHA512 7978756fb79cb8c100f5907237afb9f655ce4d07e6b6eb002cdc037161d4a5c8cc4181954874e2104cdeb183c03a8cded800cd5057164121cc0b4a23618908b3
+EBUILD biboumi-0-r1.ebuild 151 BLAKE2B 7adb325bcb1098b62ab860cf5b09e45fde8e6e607b78eee0cd47db71d761642b6f16148b05992b5fc732600ccc82ab87d136ea1155daa53102deba3cb16db12c SHA512 6f69629e91012a46c1b442bdedcb457ab241fbc7b3b5972bff9c090f06d51397bf6db991c17ebe8f299b7a81696e329b06e7223b524ec5a9df1404a37f69d21f
MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
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/Manifest b/acct-group/bind_exporter/Manifest
index 0a13d1aadd57..9c9f1e8af275 100644
--- a/acct-group/bind_exporter/Manifest
+++ b/acct-group/bind_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD bind_exporter-0-r1.ebuild 146 BLAKE2B 57abdc52be113475f1a2bd062c39d36fba9ecd3950a959d7339267441a9419b9fe7b52bc618efc6cfc0017e995b4c3d6ba98f5ddf969591c443464ed946f2739 SHA512 d722c6d270386a7594569f0764e5f1cf2e30fa345e9d0cc52e05a572f7201fd24951b66182488ab5877255bc4e0775d656b786380c16bad909fe187d353910eb
+EBUILD bind_exporter-0-r2.ebuild 151 BLAKE2B f5050a82ec7c0e1a5e524019835126d268e45fb4d9e335311f60acc491a1c0a22f6c976568cc319690d4a04a3e8b05684faf5ba314f22a8adc5aa2a35b899e2a SHA512 d7a76601ba149d8482a669d084981b0a9dad2e45d14a09fc2d5c1341d9ae8065b908267cb0ad0adfbbeb962ad044c47951635a1d69c98fd83999c74ab1fa11b5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/bird/Manifest
index 6ba1a7c07a3b..97f7626f9dff 100644
--- a/acct-group/bird/Manifest
+++ b/acct-group/bird/Manifest
@@ -1,2 +1,2 @@
-EBUILD bird-0.ebuild 211 BLAKE2B 46d7c14f282d6175e0a779f318d0d6f91f8260f2d3da539e8aad776557de8c8b4152d5739e0c38d6afc12f85e788b78c8c62a056e6a789962528bb3dd70f737e SHA512 f13d8b15c9e57d85733d3100a9e97b03a2c1338ef58733d77193bc07ef02a7aeb55e5de1a6fd9a04b54a413dd93a2e2eb8d5cbf0d4316043b710b2cd4fb9b778
+EBUILD bird-0-r1.ebuild 211 BLAKE2B 15674bf2611a6074cc57c6c73011a4822ba8bf68693a78f387fe80ba741392a1a1d3c457677d416e412652a3e5b6cbd0b42fec5c09d4fb56b12069fb2cb1311c SHA512 1d583cfeabe0a36eaf9b1d902145ad778fe362d0e38788ff42f15ea860543f4c603bf3874860850b9eb8943530cfca0663123f2046e5a01c046244c73ffeaa0b
MISC metadata.xml 383 BLAKE2B 080fdb7b781289c93a68e25e99430c9abe12915f7567be25c3d37a7c7d8903efa0eba320b1655e77ae8d06bb22aa86ea64cef3d85190729f21bc9018cbf3b1da SHA512 52461aeddda68ed1585802d7d831c95574cce5c9ddefd16ca28c71eb50a2ed3abb5b36e5e018392f184f07ad133aa2dd6b7054f7845b27ee1cc97b3bf80ab836
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/Manifest b/acct-group/bitcoin/Manifest
index 3a252de136ea..a737508c5351 100644
--- a/acct-group/bitcoin/Manifest
+++ b/acct-group/bitcoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-0-r1.ebuild 227 BLAKE2B 65bb51a72728f881ecd1ef20e551ba599f9d2930c4c749be40b17683473aa550cf673639acadc8c11be439cdeae1d7798f9323a00edd252d75b83b62d24a9900 SHA512 5339f0303ff41df1d62a1ffc60ea2b62f318ff156a98300589cc19f931665559d7912afd00e36220b4ceae58cfe7a79b8027680cbcf2c259d1e651a036542677
+EBUILD bitcoin-0-r2.ebuild 227 BLAKE2B 97988e5b1c96cb91873e160da4b0ddfee68b3d90cc2431fc967169b6ed85201d1b166fd62bb72395f2d8a203321a5313175cb4ca99965af6e19d82f4f6ac52ad SHA512 a7f7ea535865c00b01b49b502e70fd52b9e677fa8d47e9268e4e3c5433e2c67cf4ea8dc3105bda75f078ecf2f162a3ba4055a9a3d2780eef96e5c8b22ab45f8a
MISC metadata.xml 405 BLAKE2B 3eb2845f129f9c7ece1f374a0bef8eeba29614c94e714afa75d9193c5238539d48de1c761de7568eb7a1e3497fc8afc0e876be8339292e7e020d14531b963a59 SHA512 2ef8d9eb38092901821728d198e438c169f57cb38772267e62dc352ec7e35586a578802492682705fcd1d387ef9987344ef7d501d254d2743a35c9f0692d3f75
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/Manifest b/acct-group/bitflu/Manifest
index f4fddc408bf8..35e4c83764ff 100644
--- a/acct-group/bitflu/Manifest
+++ b/acct-group/bitflu/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitflu-0.ebuild 195 BLAKE2B 9984ef1713787e09a397a5c24344e60de1478b603616bd4a945f8051988dfc72f285a4e9ab8b7a671887ee09b0d046d861f7d80640b5460c3da44253d3e04800 SHA512 3515dbd442f26176a8d7eea23ec2721a864e2fe95fd0bf5aeb8a91d763bc822bb7faa8458d97ac6459694d4d155b3e0829d510104c4c64f7da82cea2554f5430
+EBUILD bitflu-0-r1.ebuild 195 BLAKE2B 5ad5dbdc05539091a237190455aa3347a0ab3aa04243a1a453317073f502eee1bb04db5c1a1b8e82156e38279ba62c3354127c8012569fd53587ebcdd2c95681 SHA512 77a2439b436531dec91e99bffe1ef2819b63469943fa271588f93f0fc4a87b5e96e2d7a26fef6814fafe8b32106c3077e21dc3c983f8d38fa03aec7e9e8052e8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/bitlbee/Manifest
index e9864dec0a57..5ac0b4bf1714 100644
--- a/acct-group/bitlbee/Manifest
+++ b/acct-group/bitlbee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitlbee-0-r1.ebuild 146 BLAKE2B 45428e84c6e372bffbb76a9d1af886cbc176e6e42b4f8685e217d765f859ad1b753bb06e85c7009fa25ee4a1858ea5c91b8419519e28cc448dd5a59be79834cd SHA512 96ba1e542a55002b0e337c947111c0562f3976d5040fb6214e58f1ea9d678672336c10b12c1af892c59079d65b0f62e9c7892fd2ecfe72fbe165000519d3c9cc
+EBUILD bitlbee-0-r2.ebuild 151 BLAKE2B 8df8c1742d104abe8e7157517fbbcbb4662b8744b4826664d5d0d815a11ee28f89a237b8491ec8bd1093408344565d68bfb2e02eb8775cf679969b27db7ddcf9 SHA512 7f6595a5b74d8576a4cd85c4973c8eb0d6076fd5eea860f3a5824f653e970cb51e00e0676761ab51ec252f30b22c9982380b48cc9b2f00e44cc1b922ce673d0c
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
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/Manifest b/acct-group/blackbox_exporter/Manifest
index 12d8b549c36f..c7c657720c51 100644
--- a/acct-group/blackbox_exporter/Manifest
+++ b/acct-group/blackbox_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD blackbox_exporter-0.ebuild 146 BLAKE2B f19d6c113985a1ee4202e3ba723a2a614bba3f8c9dc0ba7418c6f5c0ad71d1cb499d86f5ce3dea4925efd294a962241db5b62d3f77ec5235a3577b275f68fef9 SHA512 e42747231330e51829d449212373f8b45c01a06a5f86447da6fd79793be62d1fb4de37e26998c1206bdeea5a701b11f6f96f5ae2bb6ecde780c016a3911857c6
+EBUILD blackbox_exporter-0-r1.ebuild 151 BLAKE2B b1de27dfbb6020abea966efd607161d057015f55e059a781e957d04586777ad7fe6e675cce61ab3e2db04c9ea02eb640172560355ba58b4a41f3710cd739f13f SHA512 a4f82682d1f66b8d7a4e553887905bba9fa22368ec9d5b2fdce3eb949b434ee7012a0d3ed14edee8ee627aca62fefaefeb8a72e34614e9107c59c41f08fe29ba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/boinc/Manifest
index 93d0239792ad..d82dc73f50f8 100644
--- a/acct-group/boinc/Manifest
+++ b/acct-group/boinc/Manifest
@@ -1,2 +1,2 @@
-EBUILD boinc-0.ebuild 185 BLAKE2B 5460f7bc31d15beba86f16443aeb364fd40b207285fad0f1534878d83eded1a060aef502ebe04b830c49d2908efe6ec47840864a151cadf819a67624aab88976 SHA512 0ea549e2b4dc5ad23aecd49359e78cf294d36c3d1d4ca9099bd7c919caf991b1591699a0411e3b828c850a6263aa48a3ec6f9e6f73d744286ef6cf07dc812052
+EBUILD boinc-0-r1.ebuild 190 BLAKE2B 87ee45fa74444cd0440b56ea89b5d6d282d9f78d1eac87e936518b414f3d5db302b21eedd910f9e82f5fcdffe3ce5053392806c2e211e97bbb4e572d1d3a6340 SHA512 a310661ddad06ddacbcaa93522701e9e91c882bdc7c57c1f92c55586be91038fde4949856ae32e0f4a05cb924cd8153a5811def8444262f1085d87ff5a7b865c
MISC metadata.xml 510 BLAKE2B 80b772647185a13d46c2e56c90a473ce0752d55a9bd1aacb0847383ff73e4e4d56c5eb48554c86eabce217191ed36fa411c05fbe27edadee551808cc97aefe6a SHA512 d5d44bd410fe44f111a327b50b9f583589b749b7ff0a8ee66ec5fe54e70d6c18734e53803e2f3cfb761bb48a6d1082ee9c108d64d230a02fdaf5ffb737b7037e
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/Manifest b/acct-group/brlapi/Manifest
index dc59b0d79c6d..bcd39facba89 100644
--- a/acct-group/brlapi/Manifest
+++ b/acct-group/brlapi/Manifest
@@ -1,2 +1,2 @@
-EBUILD brlapi-0.ebuild 151 BLAKE2B afae1a84783a8fed665a80b10c5aa429df69edbe6eee9d04e81bcf7db0cbb3b60c29e054dca5c95054a4e195eb91b60fbe337dae4bdc35b0624810697f981166 SHA512 a0459c60beeaabf9636dd2b7a3319794cd88b62b50005c26b6d5092a16d74ec085e09949cd953709d816d56362d1f64d2e65996e4e2a4170ab310837dfb3f8c1
+EBUILD brlapi-0-r1.ebuild 151 BLAKE2B 5235da32932170c316e874cce192b1401997aac316b06a25c26efeb2800ffb51287d4d0393f1a1f13c7523af9f8e9a702f3be201459fc65c08ffa47c6c5e54a5 SHA512 a76d52701c08c5edb7d042d1ea8999be5e69c954bb532196246bec1a9422b24d53a91bf5ae80a1657ab1d8a14be56f473d52eae033782345961116f4247a5032
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/brltty/Manifest
index 5df13956229e..79b54f5a39b7 100644
--- a/acct-group/brltty/Manifest
+++ b/acct-group/brltty/Manifest
@@ -1,2 +1,2 @@
-EBUILD brltty-0.ebuild 151 BLAKE2B 1a0c9b4c11a5117712f84c940e6624402f9a945208df3152232e7e996d5761d126f905429f930dba296cbb505929b440612f2a9272c6d006620b98502c2e03bb SHA512 f7b339e948f69c99335186ec50dbf12fd3855240e2a19eb4b1771d9a701174914b339d57fb084f732f76d039e4e8d7eb018dbcc1f7cbfe2f4cb3269f64dff0d9
+EBUILD brltty-0-r1.ebuild 151 BLAKE2B e7a433fca43ddd6a1e04a01d8bf9f495fba60cd5f2cd25afe88f0d58d3399f67ab72472e3de6105c62c5b1b3f467a109a3a26f5173bf4713ff32dd0a6aa05c27 SHA512 834a87e4cddd12d7f51c77471b0d27c702cb9e692df3b87e67d831d1b45823d588cb5162e2ff0e31808e777b79fb86c0cd3dd01d0e5a77b362ebb2c1e4c0bbca
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/buildbot/Manifest
index 3a36fdf6a622..0ee5ec5fb3d1 100644
--- a/acct-group/buildbot/Manifest
+++ b/acct-group/buildbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD buildbot-0-r1.ebuild 197 BLAKE2B a19503326f676972c2eed8a55fd767973fcf3f52a82875b7a34ef615a2feaa677c2273db53966a73812d52e6d673f8d9ffd4463e6b7d748c70bbd1732db3558d SHA512 03b45b53eb156876a7951fc140ac1139f56aaf733b1583df1036af91178c3df6065a141a59ccf1cc2fd5980000ba54dc16813ee8cf59704f19d399cfa5dfc8a3
+EBUILD buildbot-0-r2.ebuild 197 BLAKE2B ae617e87921fbfebd3d8218d987d8d15dfba56e524f60c6dd9bc37aaae492cc7f28350e1b0055ff30aa2e9c6de6a595f9cd1541ba8f6567354a7c7d12947f15a SHA512 209f0c19d77ac05ec239c7314711d244b56a7ed9111030e9cbaf26a371043f64502171d120898486b6b0df950789bccc02ede79cc950a469b71d106aacbe8996
MISC metadata.xml 252 BLAKE2B a7ff81694559e4649beaf5821bf5c155420d0170fec450c215147b27928cf668494a61f850c49c5b5fc2f2185eb5c33b283766bd3824969c6e84e8327c340c94 SHA512 dc07337dc5c47477164914f740f97763d2dfbed7a82c3b69f34ca12c5e0d290d26e4e15d126ded66d525e98567e86814cf4ec7ae42a3ebbcfca0bf723a23d31a
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/Manifest b/acct-group/bumblebee/Manifest
index cfd9191dea57..d56f7de52a04 100644
--- a/acct-group/bumblebee/Manifest
+++ b/acct-group/bumblebee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bumblebee-0.ebuild 151 BLAKE2B ee49856581a6a3f9f8a136135999bbec66304d7447a151c95124229162747db99dd603cb232e99dfa40e89a6ec818a8eab336bb059288467948293f9d0bcc93f SHA512 9f3f123a47fd0cea67720eec2c0ff8485b1c088977b0f46d96ae1c40eb3d8aad2c90bb1965e172c7ab11a25723bd6ff3899099fb496864d848b9e940201876f6
+EBUILD bumblebee-0-r1.ebuild 151 BLAKE2B d5c37fffd8c26c6cd1103a063912728dd51e5fc4e071d91dba799adb0c7180c529c5ba966682b2dd42de55afa48cb885395abb19fa4ed1ba790825067c81a2ac SHA512 f63354ec194fd1e5a5a2aad4b368003c1b44923af4b4e44c6f561efd64d876c8d5929357a4094ca3a32d1b5d765fd8661000764e39ef2b549ed47c2013c757a6
MISC metadata.xml 490 BLAKE2B 8ab0a93f01ef5bc376df76380f71d77df5690f57ef6fee14d5f14eca9f3b1b2e3f5179738c2a5572469e95c36d4fe4e526d0710c70dad2be3913723af2f12d03 SHA512 74306c1c368dc7456e9b2b9556912cfbc11af299adafdcd27f011aaa23c18a814ba4a83d0551959b7edb0f6b7617f77e63eeb07818dd9e027fcb387551f0056e
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/Manifest b/acct-group/burp/Manifest
index 5153eb6b754c..0a3bf9ef3d51 100644
--- a/acct-group/burp/Manifest
+++ b/acct-group/burp/Manifest
@@ -1,2 +1,2 @@
-EBUILD burp-0-r1.ebuild 202 BLAKE2B 9ada524404732a529917909cbc77311b8de82fe3a085b90e047e0139ec4338b349b56465ab2b29f41dca2896ced0cbebd5ce139d29876d4de50b0d24230a133d SHA512 9283479b2e764767501797f4232fee161769743843a91fdbfb6f3b8dbdfcf72f57463d2251887b632ca4607bf65ead337ff0efaac09f92c0f535bc5f44df1616
+EBUILD burp-0-r2.ebuild 202 BLAKE2B 4b04dd679b0a0c5eb84c10074345e980ea92c7fb6b28e7dfa91451dfe1c5604e322048ec7034617d608384a11c0f4bad3e506fae16a482cb9de4cff117c97e60 SHA512 7ce4081085bf78bb0ac167955b2de7fad649f369d23a5f8f5984e1d86e1a188c16e8f3d561ebeb7c4b5954cff43604951f378979cad47e4dab43d5effa50b90e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/burrow_exporter/Manifest
index dc9746a7d20e..1644902b77d2 100644
--- a/acct-group/burrow_exporter/Manifest
+++ b/acct-group/burrow_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD burrow_exporter-0-r1.ebuild 208 BLAKE2B d182c60e6a5cfdd706540f2d534e0dac9e17543b3ad58f6c2fcdac5d4aa750966693fa7fbec7e7e1c99b0ea5946652614e344cd51d6902fae95e23ae2bea700b SHA512 308bd5034395abc042f626e5ee28f1b9be1d4e6b64e71e929ecd16da52680a314f1157d7c6527126e6ea255e5090a6b58d2ab76be569840bb15c0a84506e16a9
+EBUILD burrow_exporter-0-r2.ebuild 208 BLAKE2B f4d9771935ab83f8045944127d0fd02574b684ddb4b7738e3097c4476a3274bc0abaa8e37a8120cd2443a7ba2b1f65c5028c1bb0c5356a86f5afc9220cecdf59 SHA512 cfde4b94351d5484887377a2422b1fa3bcfa31d457440d76c4003f5bff92bd4e59a827bec08d881653e2d4ad237aa6cc0d9193eec86c2fcddf6892f74faf770f
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/cadvisor/Manifest
index 7e014f2052d7..a5e48fc60304 100644
--- a/acct-group/cadvisor/Manifest
+++ b/acct-group/cadvisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD cadvisor-0-r1.ebuild 146 BLAKE2B 13cb2e567dbd252efe668b3c9b374b22635992797d2c5f8c03ff465a434bfdc7b96d19a92670a3159dfc96081e2d2b1314d97609cafaefe18a78c37d823ce1f2 SHA512 204f9e1c13bd44610e3564022539523b7347183258da3533f6e7804b1119ee414930f07db17641ff7dc2b5f716d84ef0e6670b30ecd49ac244d5594d90a88802
+EBUILD cadvisor-0-r2.ebuild 151 BLAKE2B d717a8ee90d77d4c564ea2930748042dc662bc671519a41dee9cdd5a1006d95b9571c9ca225e6fe85ff1f517419337029762af396305305cee2aca90d24f6efe SHA512 eeae26ffc075d8115a90c4c68d2cd606c586a4b134cf1785f2554ee1f37c2d49e43ab01367c94de2922e1634911a542fd39c19a92e0635f342d59a1c54d39992
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/cancd/Manifest
index 5acd351964fc..4d9f3ba86a86 100644
--- a/acct-group/cancd/Manifest
+++ b/acct-group/cancd/Manifest
@@ -1,2 +1,2 @@
-EBUILD cancd-0.ebuild 205 BLAKE2B 6564c5e48353a24a4267bd5c284c9d6253d63cb5d6edc557da0dffcd9bd7cf028b8b01f6847dfb26540e987e496e97b06f2cc353a4f1c8c9d55e632576d58ed4 SHA512 17d8a77ba86877ccac91bf866573ac54c84f5e46fc80b0d8c7359934ad70430ab28f73e32c721ed46f48cc383278e241f640433be5bf5277424c4429e38e857a
+EBUILD cancd-0-r1.ebuild 205 BLAKE2B 9a2d8ad8e4ad85919b99dff346f6ae1d633a50320d457a5424e94d38fd0428a01fa70362cf736a1d1d862ec9e9cc877eb0c6fa9e45cae7636fbddaa5241695c4 SHA512 973a171797f7f93e98698e202a942b361b9297455738433d6e9ace1c90d4d593a83306e211dfe183720c3292c7efd728425cfffa50167f06f73568137d791499
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-group/carbon/Manifest
index 4afc886ca39d..6de860eafb97 100644
--- a/acct-group/carbon/Manifest
+++ b/acct-group/carbon/Manifest
@@ -1,2 +1,2 @@
-EBUILD carbon-0-r1.ebuild 146 BLAKE2B 2507fa2f8406587442b8deca1e304c88bb343ff0beb332cb8d585c9258629f6d5c218218d4ece4f54d0d75de8b32926c2df204b63da0b1e009adeadbd0b82efd SHA512 fa4415aeeee8a3dd29b233566ee9cb0374aa4bded8957b322f93cb3b7228fe70853ba40e795e78b2b28f6bddd07088abcfda287197ba5a88865dc5caace40806
+EBUILD carbon-0-r2.ebuild 151 BLAKE2B dd8b6d1a44ee51d0986aaaf3eb564d354423f8b08229d3f7f44d27aca82b1129908e300977f22fc09c0d0b74d762ecffea9411b445574f9567d61f12bd690d0d SHA512 5d95fd7bd439209e503e68ddbd194d80c92f560bbd314fd6a70f945c2bb8d6dab3b170e446bd4bc0b9959f01b4f56af8a9162cc77b858ea53f74bd70273d8517
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
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/Manifest b/acct-group/cdrom/Manifest
index 6a5eb330c02b..1c3e3aae758c 100644
--- a/acct-group/cdrom/Manifest
+++ b/acct-group/cdrom/Manifest
@@ -1,2 +1,2 @@
-EBUILD cdrom-0-r1.ebuild 150 BLAKE2B 77bce8dc6ffbc924ef59afbca87f6b7dc263e69ea8c082cc0e10a0692707fba52cc9691165f399080cdebdd6c41a5f2a6da0f2fe65e77053d437e40eabf62808 SHA512 1b37a7ec3e9c9bca91e7722a6e74ed4845d399f1c589110541bfba155bdaa168715cc7cbaf6fe95ac7576fa29f054d2231dd79b97657429cc07e3b239309d7fd
+EBUILD cdrom-0-r2.ebuild 150 BLAKE2B 83bf383304bc9b55d04e20e98f1f3c2c8f3c51731f83123151a2db20d2206dbe7762280fd0b8b321adc50cb0243e920ffa20d801fc7d25db144065f78f265334 SHA512 052f12098feb680aeb884b50dbb133e921322d22b9409efe5d1776d0e731c8d80bc448d148f1922022e3b29f31d8888e87e7e5439a5555347a4ed17490655eae
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/ceph/Manifest
index 06dbf642fefc..c02506682e5b 100644
--- a/acct-group/ceph/Manifest
+++ b/acct-group/ceph/Manifest
@@ -1,2 +1,2 @@
-EBUILD ceph-0-r1.ebuild 151 BLAKE2B 2c00b84402d1878a606d0694bb1605086406b59f5475c88092c4239c1ae0b19015c9013e857c2ed119b069626a59fab58446aa7b6a359781d789ae4d80fab268 SHA512 33fb26daf9b80c0b1b04b9655aa07e58261f929ecdfb55f74575ecb9518abbaa3b2ccf11a7fdea2736fab6d2198654bd376b1df5ababb6882d2f21cb7b63f314
+EBUILD ceph-0-r2.ebuild 151 BLAKE2B 495f0122b3e3f48b8085722a265170f61b56f889ee1dd4be040b147816aeeb7d12ffacdcb53b98a0d6c169b79a4a6ed54fad642a7563d0ea28bbbb76448ad96a SHA512 518b15570e98eccfe1360d15c4ab57f80a0399cd94595b21b903f4d1dd515313c23214afe3662f581481bd48245ddadc0031368f2ad47641aff012ed97f28d62
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-group/cgit/Manifest
index f6feb65ccff5..78ce8d5c3af1 100644
--- a/acct-group/cgit/Manifest
+++ b/acct-group/cgit/Manifest
@@ -1,2 +1,2 @@
-EBUILD cgit-0.ebuild 146 BLAKE2B dad7b37c2102ac5631159d49935e904a544f0d0be77cfa057a469d310203e63e87dfcc522aeb50c6d4f102e6e043343311f3ee54005864a2df8d6ea4ad4e40c7 SHA512 9b3d4d17018670f87b472f409c4c4a56684b562e13b9123aafcdedf555138fd46fa8f78b9864a7df9e2e3e3a5b10fb87fb35d473834aeded129e89318f3deaf8
+EBUILD cgit-0-r1.ebuild 151 BLAKE2B 41937637ea053ea4ef00fa7e06a5ca874a7e43df16adcf6299bb02a69db410645c3db842b8db4e88ef4ed544e526007b78604c206f9537f29809fd5f42299dc0 SHA512 ed2cd14188f20411394b217be1f7ea358704cfbc3c80c9d29ca03ed38749f7d19632e5cfdc380b3ab6dc4f215e999c34f47282247e5118a98c1b448464c7be13
MISC metadata.xml 251 BLAKE2B f41d5969712506f1083eeb23748860a267a5cb5a66dd8b6e765f057c4ef6549bd8e314aad6f6081eacd3f11274963a46093d37a4beb95ae442fba32fe6fe5b2d SHA512 3d0c951bc2e14c38f4b3e8cf2da3fcc69e7077d4bcca59a3a48e9c69b2de759a7aca10ab736ed3d2fa96fe8254a6519f62f3f584418f0b8073281f4bdf874e3d
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/Manifest b/acct-group/chronograf/Manifest
index 4ff6332a1aba..2f8701e6d53f 100644
--- a/acct-group/chronograf/Manifest
+++ b/acct-group/chronograf/Manifest
@@ -1,2 +1,2 @@
-EBUILD chronograf-0-r1.ebuild 146 BLAKE2B a3d4a89fa7265184b1cf88c38cfb9862e426f24efa5ef165ff9f9cebabcf9cd7843545af440f974a90495985f1ec75f0f755313402ff9e1e682d63341aec775e SHA512 109f84f21b642803e8a1cd29a00530b7d2fd1efeb5fefe193bcd134accebcf00b42f9505329f95bedcb1b9880e5a8169db19c006d4a9b049a7c163ad461a78e4
+EBUILD chronograf-0-r2.ebuild 151 BLAKE2B a909c4324cb0d50b6c1b7a9691096e468dc83cae6bb000049462f092dbf42f987619f0cf6476fa7c7efbc17d1ac2ea3767b8465e6f95aec2f0703f60ba17afb8 SHA512 8547ec6aa451ab732df92782e7ee78df8ea273cbb996fbbc989ea55d65f56b42de699454dc87c5cdc403006599db7beee27626b8f1fb6d457710e2678c3cdaf6
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/cinder/Manifest
index 9c956d8f1d0e..6a3e95fb1341 100644
--- a/acct-group/cinder/Manifest
+++ b/acct-group/cinder/Manifest
@@ -1,2 +1,2 @@
-EBUILD cinder-0-r1.ebuild 146 BLAKE2B 0e5cc4f863eec1a1676c9f476e22cea58ec8310e7505b1ce29cf149cdf00a1a15dfcd21f692b868dbfedda379b3153f3e6f17980d1cea01b20bd7978162c3fd2 SHA512 72186c25bd32a2de325350067a3cf8d1eb197283cdd1bc6b510cec7792e9dd5c049f06f71c4529a3b60a815d566a66662fb85fb197c0b6741467aca139e066f6
+EBUILD cinder-0-r2.ebuild 151 BLAKE2B c2be899e2e59d2671311b09549fad39b6464f274a7b33411fdd72ba2848a14c85d04a603b47f417adbe9947a20f8279c3c8d8c9d6342e4cd557a8ad4fe65e714 SHA512 64ec1f56a83a255c84afddc4900dbac0ced0b3197ddf1305d323bb6b68c18113d7bf37df32a166682b25d184d76d0d7551248dc2c7e900cee3302483da58bca9
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/clair/Manifest
index f296a6cc81c1..1c04bbea1dc0 100644
--- a/acct-group/clair/Manifest
+++ b/acct-group/clair/Manifest
@@ -1,2 +1,2 @@
-EBUILD clair-0-r1.ebuild 146 BLAKE2B 1be3ba4cb3e2c0495032ff7d7ee8229e10889c3f59301da51d050a2d4242510c3a3279037918f8558513f96d3cdf1080c21e5112193c31c3d31a2b145c0aeacd SHA512 76b6c459aa286a18eed9916cc8a9a5af657a69b968a37fa6291518ec9d0f2dd8aab3a67ab9a3871ebc38bd9979ab4f572aaa1c19572df45faf174a92a8a480e2
+EBUILD clair-0-r2.ebuild 151 BLAKE2B 559a5f8658c85e00834a7bc60a13885bb10a72ed8a2568fad25535522da466b8b21ea367ca1258798084053ece2b3f04dd749cb73e5c5667c33d27b332f18304 SHA512 4b343a44d2c11fb85f61c9e6423b34e19fb5cae4f27d09d9cd921f5003add8cb8e1f053f0d81f67ebc08d1cd90646ab7c57e519ff46393876da2114c689b0c76
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/clamav/Manifest
index 0c2a7e886986..a7d899b97d9c 100644
--- a/acct-group/clamav/Manifest
+++ b/acct-group/clamav/Manifest
@@ -1,2 +1,2 @@
-EBUILD clamav-0-r1.ebuild 151 BLAKE2B c59f99d3baa03f53519f153f4b2ecce857966a8f3efd7cc1c3024afd1799d60669367862d5db57e93b155a6317e1f33609e13f33970fefcde0dec3a61c8fa6bb SHA512 a283478882ef8cb69c3eaa8fd24b449edbf22699eb971de44357c83c92f34f8c3365cf5f048db48f39c346f7207f44a0bebc25306f4c31fd5498b6ea4acff106
+EBUILD clamav-0-r2.ebuild 151 BLAKE2B 09baad0b80d0c0f6729ee877d7aa9b947667847966806b9c64573178a372b89627a543b13a02b38bfc9a9d9accd30752d57722836634350f6e6ac04a291b457c SHA512 70bfdd90aee6843de9fed4afa41d7db60adc143ac58f908a2c221e128e32dd8b61a03e5595238e5d5a7d0ed6d237296c4c930c07c5db77d89a67f7623679b5ef
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-group/cntlm/Manifest
index 0426a1974b06..4259aa0ef6c8 100644
--- a/acct-group/cntlm/Manifest
+++ b/acct-group/cntlm/Manifest
@@ -1,2 +1,2 @@
-EBUILD cntlm-0.ebuild 194 BLAKE2B cc29110cbcc934d6803ecfdda72d45156a38c31226bde07eafc4e39203950c38b200d73b15845cc0588762214b628006b9bf2c6e281dbdc8a600415141209865 SHA512 ac6c4052b6ed3963dd594be9af244f25de244672d0895099e414a0c4b5154ba6d422a7131c4ee794ea1c8aba0987749bf0fa9de512109bd93d982ff1dd5a3a5a
+EBUILD cntlm-0-r1.ebuild 194 BLAKE2B 5934ef171699f275acb5c20d290ca52c9c9f8fdfc9b11430bebd504d4a680d1defb1e9ba887aa55ad221798304ef3e3e6b0c289a534dd20abcb053fd60c0c7e3 SHA512 77b64b394c5171dab0c4e4f37e1245c3eee832e8716fbfdea9f658ea8ef11e939761e0c2406856844b25f2b59bdbe98523f322aa8b2242e1cbfafa799ed252a1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/cockroach/Manifest
index 7b32502998b2..eb6f52789581 100644
--- a/acct-group/cockroach/Manifest
+++ b/acct-group/cockroach/Manifest
@@ -1,2 +1,2 @@
-EBUILD cockroach-0.ebuild 197 BLAKE2B 6da2c17141bb788c5236443e48f3eae0d09af0814ade208f9acc080e373376b13923278b612d54ff6a4b0ddcadc56cdfb290c0da89372d0564007d3d35a14c13 SHA512 c57038c2a55b265af1a4ad9b64d6abaa0142ff9f2b52c1462a64769cbf0510df6bd665e93e50c3b41d2a2011304ba01bce2d58ffd3593a32e2f958e473e9dc83
+EBUILD cockroach-0-r1.ebuild 197 BLAKE2B 826b74008c46e030a0145a75d538d42144ad4a960827587dac2d8ba0be5efb41b7611b2ac4b9b9724a4f98400075ebf474b6ac1880ab2b459adf82a64c98b981 SHA512 d0e65acc3cf53d57d1a3be0609fa157ecd1b6396d4316ff1f6089a68e821a9b960b4f104762968e27e466d1e563b0ee418437574b5993282d810f6d6c559765c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/collectd/Manifest
index f124da481be3..fe57b202b937 100644
--- a/acct-group/collectd/Manifest
+++ b/acct-group/collectd/Manifest
@@ -1,2 +1,2 @@
-EBUILD collectd-0.ebuild 184 BLAKE2B 6e09594aa2ad06bb37c9cee3156b4d99b8f44e739eca89c581e8542ba3f49fdec75bea0dc88e1be87bae90ff495b2ecc1b2f9e339b7d6ec3aeaed87f0b7bfecc SHA512 dfd9e2fe7e49290982efc33d6d78d615c0a124d379de8450d0fdcca87affb46c9f65dbf595c31b209c7f37a1b946835fcd2bddfb6f312936581f19b522a5674f
+EBUILD collectd-0-r1.ebuild 189 BLAKE2B 0050301aa22e59b49ab881a81f237fa4b21cb8040936e6403fe27c33ce5ab3edafb078058c3f3658c605bbc2779079a9db3b063766447058d1ecbd04dd3d5a5b SHA512 b37947900e4cda4fc97db3cbc22855d7b974d5cc4a70d40e090e319fca104b12fd1b07b0fd69adbea62a7d96c73c3a5c06287ee9bd66d83414bb006cc6d7c4d0
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/colord/Manifest
index 8e9e62476273..73a8b85e2d72 100644
--- a/acct-group/colord/Manifest
+++ b/acct-group/colord/Manifest
@@ -1,2 +1,2 @@
-EBUILD colord-0.ebuild 151 BLAKE2B ca20121e9e263fa0d3462cee443bb37189d59333a400c9c4ce12c31b589337ca0556effb0ac8505710f3c3b406d2a6240085eab46591a739a9b6820d951d577e SHA512 e155830328da665607b939f8d76d7e420b2d3aada13015af3493b4dfdd72521fbcf42552f0c89162e6a1f35fbc7910684fa89c173b08657443b032330056db65
+EBUILD colord-0-r1.ebuild 151 BLAKE2B 817c038c5d34173b9f39e1e07bd5901e736652247d4049de983586ad6c27edef1d54074fb1b7bc6cc31c0222d47243d67328f8236618dbe9c81e4d6f8cd69bf5 SHA512 7a11570b0e484588cf14f957d88f067c7c1ef0cf6d25368180e41e1c63f2119cc9392d1dc32274fda6b54b1666462c285e0cff46f7b3748f5e7be22ecfc076ef
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-group/consul-template/Manifest
index 0842b52da571..239ce2c4b59b 100644
--- a/acct-group/consul-template/Manifest
+++ b/acct-group/consul-template/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-template-0-r1.ebuild 146 BLAKE2B 31e96fc30db13a5903115a3bdde334be9bf906e8472f91db9dfbfd7e1389e6201b15b71b9ba55ec4bf39fac994a5e3346949a08b0fc364f16cf49c762be9b530 SHA512 7fa3bc6e850fa236f2ab8ec907eb31d7210d217e2b627b2484407d1a1f0c36c543649952dd45641abfa00481d8931985e59525a6e51f6ed45ee9397d130a1b6f
+EBUILD consul-template-0-r2.ebuild 151 BLAKE2B 30b45f090d85188c518a5ef274e9389d8ffe4d845023408beaf16fda4afca8b58c8261330304fc1f0b56b98dd1a2ad19a0e24a68d7ed0fcbe7d62cdf6604fcce SHA512 bb0fb4fb2ca5655d2f1026f55d76cedffcbe8a12fa9077b7c5947af20efdfe2b07fe424d7fba03f4c012f1614ad2fae1e1697cde2247ffe200da943c07660746
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-group/consul/Manifest
index f32dbb2898a1..d392c47a6dfe 100644
--- a/acct-group/consul/Manifest
+++ b/acct-group/consul/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-0-r1.ebuild 146 BLAKE2B cf8b5c88100c5316ba506f37d13ad67ecd80f9d63b2e76eef07895d7923c11a99b110b4231a5153e3974f595d64a835cde1f192dcaa8598bb1a38abe7a66b4d6 SHA512 7bc3d0415e906003fbb2c1a13698628a6541fc0da23b247444d8b0ee5c05d8f97aa72f65d52612b9a4101799165188157aede4444d5fd66edd487f13c4ebce21
+EBUILD consul-0-r2.ebuild 151 BLAKE2B 92275d23403ef6d3374a4b8b4e05c8c72ff5b464f448ad324cd83a96aa96ba193f2eaea30e6e37f0dd5d1a8a43e1a1c92a4bda663ff2fd34e23c7015ee222040 SHA512 fbc847499aa617dd9aa8a12a89a868ec6a2c5b590f601d5d817e24fa016ab2961a5ee9f9577df85767236aaddd86f8ad17b25a11e21029f94496bce36ed3c44b
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-group/consul_exporter/Manifest
index 341f4ba02644..90323638f42a 100644
--- a/acct-group/consul_exporter/Manifest
+++ b/acct-group/consul_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul_exporter-0.ebuild 146 BLAKE2B 5e82e2ac385e0d8180b6ba65b19a26b51b88ebab638f444808de8ff48fd9c506ef95571814581cae0201399d90988e67973c7f7dab343851a07e363a7c0a4d6a SHA512 87b182bb1e9f049849b7f7c369d6485cfb0d48bad676a510d7e9e2a52bc0eba54bb8530430258d94aec854f8ad0f4cb97c1d7e0491cd753863cb6706252a42c2
+EBUILD consul_exporter-0-r1.ebuild 151 BLAKE2B 1746e139e362b4805480b58bec27948b803db76a8a99eaeba22029c87667b199fc005a13780ce8065f44fc2e4aa3ee2a1b866edcceeacf8b1c9417bfb2420588 SHA512 54d226b1a9f7f7cab21aa68b88dda139d3f91b3296d50a846c2ccf2ec16c4d3bb26cdaa32376858762289608ad769a56a5b5ea74540b7d62bee5e937168e1b4d
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/coredns/Manifest
index d1947eecc259..80edfe930f00 100644
--- a/acct-group/coredns/Manifest
+++ b/acct-group/coredns/Manifest
@@ -1,2 +1,2 @@
-EBUILD coredns-0.ebuild 196 BLAKE2B f69407bbf5cdfb56f314c1fb3e4608b0743879c158a86dcddc9d8bd409848df9d73b759f25e0a72d33b630768eac3d38850dd6b927cf7fd87394864f571429db SHA512 5b8620326edfc300aad6143c09d9dc918de2a8780f232dada7d4cc836109801ce3d510c9304c9fae61c16c1043192088bc04560ed4efd072e1e93ea6fcc0e1e2
+EBUILD coredns-0-r1.ebuild 196 BLAKE2B 1352a9791a56e5b68a1d04a57d18eb5d5d894e598d7970ce3a78fd5af8c47ebfe8df3fc6be9a346fee5c37f03bfaea0e2662350a20c432f12a2a63ca1939788e SHA512 07409c6514515269269efa06f3656226ae0d05403e670fee22af5133fc70afcbd74c29d99c9eb776319a3fd5ad840f64b751a187444c840aa6985e4ef5d217c2
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-group/croc/Manifest
index 6530ed564d51..2501288380ac 100644
--- a/acct-group/croc/Manifest
+++ b/acct-group/croc/Manifest
@@ -1,2 +1,2 @@
-EBUILD croc-0.ebuild 184 BLAKE2B 73faeff898c36af00aac87975acb1c573dab4b7c335de7fa4e44d37a13ec0fd19de6be00fbce0b78f901b7690ef09e84b729a64e72ad008d2184348880f98090 SHA512 a2c2e3b571174829075c927d0ec86e79d5135000332e3381b97d1f323790177f23abada9733dd423f85e5964c4094d593c6eacc9f708f5b3eed11498e74630df
+EBUILD croc-0-r1.ebuild 189 BLAKE2B ecfc95a4221dda93f1db520c6122d5de1795b1c3883dd8a9c4ccb82cacc92fb626a400f95e61b55b740da116c513a1de5404a50a0df6bc15a70b55af457b7c2a SHA512 664e4ed4e047d7538c2bebc6578a8ca2e5597d1502ccd90e5a1a1bf1618ee1e50f8f9267935c69d1a01da59d6723420c690a4d090d45023244fba05caed198b1
MISC metadata.xml 250 BLAKE2B e1b3331ad38b6a21cc4a5b15c11669fab651b37d69c6259fda26509a6c52422d87965ef5e60207db0f42b6e2b52e2f98e87c289f57f758eb886faa271606b67f SHA512 d7cd0a9d76d9b5d2f3c9a73da396e760fffea65055ae5b083b8f4616cb6f0620443f387a2f726c841f2d7982516dc2d87c60bd1e5cfa9625800015ad85b97c26
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/Manifest b/acct-group/cron/Manifest
index a200549b2633..0f413d63e751 100644
--- a/acct-group/cron/Manifest
+++ b/acct-group/cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD cron-0.ebuild 200 BLAKE2B 5fbf0e93ac15528e4670b06f405302cce8f8e9f29ec6d12138dc1f0384b4645a6bd5690b1c863c94dd5ee62b56f5888d01553b45ecf73a49f4f6cfabb71b06c8 SHA512 23690ab72f412d18b23a36aed6ebfd88a4608d299a5d79b18d88dc487d1cb5feaddbdc08d2bdef13e661b258d7c42b9b2c4e77612259ad99493fd3b56d316bd0
+EBUILD cron-0-r1.ebuild 200 BLAKE2B 9aa0f8eb28cb391ab6bdd6979f72e33cf39dd48e934fe74e99d356e746453c7958bd52ce058aa3c8efc79d497833eff77ddec7088e3715bb25fc5d1446079f74 SHA512 1e30c768f793babc8a79b00bf7d9c1b9f34bbac1ba37424b10c6218249a2ebab7f135d813e8ed5b54f48683122bdab283dbeae2fe41b36c9cebd353dd32de8e4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/crontab/Manifest
index cd81b88404ca..dccf2a648246 100644
--- a/acct-group/crontab/Manifest
+++ b/acct-group/crontab/Manifest
@@ -1,2 +1,2 @@
-EBUILD crontab-0.ebuild 151 BLAKE2B f392b8432b249a644a93bd497ffb8cc1bf0c884ff4880d0e8fdd7854772bded383b0521999c885f179f85bd9e89c75fb5b8bd11b6dd930f5148d96ab9f142b25 SHA512 d8efbdab91c6e84f2d789f5d98cf78986012867bdac0db2a72594c45278f3c83d48c5117108db376d9c89858344003af567b5650db85fafb8964780d950db514
+EBUILD crontab-0-r1.ebuild 151 BLAKE2B 0a94d546ffa0e5db213491d0e935ed6150a5d74f541aa966fa85e614782a1d691b1bdd02980907dd15d9da093925e84491f9bd1cf4a214dcb5b0ec024930189a SHA512 8d2a18ea92c8e9e9083ce335e24ae627217f63654aedcf26310d2ed81804135b2bd0cd98b60a9d673795359b61698b20079016dd2dcd919e56d37a09ff001703
MISC metadata.xml 265 BLAKE2B 2d1737d530c84aa435cda3fc4535359abec43e5233cf20b500b4561e253a470f17915f9f0c50691006160c96adcf32083cd6019399b2ac2221a2d176e012b362 SHA512 cb5f700e87b8ccb0bc883bd4c51827e5e3032b021ad995f71364d70a9d5a293ca48d2de95919130e91ac73f35c69b136fa21a482636a229d6740a1e104ef4895
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/Manifest b/acct-group/cvmfs/Manifest
index e93976eb7ed3..714d56a337da 100644
--- a/acct-group/cvmfs/Manifest
+++ b/acct-group/cvmfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD cvmfs-0-r1.ebuild 204 BLAKE2B d90486273f1616e30a399ae7a0abc5a2cb2762dfab00374448331e11028185a434b6672ab189aba699c0da92456c3e3859b7d71976b9c8693ac9effa7540f192 SHA512 a0278844352e7e4293ef07a2693a17daa8d542c6db60c261b24df82466781e31396269a2c79c7538259099b61344e3cf6c85dcb48068c36b76038cf4d4534dfd
+EBUILD cvmfs-0-r2.ebuild 209 BLAKE2B 11008cd6d660d6962cdef3e71c2eb8a30824071142b139062b6cb62493275f7acf982cec93b0473ec64be08298a03fc06746a787dcab675efc10f339df9cdae3 SHA512 3cae32f151909ab7c0c4181382328deefdf17fb448f03e50c1a1a831e53779733d866fe3b83635770280168b998307fb85bfafa4707f8f31672841a3b531fd91
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
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/Manifest b/acct-group/davfs2/Manifest
index a1456b51c86f..c47bf97962da 100644
--- a/acct-group/davfs2/Manifest
+++ b/acct-group/davfs2/Manifest
@@ -1,2 +1,2 @@
-EBUILD davfs2-0-r1.ebuild 146 BLAKE2B 53c74f6df9c81b3a9b4058d3a58a0b08bb45122576018922086dc78a0fbb46397954208315510236717450f07211f8c59a439547d81e240f012c8c1f918c9c2a SHA512 4d9d0ce943d233878bd91457224a2341c650f47864994c2ce6e187bddd63934c55feb852af2a2691ce344f77e8ac1e485268b42569f16eef145ab58dea4c4648
+EBUILD davfs2-0-r2.ebuild 151 BLAKE2B 90c70265fd59f0d5767d545002f20b58d2ecd14381f34e2497674551ade6e558a993a2fa33634c7b70d8f7251fafea8cd751b1645f294c1674818fec61f85ba2 SHA512 ddbd0c954bab419ef08121727ea98e538a6917650e1f56057be80e406973b70449123e797a319188650c228ddc16a4885bf626e92d96b050ea917c149aa132e2
MISC metadata.xml 219 BLAKE2B c0192fc2c685f564929ff304a18b20facdcc8638726bfb8711803a633a109780747e98c42b14cd3e8dd674a92a7ed783a40d56e617e414b6cbc3d4fb18a63caa SHA512 f702a981fd2afe5f23c2814fdf91a540e6335e50e3cd85003e28ec2130739001ecfcfd824cfa91780c6b1d5999cdcfbb06857dada1c53b4f9580675a5491eb46
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/Manifest b/acct-group/dbmail/Manifest
index bea1a17d0432..f892c54c44da 100644
--- a/acct-group/dbmail/Manifest
+++ b/acct-group/dbmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbmail-0.ebuild 151 BLAKE2B 98b775b3e5970380b04fdfa1ad75b2ae2502256de930926a406a31f2f85ef821080d3471f9de3573418281f094f0a210a68513ab6947e32d37316bf1304f77d9 SHA512 0686e1ec9f45f677ec8dc6077669ffe50b932ad1d7d3fae31b308637b9cffc461058dcf45fb8f8787609f9f3da4879810aa293841c7ee97b3d8061fa4625829e
+EBUILD dbmail-0-r1.ebuild 151 BLAKE2B d53218559931b16df962818b9c19486f817d334944e977502e4c937b4ef1ff3970d70f74f228ab7c13cc5d97ce6e6d32c4549783f0bfa569c8b6cc6dd5052cc0 SHA512 23625fb7f665a6e8ad4970aaf05c5cd867e9614e8b3526ab2c42dc892fccc7c1f88da9fe1119de2668cecdd5b6477f99f98432917b74598374a665bdac589a40
MISC metadata.xml 259 BLAKE2B 3d6e2c71a67eb6eec74e229e746e4ca8c32878d251276044aeacfc21afb48be29752d2257e41ab4ffefbd061fb05929b17237905dd4fd01c65c24e61e464a681 SHA512 ceb54d3784d2abce86137f25059dba4f90ebba03e31dae56d2b8acbc515d9c0d7ed909f46c569a73e929cbe9dac2caef440e9c52b0518d37c081e03be471fa4c
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/Manifest b/acct-group/dbskkd/Manifest
index d3e904d14f91..6f1ff5ca0a38 100644
--- a/acct-group/dbskkd/Manifest
+++ b/acct-group/dbskkd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbskkd-0.ebuild 200 BLAKE2B 698108f0525faf5a33527ddbd46a59459fb6cdb2d034b2780b17da94cad3c97e9e7b0336a70f68eece60b96cdc109a1737925e75bc6ceb5ddea316df6fe48e19 SHA512 37b0ab0360c4e82092944521d60f9faf1dc10b4e324bc0ce4dd9b600ab3d84f77e24e80aee56e6d824de28d476f8b34faef67cdec4519c2441b43c043ba4b164
+EBUILD dbskkd-0-r1.ebuild 200 BLAKE2B 9b7b5203d53d16ac2b7b65729ca4f9111ecda3dadf1e384de819e75989ce09cca83b9ee204416695a498d1d11afc7738f56984680db4549da149e4ed8268bf48 SHA512 abce279f501d14da1c0133b85f5615edee3c0f9aa798ef23bbae8e6ec81e9b4f2fce8f52c417c07b1316e85ac557b67d287be51c8072a6e664297ea914448fab
MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
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/Manifest b/acct-group/ddclient/Manifest
index 4f70ce554e5a..5913e3f97fb6 100644
--- a/acct-group/ddclient/Manifest
+++ b/acct-group/ddclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD ddclient-0-r1.ebuild 203 BLAKE2B 452d42fc9cf47b2b206435e946ad94b7ad67159273e2bc26d3fdef7dcfb347c976ee4e11fa2b789dce04d357dbfb3c375394a3b96d97d21ba4650aa48bd283ce SHA512 25e07b77cd117993cbd7113a01a09d01ee2cfd1c135f5908d0ab7faa93dd693b1223d33fe115e40b2dac04afa430b22d912dd3539738ff4b20679892c120cb9a
+EBUILD ddclient-0-r2.ebuild 203 BLAKE2B 3ef1f11a5e512419a4aad77b84f5543c5913053078879ae7a9778a6a86c099ff0dad8f231387ab75284199a15d375780e7e4b3ed1cdfa1c3a7b517d3f249b753 SHA512 e117e94f86ca12a460f25161ae8f1911d731f800aed139105f37dbaab2c3d6df747b352a03fb1a7cb1ac8b3076145bbe1818cbe81787e9f262b9e96c1d67d127
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/defang/Manifest
index 544855966eda..f443f35365be 100644
--- a/acct-group/defang/Manifest
+++ b/acct-group/defang/Manifest
@@ -1,2 +1,2 @@
-EBUILD defang-0.ebuild 203 BLAKE2B 87ff25598dc20632e298b577e0461134cd17e3d5d92bccbd4e5a1f653af0b66541c9f4abfedeafeaff4428684e5dcce8c1175fddf826245fca802739e4c6f999 SHA512 2c180a4d6f3700e84d048fbcb22fdceeacb9d9181c8ca92f3b137a7e168c445ec824a6cf6fc4d355fe2bf9287fd05fed2512f2c183deaa0060bfbe5035b27c50
+EBUILD defang-0-r1.ebuild 203 BLAKE2B 68aa63ee0cd6c6cb8f4fc5ef7eacc4222830769817b587f92e94881c122e2466d74f532e1dbcec0c5949601c34dbbc7df205eca74f1df81c99923c77dacd8a28 SHA512 07f53d72ab9dff823fc8664c8070110d74278c8e2c6c9c5506b4a76d7b1978a49f821a5d72d512783447ec1889f7b7a93631c406d99faa0a80715585f716b45a
MISC metadata.xml 397 BLAKE2B ea8573a9aa18ceef29be88a477c5fdec0a5ce15904a80395a73eb9947df371f257b285249576d1ac69158c1d6bced11f16b742c52e63715ed275d43cf960b5b9 SHA512 0af40b5fc5e6d00c9be7afdb6d2d124aa13de899b035c7f61e98c82c37e74377b10ce09f909d5f52bba93cfae069cd17bb8cf8e705155a2d221ccda184ffd343
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/Manifest b/acct-group/dehydrated/Manifest
index b03c0a7b1684..1b815e72ff1c 100644
--- a/acct-group/dehydrated/Manifest
+++ b/acct-group/dehydrated/Manifest
@@ -1,2 +1,2 @@
-EBUILD dehydrated-0.ebuild 186 BLAKE2B 3a6d7001e2bde0eb1ac13d0d2c6c0c2dff2c1407a67cf864cfc41e56a91af5a352d2d72d6dc1b44ef80be212d186a7ab761f54f7bc82d3387feeb457ed840c0c SHA512 8c363fd226513afc25e67ba1d12a0da8c0d67241bade538d275f99115099a0fa2378f52afe0df084f5d7eee2748f317d35716d71337c66d7a0ca1dec4617292e
+EBUILD dehydrated-0-r1.ebuild 191 BLAKE2B a313bce15933ac965e1cd3dbbb4c0089affbf39c38502241a3b5e4f20855ec7c9d602556c38001b3fe3b008c01a188ab51ccc1a14efa5920b887411e7e659637 SHA512 98229252e9343ee8cbeed09e515f1ff87300ad5de22273552c7585f086b8a6180932cc6820ce8bfb7dd2e97b2a5517a96c89f2e54f4c860474e4441b73d0efb3
MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
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/Manifest b/acct-group/deluge/Manifest
index 7066cd333013..2464855aee49 100644
--- a/acct-group/deluge/Manifest
+++ b/acct-group/deluge/Manifest
@@ -1,2 +1,2 @@
-EBUILD deluge-0-r1.ebuild 151 BLAKE2B 6ec42fd230b4181ec62a967daf16a7ed07f6eb378b7c4891c7d19cbfe1dc593dbfd4d11122497902a03a29173b3e9c9f81cb782e17e7df1d9eb37c48e54a7bab SHA512 af541474931d771efedbe5ec3f321ef2c1edb8a3f0d4e094470b2011e87f7220bf05a08f2e68bf2fa600dae468a40628a7d870988cd004a228e8c2d97ac2fefb
+EBUILD deluge-0-r2.ebuild 151 BLAKE2B d65aa03726916e276da49c0a01383101cbb36d9ff9da16568f92b77c431a96f096a0bb00c0a0f267da7d0da70dede5d62deeddd34eaff664d86b90fc61e30047 SHA512 65265fd6ceda4e339a8f12f6cb2744b6649e19ffc94aa1d8fd2bd447015fd3fc4c7054c01d8b5caba9f78a5ad40c1b8519af3cdfcefdd69b0b63258e1fe9ced0
MISC metadata.xml 521 BLAKE2B e4adb92b824153ea2e9d79164c2111a1e49049286cbe9e1662ff0ee8300031092d65b3ca97c3cf449ca7a57bcdb78f86c9988154244686879194686f0bf3048c SHA512 d37d8f08b7b7d5a5a00d1c0ecbcf27d42610df9c4a1e68dbb2f17272cbc73fe000bba406f0f9ca40aba22f081ef2de097029886af6938d1b64e63a6d25fc8bba
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/Manifest b/acct-group/dhcp/Manifest
index cf22cec50ccb..a856c3d3fb1c 100644
--- a/acct-group/dhcp/Manifest
+++ b/acct-group/dhcp/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcp-0-r1.ebuild 151 BLAKE2B 93c98657f5316c254b8deddce973a532ccdcfe1d0b417705d73ef2c53691e0d4ae19c72a78b682d681c4748d031667a8cec6b86b9460fda75229f37b8b47cb51 SHA512 bc4b1ba5627f0f529a7f590836e3d2ed9795cd97a463b1f5ca1c0a0a321a2964ca550d8c552c75aefc8ce104e41c2c860e5adbaa95e753c72bef2b78a15b542a
+EBUILD dhcp-0-r2.ebuild 151 BLAKE2B bd2658011fdc9e8a1797f57b2447c8797d1f9f58f73a4380408ffc5f1b83eba415d45f481538a4979f50d2103bd54c76d4b34398cadd64f15622ceb7eb932ca9 SHA512 35e1527785f1d8389e4b8d66d1e21ce85f6858e4e4f295d888424dbaf0cdf4138db15c49eeb0bd2063457bdfb68d2882e5309f646469caee923e3c7a45d66904
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-group/dhcpcd/Manifest
index 7153580573a2..27c5c84f55d8 100644
--- a/acct-group/dhcpcd/Manifest
+++ b/acct-group/dhcpcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcpcd-0-r1.ebuild 151 BLAKE2B 306e0904bd08b2cc315457a6cf928609b47db968b3e70069cd47369ba3712322d17cd3ba1fa553d720e1b78bba11ddad87afadb97032338898fbe60eba99bd90 SHA512 ba1b216da075681ec6658b023bf1654067a3b04eebb8f7e8aa40f033b9fef7c5824bb436d47296d7dce74af9ddd5e53c5bc3e12c1c559fb48f98372a879f8a57
+EBUILD dhcpcd-0-r2.ebuild 151 BLAKE2B 0adfc2ba925b1a1dcfca499857406406a9010f0eeb939816f1dc9f6ec2cec0ebe003529b983c9778cf650858c30217ccbe7efbeb9c86e0593036c22208374f72 SHA512 e124bd09301cd1e2665e3cbad37ec776e8731cde06022dc6eaaec3a0e33357d23620397f02313c92d750791ffc51894713f80d37b02e7264ee0c7538919bd302
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-group/dialout/Manifest
index 107ba744b004..75ca511ff0c4 100644
--- a/acct-group/dialout/Manifest
+++ b/acct-group/dialout/Manifest
@@ -1,2 +1,2 @@
-EBUILD dialout-0-r1.ebuild 150 BLAKE2B c3d3cf780abdab60516a23ac60bb049165b18941a0dd2e9bbf03112bb9f0450548308178f84ea55f1ad36e35310fcfcf04b355a7d018c6bd74af5e6919322892 SHA512 a98f4ed38f2331720a454b3d06761df5ba86eebecd72b68466ea13fa46fdbbed62b0f8194f0a48162e1b241167cabb057de906bd9d60424a4635a1cde28ba9e2
+EBUILD dialout-0-r2.ebuild 150 BLAKE2B 6c2496da9ee4966c751839793a0a68679d500a05c17d334a846716481562a1464077ce85e8870a377ec15cd64ad6494a4b51f2e11e3e39c28af425ca56291e34 SHA512 95bfa65320b2e04d878484eb8c5335e4a8ccd64539b3adbf21f6ce76dff9925810f1bd3881c9116ccb83b30fd3c24134b9a87f0d131ea4bee591482319136ab0
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/dictd/Manifest
index 1cf9267117d4..38912307ee15 100644
--- a/acct-group/dictd/Manifest
+++ b/acct-group/dictd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dictd-0.ebuild 184 BLAKE2B ef5e69ed44748c3296857c5ce17c98ebf69d169d8fcf666e628a778e85118db2fb7ce1d715f9ccee2cd846bb1fec22b11775c2643122dfb2bcbbd64a5026f45b SHA512 7fb1ccedab2a83a0b678760a8375992e764a2e55702a0ef9b20c8290cc9e9890f5ba5fd1489cb82888aa36f283510aef1115c06350905472b60eb182b8a2abcd
+EBUILD dictd-0-r1.ebuild 189 BLAKE2B a677d245b8711fb45357a627c7b902f465fe13e476cfeac2e68a2c374420400219e8595b4fdef7cb8249f1b6afddcbbc6c827d651ff9825a2e47e91e14d7e624 SHA512 6a82bbe7dc5cdb1a331514365cd81d45cd0bf85ebf95bbe8dbec402a7c70f9a25ce415099c8147053160b42b416b40a8bdc52f077e4e72242c932717d0cb8f33
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/dirsrv/Manifest
index 8e7d4a17e28b..731e9b120a9a 100644
--- a/acct-group/dirsrv/Manifest
+++ b/acct-group/dirsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD dirsrv-0.ebuild 190 BLAKE2B 368a26f8c1f9ef3327aa8bcae45cc4c419d4719c1a82b0307ac862aed6c8941def326568aea406068ccde0bec694b37a32ac59e59ce0c5b5a75d99e4e15412bb SHA512 fd9f41d1e2f9dacae5831d3b00cb54fab6cd6c801073ee015c9685c9a4e38b9cce0b1b90a60e2ec219156ffdb26985d686531b23d4f7c25d5fbeb83bbe2636d1
+EBUILD dirsrv-0-r1.ebuild 195 BLAKE2B 9950599616e84d0ed717b4c831abe3fa026f0ea6f054a6aab08ffd62d5a52f21a902ca466073fa8a285ace87516d4e860c1b111f80cda8d5adb5b31dd3610ad9 SHA512 4f2b090a2164354d8673080c74a71ff8e564638dacf1efa00308044ab5f650c1c4cfb0a033e4be691339cc8a8e36457e7c5d77258c299abf4f466668431fa45f
MISC metadata.xml 531 BLAKE2B 9b3cdbe8aa6b5513b7b2fa5c16b4f3a3809e369420d156c9a84dbcef3b6630ab328732a81e0cd88d06004e208a3156346bc5bbadeb549ffa2adebdea758ac45c SHA512 0744c746cf418423c03e41753c82d3ff22cffcb26c763f16fd449d86ec22dd1a927ac38d8f8f062983c75962a62b1556181a8bfc1835fb7a11c60e8dffef8cc9
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/Manifest b/acct-group/disk/Manifest
index 69e60593e70b..0fbe0c69b1c7 100644
--- a/acct-group/disk/Manifest
+++ b/acct-group/disk/Manifest
@@ -1,2 +1,2 @@
-EBUILD disk-0-r1.ebuild 149 BLAKE2B 9de9db5716dea88d70df54b54a188f3d5a5b6b59f7dd6c76584163bc71d95e703c6d65e9cf200eb77fbd33210ae728082471c9d4d5d53b0ccbd1632286d95340 SHA512 9154bb221b84af1e5939ec292eb9d7d525ee2675aae012cb06d7c38f4c464b9e3724aefaed186cd2707c7ea657ad66cd46338df4075c149f7ef160ecce26cbce
+EBUILD disk-0-r2.ebuild 149 BLAKE2B c810342ab964f1de2c1db14abd1a1af4484efa0461da05f83e3d3ec58684bded78d457c2feb6ab9ae20a836006d94d80c75b316f860017b43816a65910acd261 SHA512 2845f3f33bed8129a046408764b0a36bc1e5c77c703bbccdf88929cf19e18c09301ac98660cdf06ff49f09f5e0e0e1dd46853c161f534dd3aa0a5664676baa9c
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/distcc/Manifest
index 1f95fca93003..ea2b923dad2f 100644
--- a/acct-group/distcc/Manifest
+++ b/acct-group/distcc/Manifest
@@ -1,2 +1,2 @@
-EBUILD distcc-1.ebuild 146 BLAKE2B ab9bc3d182e718824f0d70910580a17f7c049e426c30938c8803b5e070e26b1a50169752338ed734cd03540dff02fd23fd5fb3f595d8bf442712b4d7fb00627a SHA512 9cbd35574c7727e1355ae42131258de4250b2f633da43be4a038f0dc0fe19cf67644efe789102e1c67a3b175d88bd4326de2135b30818e1ddde3be90d60928fc
+EBUILD distcc-1-r1.ebuild 151 BLAKE2B 1f95dad39f33a3fdf5aad5bae968e2c4ab69f0b42c0254573dce2aebd4acb92cb06edfbd7079abf616b440badb44bebad9961d637abe1702f96606b8f94b572f SHA512 80545347d33b9bb82f6589f45b4b33a8cdadb478dab468f012676f7560ff6b71799e798367b1135803c8f586804ae1edcf6aaba9ea3166dec646106df8c83a8b
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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/Manifest b/acct-group/dnrd/Manifest
index a083fee69bf8..175931f55f57 100644
--- a/acct-group/dnrd/Manifest
+++ b/acct-group/dnrd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnrd-0.ebuild 191 BLAKE2B c432663312085e0815b16552c5ed0a7055d08f9c96c07cd1f203434959ce74354fa1beaceda62b332bc44dad4c03a4940f372a318c135444fff2dbb5182e2c88 SHA512 1c0969d58cccc7094149db7296fd20c211403f6327b3c8f1c492004b0794efc05c9fb7bc7869ea87d53d467383cf357d957bf0bda5acc7f21e3cc7fa3fc06ead
+EBUILD dnrd-0-r1.ebuild 191 BLAKE2B 7ea12f13fb51787dc36d36cb81c53276c5a022a22ead8f72c4d07910bbe1a8ec16b1a7374a2238376d12a0d962157f70d1e02243b5ee8ace56a27597eb54714d SHA512 44ea40507f90db997ed30d02fabc8574fdbf3355a46b7234d4dc354aa9ebeb69e835e13cbea3640121ad60655481feeceb730760cb50a9c45b214a02720791aa
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/dnscrypt-proxy/Manifest
index 6002ac56b17b..18dd7a0be7c2 100644
--- a/acct-group/dnscrypt-proxy/Manifest
+++ b/acct-group/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnscrypt-proxy-0-r1.ebuild 198 BLAKE2B 7ccf9d5d9fe0cbaaa5deede20bd01353d10c2b3ffa42c4bac59ad4dc1c02c7a452413315e19b5af976aa0c86e99723d1a86849e7e4b41274179664093137ee43 SHA512 2e5cafc8236050e3ee1ec9ecdc89513954b1e590dc93a393ff4d36508e4cc3e55a9fb54a43db432fb88970a053744fd89104b63fd90be9cdb90b8745fb4bfac2
+EBUILD dnscrypt-proxy-0-r2.ebuild 198 BLAKE2B ecab2f45be2550ee9dc5f68cb4397004b7837bf58376d10f07d1be646a6a29833c1747fc70d770c4362738b168919fb64d5371f5ce8fa2500c3bf51660e66e85 SHA512 00978a2f612bb1115d3f4f25f050db7a1e239990c2e563c00235cb608556c09dbc556013e646cbe969b4e03de25c37f0f36a66fc66ff2ec1f6ba33ff5b7fb477
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/dnsdist/Manifest
index 20565ac3b4d4..a4dd053834f0 100644
--- a/acct-group/dnsdist/Manifest
+++ b/acct-group/dnsdist/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsdist-0-r1.ebuild 191 BLAKE2B 5ee8d3d901d508150218f5e4af830fa9f58c992da305e84c4cbb845b06b083f90623685d59f354597190b1640697be09bc0756862df7d0e65570adbf2390ca28 SHA512 50d80fb8cc61c390fe1006117d07204a00b4b90232ed5e23a3e9c2ad18b0db0b55ab8851fd59560bf26df19458bcd2d2507464d85c1e1cc8e35e001ad0cfd2bb
+EBUILD dnsdist-0-r2.ebuild 196 BLAKE2B c332c82779ca0c2b16b380eef6e54515348b2c4cc1acc64b1f670e09d4edc7b272ba8551a0ca080636109535cb4f1f337784be38e7d270159bc8e614cec059dc SHA512 9bd7cfb6a3d4c91dd5c9c0bf179451b4b6611c13481871d9dcad7d75d7efefd79338a2d64b6b0e10655c0c75c595f195877fe6dcc2fba5d0edc32a320cb43900
MISC metadata.xml 253 BLAKE2B 48176bf4d3261fa1fa73f54f89eb55371dae1f30f8b6fce3ca78b404418583f11c35e1978342d406e1918f737bb8e971778a780d4195f4a1936f866a23cd8423 SHA512 26103b425624e485d98f014bc88d2574fad61a638f750ff21507690509c78529885f72d410975d4f3586b11192d86d8b6457a86330e39d64312c24ce58aea7c9
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/Manifest b/acct-group/dnsmasq/Manifest
index 1a6267890961..165021075924 100644
--- a/acct-group/dnsmasq/Manifest
+++ b/acct-group/dnsmasq/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq-0-r1.ebuild 151 BLAKE2B 56b9d84aea0631ef62ee7a808c03cb0d6742f86633131d94130c322a93795dffc55dc27c9838f7c0b3018f389252ce2ada75c2d9bdd793755d210043390b7d98 SHA512 c5918a7e4972c37cb7161d5c0491d0441c92944909f2b29542ab360effcc511bac696f4eaebc825ee26ddf11f712c6429bc898c6c92255aba017021e2aa9d43c
+EBUILD dnsmasq-0-r2.ebuild 151 BLAKE2B ab1a50c19482ee843f70c019f38742772f04802962600918c4f2f9586a5b09d730294dc8dfbfaea4c0eb0e74230c30738bed18a0a20c215fc9def27e388ec6c9 SHA512 33dc53a1383508b38f50d216966b5628506c8d32fae19c365abf0877c8adc92bcdbfdf517bd89b570bb757f63400897f41f72e05ebb29530b3922e97a216e697
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-group/dnsmasq_exporter/Manifest
index abe9407f1dc7..d42fdf8f37d0 100644
--- a/acct-group/dnsmasq_exporter/Manifest
+++ b/acct-group/dnsmasq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq_exporter-0-r1.ebuild 151 BLAKE2B 80e7aca1fe8aef356f7c90b867481e2b2e1b07f46ac0afe6c9d3689a6eab2cfb7ba5b60a028ed651fc367dc6e707cd3f44363b1fc273adc1baf0a78aff9bfe47 SHA512 6903572dc26d002bd962fb58ccf4deca5c938794d21aedf0a99d439e3528787b51286fe0630a86d72c23166705ae47439835596c4957860afa7b9676af5733cb
+EBUILD dnsmasq_exporter-0-r2.ebuild 151 BLAKE2B c5824f9bf752ae7c01fcd228ddd8465f98d77e3ff0ca9446da1d7bdd0e99be375ba26d3a66e8ddb4ec80ea0ce3b516038a7397be68b4fb41641e38bf323c0849 SHA512 24f035576ff8e4e5f6165bcb05574ed7dde1a82bc9d00748dd42d803ecc9d7a7e24afa86b28e31d996520d4d441aac470d6c62398d260f30f6484a1bdf445a78
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/docker/Manifest
index c30a03991b99..d5f13b1f66d3 100644
--- a/acct-group/docker/Manifest
+++ b/acct-group/docker/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker-0-r1.ebuild 145 BLAKE2B 9e4a951d2bd6b77904803ef8a478a5b69a1e1e5ae67007234feeae2564a912f106978a0414669970ad27238a1e6ced02178cc2428becb5626a658c71bac28409 SHA512 8fa1eed96570cb9f04e50df7cee30a23b7cb4ba01760bc299f0e9e5dcdd87ac39b70c89beb6e7c914839cf91f5209f36302d3e8cf4de9b192aebdeace7be6ad7
+EBUILD docker-0-r2.ebuild 150 BLAKE2B ba4f757068cc16b68bb52e0173c9d7385a530ac241c3c97aa7d4b9c089f24267486fc3d6b61422e290a7f66a55d9285166263fbf8be09aff327510c88c97332a SHA512 2423b2073fd29d31f7039119511411d788b23ce87f7c58a38b052404dec99cf24b9cb7a076457a8db116080619d653128407a3d2b8c67b1905651bc6ee028161
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/docker_auth/Manifest
index 1a82576a83bc..f87149a9d056 100644
--- a/acct-group/docker_auth/Manifest
+++ b/acct-group/docker_auth/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker_auth-0-r1.ebuild 146 BLAKE2B 18bfc521e2fdc0188b41dc1afe1abb57a6bf6ace550ee43c2f70d3a7dd852d6fae448ed114a9262817d1da26ce2177927c37f5ae85f8c7c85b82648e8eeae78a SHA512 ab0f8dc1c0a94d1ab670fb6b4e49fdb6b71623f459d36e68abcb943d53a23531236030ba95c7670d9790b927928517ac53977cfc2cb65bbae43772a467fe0f9f
+EBUILD docker_auth-0-r2.ebuild 151 BLAKE2B aac7e84f3af549f5cd37c7827f2932d7efc2d61c4a8d138702f9e338c5b7b2578639895a96d063a62738c4cd0ce33c0d698c43a6236a132303c4f6a4c28d03a9 SHA512 6a9d6f4b5d314d27bc0019203cafd9151bdeafc806d86ae707be6ffc9a9fd731625226ea209be78c25eaa2fd806591adf0ea13df00b5b52fe9076d1e3b4ae40c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/dovecot/Manifest
index 4fbeeda2f422..8d158b43830c 100644
--- a/acct-group/dovecot/Manifest
+++ b/acct-group/dovecot/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovecot-0-r1.ebuild 150 BLAKE2B 4c86279b268425d51c1af2479896ab1a7658450729b136ad7a7b4a956878faea26b74c7c407dbc9bb66dcefe38e3509a178cb1b0967f69f5a898bb6f89c1dc38 SHA512 b0346b807c6d68b68e1453218160d32a4baf5d60b626203ed1b87edfe20d4cfae450034243024332847f359dafbed91439d7c7be92076941671fd2edcecca308
+EBUILD dovecot-0-r2.ebuild 150 BLAKE2B 196d19787b3ffc014b4cf34877a484969c2e1625fcb732aab934716fefbe12b5959b5d269b8799baa51a98808cf9583de8cbceb6114e259677e6e0e9c0fb438b SHA512 47fcf07792c893f5c65039f284306b63fbf578aa6502b69b9e3fbcd9b31b061238ec515d5013c8f18a98266710db1e3e2bfe4619dba427077e965fe5b184e641
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-group/dovenull/Manifest
index 1e6c9dd3a78f..baa2a12a03ee 100644
--- a/acct-group/dovenull/Manifest
+++ b/acct-group/dovenull/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovenull-0-r1.ebuild 150 BLAKE2B 983a6c3ccab5f7f39d0b1516ac2c6a6f7daaed4e594424020a7234edc1f762dee99b5a00898a97a3a22ff97327d7f37d629f55c7bda8f6abca36b072271ce3f0 SHA512 23d02ad73a8c9fb417101683e57a19168535b68ce264788c8e9213898451aacb39e0a786796d94daec7b2fa5ab0e856eb22af9af5bd4049248f9a53f01add4e8
+EBUILD dovenull-0-r2.ebuild 150 BLAKE2B 488d61dd9d9fe16763760d7cd38002ef1f9757d7689d792adefa50e96c19637955e5ebfe551d2a6be0ce2f1ec064d5d8275acde20ab4fda7a36e241319c7c992 SHA512 e8c23a4a16de2059c7744b23e2a5fe9882f558b2b74eb3b56bb48659a95211884d821d17db48866cc03cf221cf78dad8dd7fee834ba9ab87bee23b709905f9d4
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-group/drone/Manifest
index 834783702e3f..8bd546a5a5b8 100644
--- a/acct-group/drone/Manifest
+++ b/acct-group/drone/Manifest
@@ -1,2 +1,2 @@
-EBUILD drone-0.ebuild 195 BLAKE2B d2e0f02d0bdf5f98571a955e78ba080a31da3979ceb037089685a89f796d5244595c40949174a1f19fe4c25f1f920573278395aff64880bf6a995e6688eda7b7 SHA512 5feaeb4795c1e377381e6654665bbcb9f94dd7f6d91847561a551ebf2480e0e7f3bf67fc0cfb74605715c456448470f037838a4a79bf75a4a621d06d75f815c8
+EBUILD drone-0-r1.ebuild 195 BLAKE2B 2f061770dc8358d45accb5fa09d12f4f719ac637ecbdd883042cadeae63a1642940f4526cd5ccb3d612288ab0a2662325078fc12db81a44c7960afd04a48e32f SHA512 19a95654d9bb1fd5713c8d53399e5b9f36e40cdb67c359cca58379600d2180ad0f8d7151432a321986c757116e82155e5845412bcac4e40e17298dc44b5deab3
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/ejabberd/Manifest
index 0eb50fc74081..0d9479561959 100644
--- a/acct-group/ejabberd/Manifest
+++ b/acct-group/ejabberd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ejabberd-0.ebuild 192 BLAKE2B 619a3d9ba875a020796bd72c9880a57bfccc663897f1d0790fa270585a602828d5bd9a421b2b9fdb5ac8b72f85223474ac660cd23c1a447522745e438cdb9aaf SHA512 179a1a67a20b7e2a75bc19b43d4d7da39e42c69ac8510e23a8278b60dcd17e6ab161f16d34313640587a16b5d54f1c0c2a7b4955d2cde451abe4240685a07486
+EBUILD ejabberd-0-r1.ebuild 192 BLAKE2B 7766549dfbee1874ea04fdf3641bc783df6119910db1e4fcdbec75105311a559ed23abdb42af7c1f5ed61aca833fffb36a9384cdd959e508cfc22ce143075026 SHA512 2ab54546629107cd00cafdec010eafaabc858f00de01e0ab15a14854e6a61f5d6abbb533b6996c497101fbb8d9aa8f0ebc44a79c29fdfbfb909d1ad21c8383f2
MISC metadata.xml 328 BLAKE2B f5091b52d611b1b5316381dc2a1bbdb6f4bfbbcd6bb92f6e0aeb9dff2e8cc080665eed36c14e0abbe593c8d7f4074cd19df1089915441a75f57f3317d2c8b5c7 SHA512 64e578aadb702803be2ad5d4bc629c91e72cb5d6446e9c77a46198cce513e4de1ab582d527c69da62e3f86749f2a1eaec9ba0e0764627562283c29c2ba223811
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/Manifest b/acct-group/elasticsearch/Manifest
index 0875047b0c4d..1a61102bc78a 100644
--- a/acct-group/elasticsearch/Manifest
+++ b/acct-group/elasticsearch/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch-0-r1.ebuild 193 BLAKE2B e3d11c3bd47b75899a6e4afbf95d867bcd975aaa9c9d90040a509329e9b8b37b29753e7a3c9a907c181ae3ecf07107f2d351c80838f9d6292daff2d53ac69ae9 SHA512 540182eb4cc6dff9552e27618f2bb36d371cdc1b28e440da9b12577444b1ab5f9c5fea69c0a32c8814ac630ea420ca34d0e12e0394e2aca07a751f51e3af4be4
+EBUILD elasticsearch-0-r2.ebuild 193 BLAKE2B 2fbce27364c96c520cb186f3ead2c715b1ce00e1d23ec15ec22b15b218f02d302aeea4de52f83b0c17a9a6628488587c84a0505efec12c3d9d6aea31724b5a58 SHA512 31ff13fde899c28045728ad5fa10c2e392f2f29878b967cc4df879ec929748a379261e87db5c9d191e7a057d73ba6cb254a33442c8e80e8843003ec68ec00003
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-group/elasticsearch_exporter/Manifest
index 0c7cbe0c3bf1..0b6c14d4227e 100644
--- a/acct-group/elasticsearch_exporter/Manifest
+++ b/acct-group/elasticsearch_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch_exporter-0-r1.ebuild 215 BLAKE2B d2f21cfcc0664bf09736ecdaccd0b5c9d9449c0dbfce8c9c11ff0bef68ad8247fd6ffb4e3cab0a95449ea37be7c8bad2147acb6caa42798528424e90c20699b3 SHA512 a4f7ecfb6ce3ecdb6efc0e6a31560aace98cbd09e3861b0d2d6d758bd00b9e828f69d2b29c3ba19e70452f73a0807e746c4d208790de2028a3aade3567d950d3
+EBUILD elasticsearch_exporter-0-r2.ebuild 215 BLAKE2B 756bba51cc537d5f40aac9072f2f39fad80f03a0bf75760cf0612d564c124078653c92d0007813687dffdbe38a5152ade5b59e34ba7aded59e1d0a511efd6c7c SHA512 29c48030e85b4a070f4394d30004a709f0e445cf54ede2bef07b33096078a14f0758003e67167255cce37858b8ac86864f89d83bd31ddad29e9053e6d80c0830
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/energi3/Manifest
index d6fcba62e06e..5bea4cae8f06 100644
--- a/acct-group/energi3/Manifest
+++ b/acct-group/energi3/Manifest
@@ -1,2 +1,2 @@
-EBUILD energi3-0.ebuild 203 BLAKE2B c542d9ce036ce33f5c455e324665ce51000f5d9dd2b1eb36662d6cf6c78c6b31de06d9916fe9656bc6a7e29338e402092419d2c6540681451f15ee3e0b4b3cef SHA512 3449a20e739125ffce90cc3b42500197d2c4e60fe412ccafa857de09e43ab8dc742e9a33f158ced35c66f39e99c140f889dbd148b11ae38e3286dc6497c31f9f
+EBUILD energi3-0-r1.ebuild 203 BLAKE2B 60e793d8633c8a8e19eca964bb0ddbdd39fee2670ec1bd36d546abd6178437f7eb41b28ed2cb370645564f231d894cd0018e9cba42bf6e2b1f5d62ebef16b26e SHA512 dcca88177eed85416c7de3f3d9eb1bfd14662e5049ca2354813f9af98d663e5909b40f515c5e587144f4c69acd74e3c284e9773cbcb10288ef33152b00fe9b79
MISC metadata.xml 245 BLAKE2B f1fab6ac89edb8c7e0d5c3582eef178767c9e0a28ad1a59741d043cbc57c2cb9a14508be1e9ef31c9db4b74c8b265c38efca55d8b64cd30a128447862bc4550d SHA512 049bf946fa98e28b0e4b016ac2ccb4c10cb132b2b2103e1483ba0fc7351a0cbdaab6cbae460c6d9c2781a21cd1587449469516d5b23dea33418485ba5f4df8e0
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/Manifest b/acct-group/epam/Manifest
index 741f6716be0b..694b277dc884 100644
--- a/acct-group/epam/Manifest
+++ b/acct-group/epam/Manifest
@@ -1,2 +1,2 @@
-EBUILD epam-0.ebuild 205 BLAKE2B 1791186d2c63cbab9b7aeb5624aeb7d2e5f8c6a83baf7c985d753b047d5388f162d79f319ca9229544b1f36acfb2ff1b13046cecc74ac5c91c0a78c712145f1d SHA512 dc137fa1a85c10eadd3ea11dc3bccca485dc3a2b7f7a03af398e7c7c592c4339bad5beacd3bd82a6123f97bb9e3d0acb6e50e1f3c36113a51136c21c51644b20
+EBUILD epam-0-r1.ebuild 205 BLAKE2B f4feffae5f02c062475dbe42c6f3daa58fa97fa9155ca99c96b1a3d8ab16f1531edd197d607b5925af507e3cabf712a9db46c9f01ca7a0288ffc5f215642f416 SHA512 c0073d5d44a4db4967c8537f79b5047d92e33d376daf085f0064df70677cde82a9bcf86a3f1606b211a7c5729af473dee93f75ad28b0ff1a4d36ec94ae5cd8a3
MISC metadata.xml 221 BLAKE2B a0dda8dc3093f745d94283847d532e168cc7f74669d284078b7768afafc96c6af33260cb99d4202e7f6f3611cfd5d58054702cf8c83f1fc7103f1230e3096459 SHA512 cbe761c117b6dd24885c8cfe83896bd027383d543cddde6f690c9ee9e8b941147957d36a859e47a9f6510abfa0479e5200ff730f24305e67375af025b106cd25
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/Manifest b/acct-group/epmd/Manifest
index 1aaaded72dba..9af82c532f98 100644
--- a/acct-group/epmd/Manifest
+++ b/acct-group/epmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD epmd-0-r1.ebuild 200 BLAKE2B d300b2a3247f1612784635ce06f0cca3ef48b9f01c49919ec3955620ef63b28434da520ecddedc7c757034b470b614dc17bc03736c29000137f8c78e92b75e98 SHA512 f95a919258e9956e1cac3a5c349de3518b5928b8627e129ec8dd346c4e85a0c42ed9253175848c79c1b3811bae52920554f3424f73da04f6fc317df9d97cd675
+EBUILD epmd-0-r2.ebuild 200 BLAKE2B 7b77ad6f7535f17e13e910a2779bdad1889c5e715cc895fb3eb8b581d712f1f022153bb61de31678483b603d2573d812173febecdf1aaad66342ebbb48298d4a SHA512 0891531aed776fecbf0d4582b93699cc3ef42e891848eacc6ae000b6446f08ed31e9a72e6ba505d9e4b9870e42ba3c11ce129ddc568d390d0ea67150727f02ec
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
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/Manifest b/acct-group/err/Manifest
index 90213683b1ae..14ea9a229773 100644
--- a/acct-group/err/Manifest
+++ b/acct-group/err/Manifest
@@ -1,2 +1,2 @@
-EBUILD err-0.ebuild 146 BLAKE2B e86886726733bb070cd675895d80404253f818fbc728874005bd25b6eee7f900d1b9a0c3acaf4530219c6103b808801267519642ca34cdb377b3fc94842a2c06 SHA512 d7a0fb33ca930aaa3adc8f022dd90ae516a9261ab297edb69b6e043b2e47e0d38dd1d4880b2a56973f91299d0962d014635b1c24e60ca4c2f66669f5af56cf42
+EBUILD err-0-r1.ebuild 151 BLAKE2B 070df455fbe19bf62654b173fc6774ce94c917f53474c23033b83e8603419e28ba6cb57b1ed28e21f62cfe4b6574c4328e9c5f61cfb227d3f623e21615cc226b SHA512 5abd13966a2cac90201f9e76a40b8e107c6e44ceaec8dee38e6597a5bc0781a8cc05671effb3f974ffbb5fb4acba792d01c847e942e98b44c9aab5c9600ac246
MISC metadata.xml 387 BLAKE2B dc4c71051208fdba10dfbb38deb731492f03310bbe6a90d46ef696f7549a851f0933f51d158f598fea4211e55232c15f757d3b436bce0d1b8ff0516c85964118 SHA512 d9a689e19f684bb65ad0b38ad3050ac6aa247b45f7321deaf49111d4153a841bf2ae97b59a21472308c79668de3b96f60e8b50738d5998908c359cd1be0b1de7
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/Manifest b/acct-group/etcd/Manifest
index eba19f54d3d9..ffcb0e504ccd 100644
--- a/acct-group/etcd/Manifest
+++ b/acct-group/etcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD etcd-0-r1.ebuild 146 BLAKE2B f4c72962544a7204d0d59aff67b3d8aab455b3f0187384a2bbd45bac791321fe4f54d32416e24c90af8120624c6aa4374fcf6f02c8b2807c869127c0283c1980 SHA512 50c1984782e97d873a03fd74c6e62f84de459f42c2930be489ca73d95eaa48ff07256985c24240e89fa3c50dfca681ed65395c5519d0957d14374b3fd90127d4
+EBUILD etcd-0-r2.ebuild 151 BLAKE2B eff3e5204d072841e4b185f1b855b6fa1c758af9be639bd62e701c7167240c4d0939e85707c8daeb0f217e9c7fd54e3813d414e8816ca6a7852d529bfb121fb9 SHA512 96e0080c21d45c9514d30f7154ae6ecc4fb788f374b3ff2b3d9d6e57688506357de1cf8aa0d21b522206acffb21bd6a1b64c34ad71c73da1bbca128edb5bc10e
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/exabgp/Manifest
index 2a1bfb4ac37f..7a4457f0834a 100644
--- a/acct-group/exabgp/Manifest
+++ b/acct-group/exabgp/Manifest
@@ -1,2 +1,2 @@
-EBUILD exabgp-0-r1.ebuild 151 BLAKE2B ba6cd346296a2aad30236efbd4cae5e5f4680cd963d737b1a41e6a18830c1d71c7d6f298d1c6c300c007cfe2f0128aa9798eead07e36dfbb21714405b4871a78 SHA512 a32a013745a253dc0f44ff73b565824678546e86949b812452ba50560cbd634e62006102b8051cea544330edfcc53fac6b29ef79f94d8c8c1870d4e9d14bcd43
+EBUILD exabgp-0-r2.ebuild 151 BLAKE2B de225420e70ce3a9a18bf0091034f08ff733bf646aad264a04524686bb38efac63a054941fe02d7532316fcd03a42d1272503a24ef48b02db56871fcfe0ad62f SHA512 516c87c50c64728c486b297db2dad0f4e3ffcda3b3af5446c97eee4842bb60a8e238b8dfa1f8eaf72e5c77e9102622ce78bbe0292cc20a5c1d1f8abb23bda5c6
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-group/ez-ipupd/Manifest
index 8d283ca922aa..6f4f1a5036c2 100644
--- a/acct-group/ez-ipupd/Manifest
+++ b/acct-group/ez-ipupd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ez-ipupd-0.ebuild 198 BLAKE2B 3cd7e54261934ca009006fae972748708ed17c197ef32be8a85cc49dcbf539f206c5ba9b9dbf8a2102ff1735f5a2b10b4d4c1b57175fb9d82e1590673f7843ff SHA512 431ffc21b9239bdc4cadf7efe513c8ccd8ed8dfc86652cc9c49353466373911ffb1f9455cdd9ec79d460d5f4c5a8f8697a6130113b0ab3bf72cfef0193e3e4a0
+EBUILD ez-ipupd-0-r1.ebuild 198 BLAKE2B 6415f81a08c6f1220d878b4329f61ae72efcb029eca1294190e6e821ba982bb6ee7d38e3cb08f163d1079091b5592334c8413bd5e6313635a1a3ce84dad11521 SHA512 e3ade307e18ac7de842014b7b243f2ff053094dcb8a7e67a563d2941737150c367a11081eaeb83a7ffb9aa8726a97489f9ffcd7910b0960cf92bd278b33bcf74
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/fax/Manifest
index f6c89fda6288..f0f927b42d96 100644
--- a/acct-group/fax/Manifest
+++ b/acct-group/fax/Manifest
@@ -1,2 +1,2 @@
-EBUILD fax-0.ebuild 198 BLAKE2B a98aaf999857f3ba5ea373f3d5d9f638bddc2adf4e9f773af537558ecfdedf513907b6c4a86808f0a48edad59d8e470c95b15fe6498cb3d0718e6310aec923ff SHA512 48859cd9f8be428ff724251b10f2ec521af5f726b57fd36e391e80d82303b5e04b472702c179045227c2deb7ff6d73d9832f960af81759738dcbc6b54042f5e0
+EBUILD fax-0-r1.ebuild 198 BLAKE2B 801b12f3621b73f50bebb4d0ebc1f9347d17f1158e8ceca01bba71c01d17ad25ea72b1fa6813ce8763b79062764acaac38a1802e3d8f7056275deb3edb892675 SHA512 24d60f67b7b05344c12cdb666ad4519f73ef52c1e2dcc08ef486a29e02803740096ed029d9df3c72800cbb777fa7a553d03107976ab9c07d7a4756383bce0b9a
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/fcron/Manifest
index 3bb51aa91495..e0d6f239b63f 100644
--- a/acct-group/fcron/Manifest
+++ b/acct-group/fcron/Manifest
@@ -1,2 +1,2 @@
-EBUILD fcron-0.ebuild 198 BLAKE2B 1ad655d295d405331c2e7b52dfa9794ab379989c4e3eb5cb2e5a43b8f4ebd1310866700b7127cb64fd1cabbe3e466c6a10cec9e3297d5823e1cae554d50c138c SHA512 e219d07d6a9474be2182bea70a7900170f4c3fd36cb9b7fc518b7f2d510fceef0d02dd98b9d4c96cd3eaafe23f92da624a7746598116d05bbec3538eb0ba6e01
+EBUILD fcron-0-r1.ebuild 198 BLAKE2B fe5205e29279f86a95d32b1c0de92f0be39f27477869a34f60ffa8dc188ef059d0b130aa3eae029ce9d4302856e07a46607d8f4df361acf5f634a1a0e2b72879 SHA512 86329d6df25b298efd9b21dcc6bce1900c4646954128a727d463231ea6714ee1d3d587e85bb7b39042212870d3834f8f89e9278f42af315be3802e25269247a7
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/fdm/Manifest
index 06c47e602cd5..dd8a12da0d25 100644
--- a/acct-group/fdm/Manifest
+++ b/acct-group/fdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD fdm-0.ebuild 191 BLAKE2B 6b035c09f5a102a6d7a1ed4c78bb9e10b4c91a0b19187068e9aef3494d8d704edf541c1f712eb90cdb105149314ddfcfb6d6cf848c0914086e4bccf56d891a55 SHA512 7800564db9169b95b6f396ee6cc64a7896ea6c5c2e89db1efafa124afc8f5b613569a4ea757472a7ead7f7c74f7b9995006703a48e802df1d7af4f4eda6c663d
+EBUILD fdm-0-r1.ebuild 191 BLAKE2B e9cb8ea931210af3f2bf78e324e42adc5f71fae9e0d69b5c4da1e8eaececb6b8c487cbe1d409929459994415af9c054a75ea66a38810de49807e04be59330a6f SHA512 18fa9c978b72c69aae0411d8b37e60c0469b2468fae6ab94d84eeacac48d854bb2b203c56f6eeb6b79f72a25eb6689e5ff469e8a1cb363c234205d418aeee84f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/fetchmail/Manifest
index 203131d5d5c1..32d3f422016b 100644
--- a/acct-group/fetchmail/Manifest
+++ b/acct-group/fetchmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD fetchmail-0-r1.ebuild 189 BLAKE2B d3a6ad73fc23a80df236dacce93d236ce5cf72e1e5ce9d3b9baa6c1a0d261d9bbcfec658ea6a55bb4f912bd5c960725db22b789a66fd20b7f11dffa7ab7b0ac3 SHA512 f59e082db36c2cbed2dbe2e0a54e4491609bcd974dfa7542ba82ea8ed7ce79500101737181d6b708d314e668b0c843123f0e69cc0f9d2eeede6729eb61b6b7e9
+EBUILD fetchmail-0-r2.ebuild 194 BLAKE2B 87ef84ed78e68acca1da00fc96095f496755d01ea0976aa68e7a801f45832808637fe17bdc2b9cd755be566d438630a99f47cdefe87e2aa7cd8e3f637bd4c6fa SHA512 56bf2656cfa9f334c61b2638fe105d9f0cb7b486fd3d7bf0d1cc2c59097fc6a549384a7a4731f474e4cc2da505adb760bd68242a9952e9c825a56106145b3ece
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
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/Manifest b/acct-group/fhem/Manifest
index 82de52d3c476..86d389552d59 100644
--- a/acct-group/fhem/Manifest
+++ b/acct-group/fhem/Manifest
@@ -1,2 +1,2 @@
-EBUILD fhem-0-r1.ebuild 222 BLAKE2B 9927877fc297ce3661112e6c013f3a86b9a47cdf2bce72a78b4a96e7e1a99c45fb022d4d901e8ea7c4d8e2ce2b2709e700ec956c2fdcf657378c70ad2a2c76b4 SHA512 502628d0f00353ee06b8b2d0b2a168e30ed63738860afca16d2a65ce763a0fefadaad4acbaab2ec41e0ee25b36df2e1a0050ec113d22ace1022eff901d710143
+EBUILD fhem-0-r2.ebuild 222 BLAKE2B 722899fff7e98449193cc43690fb2bb35dfd45765c148a935e783ae4a9a224b4dc420aa8af433b69430fd1a8d79c7cc29d4928c908f7c2ecca4f4941c9f37477 SHA512 9ca90b2de3e85ef55a5900167e81086e01125a9ce1504f125d1f18f099dab5308cf577c83c7e28d2b62f7492addabbe1bd09c1e4b57638e6e063c7e2056b7a52
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/fingerprint/Manifest
index 60be18da090a..863dff83fb92 100644
--- a/acct-group/fingerprint/Manifest
+++ b/acct-group/fingerprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD fingerprint-0-r1.ebuild 146 BLAKE2B 6a073149697ded83c489310002d6a14459b7c557b902079de55c56ae2ba10566a1d0d221738b0532606c9767972c94d9eac3b8fefbc4a6577975d04e44b4655f SHA512 169f56b7317bb0f79f1e16905ba50fe69b85fbddfc881b91cb05e0aa4acbd666490f15e1d6e04b95555feed05beae6ffd494e6105cc4f8dd647cc229af43e683
+EBUILD fingerprint-0-r2.ebuild 151 BLAKE2B 39e009a4475094bbb43d65ae94dc86083137e539935f8cccd5a37dfba11371cba959f364ce388e4a9a9347cc958d29945b3ad09538f2d4f639c076f6bcdcfa9e SHA512 f089689fe4e1a330af1c2a59aaa9994855ee6934cb49a8b7b00d946a1c3c20e30cf00e87d8220ffb23c6d61075aba3cc8d779a51f718c5dfceafac991b766192
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
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/Manifest b/acct-group/firebird/Manifest
index 993f9d348c60..f1e904990a81 100644
--- a/acct-group/firebird/Manifest
+++ b/acct-group/firebird/Manifest
@@ -1,2 +1,2 @@
-EBUILD firebird-0-r1.ebuild 196 BLAKE2B 595b5dd52613d935f93ab1335da56548bc4a08d0b7ef3a447a01d3aac4ae486dcade1eed241e9c395f48131fc03a83126f95746c7903f06f5377642aad6358ec SHA512 d9019d5bac7b54cad187047c5fe989b3dc1627ed6d93d8d2eeb9e0cf6f7ccd4a6a978252d71921bb1a81a783a7e7f580a76eac2cd25d3b2925348f9ab5aae9ce
+EBUILD firebird-0-r2.ebuild 196 BLAKE2B 004bcf458535b1b7bdeee77a4245fd9cd0ba3439c91443064716bbf49b0e7ca48c9cb8e2399d934b2b78cbb92b0202ea7c4d56c0dc4b6f944c4b5bef9ee2b6c5 SHA512 7fa221cf110c7e42e839f636cad81bee54f02580fb52e6663db51c89527f069835bc5f46495dff747016fdb4b435c283e11c099c230be76a2fa2488faa29c612
MISC metadata.xml 219 BLAKE2B 5b3c48d040de522ffbcb035a9704f5b71799a5a2e45172b39ea97049733842723503ff69869946c69808c965b7ef9eb40cbf1f2a5277815c4bb2e4b7ac978001 SHA512 176cc78690ba2800973fc6fa926e7bcbf3e18e8f45e925491f2349ff8619ef5df4b4a0f01b0a33f9fabbd2218c09581ff028f56379daa85494eaca9387a745e0
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/Manifest b/acct-group/flatpak/Manifest
index 0cde70b8da74..16af4321b923 100644
--- a/acct-group/flatpak/Manifest
+++ b/acct-group/flatpak/Manifest
@@ -1,2 +1,2 @@
-EBUILD flatpak-0.ebuild 146 BLAKE2B f1d1f2bb5bea6c6d7ff443094b23fb8455dedf940e0d15623b8ca08ac3d3ea3b65693c3f37561986302cc54e26e4ae5d1cddfbb41ff9969dd32e211da4b9989d SHA512 0782194b389a73cb49b1f5b95bf967901372542e315e6981cf824b7fa09772075e9fa8037fc2140006f80cf06ac6238d119684f259ea84a50e07a88ca164042f
+EBUILD flatpak-0-r1.ebuild 151 BLAKE2B 058c6b84474ffa96b6f1d67ee66918186700217f785100889a1727a8e3015ba2f92cdb619d3bdc8dd5049cf2ef5b6ede9e09f139aeac1ce8b201de2ad8337325 SHA512 0e3b4a3168a25ed023dc51b6407e24afa9a1399b0740eecadfc51d325cca9528f66081940e8c9b307c38248063cbd4c6aca768c6f3e2c9aa789f62a8aa1cbb28
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-group/floppy/Manifest
index afb867b2bad3..da664d8f3bed 100644
--- a/acct-group/floppy/Manifest
+++ b/acct-group/floppy/Manifest
@@ -1,2 +1,2 @@
-EBUILD floppy-0.ebuild 145 BLAKE2B a2e033042d168039aa7ef556bed7236ea37c400a7203b3064f45165d0934cc7392f0089175655cdb3659121910a7b2b48f13ca83c42561dcf133f7a796a904a3 SHA512 ef4d4b51803258bd97d97c3887e17e14527da4ed904e573452251eb0f2b78181b9a8741f22f60cda10c606b225655822e6b071b2ff6399ae2ae87b336fde4544
+EBUILD floppy-0-r1.ebuild 145 BLAKE2B a2e033042d168039aa7ef556bed7236ea37c400a7203b3064f45165d0934cc7392f0089175655cdb3659121910a7b2b48f13ca83c42561dcf133f7a796a904a3 SHA512 ef4d4b51803258bd97d97c3887e17e14527da4ed904e573452251eb0f2b78181b9a8741f22f60cda10c606b225655822e6b071b2ff6399ae2ae87b336fde4544
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-group/floppy/floppy-0.ebuild b/acct-group/floppy/floppy-0-r1.ebuild
index 3386a166e7b7..3386a166e7b7 100644
--- a/acct-group/floppy/floppy-0.ebuild
+++ b/acct-group/floppy/floppy-0-r1.ebuild
diff --git a/acct-group/flows/Manifest b/acct-group/flows/Manifest
index 6979663f03f4..4284b0fd4f7e 100644
--- a/acct-group/flows/Manifest
+++ b/acct-group/flows/Manifest
@@ -1,2 +1,2 @@
-EBUILD flows-0.ebuild 193 BLAKE2B a7291a6dc7649bc52032c8eee46abd8a690859eea582535a3a1c5b7970f964199ad334266252db3112ed44462272a40e7031f4004a782a733a139a0069002698 SHA512 cf3d1af5edb3ecd84aac64a8cad97fb238b105717854c80c8464f677212d306e634983852a0c8df9073357fe005688b172bfdf92bbb5e1166330adb56ed362b7
+EBUILD flows-0-r1.ebuild 198 BLAKE2B f9f7d772a2fee4c388012425a5512b36561392da75e8ce0691e6a436f2fc2767824d7751cefa0e2d814ecd69c918ccb38a8d5c323b15dba5fa1552a6d4d7f481 SHA512 6a911f2d15130c8dae3030ad2aeb4ccf128a9a54740239b2e7dd897ae9be3c59d2926c6d20ad6d21264e27c576f3b7457a8f69f9547d6a9000141bc186a10a15
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-group/fluentd/Manifest
index 387768102ab6..368c2fc55ff3 100644
--- a/acct-group/fluentd/Manifest
+++ b/acct-group/fluentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD fluentd-0-r1.ebuild 198 BLAKE2B 6d4e309e203460bf12b90bbf883e24abac11377f137a55bdca6a6630719b13c3d87481ea77db77186bb53d48ab0473f0add33aab404afaa6d08da856bf164d2b SHA512 68cb3fc4b78773ea42ee706f337c8cb5a29532a8f9a38d97f6b809687cb012adb7c132aff3e4b2ba714c93340bdaf9834b04a39960243efcfc16bdb69d181cd5
+EBUILD fluentd-0-r2.ebuild 198 BLAKE2B 5ca399a329d2ddfe42da89168f4636650c4640853c39a1948b85a3388006c88ecb3842f4bd0c8b8040bb65175056189fd66d6189cc9e508e05a6c80f6a4cfd1c SHA512 e9c670927c90555f16f366c11dc6e5d03046fca8f05437dce468df3c18ecf944481c891430195c7f0b8bdd2919078bf42788de187339de88cdbcadf275969d2b
MISC metadata.xml 361 BLAKE2B 7e1f238bf7794a6961711e528c39354435aa64fc495a3c4f465c3ff6c38980fbdc787cbf5085f20588810fd4a07521b9893ba1cd8de67725bbe529d64cf23f9c SHA512 3b146de2c2d91918f739e7acdcb15f755d52fcdf808e592ac2effa1cde73aeb08e45b00bd985638ec1a07e27a1d323c2882b6db8e12c894c6d7487200a49557b
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/Manifest b/acct-group/foldingathome/Manifest
index cc02ec0ebbdb..9e518fdeb595 100644
--- a/acct-group/foldingathome/Manifest
+++ b/acct-group/foldingathome/Manifest
@@ -1,2 +1,2 @@
-EBUILD foldingathome-0.ebuild 206 BLAKE2B 17725af0e44ca6edbff1c3494350986684603a31ee2e2c21fb31cbf8912d0489f345c3fefd6275f36f3c2cf35f91c70d8ca65cdfe6131993537148ab66585a86 SHA512 156f42bce29ee516f7ad154b5ca9f134163b942f1efd8e269f3cc8879e5b873c21af7ea585b60f9fc9926fe2cdf295e40f623d7dc1ec5ae1a9973045ed830516
+EBUILD foldingathome-0-r1.ebuild 206 BLAKE2B 77cc1a2d6479c7ac45a728b9fdf2a4ea48128111b5f8cfb52fb17effde7395939e4f23fc4b1b8a50b13a57b461ddac8bba3d4744fe7fa6a490888fe425c93d6e SHA512 7fd59bc4dc993ce23c9b67c456b39e29522aaa0135d6a1a8ce856f5d8b802f32da77136807518d140958c05d464f9de85f655afa6a0ca9a4a29b802471a095c7
MISC metadata.xml 262 BLAKE2B adaacf2ac22ce09f8b1b68f538773c1e2101156181ff302eca2ce1280ee5d45db4eb302a8eee1bbead5e55942443dd16ef924cfbfdc95a1658dc6a9f460468a2 SHA512 ac924b6b530d96645f173d40f7a2bf0e3abbf49048ebf7fadcea3dd553cd25504f0e68a103395de1fb59a2e5e11497dcead601be01cc6f0295ccbc4155f67e3f
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/Manifest b/acct-group/fp-multiuser/Manifest
index 7276df14faed..07ee0166090f 100644
--- a/acct-group/fp-multiuser/Manifest
+++ b/acct-group/fp-multiuser/Manifest
@@ -1,2 +1,2 @@
-EBUILD fp-multiuser-0.ebuild 201 BLAKE2B daf38ad2ec52ef9f8eabf1369c2047a08eccf1642a215cc10dbf4a7bf45dcdc830199835fe1a49146e4f09ab5b991e7d92771418e990076f039debed481cab6e SHA512 18048e083c0d17c710696e893ed5ae7eb34afb83909ef780e907060ddcc1998d7ebf59e13bdc73a4b0d302b85eab91dfac06aca0cf37b12dd0d069619bd67b8f
+EBUILD fp-multiuser-0-r1.ebuild 201 BLAKE2B 11474175be1fdb058c19bc258adf40ee5235562430edfd1b3672a7ca6b6ccb2e24c9442879e8e1500b0806293ab67c38719a751ef1f31ef14c89049c7a0d72b2 SHA512 b34f9ef2258786ad2d5e1ed73337e1e27a33856446550cc6baf314ea51b36f12112276d34ff1cabafee2413d9ee4f7feea43627808b375c98b13032d5ef03230
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-group/freenet/Manifest
index f0f3b0f550de..6f4ef238efaa 100644
--- a/acct-group/freenet/Manifest
+++ b/acct-group/freenet/Manifest
@@ -1,2 +1,2 @@
-EBUILD freenet-0.ebuild 186 BLAKE2B 1ba47bf44fc3ed27a9858745879e22c32830fba440937b1dc263f45b096d43f95fdf6acbe204bbe7077cbf492d0074bab85ab617f8f32c1d1742a69e6777b84a SHA512 84810c99b31592ce6946c9a1916e3fb57afd49ce9e5702f4c9007ce25ef1bba2fe8b816be5aaedba4cef69163f35ec3b2a2a2cd85b37b481817447ae8679f1f8
+EBUILD freenet-0-r1.ebuild 191 BLAKE2B 3928ed097095d330ac908a9296116fba140b4b5744436dec5f29e32313ff8d2d36da1f685c9c59e31ebb2db36ab6ddbdb5acb64cbe876f17ffc9a09d6d1e355d SHA512 87a7cb6491400783d3cb53d9e128515c725f7d23046880a60e4cb4a31e2e087b87bee69f3e1006037de63489fee77c07c57e36b6a08279f04fa3a15fbe7265c0
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/fritzbox_smarthome_exporter/Manifest
index f24252d74c18..ac14da0a00f8 100644
--- a/acct-group/fritzbox_smarthome_exporter/Manifest
+++ b/acct-group/fritzbox_smarthome_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD fritzbox_smarthome_exporter-0.ebuild 146 BLAKE2B e4c8d3c0750ff64482c4b0d65a6ada6a1ac671279eccaa78fa2eda18b086efb9bfa3d37bd09db08191e65ddc6d98d75c0c5864a65d93d78dabe61eda28d638bf SHA512 9818ca4d131de35bd2d27a297c87a638783f7a717a82a738ee73dbce093dd1364021d5cdc522fb80895dbe75153b42ef012ec909764df1dbea9720c61c017aa2
+EBUILD fritzbox_smarthome_exporter-0-r1.ebuild 151 BLAKE2B 48bda5e43e6e081811284b2cfae38c3bf529499b796305363899d470f4bf324511eaa6b210eb265c923381fb34b4c2c3f678cbd912db35b5984de48c1d94fbd5 SHA512 8c2c175f6f0425169c935a858b2428e7470bfe90751f2c54181471049a4168b7a75e1fe9a6101a997db45f8b24d0039883465f18aa0de3a05f658c96ec895c92
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/frr/Manifest
index da0310cedf4f..1412accd343f 100644
--- a/acct-group/frr/Manifest
+++ b/acct-group/frr/Manifest
@@ -1,2 +1,2 @@
-EBUILD frr-0.ebuild 146 BLAKE2B c8b31ac7cef83700f2a53720ce136a55c23f56dd109c4e886240500dc95097ca103a8831dea79e35a02760b939af21ae55f94d1220ce0e09c2994def873f4340 SHA512 b477506df227d06df4e0e062699c95be22dc88c9d401b37ab5bca51c0a23a540f1d2fb3b9fb87f63b07ef49f5c3b5392f25121f16d6e89a3f3923722ad1f8fa7
+EBUILD frr-0-r1.ebuild 151 BLAKE2B 80f9f675b0b3011af2c35e1e6e5b6696f5ccabcbccacdd5d910194939ac32702b36aa2a88e10db4f59dd0c4b4967ed0775d6c07c83ca71b98452152e8d382815 SHA512 31cea66b630900047870df4ac5f77c7b6b08d2330a9a4ac0f839a4637088b1a9eb177de4a744ecb5c9b42ecdf9d2d69876f7bad239b59851a7cae806867cfd25
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
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/Manifest b/acct-group/ftp/Manifest
index a797ce4d0f41..b46b4598d8e9 100644
--- a/acct-group/ftp/Manifest
+++ b/acct-group/ftp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftp-0-r1.ebuild 199 BLAKE2B 8d79da68ef487e6242559a09d13d8ee34cda5dff027a42d564ca6f9eb4c669b40b859cdc88728b203e9580b4d57ad91e87536d96ed59fa07d5fabc651647aad3 SHA512 d808b4a94dfd995a5808aa62de045deed701c0265f44989336e6464ed7b990656a10819a7218a1a1b85cf0cd20935e096a9c04985ff9c409bd0b6ddc9374c4b8
+EBUILD ftp-0-r2.ebuild 199 BLAKE2B 6472b2f089a22b138652e6e2b7e2bd6a85fdb79a9788d404191cd104d48efa6889fa3c1b29731ff7c536f95bfb00743817ab3c023242a524c75f42d644cac49b SHA512 caa2a9d413c64baff15a38f6927bccaca10767f007560b28e11ed592e13d09cfa4cb075002d702d5ca0c95dede25c26d5b948c6d505f28a1da4bacb3eab48a73
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
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/Manifest b/acct-group/ftpproxy/Manifest
index a5716fd68305..6de23f7ff6f7 100644
--- a/acct-group/ftpproxy/Manifest
+++ b/acct-group/ftpproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftpproxy-0.ebuild 193 BLAKE2B 2f9cd8e299a261196b1d686ea86661b55b5bcf322f5b179eeb5372a19aca33081cb08e2d97a8454d95ba2aa4ad8ba9f1b04175497c91a5ad6f6be192a307eb3d SHA512 98dda91977a2726a60f5d13a3a4bc7069b3d9834e7fda99b0a7a9f426921429bd08869a64c6b56aab917b614fed5ede2755d2d3781bf490a0a7e8ce7a8db845d
+EBUILD ftpproxy-0-r1.ebuild 193 BLAKE2B 70c0f2ce9ed78c9347bca75f79127cba9c03cf53385649e0c3334c14cf9d0eab2c1db66ce6c84cbda2064767639841534bca1f3c2737a7747785c4713ec5c33f SHA512 281af53ad9376f5ea4cde1cb085b2205004c3ce786d0a76dc0338f678b8bcc3ab9cae7f8bfe646d4a6933f910bbb7eb678ebcb8cd351af29cdd93cfb88238bba
MISC metadata.xml 392 BLAKE2B fc1f7d674fbe3dfea4c499c4595eaa01bf618ac2cf99dcc75e021d238fa9bcb09708645a67d2c65c4da7ada77e4f338345793455efbdc6ccd4601fd2e25e36b3 SHA512 02230e8e4aea057d502f6a2ffadc349514d6da1f1eb9346741767d1a893dc0fcd050691fb3294dce34fdd50cd8170a084482fa863fbab2da36ad7da441f74a21
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/Manifest b/acct-group/fvwm-crystal/Manifest
index b5e5ee5ef045..72c0d466b2a2 100644
--- a/acct-group/fvwm-crystal/Manifest
+++ b/acct-group/fvwm-crystal/Manifest
@@ -1,2 +1,2 @@
-EBUILD fvwm-crystal-0-r1.ebuild 146 BLAKE2B 8da45aa0003a8d437293e96de8b439bd008e42e5c18703bbd31b2c0e158a7ab0fd27bb4f06b10c95c6bdcbe5ceb7d560fa12077633f84e354163daab5abfd575 SHA512 e896b338cfa24afc90f7141c96922e47c9f0b9e11721d0cebbe82c15f9b5844689b10677407cf2be1544123d99a83edb6e456a95380e36fe1f7a0ca33a67ce43
+EBUILD fvwm-crystal-0-r2.ebuild 151 BLAKE2B 01837f83289b35f8e90a892e13feececa26c57a40e69c0108a3da3fa6ad046f4e2331fee01d445169e388ff5c7db1705926dba836f7637ae0cba8660806842f8 SHA512 c8fca2ed5df1cdc94cdfab55153c7bee1d75ece801b4171635ad244a6826740c5f1fc3771fcdfa7bc5fc3a9191af9aa589e5e1d34731b47b02c4c5d8bdccda73
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
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/Manifest b/acct-group/gamemode/Manifest
index 0645ec84942d..f034a41a7877 100644
--- a/acct-group/gamemode/Manifest
+++ b/acct-group/gamemode/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamemode-0.ebuild 221 BLAKE2B fb883727b359ae9eaef0a38f6d64bdd404bfca8036d65b6eb14e84b83b26b329ec517b502c40c62e061046990939d53fb2921e3dccde0cf5a4753eb337408585 SHA512 d696dd8fce6e6cf753d763fd150452b2835ed995d557f2357a311678f8bcdb19e952240ce69762763af94e6a92d9386c5e0e88e068fdf59b8a04f2fef17ac57f
+EBUILD gamemode-0-r1.ebuild 226 BLAKE2B 540a62d73a0b6dc5327140fdef4ac13951436c7def9a9411212c9bb63ce0fb63746bbf501ebd0afcd007ba809c4cd1e7a97abda5dff288484f51c3a3134df6b7 SHA512 7e174fb3eb2e67795cee1abf46ecd7474d51ecafee86cc281f681788287dfba54f9d91e0333e9106364c6876885da4481f15157096264a9fe80faf5382312986
MISC metadata.xml 398 BLAKE2B 3f15e3a802595ea6a248b0d0881829913fa7165a519c1da5424595c0ca2bd95c0af09240d03ed36ae027d8cb0581a88ced73fee78ca67363e4b4252831ad1c0e SHA512 b1de318404cbf8feba1e8c19879104282519f517703039b9805616901c39f59c1e8d1db67c32e162f5c8d598d793c7e7ca9c9d34e876670717e935b50add05f9
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/Manifest b/acct-group/gamestat/Manifest
index 1a10e847031c..5ecec7fa0e9a 100644
--- a/acct-group/gamestat/Manifest
+++ b/acct-group/gamestat/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamestat-0-r1.ebuild 213 BLAKE2B f350b7b1c42d023861d4483f6cf08498af4f5dbbb0eba72153ab2d1f69128e616422d705ebcba59fae7dad401bb807c50d79bc13abc529b9ef0a02b7caeb12ae SHA512 ff0e0b908e59f34cc21508487404ab70468233ef140fb487d23759169e08feea60f6621487fd6ad54a38bf18b7affd3a101396c6b5d0290b294181b1a24b575b
+EBUILD gamestat-0-r2.ebuild 213 BLAKE2B af70310d0e63e84f583df236c7a0fc8653cb1ee274c84e58e176181e7e0bf9a993565a9b7dae9a9d68c1b9d05cdc79564bb29b60870b18a74e3d72ed87999092 SHA512 5d8a64268e6b6d75b34b6b8fd97e36a9b1dc0e2f099c188e14bbdcb1310bdfbca8c4e50b6ef4af1284438e35b9256e674c630581f6d60cb8afd99a152f2ef85c
MISC metadata.xml 252 BLAKE2B 5cc2c22d613a5c76d3178ea36be48102519ca7619673667d6361743ba59e8f03663362d921f050300cae9a24e8d81c0fe3370db27e8e59092b15e2bb7f3614f6 SHA512 67ed405e37e55df875cf6e28fce9f0e6bd1b98c726458c5b7c5769593f6b2defe317a033f5a46bf79e177a10db2585b4c6ceb7b99571ca054074455b3773d452
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/Manifest b/acct-group/gatling/Manifest
index a8ebddcd1e75..716cc98714dd 100644
--- a/acct-group/gatling/Manifest
+++ b/acct-group/gatling/Manifest
@@ -1,2 +1,2 @@
-EBUILD gatling-0-r1.ebuild 180 BLAKE2B f12c244d50cc81d30cdc906d8ccc0eacb4b7e02b3d5178194dbe14ece4dceb1f081642beafc4c55af73ee811fec61e9137bc366ca404ec0dcb696fbdb91f5bd2 SHA512 d6191769820fc8505aca4cdafe9bbbcd83ffcc18f3f44229512e174fbb3e8a40303b419b2ce4016707267887e99b56355ff719ffc6a185400af5dfc47aa815a0
+EBUILD gatling-0-r2.ebuild 180 BLAKE2B 2d8f3d7633c968969d199850c07f8f0252df883d954e35579f5cea95d6232a03d96a8fd3aa6544b5cb1bb4d10274ec2cb7b46d0f4bcbd2796e71c396a76dcdd7 SHA512 fca0dc08d4185956981f4c1604ba7d035b928e7337fd6875550bdab9b065b37cf817f5a81159aa038378aad5ce85905675f3cdf5bdebb1b0c5b038199883be88
MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
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/Manifest b/acct-group/gauth/Manifest
index a2d4662e58e4..247af4c97e8e 100644
--- a/acct-group/gauth/Manifest
+++ b/acct-group/gauth/Manifest
@@ -1,2 +1,2 @@
-EBUILD gauth-0.ebuild 219 BLAKE2B 5e675535d9e40dd480e39dfcadbef52d352591fae5ee3e6eaab2df8ddfee2fed282f5be5a8914fe91524cf8e32d9c369faf439e8eb62bcfc4abe8f1e7885ac93 SHA512 65fba78e00650a955f88937969904ce13c2c9ada86281dfd327319601881f96150a3b0f9b39b58b2361b0e0461727eecfb9146632f9134ecd8e454012d98c955
+EBUILD gauth-0-r1.ebuild 219 BLAKE2B 922d1c8740db2f9722c21f68b12a0578554d96f5e2673703aa927a0e7af24109f0f1ee7a5fe874e9fa6de3a0bc0dd207d0c7929610f6597994a38ce72cd1aac4 SHA512 2ae36d2a2ee7768d5eed62b3042174ddc0485fecc0dcb41a7a658bda181c45802b13ab6bea93e20aff07a13d974aeead38c6fd0a09343a5e0afc4aa97d5d80d8
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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/Manifest b/acct-group/gdm/Manifest
index 6e77f151ea8a..5aec17dfdd6f 100644
--- a/acct-group/gdm/Manifest
+++ b/acct-group/gdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gdm-0.ebuild 150 BLAKE2B 90ded007a25830e843d6e83df8e63fefd6a438fbbb1d8fc2edf3138bc2f846bb7fa6feb1e1858a5d1cfdfe4ca7eeefeb98949766639020b65b58cc5925656719 SHA512 f55d4a6632f23a9b1d7df9630ccada87dec5545ef805905ce14309b2f7ee398d43162df53e52db44021eac81138fc9181fd424a988c9f013f2d3142b45b7d54d
+EBUILD gdm-0-r1.ebuild 150 BLAKE2B f75d741a01282ca156d979da9fc8206c7aa07dd32e1c5031fd0b0d74863e8dd8284500e3c10c3d0fbc5245f662536b7521ddb9c09fc63e35fc3519dab3694cb0 SHA512 d74e3dea5e17c3a7800591b0ce5ea7c195efcd2823a6c133506c45e0a8eb0de886b2560b8a816ab83525499c1aed132223641c76ada961d894afea32447782f8
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-group/geneweb/Manifest
index bfa3c40dd3c1..f926f99b6405 100644
--- a/acct-group/geneweb/Manifest
+++ b/acct-group/geneweb/Manifest
@@ -1,2 +1,2 @@
-EBUILD geneweb-0-r1.ebuild 186 BLAKE2B c690d56ec0289ae78cb959821f95eb330ccea98a6097ee2ae43925fac92d583af0a95c84e53a43dc1558a0882adef5d7514a831566dbe32082f5338c2fa52bff SHA512 c1fb212272d03bc3da679de87f761932bedb25a515368384343db0c13a351757747bf96772d0b34de10c1f556305eae0ddedf0de4e73d46b539ce747627220df
+EBUILD geneweb-0-r2.ebuild 191 BLAKE2B fc04921553c735cada2e230399f3a77e33bbe74058005bbd2616a25bd3500249ee2ab40a5b73c018aab38263865f3ee1fbcc95801893f392d812e999d49c4938 SHA512 e57f9dc3dbda270a43cccc3dcf736594b9aff865735942f3d7be586010bda0e576e81f0d3a94636585a30a746fce1a7e9d37cafc2f13a62c91a950320077d021
MISC metadata.xml 248 BLAKE2B 6cf7555626f83d30e661b4284812eeb1b1f2fe0c0a2c78e68382cf21165eee45a4027020d509af5b87814913ea7f16a555b7f0b7da174f49dbb0200bcb2511e2 SHA512 4680f3a309b5836b23c44b1578f14ad49f6ebc52413f42e1d1d4b91d7000081df3be0ca1054ed47cd9df06a1a6bb7cf54d184619efff7dedb82ec7b528ea2dd2
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/Manifest b/acct-group/geoclue/Manifest
index ebd856fe7d61..d0b29ef11956 100644
--- a/acct-group/geoclue/Manifest
+++ b/acct-group/geoclue/Manifest
@@ -1,2 +1,2 @@
-EBUILD geoclue-0.ebuild 146 BLAKE2B 5616d9151f98d33d5a81ac4585387af2398d3428b29ad225673591776047eb2c93cafa397b54b2a3f52d48886dbc2be4b8fa4df45bd3147b2f22e44e7dd8302e SHA512 85fa0cdabbdb43c55e8aa0176b563ac367d9887e4cef0d1867630de5c38ab64843b297e0d6cf0752baec4ec31fec1dfbce8e19bdf78aa1dfc4569e03ff7d0c56
+EBUILD geoclue-0-r1.ebuild 151 BLAKE2B 9c6b6c293215f5ab2a7c07ebf251df7647259e31fa1dce2e6ed977f7f735ca63a1555e5156842bf227d8f98e630eb922744269e3495c7fae0ccf0fd38bbc8953 SHA512 a7cdd838d31e9084845b47c25b1baa8e6039300be86d9a28728da20dd52bbb1f546f7f02f8f25ee7ee031acef59401885f3c91777e4bc5f8f152cc9c8e844dca
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-group/gerbera/Manifest
index e450079b36f8..2144f6bc1a7d 100644
--- a/acct-group/gerbera/Manifest
+++ b/acct-group/gerbera/Manifest
@@ -1,2 +1,2 @@
-EBUILD gerbera-0-r1.ebuild 192 BLAKE2B 18aeb3338c5d555aa3a540d919c34bd62c40ef60d495572bada0d6bc03ee0262649f65301529945bf56409b7e50f2b0dc5e70cfc0cdb9f73ec1688f1b0adb781 SHA512 826d28344629898d17f21dde201235ff3e3b366683e96e4824571b7c736c5674e888ee872054655ad0c74167e487af9858b876ce595f7a35cb445f53b1888cbe
+EBUILD gerbera-0-r2.ebuild 197 BLAKE2B b76e3da3f13c586aa30adb5b40f3b9c18516c5ef4bbfbe7e5f53c419b6e30b0524d8ca3aaf152cb81edd7210dc364dfba57ea24f75b7d47ab336adb3bcda1ed3 SHA512 982c1e9059df072796efced867cb784ac86a5b95f16a853968b9cd8b5997beb891780b32a5e21ad6b597747be6399cff0d251147bc9f114ad8ec4b347960b02d
MISC metadata.xml 406 BLAKE2B 6be52a743657b969bb47047966f9220e0c095142868dbe3560aa2e55e16c6a078658a2c54b990f907e5fa0b24f15d3aab7901cfccd78b39aa00393f44e1ea841 SHA512 4a2559a1cae4a2779e48114bcb08ce6d2f1c2b5587d0296f20172a24c7bcffd54f93bcd67fbf0529ec01ff05384e26c194d25d333c63f5318ee0cadd06b7944c
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/Manifest b/acct-group/git/Manifest
index eaabf54cd072..7a16c2ee7eb3 100644
--- a/acct-group/git/Manifest
+++ b/acct-group/git/Manifest
@@ -1,2 +1,2 @@
-EBUILD git-0-r1.ebuild 151 BLAKE2B 92fca84f9b5804e682c7f86e8c5b0dd94ae1043dd40694ef1229d61352d9cfb5406e262f09648461cdefd144fcf61b9d95b7be94b70e1b25f05dad0acae94e66 SHA512 ee8632855f287227ef01a9afd81a564d64815dd25f7d210a0081f0f8d1526c7ea74be5a7f5c628e91edf519bfd519b865e68344ea06eec05b914d8650ebb96e2
+EBUILD git-0-r2.ebuild 151 BLAKE2B fd570a4130786122ad39c1a8d8692a32d0b60320cece4403d633ed5ced98e69426afabb32c15778c8e2994859b332eb9f23b95aff17ebe09830db5b3f16b4b7f SHA512 f91dbe8c57d4782e357934903786c72de04e3ac2d4b87de2f0958a69bc031c2801b6c6c06c84db971f76aef9ae08279584c2369ca85a58a6c65675138488beac
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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/Manifest b/acct-group/github-exporter/Manifest
index fba41f7b3b75..3a7be60489b6 100644
--- a/acct-group/github-exporter/Manifest
+++ b/acct-group/github-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD github-exporter-0.ebuild 146 BLAKE2B 0194c5e2fa3691cfe16af427e2c9b035f939d359b3316071c19b6c095fa4c55b8627afbc77a9417895c635012257381884679b1521c3071e8f09aa1569c137e9 SHA512 b0181e8bf6f6aec231445b691afd28387583c31ef68c3a6962eb7de13ed51c19e6b12e893b8f6ee1bac3c0e1a371633ff7a55a208cebf9531074e0b088bf6af0
+EBUILD github-exporter-0-r1.ebuild 151 BLAKE2B 4b45a4dacdd691fe1f7af79df567e12de48cd368c320c1efc7c081290876e4e1470ddc45bd339bef0fac885fd4b43cc76703a3deb18d77a30c1865ac00e160e0 SHA512 29a90d8d01bd96c106ed150cb3f16ff2d1517a0e889753031a92e73dd4ea8f3616a177b1e5885bfc731db856cfcc7df05f6cf562a99789cae79a3b991349ae7c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/gitlab-runner/Manifest
index 6505fa8a5633..da2f5bbf1c13 100644
--- a/acct-group/gitlab-runner/Manifest
+++ b/acct-group/gitlab-runner/Manifest
@@ -1,2 +1,2 @@
-EBUILD gitlab-runner-1.ebuild 146 BLAKE2B 8cd9fe9d4eede23823dd4b24485c5b001e6282525ad64cc11ba235739ee55ce6b84957f22611b417c882d63eea31d866b4ac26bad67a3df9e82970793e7954a3 SHA512 91ad3a7179f36f3d387b7da6337379a819751d862e03cae51528140c0b32836485c3c6e5fc87a48aebc7915a3754efe8e139632116514ad4ea687a0b4e11c422
+EBUILD gitlab-runner-1-r1.ebuild 151 BLAKE2B e85815d2950f2ab8502ce1177b7c754993e84ee5e6426448e7f88e0cb2c7d6b8bf4bd3d250391dfff925994d95557803f5ff30694a158cf1ab4ae3996bee366d SHA512 2eeadd86eba7e6f38fa1733234244c05edfe5d94307dd371fa7a81236befc17664e1e80cd6b9364c30fed36e4ea8eafdd3a7b565e4e4a2b29a63c5463887f31d
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/gkrellmd/Manifest
index b38f17af03ab..3570510dcac5 100644
--- a/acct-group/gkrellmd/Manifest
+++ b/acct-group/gkrellmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellmd-0-r1.ebuild 151 BLAKE2B c077d551b13cd099b591cf05f5cc879c89bfff6a883f87a85ee642ef5237e0fc23a6f3d7e208220a06f6a7efa9ad8be1dae1d29187f8020485b9084461686d63 SHA512 b2277a80783de6683384877bb0d434f3dc4607e342ddff1591ebb247aeff4dbc8dc70f8082b0378ad208161e85c4e84719bce7543a75860807dd089ec003ad79
+EBUILD gkrellmd-0-r2.ebuild 151 BLAKE2B 18990fb44711cc22f807d9fd249099fd55834fd3263f9d3b00917df3ec2269247c90649dc7a5a5853039fd72b4176b5a84ad0786125264f90c9c2a4c79570951 SHA512 1a9bd83109610e4718989d246da7029413e1e775f2e3d5629244f8496e8b3dab27c3be7d90c41ed905d190d18eaf1621e422a21fef425c1ac65735b4f1407cb1
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/glance/Manifest
index 93efcc7ef3f4..8de48e78e139 100644
--- a/acct-group/glance/Manifest
+++ b/acct-group/glance/Manifest
@@ -1,2 +1,2 @@
-EBUILD glance-0-r1.ebuild 146 BLAKE2B a1779346f4a4181545c00d247d8077d4a98ff3006dfb6b5c40a35365646330adb08ed0077ee75dfe82d9cb8c664ff9f1d6e28cc22fdeebf5f01389f67c66ad09 SHA512 fd6ad09c9a2daed299e2b66c9605eafe89776915c465f88d875b58b2cb2386dfeb9a639d16506a2200f201edcf8428a401791ffd302cf5f8059476a9d6c3bcc1
+EBUILD glance-0-r2.ebuild 151 BLAKE2B a0892bae46abd36046b5294a0686075561467751cf156c86d6bb9acc6bafea3bc347d603a2cd3926b247ebe3673063a4592386140a1167bf3c6e86d354a387f4 SHA512 a3c817b066bf2d52f30b78eda87f66dba1b6a0260e03d5a5c2fb51b216f867148770498595fe2a363c74f115f6b7c429d95f75a1b2defe4178132f3ba1fefee0
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/gluster/Manifest
index f4d7d6f7737a..745ae9fe3997 100644
--- a/acct-group/gluster/Manifest
+++ b/acct-group/gluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD gluster-0-r1.ebuild 151 BLAKE2B e2dc8c438b32db7062ed2e03a9edcf828735598bc508cd4ba5cdf3ce66e3c26edc3fb7dcff3a3e7e68669be5b562d3f07d780455cec6a99e7a6189d401ed2b1c SHA512 b8722aa1d4ecdf2f22af86e531ae4dc52d81d4006d48c0368041ee7ec6d50b4a655409f79e57f1e44289e6dbaeb6e906358e8c9d7319d6c2ebf02d1a0e37c6c9
+EBUILD gluster-0-r2.ebuild 151 BLAKE2B a4c1d6437ec09f791249ed6e3c18ca74271e9ecef537fe60555cdff0be8821934fc77d30a2d39dfe5bccf0ec40eb699b51f813d6fef4c63f6653b52416978f98 SHA512 7201da50da0f59185ecb098d73a044082cbf64a677c055718b2bd548a5f52fdbf7faa2c6a178870c6f30b82d19f1ee2d36f98327227f905f92ec3180722d1a76
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-group/gns3/Manifest
index c98a4b8fa519..f35451cad0a8 100644
--- a/acct-group/gns3/Manifest
+++ b/acct-group/gns3/Manifest
@@ -1,2 +1,2 @@
-EBUILD gns3-0.ebuild 151 BLAKE2B ffd5257783f806cf9e2d16747a2b1b047a8595d60b8d282cf103b5dfc8a1eb146a2d695a10c51b2ae3fb5c14e92d8e3aca9dc96376bbbc222c33767fce72bb40 SHA512 1672cbfcbce8ffba83522e46b3e394db08a35722df64b863f1bae6c71442ec72961f5b792dc813823ea36d410bf97ae8b868213015e591d63e9662e8b5ad1eff
+EBUILD gns3-0-r1.ebuild 151 BLAKE2B 8e8f6ab2493e9970dde7f747cf4eb9db456168bae30fa1ecf738ce8c4af16f48d3c8ffac4cdc814a6d4fb9efe482d945369445f4acfe0e4d528f2d53c8009a7d SHA512 018239cc28741d826c73dac5eee797d12007f8524adc8fcc9245a04b530420109af8fddd05d49969f179d0e77b966ca6751ebd3013eaf40340e7dd7ad13102c2
MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
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/Manifest b/acct-group/gnump3d/Manifest
index 83be05387e55..1a9a63948bd0 100644
--- a/acct-group/gnump3d/Manifest
+++ b/acct-group/gnump3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnump3d-0.ebuild 200 BLAKE2B 69294fb3cd21ebe3681e66507a3a4adfde3e4f8743e1ae83151bafadef7915849dfa6f04cb7c14f9b05c3471970144d474ffdcb2c8e69d55c0615f9cda3beab3 SHA512 c7bd38802918aa3d279ff83411fd1f542075c4251a19cc4155c96000197e0b9c7256d2eedef4603fbca42eeffa564825f9936e117fe79ac555f94182e9a282c4
+EBUILD gnump3d-0-r1.ebuild 200 BLAKE2B 2cb64b2d508a75e7ccd1ececa284c1cbc57bf84dd4aaa4d3b005f6c315c16aeb88d621920e159918822dd09ee787ef1af0e88cab7c8777aed089359ba8712c96 SHA512 5ea8aba067e02481c713654655363e53705c6074450dedc153a9f7b6ebb1307215ac76b3241c6ae795bfde5fa2abde296c24ef1130859de8378b12d4e6509eec
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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/Manifest b/acct-group/gnupg-pkcs11-scd-proxy/Manifest
index 431ce4428ab6..ea3e9168b54a 100644
--- a/acct-group/gnupg-pkcs11-scd-proxy/Manifest
+++ b/acct-group/gnupg-pkcs11-scd-proxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnupg-pkcs11-scd-proxy-0.ebuild 205 BLAKE2B a4a63bc5eb7b672291e106d04b76dbbea78ae2f58c73be41511daa77a52c02fe461386a3eaac867530b008e08eadb9cc634e93cfd469fabfd63349048bc60f3c SHA512 b61e1b963ecf3e19ab44c6c901f86732494e9fe8685c9a6e5b35cf210c6103992c42a7fd7789fe98d28593a14ba37b48ef374a4b80684305c87b5f0c0c95e493
+EBUILD gnupg-pkcs11-scd-proxy-0-r1.ebuild 205 BLAKE2B 7bd4a91317af5d14f71d8fed844a4bf083aeb4b2c01fe27704a2bf669ca454a44da0004f6ba72ab8d2ded66dde833e32569d500b397f2d66a3cb7825d630a87d SHA512 479b3940b94196e2823906ebf081560db14210e4935b5c5336b532f1bcdfce80654fd4f366cb7f89fef56cc64db55c7ffb73e12b4552e00d26a0c2ea4b4ba0eb
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/gnupg-pkcs11/Manifest
index 01ec27d19be4..4969436f4d36 100644
--- a/acct-group/gnupg-pkcs11/Manifest
+++ b/acct-group/gnupg-pkcs11/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnupg-pkcs11-0.ebuild 205 BLAKE2B 7536d5437079927309ec39b8f9a9caf9fb98ac58f299eee810749d04fe18a2afc9fdd5834d9cc77e6a7142ecf1da550af2e867245c09b85b0f55e36f01b91d51 SHA512 257d04418e694c91be82cc22ba5e8b3b92ac118472f33794bb9f30ae5bb9236649e471b84897f27cfe85a927668c077120bdc9f8abcb2618686f565655596206
+EBUILD gnupg-pkcs11-0-r1.ebuild 205 BLAKE2B 5249b662819dfd56dfdfb3a659ec15f9d877c3639d6af5657d8f8f9bf8b983356565f291f27124ce2904958ae3f31b0cb7551dc830299b49f2cb554d783b34a4 SHA512 e0832778732e13685169ab487185c62315dd5c9dd1a278c900e743827202c48dcc3ec3ac92c0ace67a9e278826e78d0858f0c08fee45e9e927ad287e403653e6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/goaccess/Manifest
index b5136676cd64..e1c6a0b6e7fd 100644
--- a/acct-group/goaccess/Manifest
+++ b/acct-group/goaccess/Manifest
@@ -1,2 +1,2 @@
-EBUILD goaccess-0.ebuild 151 BLAKE2B cdcb0d4b95257d24c6d84d6431558bb0a1ffd8cd25b719f8dd2fb0ede3ae475432c51c4e16099152b4a48fa17b20ee34703fc5d3159ce40b14a1790ceba319ac SHA512 c8bf81bece0ee8d9530474d10c3aa43e7021c3fb17206a23562e7fee4971bbc895b9e0e1cbf564f64ddaa11c97f12ce9a749ccdfcd4439e8c045a504f142d544
+EBUILD goaccess-0-r1.ebuild 151 BLAKE2B 9304bce38dd5d15e81b1e22f3759d556d9b8a3fe2ecd5ed5d23744517eef4405d10133f7e65a314234b67935146e06580546b5c28a1dff785988344acea34022 SHA512 bb533bedf5c04e18ad2478de5f03e195ccfd2a7151f0afc88c50f21e45ece2af465c72d0373032347ee5de68991930a55e72e358f6e1f67b0b89e640a4560eeb
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-group/gopher/Manifest
index 3c312067be6f..35284f21b310 100644
--- a/acct-group/gopher/Manifest
+++ b/acct-group/gopher/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopher-0.ebuild 151 BLAKE2B 04d38e74167ff89157d19efae84f68978c59ecf5b1ace6ecec8dd750d1cb44efff403c32207e3217cfcfd5ef484ce415f40805c197c8c317f88df292a01b93f3 SHA512 a78db9903043c2c098995d5fdf7500c3e98b99e731767fd6df4494092751d582d1603325bcbd781df74570a61f7ea9746335241c713ac34054f103179dcb2b86
+EBUILD gopher-0-r1.ebuild 151 BLAKE2B 24d7af5468dc36b12e477c2f6cebd4e9a71f34631f1fa43d0754e49aae612666c93fd9a78619b98f5ed455804ebf37489929051763f7530089f67ba0dfc597b4 SHA512 e4cb48f1db4eee21640162df11ae1449e9dc688e96ca6d1677aebc379cdc727f235502386538c0347ac52980d510f5ac84b5cf1f08d2eeeabbe0ca5805f20b37
MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
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/Manifest b/acct-group/gopherd/Manifest
index 0c44991b360f..084aed1de640 100644
--- a/acct-group/gopherd/Manifest
+++ b/acct-group/gopherd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopherd-0.ebuild 199 BLAKE2B 9b864f89ef0ebe533a1b724aa1e41d8d7de82fad19b863fa04a93a847811b25aa28448db23e7453ede2ff20a4da3436e7e7e206b947efd2cc3ba146b404cc607 SHA512 6b3fdda00cd10e61c58a678f0d04bdabc642b044181c7802053eee366913d1770fd650cb3d445ebd501ff6621fb39196e21ad1a65eee616267c278dc73378bee
+EBUILD gopherd-0-r1.ebuild 199 BLAKE2B 746b835bf8ff7e42edd24556ea24a584e11968ac967392b06755605688681ea7ca78b9e07cc450f1a25efd2b71ffe9a0eab1710039516ee6c743c772f3aaf63f SHA512 5cbda0b467c1d868ab14bb7f7eadbd0cbb860d491e955006ff229185ad07ef7b8c5750b720b920b63b62736943850dbba3092b74fd1d014a0e8c139aea4c6c59
MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
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/Manifest b/acct-group/gpib/Manifest
index 899f919afa3d..9742ed0a6173 100644
--- a/acct-group/gpib/Manifest
+++ b/acct-group/gpib/Manifest
@@ -1,2 +1,2 @@
-EBUILD gpib-0-r1.ebuild 151 BLAKE2B 3ba086b8f5a076239e98954833656c6f007fff27831ca498af8f6b3004d00d6d565308da083051f1f8e8d09c6e4c24e633ae5597600a2c8beff9930c87eec9d5 SHA512 2871faa878df474d5cacff944be405f3ff377d918509bdd680a89a46dcc15f22ca9f79b3a2a586346d10ee88fea6eef6ad2bb85585b66382dde54d9f762747ee
+EBUILD gpib-0-r2.ebuild 151 BLAKE2B 64ae6d4d9c709654491a0d2f7957b9a99f59d54d093f446f8dadd41ccd3cc49ed9c1ca5aa977dc05b38708606bd7aefa0d408a7d77ef15b96530441c2c2cfb91 SHA512 c75a37016c6377e73644c1f2695d6b613529a36478cd6c90752934d10a0c79bf0d4cb18d890bc1fe3b34f1b796c69d9f1b7e7a3f6c978ad20af859b32c35e93c
MISC metadata.xml 397 BLAKE2B cbd397a1319623dce61bd4db5cea611afd9f6b6f7420fe0cbbbd08f7074cf625dafb3532fc78d969c6a3d283f2c7e4a4f45df4a06440b7946b94917b137643c2 SHA512 2fa1711d8da604e0ab4b6d4f3d46411893abbdcf92889df0f1205dfadf85b3e92253d928b207df9d0918949d4bb4d85a73d4ef3026a48e8001e070a3ca1c96ba
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/Manifest b/acct-group/gpio/Manifest
index d040b61e4947..484c26c2abb7 100644
--- a/acct-group/gpio/Manifest
+++ b/acct-group/gpio/Manifest
@@ -1,2 +1,2 @@
-EBUILD gpio-0.ebuild 153 BLAKE2B 6d4fcc79713fd8889400b88045cf6c646f9ebbc080ae156c2b382f869d3a04275ee4e2b07f0239a8ee81a528f2833c2c9fc5660f9587d3bcbfe8a241ca1f556e SHA512 323d8a57fad6085806c83a0e1ba2a77047e0a842cdc50b80d8d13f663b9a47d813e92e8473489d52d4db9caaf91c543c0d8636e3a7db8b423be0edb53c23b89d
+EBUILD gpio-0-r1.ebuild 153 BLAKE2B c692fe8dc64ecce5d8b4e1fe75a4deb3efcbfc70ab340f89f07b48fd581318ef69f67e62b159df6030881c92d447416f4cca117006af8dfb9917d52afc3b9117 SHA512 0c1ca61365b5e6b9cac2c1abd6b83263d0ae3ccb78604287fca4c671226b08dd48168238b3de1ed9a39f633f8466f97614ddb38aad654ca7d76d6c2381bdef60
MISC metadata.xml 409 BLAKE2B 6a6baebac33f399b23cd4590a69ddb17a3057d8613b02f7091a6d9f61608bc13668bd5fb213381af1c33c98f7af44a44595c27a10b643968e4498263b7f71191 SHA512 8df55146c11610024c0f330375b071b8e548d7e7a4d6c46e363fd505a8feadc6921f6e0badb5a49a214e0be46f483b776ca71ba6c4e5f6c6b727818116a6c889
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/Manifest b/acct-group/grafana/Manifest
index 6cbffe3709e5..2839aa37c9de 100644
--- a/acct-group/grafana/Manifest
+++ b/acct-group/grafana/Manifest
@@ -1,2 +1,2 @@
-EBUILD grafana-0-r1.ebuild 183 BLAKE2B a2c45813c97aacb7a9e4c396b5833958ebf2b95460ea34740942158654743134a145cac9b7bc9b4efc12826907a6b1747f3b5169197cd8e428b61583bbc51129 SHA512 c9d6acf72dfd46fa4207522438536613134d716f05a725527d94c10eeaa4efadc54fdf70bcec054efe039ac21691eb7f9b3daf5952c2ec04db046a30d5762878
+EBUILD grafana-0-r2.ebuild 188 BLAKE2B 6986b43d59ea27db79df18c81c683e3c245c923a882bf65307a11d003576d504c883c15a02545943a6a0649204e79b875aa1cc91fc9a97b1f3564d5ae055a2cd SHA512 f19fb6bde5685cc85ea5153a79f55e067ec05747b07878ad6c73d98ed4c5179bc0a8d3a3afe30bdf926fab8c9365dec00ced1150f5fb1deddf8d6a768ecd46e5
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
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/Manifest b/acct-group/graylog/Manifest
index f00fd3d5d66f..d2dfe8c2a1ea 100644
--- a/acct-group/graylog/Manifest
+++ b/acct-group/graylog/Manifest
@@ -1,2 +1,2 @@
-EBUILD graylog-0-r1.ebuild 187 BLAKE2B 4c442d1faf427cf0542e78fb9e4b66fbcc568cdc9f72a8527e8c4349e068bb6e1dc1c52f87ad57d3dfb7e664502fb1a4aa4ed919550e3412e4f2e8783b3170bc SHA512 2b17687bbc27c0d8af95c25d0ff8f627a782476677b3e417412d8e7d8578c5522f86b59c8e5408aa854121edb87ea06ddd8442c5597456cf95b8890344c22bb9
+EBUILD graylog-0-r2.ebuild 187 BLAKE2B ce3c6429fed60d33629168719e739bea4aac0b00775fe62f50decbe6ccd3e416e245daed3c53163c2dd161f44b05d4922d7f9b3689cb113e6bb3d489c259a843 SHA512 3f57eb61dbc341b6e943868a4cad9a887954a1a2b5d293b6ddf8885d8b19d5bdfb88c15ed5c65cd5a8db88ddfb65e721bda0de27927998c59f2d573d4cc24854
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
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/Manifest b/acct-group/greetd/Manifest
index 07b866e6d043..fff3b0acd1e2 100644
--- a/acct-group/greetd/Manifest
+++ b/acct-group/greetd/Manifest
@@ -1,2 +1,2 @@
-EBUILD greetd-0-r1.ebuild 186 BLAKE2B 8632a04a685200261c382ea717807d2e238836ac3f2073eabb19c45e025435528ad15f966ca99a183f2246a3ec8fb59a865445cf301e85e29442cbe3ac62d04c SHA512 4b2a1180c2a63ee4b7264c106dd9a33b8bf4c3bffb7fda4806b307bdac6fd7ceea6e465a93d6e37a1b11ea0a148f694b083d0140a0fd8a7e4c9fc4bb1badd342
+EBUILD greetd-0-r2.ebuild 191 BLAKE2B f16b429983466b341f0d37597fda47ff293340013ae6a8659ca58f6eb815b34bcdd1a6c511c875f02afc076c3740fef951befb9849ea2953da6f9803081648ea SHA512 1f9b9e0b18b78493c0dfe6b9d0384f55d5e3a24c37b6e0723a0d00617d8dc0ce7937cae3acc2a21cdda3ce2778fc1d06373c5a70c6b058ae5f185093aea2d1df
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
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/Manifest b/acct-group/grok_exporter/Manifest
index d4b143a46b97..367937354be6 100644
--- a/acct-group/grok_exporter/Manifest
+++ b/acct-group/grok_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD grok_exporter-0.ebuild 206 BLAKE2B 40ff5681b7dad38023e20a9420df292b70f515de539d0ee64529564c0410f04047e5249de53d390d72f20f86d8b7fd6ce1d3c07899dadee54aa543f78b2aa58f SHA512 25829b366a145f275ebac9402cf77e2dd36b5a41cf119d87feffb0cca0551300b63fbbd668523d49d7f0f9ac6564037541dfb7e43f45fe55983b1cc8bb5f787f
+EBUILD grok_exporter-0-r1.ebuild 206 BLAKE2B d29ec5e255bed5b0340d6b04b958babb00af7c9c7a6f38d8dfd78b03ad64b255db90831d77fd3403da872fbd7e561811a6822a7206fd8439b52c5122e0558ba0 SHA512 0b88810cf38a67eed2c25204b98ad1aa44908f24fbba19c825aa0fb9db5c72f05ff4a34a15d60b1fc53a87780ecec67bf6d2f235effe70b084df7685d28f3d33
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/groonga/Manifest
index 5968f0aa4184..b91a61ad31ca 100644
--- a/acct-group/groonga/Manifest
+++ b/acct-group/groonga/Manifest
@@ -1,2 +1,2 @@
-EBUILD groonga-0.ebuild 195 BLAKE2B afb8feb4622f66c3708f054133906bdcf094d6bec3e88484cfd56ee0d02156696028ebbc1b00087753aac4ed2cd79f95f679675445ff810bd57c82ac0f41ffbb SHA512 5a404b5d9e6f2749ccf8f167c5dcec222f311fa85bb1b65c3ef34cc29a39d6eef799b1578622cc74cdec07d813124b12070930e3ba5dfb91f2ee3c73041a8f65
+EBUILD groonga-0-r1.ebuild 195 BLAKE2B 5575fe50b9746b5b253e2cf306cf0678250f44be03f790537f476b5cc53a37ec25c2876602cd7668bc8298992c2f7e76240254b0ccf28340bc3766486f2fa0ac SHA512 55e783b075285724e84bc003a9e74951e14573b8fc3785450458745718d92ed40a390dbdac46fe6b1341d93e66f9fd8bb22e23a9001815bec26da270e20c0c9a
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/gvm/Manifest
index f02da02acd99..70031d8a2329 100644
--- a/acct-group/gvm/Manifest
+++ b/acct-group/gvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gvm-0-r1.ebuild 214 BLAKE2B 9f2abda448e10f84fc8e8cbd9b2f6dbf142f54aae3d0d0eb72774076e97516d165fbe3d9bcf4b7e79360cb17b11bd1bd3822a1d80f34b03d73ff834fe2a948f1 SHA512 c2fe11b8cef3ca6ad8301b9b5366d33c1510988207f2747e6541c3dc54cc574b444ba0a445ae3433dfe8c4d7c314e9e6e508580f93ef04d29ce3f2cec5cc13fd
+EBUILD gvm-0-r2.ebuild 214 BLAKE2B e46dfa576dd99d3913fea79fb146aef4cb25a6714558b1d407e570603607b6f1257d2e436eea71f4a1c2b8396a472dce79af50630ac6f81a8720f75190061d14 SHA512 7a96a8a89de8213640897736c0edbf0e253c7d29cb9b8469275d00887d77639718957d9f49bbcfe3439abe29787fdadefe3359490b3063698d2dc982589e37d6
MISC metadata.xml 397 BLAKE2B b1e9b9b22e006817e3d1f223d7ed1196b620d29900dbf44478cb9f4f58f06c1b044ff8dde10e29b4e432b151955135a3e7c95914f477ff97f232939d1fa321e8 SHA512 88f46c3ecc6094a5283d4ed6e820372649bc5a8b37f2913d617e369d613719efb74eecdd2322cf386260b5b98004a28f2cc02c0ea63fc045fdafbf4671232b75
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/Manifest b/acct-group/h2o/Manifest
index d13fe6b25691..8a6a8766f504 100644
--- a/acct-group/h2o/Manifest
+++ b/acct-group/h2o/Manifest
@@ -1,2 +1,2 @@
-EBUILD h2o-0.ebuild 196 BLAKE2B 07de1acb5bf808d50b2900a0092ae06c179031e148e8f6158d37ebf1cf333c05024da51900a26fbc25f030f2555cb52b137ea58654b47d2c7b40b9da03085158 SHA512 30209ec782ccf4761a035cd792dd7dc744b18ed58e6cbcb6bf3dd38caca26a7b948445eb9698d3e2858e0751223d1d70c18db21ec9d8d68c401de22d4e091ff4
+EBUILD h2o-0-r1.ebuild 196 BLAKE2B 52d9e36e7f753b2b85d051878524c7f5c020e039715236621d744ae38dd4c72a83af6be43a92f4e4cd88f7c5c62ce8cef92440bf50418c46c886d2e1e6023ee3 SHA512 d2bbf1cc6fe9fdacbb0904bad12ae6a01cc1ccd910fdf8e2096e92936d8fecbd0bfdae27591389bc02b7cccb3ce1eabd8227df9e5a2dab01302c57d594129d8d
MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
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/Manifest b/acct-group/haclient/Manifest
index f5f6c8905843..429e380d0bce 100644
--- a/acct-group/haclient/Manifest
+++ b/acct-group/haclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD haclient-0.ebuild 205 BLAKE2B e1563547ecfe119304885954fd71188321221b86f76bf7e11466ff6f2891a292be9b03b20564502067e81e1f96b927302b791cc859a3e0d88b1d0e139b7173c3 SHA512 51cac51cb51b11918c2db3e8534480fa49b1b03a922adfe743506cd0dc8ee1ad0a3ee88844c24ab5aa10f5c3121d8e2dc0941a65c201abdf880bdddc9cb085a5
+EBUILD haclient-0-r1.ebuild 205 BLAKE2B 4dbebdd120e1c6f09f46293e95b28c644718778be07d7c269546e59e4c137ba454de91ec5fe25c1b923d6ea09327bd281776d41c49d8f1805e049613a68863de SHA512 90acaf01a823d6d543d7efc9bf43420d09150707b0c81623166aa454b6d1358ff39e694dc6c671ebe95a89e103a0da896b8a3bc370d4cb379323636a8e06da7e
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-group/haproxy/Manifest
index 9de6ff875960..a4b179a2f768 100644
--- a/acct-group/haproxy/Manifest
+++ b/acct-group/haproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD haproxy-0-r1.ebuild 151 BLAKE2B 5e7b1be61dff02914407570d260b4223bc2ae013da77c741d87a076e45369a263d62acf8451a4b65e24b9ffa39eb523fc923e44b8df24fe642e17ea5db11cd3e SHA512 a348cf3d04d39dc6d5f6cff8b9f1fa168891cb20c0c44cceb40469795ac728393f0a7184e6354ecfc39c164a9ac01ee3602b8ba29cc2a6c0d2a0ca3e1f17485d
+EBUILD haproxy-0-r2.ebuild 151 BLAKE2B 9794a66422ce14e7c18d5a29f91285e3e7e0afa306a6c4b59d1dc5855cf6d5ac4b24dc8b6a6b50eb3523c16149da331bedb1b8a01e7b488c6c262b8e8918b73b SHA512 e5e457bd1862e647461f1d416dbb655d3bb18c0e45d066052b82ce9688e79acb2d46f84819a3fdaae0ab66a51b09b3b85a48ba2725952cd49b4504167e3f7663
MISC metadata.xml 250 BLAKE2B 127d3b63d96953a7263c1ecb0f0cd905cbba9006349ae20351476072eb08aa6e5d0da402e3a90fea218e2e05971096bbfd13d2bb6f57221d8772885075dc6523 SHA512 a8423fb0d09057a311f01b4fe8bc03d0535b701a96846a7617e9ea61d7aa3ccd7e8de31451488a7db435e8f8178a5dd70e5511080eccee8880d6959d9de4c0d5
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/Manifest b/acct-group/havp/Manifest
index c0efc2a41ec7..ea6140dc38f6 100644
--- a/acct-group/havp/Manifest
+++ b/acct-group/havp/Manifest
@@ -1,2 +1,2 @@
-EBUILD havp-0-r1.ebuild 193 BLAKE2B 3b685727ba904f50ba7c6a05854ba0b92cd5fa1940afba64801290f6438586f778b8145f572475ef7f4d685e5b9dad16f263b2da7bac12e23f3ee32da0ed143a SHA512 7fc232e6cf5b8b80fec6a6a33a53c17b7e710fc5aaae0bcec2acde2c47bb350d23893e91bd20cf3f955c326a0b92b28fc76af6675debdaf3dd60a309e35c03df
+EBUILD havp-0-r2.ebuild 193 BLAKE2B 3b685727ba904f50ba7c6a05854ba0b92cd5fa1940afba64801290f6438586f778b8145f572475ef7f4d685e5b9dad16f263b2da7bac12e23f3ee32da0ed143a SHA512 7fc232e6cf5b8b80fec6a6a33a53c17b7e710fc5aaae0bcec2acde2c47bb350d23893e91bd20cf3f955c326a0b92b28fc76af6675debdaf3dd60a309e35c03df
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-group/havp/havp-0-r1.ebuild b/acct-group/havp/havp-0-r2.ebuild
index 13e3b77d0e72..13e3b77d0e72 100644
--- a/acct-group/havp/havp-0-r1.ebuild
+++ b/acct-group/havp/havp-0-r2.ebuild
diff --git a/acct-group/headscale/Manifest b/acct-group/headscale/Manifest
index 1b0b3a4e1285..6c95c60ba850 100644
--- a/acct-group/headscale/Manifest
+++ b/acct-group/headscale/Manifest
@@ -1,2 +1,2 @@
-EBUILD headscale-0.ebuild 146 BLAKE2B 64f5306044a7e4ebaeb3776709eae1879df563716a856a80cc5e397be36d12275f9d8895e6aba420603e10106489f2c92f85e58c7ad87eaa773696bc1025f402 SHA512 767da57795495ee3b61188cd2fa5f695cc8808b747ee1dfba218aa8644bdd7a34f6124545b234b8ae39870def6b77bcd43b099ccfe1f83a9c7c801d5ada335be
+EBUILD headscale-0-r1.ebuild 151 BLAKE2B 10d577656a69f162ce89bde7bd4033717dc3686babab0ee5811b05b50e66f3238c710eb57d6dc0c2340412469ce9dab5836145e4492ea7ecb1089123873d437d SHA512 b1238db195546098ab96048ed77ffc95565d92fd94042f963d2eaed2be3b8338d94d8f2f517549a640817862b75f35ec5c6c2181259ffe6cd157d575dff7d33a
MISC metadata.xml 500 BLAKE2B 7dc95b76985ac9cb40ac5f12de2739f6e8f9f4f4a68a0bb397968c7419900c52c6233df1ce7eefa369de0a66cfa07ce8ec71624a6111d72e8c91553012169228 SHA512 d5b77a9da9eba9bdf9ba2ce675f92ca058f145f5bebc3546ad7acbff8140c16915afdf153bba8aacd2ce5130d7427cdaedef64efcb368546da91cbac8b5495e1
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/Manifest b/acct-group/heat/Manifest
index e766dea02714..b1136d3540c5 100644
--- a/acct-group/heat/Manifest
+++ b/acct-group/heat/Manifest
@@ -1,2 +1,2 @@
-EBUILD heat-0-r1.ebuild 146 BLAKE2B 5f50eededf66c26070b7d5e6935b97a9c95162fc510e5209e65664156b157bc0f69c05050f33b59e42292f9e6d162d48a42438f01a185c14e4d2f0b0aa175f3a SHA512 81bbcb49da92b6060342903fde253874c78721760851b3b3508271f68d617e4807d619377f061170bb19576741a1e71aa3371d025cb4e11dc6d9a32888f8d9bf
+EBUILD heat-0-r2.ebuild 151 BLAKE2B dd721b2561683e691da7d2a8c5a0174f4e7a6222a27bf74f9fcd237fb773074c4c2057f6e3d10b5fc85dcc562046693b2aaa6f40cca912d89e6fe7ef6d61e8a3 SHA512 49fc4c2f78c235284e0ede7861aaac5aba415480680c52daffe8e19a1c0987b279f53d9ce5eaf33a51ffce1e7126be5e998b529ba80174d1ad32b8a64926f792
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/hsqldb/Manifest
index 0ad5c2581322..63848e211d70 100644
--- a/acct-group/hsqldb/Manifest
+++ b/acct-group/hsqldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD hsqldb-0.ebuild 177 BLAKE2B c6348becd44adf7b6a33086d3de6763878a3c1414bb755b5eee702cd1f08dfc5ebd67b055aeb8dd5b7b740603f691f53c358b573dd9f23c623ffbe045c9d4ba2 SHA512 5edb1b31539aa5ce24274c79aae09f5dd00a47f4a91d7efd941d8657c7065986c69b8924851fe5985a41c5562e47bed4a4f467ba6aa21794982d4471188b6b8e
+EBUILD hsqldb-0-r1.ebuild 182 BLAKE2B 58a6da712b1f9d3c47a6892bd88ccd6c95d922abc1d12b959bf7b223e0a353d97e258167bb27339ec4ebacb241500a547d5088eb326181411a47a9a7b6d76a30 SHA512 68eb1aa8c04abb51544e6f11e70ba24ca32120a674f07dc7572c7317cd4f947e25074e81565f9336025675f16f82b9e82f6895de3eba881aaebc2635b5071ecc
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
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/Manifest b/acct-group/http/Manifest
index 16d3a3d85ef9..4b76d2b5e327 100644
--- a/acct-group/http/Manifest
+++ b/acct-group/http/Manifest
@@ -1,2 +1,2 @@
-EBUILD http-0.ebuild 146 BLAKE2B 73a0adb4516e0ea612354e4dbcda33ffc00be4192c340c046c6062b37cee527d788c63476a59e54cd0ced3130f6692125664738596f0a81854d59295109d06d5 SHA512 4d806cacd1807b50d26fa5db8ebeafd11e90cefb13b4588c1b9f6ff34bb74082395e663917e8e79a07bddb8880d2dead77fb9481f1cf0c67deed470c15066ad4
+EBUILD http-0-r1.ebuild 151 BLAKE2B 85af1588eda33c31dac522cf124591f64cb4d93e899d647fd9016696fc58cbd8a904d1a6dbfcb019252450065b861780ed289d47034e627d79212940d49aef5a SHA512 1420fe82d6b674f164f28913361648a91af0295806d2011cb85e4b9f9e5b91f6bd14b5d80d59ad1189c21825150588e5ad179754c88a03bfb47d614fbf25252b
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-group/i2c/Manifest
index e048601ecf3a..6cbc0d228401 100644
--- a/acct-group/i2c/Manifest
+++ b/acct-group/i2c/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2c-0.ebuild 153 BLAKE2B e564e71854732378a5585b73e3682557be654f756a9344f44aeacc4c438dbddd8027027453e7d2ec0c41e2b0eb708ceb978f0a97dc572c23a3a5beb38840b234 SHA512 7c10267bb3b0656595965222754f560a383020a15cc4558213b3773af6a72bf63505eaa8f0dd184cf0e586f9e6af7c08cdd28eb04aa578449932058aa27cedb4
+EBUILD i2c-0-r1.ebuild 153 BLAKE2B b3fcf77585f369e26364a35e08344eee94bfb64fed2cf8df6e0471329e96bc145605c480968ff6a321c750741ecbe90175d24db2558b8356547b21d3e478af0c SHA512 e7280efe1fd378254181c3aba28337e7eec5fa26bf0f92fe8d3fda2cbee18bc45b727fa566f51b3df582aa0dd88da3d4022979ed5abdd5d268b9e83f79ab3c13
MISC metadata.xml 409 BLAKE2B 6a6baebac33f399b23cd4590a69ddb17a3057d8613b02f7091a6d9f61608bc13668bd5fb213381af1c33c98f7af44a44595c27a10b643968e4498263b7f71191 SHA512 8df55146c11610024c0f330375b071b8e548d7e7a4d6c46e363fd505a8feadc6921f6e0badb5a49a214e0be46f483b776ca71ba6c4e5f6c6b727818116a6c889
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/Manifest b/acct-group/i2p/Manifest
index 655c7f975091..1bbc7f34e7bc 100644
--- a/acct-group/i2p/Manifest
+++ b/acct-group/i2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2p-0-r1.ebuild 199 BLAKE2B cf128b05c061e4bf01767db2181bc5f59b77cc9fd135f97a9e9bbf4edc99e07f5114f851615f222b90ed404d53ca3a31c70853094e824b091bb01ab309c78228 SHA512 482824f51a6d4d0c74e18aaebab948221706389272487655dba23d9d83491b9a07aac8611157a170e2514aecaf496b95f854fc7077d31ac7dc4aef92a091ce3a
+EBUILD i2p-0-r2.ebuild 199 BLAKE2B ffa2b31b5eb0e4acffdbc9a5fb5a4d4694b61cbddadc482c22079286d3263f9d5512a853d2f6f7d7eeb557c322aeda3a21a625a20459d0c8c6f1fd6c5f9483ad SHA512 f457a29825fbf665de9823adfe772d1df71a5d11118ba2be7add78f6406a13b8522d1de1b25abba58b22d5fa7f14ac794c668181daff6f966ca477f94c7ecea3
MISC metadata.xml 483 BLAKE2B 6e2651a8813c1dd7ac7feef36431a6e08809d57b66381ded08d142088ee4f71d3fd2fed3e441cca0d87b1c22075acac5576528b84997743ad2b2b05144d66b98 SHA512 354e27f466ce32837109c395204282426ff5ca47f7f5e6c50679add744daf3b6507ed9f6e1e954db4ddebb98b9c9e556d8a0de0f58b9a0882905f83b46f69aef
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/Manifest b/acct-group/i2pd/Manifest
index 36b6d618cc17..c96da7cef9a7 100644
--- a/acct-group/i2pd/Manifest
+++ b/acct-group/i2pd/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2pd-0-r1.ebuild 211 BLAKE2B 217d3a4681c74dca3585d41743720c4d57d9e33a6a35d47c6539d443bcf67a1eb910470043a7b1e8bffb5fbe286ea3a00997e472d3840b4f523452d78daa1036 SHA512 cbf2900498de05306f1cc575f2071a480fceff85291e0275571ee6c3d1a0ad9bc64d1c9b8013415f3d41c20cabad32d872b0ba5823d153d06c2d6209abfde251
+EBUILD i2pd-0-r2.ebuild 211 BLAKE2B 90fc1859b684c66c390689d0c20d5f3cedce243c5c08d6bea0f66afa2796388f0d47dfc25ade30644e44dfb89ea5bbb816534ae22d333d49d1e4b5a5adaeec5e SHA512 78daf64db88c26d3e49d48a638f59085b62a7e984354994396970b5aec45499dca94eb29cf17275769dad7cc9f37c72b74ab8ada37b63caab7fa6b4e5544d93e
MISC metadata.xml 399 BLAKE2B 85166ccc3c029d08bd993b4040ba89b287a14fe22bac1a96834686f074766a5545c64e6062766d0fe4162cf21e41772b8fedfac25c0d3f6f23bc38fc6feb1b6b SHA512 5add7dc4ce04ba1d51cc81d277ed0b7d50e16b678847aa00061fb7df1588f7080a911f54904ef36a3577dc199051189400cbcbb76b2c632cbbad72c2b8876da7
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/Manifest b/acct-group/icecast/Manifest
index 0e1b5cf98201..a393a819edf6 100644
--- a/acct-group/icecast/Manifest
+++ b/acct-group/icecast/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecast-0.ebuild 197 BLAKE2B 11758515e3f6984495a294d289eb57b694ea4f709fe106338f5e0aeef0be096a37a0b6c34ac934b5bb52acc9f5e75d14ca54427b98640add086e60ad71cbc3c0 SHA512 58d3e9f5fbef07d32cf3eaf7f58df90eb01f35fe9eeac5c56a23a2b8d48ba817f50404a31fbae5883de78a4a115d80f1b791bf979c312efbfb031bb8a2da28b5
+EBUILD icecast-0-r1.ebuild 197 BLAKE2B bdd254a0b3abc1cdeb059c4258f39936c1fcdf603a6db25e5ebe722ef5578d18a0b2373ab8f2220e7085e5aad7319df643af388a9a6cb69df8ea1fc370585bcd SHA512 cca7413f44b4edb3c21e35802b70764ce9f041a8b9da0c1f41f55c20ae5d0304cdc637d6f69fbae12cf0db23774421d41236d2336e1e715d729c7fef34f0db8f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/icecream/Manifest
index 803edb34b61a..874e6f3c7872 100644
--- a/acct-group/icecream/Manifest
+++ b/acct-group/icecream/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecream-0.ebuild 199 BLAKE2B 5ad5878f3278c629f1053228d22ebff5dcc0ccbcafda8ff64bbbf18886529cb04be68924f74346339bc37cdc016de63fe52b685db6ef840903c59aab3dd178c1 SHA512 b54cfbfb17b47a939baa9395e88bf403cacd0bc66b2482f35a98758301888bc1b4e1a6f56dff6fd8669f2a13083588a1fe43ad38fd377b68f62ab485725dc31f
+EBUILD icecream-0-r1.ebuild 199 BLAKE2B f51851dfad002928e2ca4f47b24faac8ebf637644ae5039695ad2cc37a0b2cf0e90879ecb4d01b1472d752ebd611a167ea5cd1c0d5046e6cae6fccb4c34c8a1d SHA512 f2b5afe7b070f8308578d66dcbaf40b2625c7fa784d3b5caf129e447e926bc64780c38db2fa8070a42608e930798acfdc0384e49d725867b4ba7a3c539db1b3e
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-group/ices/Manifest
index cddbbdbf8b6c..d4897443558b 100644
--- a/acct-group/ices/Manifest
+++ b/acct-group/ices/Manifest
@@ -1,2 +1,2 @@
-EBUILD ices-0.ebuild 194 BLAKE2B b09ee9771e5a131e7d39ae8d2a44e23a0983e30e9556d79dd0b629ff998a969fa5bfae97e917c8c157e186a07aa82c2fb932e9b3b462baf9fe1de2a25ef3e67f SHA512 7bcd391b1f6c88a60f00d7b49fe424b7de18ad1d64260d73380e1d2bfd82e6167f3bea23f6eeb70cf2c76a9855fb34abc75542e0a37ca0b7905279003e9e5a08
+EBUILD ices-0-r1.ebuild 194 BLAKE2B 583048b2cde31b10e63986f787155611e2bfa27b51fd592841b50abe6d71e629a1368d583bfa8f09f83069fa65ca6bd9edaed3739cf996deb68426c1ab769cd9 SHA512 f4ffb69935046d2718c39e2baa3eb9610d02106d7bc21b376c92fe7da8f7be19e5e7ab3f39faa8c157b2df417fae9972b4f1af2ea0bac4e62ee4be5d5a5744de
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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/Manifest b/acct-group/icinga/Manifest
index e27f73177e41..7ffbf886e700 100644
--- a/acct-group/icinga/Manifest
+++ b/acct-group/icinga/Manifest
@@ -1,2 +1,2 @@
-EBUILD icinga-0-r1.ebuild 146 BLAKE2B 888c34aadc2858057de6eb62dcac35f5c6a9f669315b91fbd4dc323ecb475079eb58afae4c7b57606d3b911a0f79a9f3229fb17ace6c4d63659beaeb77cb578b SHA512 ea04136042b770ea8f6dc24ab074593029e663821b1d80095cc87b2076af4ef1ceec19f81931e41d3d9d5533225f4d09a56c690250edf079e6290c5220fd1221
+EBUILD icinga-0-r2.ebuild 151 BLAKE2B 69b64c1cea9e3debf5702c90b45135e323d332a4fb68b8070681f75d2cb93932b63d37716b144e4bc46ae2d95b22ca1e97abdf640adaf94c7b2c6d52e0bbfa31 SHA512 60518ea2d7478a3443216bb98549b76d4aad7fd0bad393c02fdbd1d7f9f490fd57e7daf4d177f7e826b0a42dda698b0403450851be7ce0791181629f959ff8ea
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/icingacmd/Manifest
index 1ab1984243f6..f799f8e59d92 100644
--- a/acct-group/icingacmd/Manifest
+++ b/acct-group/icingacmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD icingacmd-0-r1.ebuild 146 BLAKE2B df0c590925c461687640db71444552d7c5bd70828ed184414569adfcaf30c67595c093ca6d58120bca4194555abe2e3a8b9466a58ce4350f3b667d699e3c120e SHA512 18e90c85500d3cc28f4b4f2262f859910db355eb096539b0b974dcdad1f5fd62a2b2c405428847e1f203ae6ae0664dac012e1c8719d52f4fe883d6c29e62173b
+EBUILD icingacmd-0-r2.ebuild 151 BLAKE2B 334dec4119c14bcdd8511b4b9102ac16074434fa67dc49806ea6970f95b13bac7a863901cca42037931c0c4eba431ae558f9a2465da3877bc27686f9e14e5128 SHA512 0f687530126db975a700e27ee1fe9dd32b2946ac15305b577a9ba4d6ea3b0ef2e8799e93076fda4d30a2d6ef73d8e7cfb65bdcc551006f4606f34e7ae8dddc02
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/icingaweb2/Manifest
index 2d872afc15be..14b09fb1f4e9 100644
--- a/acct-group/icingaweb2/Manifest
+++ b/acct-group/icingaweb2/Manifest
@@ -1,2 +1,2 @@
-EBUILD icingaweb2-0-r1.ebuild 146 BLAKE2B 617c773b883333c3d207d7168acfdbdf17e78e5384314568329d0cda2e00d515cba8cc79a72c8450d7c08543b3e512dc6574eb093f3b38981a1daaa10720a7f5 SHA512 1780439859c93a9133830bec75ece827ae5773c794035f069e78d091300763e845a26e31ba5e3411d50c10c36926e072438e6e0cb2218d6b0c6aaa9f28ae7a55
+EBUILD icingaweb2-0-r2.ebuild 151 BLAKE2B 5781ffd9db20753025129dfb979bfbea5b310dbd255792353d4e38554d67879a21edb1aff7806b5b249a8cea816a4f1c349d423ed83e7965a23958c2d5b9abda SHA512 791b1d20fb313d7013d1ea920663d957a776886f6e401fd50b44b1143c64cb38caadada17ea16992c8463441d384ca7139f696751b71b5c8e9d6e5debb5901e1
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/inadyn/Manifest
index e259a28be6c1..5872d86d5273 100644
--- a/acct-group/inadyn/Manifest
+++ b/acct-group/inadyn/Manifest
@@ -1,2 +1,2 @@
-EBUILD inadyn-0.ebuild 153 BLAKE2B 488c9fcb48c7930452c13a9e7f9d4000772d2d220f6117f08b0b5ea786260648956c4f1c8de1ca651a05545398876660d6a734a403ce830c3b31ff2d4b1e4f10 SHA512 75112cd0cfe78fd01a04f738562b1a4809289d5aac4eb849cac2e73c239e1eabddf29bd6e5a0e5e64d1d2d0131fdfd4e7a1527f89f238a14a888ff0947a78e57
+EBUILD inadyn-0-r1.ebuild 153 BLAKE2B 488c9fcb48c7930452c13a9e7f9d4000772d2d220f6117f08b0b5ea786260648956c4f1c8de1ca651a05545398876660d6a734a403ce830c3b31ff2d4b1e4f10 SHA512 75112cd0cfe78fd01a04f738562b1a4809289d5aac4eb849cac2e73c239e1eabddf29bd6e5a0e5e64d1d2d0131fdfd4e7a1527f89f238a14a888ff0947a78e57
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-group/inadyn/inadyn-0.ebuild b/acct-group/inadyn/inadyn-0-r1.ebuild
index 1b0c291e1034..1b0c291e1034 100644
--- a/acct-group/inadyn/inadyn-0.ebuild
+++ b/acct-group/inadyn/inadyn-0-r1.ebuild
diff --git a/acct-group/influxdb/Manifest b/acct-group/influxdb/Manifest
index af0b08967666..f04d71a143ec 100644
--- a/acct-group/influxdb/Manifest
+++ b/acct-group/influxdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD influxdb-0-r1.ebuild 146 BLAKE2B 45b65764c72c47fa403ce75a8759d978049b1721e9cc70ded079a14be4b59a77e1716aa90564428a2713db59f1f166d8de7ea9fd0af568c45031925c75ec71c5 SHA512 1edf94c66f684feec72b2e1b2a80c4f4544cfe5db343d5f743d373581f5d6ad743a42785c7cddc4e68a4002700b884a7dede8f7bac9fc0709cdb707997671492
+EBUILD influxdb-0-r2.ebuild 151 BLAKE2B 06ae5cff4ed259666f9632c70490a381e2c7388aff99e89d6361db818997225be8ace3cf1388b953d75722ae8653cdb924cf26f8778abd9b438ac2e1bba8b65b SHA512 4b9ae23881c97b040fe26c26dc69c7c8718acab62d2c2484b214563d69858af54d306d47cf14da56f3c2ae67852c1dc999aa0042c715fe24646c21a26ba9b0e8
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/input/Manifest
index c39a55369569..b7ae5b8d09f6 100644
--- a/acct-group/input/Manifest
+++ b/acct-group/input/Manifest
@@ -1,2 +1,2 @@
-EBUILD input-0-r1.ebuild 150 BLAKE2B ffb48e248cd1fc40822e342f578432c79a9d2a71ba354e9bc5476dbb12c9d050f07fe65984d8c0e424585e691237e8d1e89dfb5811819c27372f0e13337e5728 SHA512 d32553066de6e7fdddc27586ce30bb20eed72689df529ee92a458fb5aebd8d774eb5e12f8856858fb4284334fbc099e192c3d1373f18ea1dc4228593380574ec
+EBUILD input-0-r2.ebuild 150 BLAKE2B 4e9ec6948ef3a52f850bd7906dcd3d859cc5aeea5422902d19abeedf738faf7ed30079df3b2502a4f73c97950b0968d0bf32e8348eed5b1db91aeac8bb3af037 SHA512 7f76231675f4c3148d2b9b07d80018c9183ad89c74b700452ded0a6e340792637e8b9a1a223b8be48feb593e9fffdc6e4b62eb7048d047de404cdf7b3504964c
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/inspircd/Manifest
index 786fca6b33c1..6922f88d1204 100644
--- a/acct-group/inspircd/Manifest
+++ b/acct-group/inspircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD inspircd-0-r1.ebuild 169 BLAKE2B 0c0ca44d8d2a3ee7b99bab5692ba52f08dbb8d0e5e929789a6ef7979d475a1b9f6ada85b59a2c1cba7f12579eb4d97992ca86ac592ca30d85c980ea3df51da84 SHA512 8e8f75169fcfd3b7bbdd19afee000c1443a1604c12ae8100d131117fd7bddc544443508bdec30792f38f0d2a4b307e7a412022d27c8b2dd1b44eb6d534cd95d4
+EBUILD inspircd-0-r2.ebuild 169 BLAKE2B 2ca06e9f7fc4f023b38596de2095ddda45457664a3da620a3bfc4934f3fc1bc37f3e42cf43614ae3e66b3a80aca681050c788e431b161049e211d31f35f1417b SHA512 89148001a10496e93438eaff2b97730dc8add73b948c53e00a838446a46fb126fb5a82315f6e8df653479a8cb9998a4c568f8d600c4a16ff45275543d69724e6
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
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/Manifest b/acct-group/ipfs/Manifest
index f37a5d58d523..3dad770c5c31 100644
--- a/acct-group/ipfs/Manifest
+++ b/acct-group/ipfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipfs-0-r1.ebuild 218 BLAKE2B 48e70745fca2586df57d3f9cc36a5139215b131faf850192c36eb9ec47edc5be7262b5db6619af4881da90d2a758d7cc7a5d8451083285ad0c51dd383f8b9012 SHA512 a3cb974b7226597189bfcf690b83161d0c1934ba633d63b89300c58bf9b653ff74c6cea24b5b6d20448878cb8da8420ba111e6d89d5ca318e87f3a0e9f423569
+EBUILD ipfs-0-r2.ebuild 218 BLAKE2B c0365355132bb0691e2ca2898803e4e0db43a16f04ee569a90c461a1d9ab67212b21b47fece0a757e61cfaea91968f625d87191b23de9ba2fe641150edc354af SHA512 ddb5ff7a7184a53b6535589d0879f832cf28657f7a213da05373f09ce32ddc298b42bfca9990aa85842db9d004d5ea61d0f185f4dacba58d986f63c9e82823c2
MISC metadata.xml 398 BLAKE2B 3f15e3a802595ea6a248b0d0881829913fa7165a519c1da5424595c0ca2bd95c0af09240d03ed36ae027d8cb0581a88ced73fee78ca67363e4b4252831ad1c0e SHA512 b1de318404cbf8feba1e8c19879104282519f517703039b9805616901c39f59c1e8d1db67c32e162f5c8d598d793c7e7ca9c9d34e876670717e935b50add05f9
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/Manifest b/acct-group/ipsec/Manifest
index 9e88e06a3f72..65147b758827 100644
--- a/acct-group/ipsec/Manifest
+++ b/acct-group/ipsec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsec-0.ebuild 194 BLAKE2B e59a7eb31d2c8a7f0c8ae9c6a7642e08be108dabf8c7a3476ebdc3f9fb64aebfc6c28c8aed345175214b93b51d1b3aeeab269bdb74202e3eff2e8ec94b898721 SHA512 e9e19747ca125b5d04b2aa4eead078b258a964fb12761ed7daca7603c151b49751001611ba1b93f96b50a832e28caf15b06d691db959a545b43137baf0a7bc68
+EBUILD ipsec-0-r1.ebuild 199 BLAKE2B 8997c3f4ca2e9fbaf67a66ecff5fa66082c78b55d5f29e864b4264c86c28b77017725d19b2bb54001ff7b5efbcb0efbb63fb4d0f3be5be35a74bda53bfbad903 SHA512 9df048a9d596166acb273a456583ba11db3a68c12e4ef259c345a9da13f32fb917ba1846edf9314be8d895c3e27aba7bbb8661c08f544dca6fcb9de0d0ee8c53
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
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/Manifest b/acct-group/ipsentinel/Manifest
index f1f1d7f9b8e7..0d36f0a10714 100644
--- a/acct-group/ipsentinel/Manifest
+++ b/acct-group/ipsentinel/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsentinel-0.ebuild 201 BLAKE2B c895adeeacc338175b16d481b136dc1e061fa969fe0031e96e8e593201177895ba4462b7a6da8ae3e234360070cf6940e502ab3e4cc865d1e54b681c8839ff66 SHA512 cc261891d44dfa0cb1fbf40e6722f1ef15495056c149dab9e1dab959b8005dfa08104e0c198be0bbeec691ce8db4178d49284a2153bc3f6541dad56b029c308e
+EBUILD ipsentinel-0-r1.ebuild 201 BLAKE2B 9dc43f39d9aedadbb07c8adf6227c383966719749e097672477f1ed0c8eb1ea3f542284965a86c98a4ee99deecde1cc71f8e696338d0b2d3881aee8946dcaa34 SHA512 5af293dc4101bfbc3750826af5474b19fb219373e4e773fb63a4b1d58df824a5b36497063dd17e264becfded72e95dbd205cf203c4797a1db477e1cef2e90d98
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-group/iroffer/Manifest
index 00c3906c06d5..f204a1bcee87 100644
--- a/acct-group/iroffer/Manifest
+++ b/acct-group/iroffer/Manifest
@@ -1,2 +1,2 @@
-EBUILD iroffer-0.ebuild 146 BLAKE2B 95628d12f14db67ebe2dd4cbd882f38fa7d0112518b03b86b380ade1f6e7aa37d066790cd7b6952da2e5e31d9fb43b7462320dc3bbffb2cd6b48554d5bd49b51 SHA512 b0f34f3ab3be14e0eafd1a363396628b2148c468702f6400c0cfbcd06b9ce0eaee62edb4a0a25ff376cc7c8ea765269b55e0af1c10c49cc686dfd4026ba80f19
+EBUILD iroffer-0-r1.ebuild 151 BLAKE2B b69bd43b9dee3ccd6a9d2072890778874ed1f7de6e530607cc4e9f22bf29cad8a9e20dbb97e5bb7126ad4d009f5e994b980a7b9fdc019d39cf20991463b4fc96 SHA512 2bdf346c0aa0e90df92eb9d7b3f70e5f2fd2d42c1873b2137a050d8a143de09b6ab2ef83b40092dc384627ed64f2c72c31d13494f1a09e9b6f0f0aa231289e37
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/jellyfin/Manifest
index 0e456b2ab6fa..8f41a7ea07c9 100644
--- a/acct-group/jellyfin/Manifest
+++ b/acct-group/jellyfin/Manifest
@@ -1,2 +1,2 @@
-EBUILD jellyfin-0.ebuild 151 BLAKE2B 32d3af1e0f16244a52146064c5dbe1fe49e9a2fd3b2bffb75ac9bc3b596e6a5030644d61de97cbe274294709553552fbaa7a0345dc07825b798d8c9adefd1dd7 SHA512 e0eec07960cb03278d479057b0c617f76f9c17476eb170ee1dd3a6799b593574fbbc4fbb08e7287bd121c0ef3a96bab436004ce31257ca9c5576899cc7405381
+EBUILD jellyfin-0-r1.ebuild 151 BLAKE2B ff158d56da7e420a8f9c3523b37177aef7ecd93225fac66a93776279c932a2ce2eb0a00be6722b49417a5974b2e5e6a3da787653bf39def894f39efdd54b01a4 SHA512 d767df063e066144f5f6d9ec9bc7dbbcef5e19b246c7eb32e67667bb1b127f79ff52ef08a368af49248beed2ef90173dc8dc72cbf21676def96f8dded8ce2f17
MISC metadata.xml 649 BLAKE2B 29ce34c89c1300d32c3ff30990ec92e49cfab21d74340d1cd6893650ffda87920348ac5feda5ee68feff3e8adbd8cd6e58548d73879025a206dc82756a99c383 SHA512 d8a36b27ee99f29cf9dfea5cc4a9735732bb11cc5931adb4bfe1d1942378d2477f63417b6a2a694e9691c217d20c5ce84bc8d46af5155c46b99b850c0f561315
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/Manifest b/acct-group/jenkins/Manifest
index 19802e2149d7..3c31bd7f9f6b 100644
--- a/acct-group/jenkins/Manifest
+++ b/acct-group/jenkins/Manifest
@@ -1,2 +1,2 @@
-EBUILD jenkins-0.ebuild 183 BLAKE2B b1c241c9651d8c8e3d3500c8f50ac6ff1d2542fc8ee7019a0b80eafc94a1d8a1aea3ef20cf42c8677ede80d5f8e11fef8617d2702c841c0c546619449a5b73e9 SHA512 02acd3ab5aff31a13c514f5a209f42a1e06d8a18cd1256f604d53ea51a91121bfc786a9763a6a5342197335ae7673a206aabdda2cd932cfb558299b46e2d3642
+EBUILD jenkins-0-r1.ebuild 188 BLAKE2B 0ad93ffa4901e5d818c2db0aaea0d2fc68d5ce904b32ae3e6d4fd3e51d428fc8a9a2ec4c11ed52f0d8024195f3c2eecb20a76e97115fa180a44afbde3c23b0a6 SHA512 30c54ef2f55d29590bcfa71de80e0078c8a35e7aab7f9c492e20bfe981e1c724a3650d5ddbe8a1cdbf59338d1a72b8a9f8f33838ce9f141a8a5d24378cd7899a
MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
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/Manifest b/acct-group/kafka/Manifest
index 449fafdfc295..fab6938da32a 100644
--- a/acct-group/kafka/Manifest
+++ b/acct-group/kafka/Manifest
@@ -1,2 +1,2 @@
-EBUILD kafka-0-r1.ebuild 146 BLAKE2B 36588e4aef0eeaabd8fef7a76a123db8483296fa0e71d9a85751bed72c3ca595da114078037faabd2ad834c3f88280535cf6dac6a6853101b6bc61efa5fbbedc SHA512 17d74d410bd7e4cf08d43b288072161b6a3bcf60af2b1f23ee2503ab666d0045141fef8cda5cc72206fd1ffc043e7636cf0dba5c3023376b2379260fffc2b274
+EBUILD kafka-0-r2.ebuild 151 BLAKE2B c7b78c0eb2d6467bf77fbfb99e35fb3d298d45f9201b356cb1b26cea2849c88a9b6e2938b1cc096bf203330e63888db4d0e4f3d5c1818bbab0e1088dc21dd76f SHA512 ad62320884d89a4a1559ab979fd93750bc840037a223fdc88a413817a52712b9a0e9fd1a1bb625ebffa5d424fca7bc0358418d40a809b00613685f35bad37605
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/kapacitor/Manifest
index ddd81dabfbbf..fbaf1497f0cb 100644
--- a/acct-group/kapacitor/Manifest
+++ b/acct-group/kapacitor/Manifest
@@ -1,2 +1,2 @@
-EBUILD kapacitor-0-r1.ebuild 146 BLAKE2B 2566b20d84fd72e33109a545571b5908b4062b89f8ccc0552c5a3925e16ba3b562b3c9a389d47e279e0b47f420cd991721cf582bb3ffea359c455cff08d5e455 SHA512 64364cfa96c04c1db1c5ed750f1da03576039dbf2beaddad00deb880b18ac919405f4218b64b4ab01f21226bbb5b4e3b907c2ae70b4c4bd93e6b05daea0797c1
+EBUILD kapacitor-0-r2.ebuild 151 BLAKE2B 6703c17509ceaa4297915bbaad96e92ee3da45cf6411d6ec3d78618533dda54274c0a80a882f498e3afe339cb60ba7f1d997bbea0342a7bcc1c1c5e19d67fdf0 SHA512 6217a66d57289992f4f93ae26319f299da48db080858a0986db57279dd98fb26b8bc072b50965ccdc50ad5ffc320bc8a0f3f7516d65028e956bb29e88c27ac85
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/karma/Manifest
index 78fe09496b52..90b722587551 100644
--- a/acct-group/karma/Manifest
+++ b/acct-group/karma/Manifest
@@ -1,2 +1,2 @@
-EBUILD karma-0.ebuild 199 BLAKE2B ee6137b960a3bec6c51b4d05232364c2bd79afcef52343542e5e13a1bbe71391c07ab1c04cd324fc5865ff1611a554ac99cf64ac7031c39dabc3fbce92f94f8f SHA512 0779092d8a6c61a478576e972071ddb9a72559e10a1f273c48cc9dde47fa1e50288ae48f8826f12860b63c3df6ae5613e6010b5050bd263721747b70d28421bd
+EBUILD karma-0-r1.ebuild 199 BLAKE2B 0630c52a00e93d818ac7433f1e049304cf71dd7c281cd9b24ca4096ab36a0ad7ca4f108ed86df89aa2edd6fb06b97f3aca486c5cb9db4f2638aa86ffc09cf8d6 SHA512 0e564440229d8dcaf556b449fdf61768f200c75b1587e8de30b2904ec0c129a648d945ec723e166b6c4c900bc5c91a1627d4a3941304b727a34e3994f7dde76b
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/keystone/Manifest
index 776ec2a9915d..d164520cc0b1 100644
--- a/acct-group/keystone/Manifest
+++ b/acct-group/keystone/Manifest
@@ -1,2 +1,2 @@
-EBUILD keystone-0-r1.ebuild 146 BLAKE2B 802d5a902859a74c27c497b6953ceec5cae22fa7036a3d034888be01c34a5ab975f53b34574f975e00107a19abe84a26f48fd5e6e59fec4a2a0c0bc475e5701b SHA512 35f2c950a32cf151c678c37739344d8bdd2ed4cfdbd04d917b1449fd164a64a3d8177a602f48b3bbe903dd9a6f5e2b9fb6f0329e33c96de93496f749c80dcfc4
+EBUILD keystone-0-r2.ebuild 151 BLAKE2B db6e379c04f3685790421d6672cb3c50f1f7efd51b8236e60d866e7cdfe2ec3e920d478d7dd5d12c0d8af51077e9f6e4ec448548ceb1af7d3c4a9eb8e04ae39c SHA512 b92ded1a7965b39713d35bcd00ada887ecdac4b99f390ed4f612d9454c0172f5815208209d8450b76a353966fabad0e6bdc7c2a9008b89a797c6b25380593eef
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/kibana/Manifest
index 8131125e587f..aa01d7ed62f2 100644
--- a/acct-group/kibana/Manifest
+++ b/acct-group/kibana/Manifest
@@ -1,2 +1,2 @@
-EBUILD kibana-0-r1.ebuild 186 BLAKE2B 69fb4e21c1b09789c18cec977adea72b4dda37ff7e95fca823e0652664e2fb18bdf0627ca54d9920f1555d83ce3978b38e2e4dcd461e323a6e74b7578a0823ad SHA512 6ddcf5a360bcb844c7f909902a3dc31dc97f7a0858e3b87b7e9319817109581e676334591903ad49f8d73237490758d689058ac3068b8fd19e67fd91d16a66f6
+EBUILD kibana-0-r2.ebuild 186 BLAKE2B 6d40d1bdfe6b952f13aa713c426b6ebd8951971e20cd14506651155383e6807f50762ed3877d82e096bed96e87d8f9993de5deefe5cdea4c8351a3c79da7cb37 SHA512 1ac7ca9c04070a38bdfaed531c29d610ff53b54b755ec792f2746ee71580f4ecc203925ca6b0ad19221acaeb33a7a8a22db1c320d09e25102c79545516678026
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-group/kismet/Manifest
index 4adf08648521..66746eda475d 100644
--- a/acct-group/kismet/Manifest
+++ b/acct-group/kismet/Manifest
@@ -1,2 +1,2 @@
-EBUILD kismet-0-r1.ebuild 182 BLAKE2B 6dc41fa6526c2ecbaf8d31b99b0590d069701deedcad72e85463c59f10956d5b5571c01a390488dd5f5db2cdfccb326b2000b87b0c3725bc916e5b7de4242014 SHA512 43197679965719a871cceccc4196a87d124d3bd1f0239109f68a03344c0b43b526243341986474dd3cc0417ff9c26ae90d453d982eaf7350aea7420d2d7aad46
+EBUILD kismet-0-r2.ebuild 187 BLAKE2B cdb5fc2eea34ba7653e4ae7e92f85626286a21d38e6bebe68a6aa99d8119d961bf480e0a10209b25248e51b349658109c90f53c5a9ecec6ad591e3218c8e4748 SHA512 d42fd7ce8d1c72cbca9640b33f31f9856058979d0becfbde4580c2df3ee50b70325c134af237dea022a1e9be3ce978d32c33ca9f9c610e3c3b20d5297708ad4f
MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
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/Manifest b/acct-group/kmem/Manifest
index 45b4a5143579..834016da1205 100644
--- a/acct-group/kmem/Manifest
+++ b/acct-group/kmem/Manifest
@@ -1,2 +1,2 @@
-EBUILD kmem-0-r1.ebuild 149 BLAKE2B ea0bd3ca8325c2c3e7665af06678235b636d948b4a9510ff5026dc00944e9085d99c501ba07d5555288b87109df54f86f3c75ab389796c688ea4fe5ffb769db6 SHA512 321a2016b3d957f25bcf41576413017df7bf413c99fa6891c9679dcd0d66d117f423fb1740a6e8bbb309ccc1b066c9bf9547d1be7256bff02d97219e69d80d46
+EBUILD kmem-0-r2.ebuild 149 BLAKE2B b6936e330f69ce8f03524b53078ca3ddcff200a3d7015e06656b05536655b8ee2235b2280f1670ab5f2228eaebd4382d2698d11326c97bb2f7593a548a8ce416 SHA512 0a248bb3833de7330a8027a84dd949c998b4db0208c82b480b04e31efc4fd87c1ba6eb88035f37a43c3ff40a547b0d0a43363af6b1d0ddcdbfea4083ef675295
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/knot-resolver/Manifest
index cf82a8260ff7..a87da687319c 100644
--- a/acct-group/knot-resolver/Manifest
+++ b/acct-group/knot-resolver/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-resolver-0.ebuild 146 BLAKE2B d1a19144e78fbbd0d969ec4cc230a8ceb19284c634b01410f7a92e4ef1e877f67e3124fc7da391651fa0fe1218f9dd345758a32c1309c6e756c9977092269cba SHA512 fe785f1f7a7468ff6512dccd2ef2129e12621dd64cb488a6f97abfce457b6ad7909d8a58c99ce8bc0e1ee780391bb06173263afe118776396784217ecd1351af
+EBUILD knot-resolver-0-r1.ebuild 151 BLAKE2B e2b2ec4149f1b4bb9a25253dcfdbf222222c4cdb20309177ff296fb2cbd6e21b927c16cd5f11fd37603a55074d7a7a31e5519781ee8c69f5adb7735f8affb76f SHA512 8e65b7d0720ffaf11bd7caf3ae99471eb7ed6f35dd2eb38c3f6daeb4f1be45b6d053072dfdd5e8be4909174dacec1247db7ced3eda1f7d82c0d063fe63ecdb7f
MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
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/Manifest b/acct-group/knot/Manifest
index 742d4fc21dea..45e4c6b72a2a 100644
--- a/acct-group/knot/Manifest
+++ b/acct-group/knot/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-0-r1.ebuild 150 BLAKE2B afcd002f4fb11e4ce7c3a28fd59b26ddbc036b6a17b8e505dce673bf21fbf72b39493401f0e4bdd8aa19135e80c775776d4cfcb3c2aadb5c017904753ad3895b SHA512 8b3877f5d6e398c2f9b02c891cde8ed8f7e7e06bba88118ccc86ea47e9bc74f1974c93f30d3fef0c7e8615c75efe3f59d31f836a791328669343276b07593fb2
+EBUILD knot-0-r2.ebuild 150 BLAKE2B aca2edcac668ff0276a07c04bbb14297aee6ba67eded7592b587b832121bcd88857391b4b48ec988ecd05e8595ff300ab73b234e693a73f85715ec280a2a3115 SHA512 dcc9f9b14aa9ee3dbb05f52b8bb36e021c8d69b476a4ac4fed0a7944ae9bb54d9be4bab81400b8641c869f853c901684eb213a13b008a18c32d6c2bc73a6d1fd
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
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/Manifest b/acct-group/kube-apiserver/Manifest
index 9e3218e25452..1bd3399dc006 100644
--- a/acct-group/kube-apiserver/Manifest
+++ b/acct-group/kube-apiserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-apiserver-0-r1.ebuild 151 BLAKE2B d68d1abef30358b9378d39e2e1c8b3de7a81c2831a9121e286adf9c23188d8bac8a92c8f2e8efad5b3360735844024d023af8575bd6e33585381a7482d99ed6f SHA512 c0905b505bf44cab492644323d80ef6831549dee58102336acb103de1fa07543315c3a9cc048b5a1f380bd9a65cddbb7cd31316d810dfc6ac4771e49b6ffa54e
+EBUILD kube-apiserver-0-r2.ebuild 151 BLAKE2B c645303908b7ce624702d6d951e3f5f7ec04eda18b00ccab8da270d1b4a57d178f802b2bedfda11d6f0dd03ae47c79fcec2237aa5ffb7132402f0e393710e6d7 SHA512 e4cbf09f45848fe9c27ab4e13d9df89f6303d60def2233863d1a69a58a4ee0bece0b3a07c1b8d25fd28ad63cc60e6fb43af12ba4adcac280638c1a9700e8badf
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/kube-controller-manager/Manifest
index 00c8bd1923f5..5d5e0a158003 100644
--- a/acct-group/kube-controller-manager/Manifest
+++ b/acct-group/kube-controller-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-controller-manager-0-r1.ebuild 151 BLAKE2B 3c72dd8271d27d579a00e93a62ab98e176080e33dc2d334ee91088360ad9d5a16c01807275c6c99d64a264319ddfe443f5ec2cca8826d86b9d44f053036ed521 SHA512 5a9e687349803bc6c403c5feb4cd16cfee1290339117aab6dbb01ceab2b4524bbcb29730b6445d3e62e2a429f3fcb5386f1631438bd8fc773023bc5cac82e426
+EBUILD kube-controller-manager-0-r2.ebuild 151 BLAKE2B 07cf3c0bb529655b751a69f70b6ad149384cae557c2ebd8f6078500c60228d8f454fa6e239b17a1ee0c5abf27e3014135f337df9500208735f6fa04c8a94f69e SHA512 d219fb3ecb34c0deba2d5b6bd9a6e6528ab45efd9a84e18bd7fb2232c44cf1d39c1b24a99cf754f024653bf4a4e6ad0cf42e8849c11e3bc175db875c799fa805
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/kube-scheduler/Manifest
index e32b775e7349..9b10fc81db7d 100644
--- a/acct-group/kube-scheduler/Manifest
+++ b/acct-group/kube-scheduler/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-scheduler-0-r1.ebuild 151 BLAKE2B 96658ba855326fc57a693f2d0dff9e616597c132ae15f3abf5398e1ea79a2b23e0dbcf44c7254fdeaf5004233ef2df8b68d677816da788024ffb7e319a0ac718 SHA512 2c631b3ce0df4e6c0cdf1f6b22cc5f449e9e15cc47fd7c10c3bc97c1d0fdd49b5749dfdc54907fe2ac40b9880d27248623635ead19fe2aae80e02e6bf3d640a0
+EBUILD kube-scheduler-0-r2.ebuild 151 BLAKE2B 6921f8b1a381cdf52728a204654498d5943a6d332c029813734826607f4aaabdb127dccb519e263ac6decb8efde23ade08a9c618b1d8a10825d0b3a714898bcc SHA512 59668584db75f4d45ae08f47280bdc87ee923d5e07d79c5a674e6982e4a1ae8fcbe71ecff5df30d62faff7fbddffa3fd0819388f16d1d9b8b9db63b74660c1bc
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/kvm/Manifest
index 373f38e3f26f..69f2d0ff8dfd 100644
--- a/acct-group/kvm/Manifest
+++ b/acct-group/kvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD kvm-0-r1.ebuild 150 BLAKE2B dd8665f1e1db1d9c69cb4f2d71be815a2d5fc5742af346e86f5ba79f27077b4a095e860cffa1707e00fd1ef9c221e85247d6b743e2fdd5ded9a0ef4830eab774 SHA512 5a0be4e0cd8fbbb48f36d94f0d51aefdee999d018f132464ae5d7f7928be9ec840873fcd15680df974ea87d3532a68d92fedb6b1335cc9a6a4b7e5b6ea5648b6
+EBUILD kvm-0-r2.ebuild 150 BLAKE2B d48ebefb710fe5399f19a92eb43b7e6d4b04cfd5596d7f73a47c48b3586c9f69b3caead82e1a1cb8275fbcbd39a8e4ee3c5b425af2e94ea2d503ff4c53978086 SHA512 13313a08d175747ef836f23447be46923cab07aa463d0dced4905df5ad6481fb456605bca8539a55bd98cbf6376284a9ae4b5e7f3ea0e28952382b6ab850a68d
MISC metadata.xml 307 BLAKE2B f3bc564fda062e522caef7e6ffbb50e253b7a17f2ab2f24e7df84cb805bee9d454e3b4bc946c5764464219161ad057177ac7c8911cf3056291b06770d2b1b1df SHA512 fb2e553cd8a6663edc6cfb17d2a41193f970b89efaf93e2f2516b9ca778e8a9426126c4f22cef7535ebc2d99912507e3906fce0170859005ab2e1590632534bc
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/Manifest b/acct-group/ldap/Manifest
index eff268c0b60b..592f3b55b2a7 100644
--- a/acct-group/ldap/Manifest
+++ b/acct-group/ldap/Manifest
@@ -1,2 +1,2 @@
-EBUILD ldap-0.ebuild 146 BLAKE2B 1bba5b3775242743c7cd0ed70ab235b621f94118cce2b259399293bc465b32f35c7579d063d6a180bcfb3ad12365d8b744c091569382d3dfd2831d06d97540f8 SHA512 165954c77f2cb40f113f1ad10411ac30bb93dd9556835139c0262c7d5924de72a58a57b90082833ab1e555aaf6c492b0d7ebf34b72c3cf22cd8c64554acf7f77
+EBUILD ldap-0-r1.ebuild 151 BLAKE2B aea14a17cefa4e53d6e4cb8bafcba364276d16b5e1af9c646ad160b97192b5cd9c0c1134ab73d32458e5ad2197f837b5149bdf4f3ad2d87a46fff5d8aa6a7b64 SHA512 ed611b86cd45dc9fff99470d76c094ddee8f58bbac831334f0be60cc41b376942d1e533ac223a81c14bdb67ebc50eeed756be246270045a0e040f9b826974f40
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/libreoffice/Manifest
index ea6f5f78db7d..043444e194d0 100644
--- a/acct-group/libreoffice/Manifest
+++ b/acct-group/libreoffice/Manifest
@@ -1,2 +1,2 @@
-EBUILD libreoffice-0.ebuild 153 BLAKE2B 93bc7b9775610a66a706980848d3738e003cbf2bb00e4f466c0061d2debf6f276a96865cf5e1fb7ea510c702c525caee12b68db3f0cc1e3aa1630417d4940cf5 SHA512 1bf0b96d9e8a6e6b853b91e7d7afdafb0fb30c072d371ac08b2e2e02c0011860b785ae62233e847c86e22cce7ef997a78e3fffc5e7fdb5e102be4ab1e1f940ec
+EBUILD libreoffice-0-r1.ebuild 153 BLAKE2B 3e27287c2d8fce4bb11f5a4a73d8315b1b98881d2a25f62991ee38450a6af906fb2ac413d4e967ea8bd1a5a634f91bf964de8d436c4e58c48ad7550edcc464d5 SHA512 c8ae5cfd9e45d0bb07770eab2ef3e7e11065004b66de583c60a3e63280fd59c679ed5941680b2c50b233d89ea58d45e8040b102523a2311e9b436d8e62ef088d
MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
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/Manifest b/acct-group/libvirt/Manifest
index a7f3044db298..5ad0c88a9b00 100644
--- a/acct-group/libvirt/Manifest
+++ b/acct-group/libvirt/Manifest
@@ -1,2 +1,2 @@
-EBUILD libvirt-0-r1.ebuild 150 BLAKE2B 59cb75a9296ba0b5e63d1401d4c8ef2fcfb8d6ad795feb9ad87d95319375348284e59d84e6f018dcb1f3e312d12a1e8c25a64fb67b76fae95cbd9ab9c5ff3c9e SHA512 e0e6a9a3c6184c02d72a8cbe085d1d2e77bd54397e67028ef6a0939039c8b50ef7746b42855f066c91313e5dec4eaa38cd31db05d390db8bb5be32f95fff8d2c
+EBUILD libvirt-0-r2.ebuild 150 BLAKE2B 1a7eb33c8ce00043293606375b151ac4532ed77c4b3f65861988aab3428215534d9b29b0dca7a7a66befb49a0cf54b7270c0b9be00a3f17e906012ea0cfe0f14 SHA512 f04cb2ad8ccd72f12701e21a2ef13d8929454748004d78c4e629e136e2bb19a12617d077052e10b804abae29a03e09232f827e690983f15d221614c62a28f198
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
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/Manifest b/acct-group/lightdm/Manifest
index f836e5f8564b..097d7a302710 100644
--- a/acct-group/lightdm/Manifest
+++ b/acct-group/lightdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD lightdm-0-r1.ebuild 197 BLAKE2B a7fb16bab90c0d06af0f1fdf81bce8a89a3e282d36362bf2e5a22ed7747feabe240d9fd27ec54cb595276785f5683d70627599b981d9710f5554781dda0d12bc SHA512 c03ba0634bc436c25a5f53e2e0ffca4ab1232e701e1b576af2528fa76812faed21553d9249b263d7de8f3427815ff65f48cf3c48792f22f84b4aa75ddaef44f2
+EBUILD lightdm-0-r2.ebuild 197 BLAKE2B 4a1f0c5a71a4d9fe10cf5256dff2dacd53386243ca02e8532b002f062467f55665f54b1314d9349b82b1809ff63c4652c0c4a63324abee321ddde18b567d4173 SHA512 51ad773207313bdda9c5c0230ad75e924e37f375534bfb2d1b48462199ea84f070648745a745474466d792ba7b55965f70ce2786a6d22889ee24ee70523be510
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-group/lighttpd/Manifest
index b3f3e93dae86..dcdb56bbd510 100644
--- a/acct-group/lighttpd/Manifest
+++ b/acct-group/lighttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lighttpd-0-r1.ebuild 146 BLAKE2B 7cb39baec7dda61b97a160b5e09068801979e3230fb75622df45a88f60688aad86d8bf2461b12d14c4a19b21efac2d729c0ae85efe6256a6883e669d8434304d SHA512 2b1b803ec1b592e944c0a8a46d3119682c2c199d80cd8bbcf01aea2a6927b920d30711ae0e0c8ad1d79ccd6c403a1787650b5483c644f4c5d33890d3d7ff899d
+EBUILD lighttpd-0-r2.ebuild 151 BLAKE2B 21d96c00156009f30a422ea3789c547269dd62e7b16f2254416861e7dd4a2ad7e027c174c7e70562ba166c24c9d919f2b276d4f1c2a6ad8c4a511e41ca24cac2 SHA512 8ee6a94ec9452d7cdd217d2840df15305001e2493a2fe0254c31192bd9de02e57b0c54734d1007edb9583e9126c668340f29bf9b5c0845e2899153aafa9b0ec1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/litecoin/Manifest
index f3b7b9426bf0..6ad5e79e5969 100644
--- a/acct-group/litecoin/Manifest
+++ b/acct-group/litecoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD litecoin-0.ebuild 196 BLAKE2B 6aba1511d4fd084e305ab75a905ec1ea7de98294db68f1e47f06b9c7719ff075e6432063e0b70aade1c37eabf201a0f44e14953d12deb19c3cb3d7c009853327 SHA512 3b8be3e6a9fb988800546c322dab1dd076d1531ca792ef1b07f3a8c493734ba0d423460e80d2a10308c9c3958e38dc9517bbd8d843e74ab3e3108773275478a2
+EBUILD litecoin-0-r1.ebuild 196 BLAKE2B c4b925d7f94790e41fcee2e93878b0a6580dabd185e729dd292d57c3060111c67f214d60d457b2d877e8ee35d4e040eb8d80e644f12452ac33af780d6dfb3364 SHA512 54a38ecd33d333d9e0bb6c72514cf64a0c0a620c0b129f53bc426ae5aef6b644bfe20aef409737538cafbe50b6d565051fa5572116b040c85c2b144963c23af1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/lldpd/Manifest
index aa7453462d4b..6cd39b9e4376 100644
--- a/acct-group/lldpd/Manifest
+++ b/acct-group/lldpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lldpd-0-r1.ebuild 151 BLAKE2B 2e64b2527233fd372fe8cdc85a7091a758a01b40da1ca5863603ac66a064a8d8a2fb23a7e572a05b692b4bded032545d4820c5dced7fcf82a8e89da56bfeb4ca SHA512 7f4b0a82c033ca0a28676d613e40bfd43261de329443462ec0d9dde2d0cdeadcdf123e19c12892b9d9f2514a592c2f71637a703bccf00bea53db32bec0186b3d
+EBUILD lldpd-0-r2.ebuild 151 BLAKE2B 8f3e7b54d70a088fd59162f2ff8809ca9112a94739f63bb2dd8e103142362b5d30bdb99df6390252df64f036acf8d30e37418801d1770b6e78678b7504dd6337 SHA512 95ca51deb35a85b25e19eefd43788ff5d63da60d8894278ebac20f184a09a3140d1b85b5f31c8e1e2345ecda2b9516a724c6110bf80b4ec87df75987e65b5bd8
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-group/locate/Manifest
index ed5701956aec..de60d7510fad 100644
--- a/acct-group/locate/Manifest
+++ b/acct-group/locate/Manifest
@@ -1,2 +1,2 @@
-EBUILD locate-0-r1.ebuild 146 BLAKE2B 63dd494d2b23617970ce4412d94ac16f4ba2cf0b15ff13cfcb28d5b3c4dd3b67c59a5263cbe01e7f99a8b5a260d2cc085ce0088b5f3fcc7d1bb131dfa68b586a SHA512 318518e23bdc9adcb55f0683c3fa5998e7b7ffc553aead8920766200080408953e0e1e74772cda973f4460bb3dbac3e8fa036d6ef404ba813c7f10a23dd1968a
+EBUILD locate-0-r2.ebuild 151 BLAKE2B fb31ec9d6d3ca45b60d78f62fc082a3ac21fdffd9bd86e5091997b27b5b0fe34eb8c7def342a26fb616bc935770a6ca9c4d0d1aca3ac6182111258c1c48fa510 SHA512 86e34031fe500aa5a14070353db4067fc104ee55e75dd1d09311657c66b640b82739919e9bc7939aca55d71bd06e3543e7cba2f65c6d6fc88d0f2b478a48e859
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-group/logcheck/Manifest
index b876fc315cd2..04a19b6dbd0f 100644
--- a/acct-group/logcheck/Manifest
+++ b/acct-group/logcheck/Manifest
@@ -1,2 +1,2 @@
-EBUILD logcheck-0.ebuild 197 BLAKE2B b3d989419ac9ebb9b0319399407cb33397cee4f1a7597e2ed759d77dc175ffcb891833add6ca01462a7bfcc76020843cc944d4631d8c6a03c1ce592a5b15c04d SHA512 b58f79a4aa280f317efee8205fba7b5313d5d2b67a267b861351b21ea73474da3ff1b652dfdd0f2dbca9dc388bc270856ebba2df8c5fa0bc2bbc51369210437b
+EBUILD logcheck-0-r1.ebuild 197 BLAKE2B 8a1eb76ad9c5af3d6812c28af6fb532bd2d1f7f010dce2eeabda940168231a9407360c29da9568cc8715393b014d0f1a7e5ab67c57d960b28713770c310720ee SHA512 d991e52132560f6f0a91b6ec08026b803df0ef66568af9e4fe94fbe248c048607859bb3bebc3a62a6be618cd031c85d70194d284dcd3e8a4f64fbc0977fcd564
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/logstash/Manifest
index 6f68cbfc61a7..d6b02bfdacc7 100644
--- a/acct-group/logstash/Manifest
+++ b/acct-group/logstash/Manifest
@@ -1,2 +1,2 @@
-EBUILD logstash-0-r1.ebuild 188 BLAKE2B ed36a4be07db7882f86a99bae2e155926bb5e139ecb8f4a75c7e1f063b4d12596be5ae8bbf026ef1865ae8c313e55d646cb6e99c2b40817cc2d28d70bdc8a9c8 SHA512 507c1b0323222b9b9423cdede2261d2edb5dcedce64a4892ecf49fb09dcf1620efa11e3e2bcacd7a348932a0c5c39b75b347f5616e276a96658ebba8f655338e
+EBUILD logstash-0-r2.ebuild 188 BLAKE2B ba3b2e68d00348f9fa7d7bc7115b49a0a9f4e8ec137cd2b1120d75e434823926ec2ec517630e13752efa844543d40591ee2c3760e36a83102d6ddf3ce2ac8a52 SHA512 d16199ca20a79f9387ac6b1f19703f515e523bb1e92be7727820d11bbafee52855591aecb5f2d107358c158d1d8827b635d7312455888765251bcf26a9882d4a
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-group/logsurfer/Manifest
index 072f3e604e3c..30787c484df0 100644
--- a/acct-group/logsurfer/Manifest
+++ b/acct-group/logsurfer/Manifest
@@ -1,2 +1,2 @@
-EBUILD logsurfer-0.ebuild 198 BLAKE2B 5e4c3bc7460d1b5d120415d496c86e804c060c164fffd0fd6a69c2b5ae26538e3d1534080adb0149715fccd07dbda24ea163ad009a41806d01d38488f878a694 SHA512 3484f390e1e3072d078dac571615300240cf9a12499ca368792c8279fad5ac313d5cde3f99c24ce2287d802f21266a2853dba128eec68db53516fbd261b48890
+EBUILD logsurfer-0-r1.ebuild 198 BLAKE2B b1d5f3073b7657e25a1eb51c220e2557287863bfea35633d67806202293d6976023953ed4b9b52153c5e237a0f70e092fcb4ea3cde69e20017ecd7320b193494 SHA512 a1756d206d0a2ce227a2de856a52a2d64c7e6241ee320ddde28cebb57dc097c44574451ee7ba8a0c4c90483503e76e0e24aa010d3ed96e40fae7b711a07b97ed
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/lp/Manifest
index 7d695a149c5f..0d44343eb412 100644
--- a/acct-group/lp/Manifest
+++ b/acct-group/lp/Manifest
@@ -1,2 +1,2 @@
-EBUILD lp-0-r1.ebuild 149 BLAKE2B 4e4044cd2f2b0e34c4b2d5776736d2febdc8db2c7d5c8719de2ecc209721a7337a18f8696201b52495216e12917bbbf06f779f33495d23411c9c73027dcd772c SHA512 0e3821fa4ab1a49f1e2c4d96fe7c56a424de909fc6aa1201318e8f2aeabc3379c98ce0017e673f713091b13fcaf22a6ad926bb46ed20b1cf4988e126e60f627c
+EBUILD lp-0-r2.ebuild 149 BLAKE2B df4f8d76b5227d5c88d4eaef450b47768e68165c685706eb790ae5055b714594e0ba0532785f162a594f81d119385eaee989ddcdb443f462070bbc271066330a SHA512 7afd7905ae4e94b262188a6609a7cfa7cc925f4035342b27be32aad874e2fbe63684948540c0accca5edeb7a9b0936ac4d764378009f2e2f3735f5c437b5e179
MISC metadata.xml 301 BLAKE2B 86ad0bddef68521045ebb915b0ba368f84a75abbb241412b62599c2ee8c31697e6a7a01dd432c1b8e233aaeabd3db7593e861c5616256a3f9961b986b8e1da3b SHA512 c021de9a8b6fb3d4e8a5e3d1c17ec4af1864f421df07cfc431e147ed1fb4bc00f2428e988220c162a6732747086ab884b43a9e390bb8e6314563a48e1e2095a4
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/Manifest b/acct-group/lpadmin/Manifest
index 20685f8d7ecd..2b6b91429b43 100644
--- a/acct-group/lpadmin/Manifest
+++ b/acct-group/lpadmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD lpadmin-0-r1.ebuild 151 BLAKE2B fe985ecbb43e35ce631828df68ec9f0a2e3bb7ca45b574e23e55cd0a1be543a9955062de1b20bcd3905bf1bb3a1b4e98df281753a90e30fd58b18c24c5aac308 SHA512 e570517b2fdc74926c584bca705bf23fe25636d6522e94c0d3b22066cdd0825aef0a794912a80a3e193d04c46b2c51167b17e9c3e3204b610c252fd538def7de
+EBUILD lpadmin-0-r2.ebuild 151 BLAKE2B 6d604eaaa87590f194aa99c4d9623aca1a871f1f7248dd6a1e4430d3fe819099fe2f748b8ca1dd2f89b7f4f2a8aa89b8673eeecf8bbaffbb9bb8d99fd84d326d SHA512 57aba1a7ff4a32e174e5f9984c47f0af8dc14ac533ae085ef2f2af046065e53b7acf1db93cc00eada438ea238921dd8c3c69c9cddfa8c9ef9f993acd80db1fdf
MISC metadata.xml 221 BLAKE2B ce23f4ebf10e1e55aa36ba3cb894fd1b38220b6e75aca1d9261563a503cd86ab04c537d6c0740b62865566c76a1cb201e07e9f717a6e53ec899b0bd6827c8624 SHA512 6b27a3121ee6f6cd4e7dc0e1880b6b9b51171196d9739663ecc56d1d8e73ef3d81cda09cab6bcccc2ff3ea98e260a3f9e9c5091b3df20fd08e2b443ec435777b
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/Manifest b/acct-group/lxc/Manifest
index 7ad5c0997e4c..a49d8d3215b5 100644
--- a/acct-group/lxc/Manifest
+++ b/acct-group/lxc/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxc-0.ebuild 189 BLAKE2B 155216bfb081cb9e51eee99b903a6e04b7a48dbd1bcac9fb36078ae0f4b7fc400125500ba9444907bfb36685cd31d629662e94283b895dec2717055fd290251d SHA512 eb693ec967d51cae4d996471d6dc53148a2baca85fdbe0dbbfac8fef45ea70dbeafa9d90356aac28b35353034d62c12b8e04ae9f3e684bc211e32c23fceefa47
+EBUILD lxc-0-r1.ebuild 194 BLAKE2B 53801e58b9978c28f7a6a77f216a69ee213e868654817af9417818f58d25d7e25039f033ac25da38f2c8f20fae2d03c4fc8b8558bb987592a7107850ca99e22c SHA512 0cf6c779f84ca3c75eb58ca0796780d382c6529b1efda4764b6ac300938cc70a35dd26e5b39dd274f043d7015ca20a2085944e81ae9416497e12ef30427fc440
MISC metadata.xml 278 BLAKE2B eefaeacc4adbdf7808105113674a97a8aad48ba4b6ac35ab0db401ed86739e62b5cceb545ccb8185d74e660c6222bc21cff58ac8cdcd6443e1acb5be5122e3d2 SHA512 415abb61e906b24fd0acd5cdd10299585b7ff38d24ae4db63d93f715e4efc86c49d7db13488b1b6405608bd60a4b75e949fe75fe93debaaafa28a392407bfa37
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/Manifest b/acct-group/lxd/Manifest
index 6486405cf9e7..ae7fd2772524 100644
--- a/acct-group/lxd/Manifest
+++ b/acct-group/lxd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxd-0-r1.ebuild 189 BLAKE2B f970417ae2f7a8b7380c9fa5bc71395c388160f63e3b747902467eee2c256b7f367e97283cc039af51b7807ecd7218701f5561401f24b1d47cfc39bf8dadc6a6 SHA512 97b99520f8d049bca2e99b27c120ef815121fc00568057de6ab7e4dc5d69032ed765fe618af474d980090c1244c726f2148818ea282f11528f0032127b317c74
+EBUILD lxd-0-r2.ebuild 194 BLAKE2B db30fe63418abe7de473b04c27eb3565d41bb90ca1a3855cae27599f38eac6cf92bcea9f41eaaf7e97c03336fc788ee41fd4fc9eb06e096ce73aaeb06c6e9a8f SHA512 bbd72ab733c06d46428bd416ef6b264f5cc29594783322a202b2f8ae86c2a1f8ee6c22c7e42e3317844f0f184b0d1ee0af8b8e68256bf2679fdf8e6a6428c361
MISC metadata.xml 278 BLAKE2B eefaeacc4adbdf7808105113674a97a8aad48ba4b6ac35ab0db401ed86739e62b5cceb545ccb8185d74e660c6222bc21cff58ac8cdcd6443e1acb5be5122e3d2 SHA512 415abb61e906b24fd0acd5cdd10299585b7ff38d24ae4db63d93f715e4efc86c49d7db13488b1b6405608bd60a4b75e949fe75fe93debaaafa28a392407bfa37
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/Manifest b/acct-group/mail/Manifest
index d00f07973bc3..1d936bec8eaf 100644
--- a/acct-group/mail/Manifest
+++ b/acct-group/mail/Manifest
@@ -1,2 +1,2 @@
-EBUILD mail-0-r1.ebuild 183 BLAKE2B d02a954dc4c10edd2a89cce9162654d7ff1b435ddb18eef1443006530e9d5d75d19ce378ef5073defa0baa6041b24367b9aad7f01b4543e51062012a4b2b063e SHA512 b03816e2369e2c60bdbe24533a5057dadc01b677a84af58b674420808bd9231d7a3424cd0cc4f8abbb87c3b08507018ea11aa985a170600caa1e5af5795bcddb
+EBUILD mail-0-r2.ebuild 183 BLAKE2B e51079d08de4ac6adaf06be287a0953b2274a3fc8c1f27fd08704ce19837460b654cba28f8b31718e53cc8614ea174a5fa0692572beb9ac058dc15abd1a5e458 SHA512 6122e77360ba2acd55305584cd8c18aadac02fac40304773f07eb60cad166c2cb2945562f6ce9da41b1141340c838838637ba75b133cfb69b2a36d7fdb0b8f70
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-group/man/Manifest
index 7482e2d4dbf7..b55ec6c42dfd 100644
--- a/acct-group/man/Manifest
+++ b/acct-group/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-0-r1.ebuild 150 BLAKE2B 393bf4cf84bb826a1a3c94d6de851af5f3772a00eaa83a0c741b37af1dc7e316d34c8416b21579bc8bdb83ebc06abd8b19c768c223bf7e356b4b1e2ef1994de7 SHA512 a2c9bfa148c6ce1456cbe2c8b3e3b76d9f32e9c5b069effaa1f87d606750b9ca0db6010d578926b996c0f98d7f4bcbdd8fa8d0796a84db6eb8db9e491ada19f1
+EBUILD man-0-r2.ebuild 150 BLAKE2B 59695b071eae00e45b00f760262a4ca77d39f4fafd30b256ac42bd5ac1343994197f79165f4666d63673c5c8011257af600882461a541c371871102442ab6393 SHA512 b82a485a15f31c3c153965353be3ba96fc8cbd0271f35e03f3c983abfb22ea14735d05383b687087ac10dbe9ef7327e9dc1d962b254ad8938d575445b9a07d00
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-group/maradns/Manifest
index 43307be24c5a..6a3b1d80923a 100644
--- a/acct-group/maradns/Manifest
+++ b/acct-group/maradns/Manifest
@@ -1,2 +1,2 @@
-EBUILD maradns-0-r1.ebuild 150 BLAKE2B ca34532d6f90cf93065638d4382ec1714f3601d52948950cfa0ea7359ae702c865d9e347ef9c77af103d5ebbf7516c8c70323547700c4e1cbf3c201d18a6a6ce SHA512 aeae32838648374f71b0c69c2ae516aea52aa8323921bf82269d2de050e709d97b8ac67e3ff2c943269ba79d9a8693debea4c2b5007b45c22d0ebce391afb0d7
+EBUILD maradns-0-r2.ebuild 150 BLAKE2B 4336395513c43f8b64e6204c4a14dbef97b61014afe427e53a44a910865ab32ae046779dc8a4f08bb41776d0949a3d89c8bc3e1b56317af29dc7f6d60122f414 SHA512 9f51565fbcf1a36fe9ea3bd0cc13101a8b737c4031ed03d04f1f19ba48d6085c18468284a552b176b1ad23ebd583f4ad996dd28598839b3aa33ba8c0f98b1139
MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
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/Manifest b/acct-group/memcached/Manifest
index 04f4795bec64..da4085b43eac 100644
--- a/acct-group/memcached/Manifest
+++ b/acct-group/memcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached-0-r1.ebuild 146 BLAKE2B 6a68996d704e48f5abdadb81a83044394f9a1579cad6bdf4258fc544731580d6fd0e9e83218b69ba119fb2fa3bbae427175dadd2552c3e51ba9eb6231038bfa7 SHA512 773ce6db883751cffe71dbf19f678ecd150d509c67b1b7bd3d4254ffe06fee9b86503a29f1c1ad858c637b39a25292b10b9b3f57dedbeb63b08eb34411bbb1b3
+EBUILD memcached-0-r2.ebuild 151 BLAKE2B 7f1675b66cfc1b04981689f93ac677c5a3ac0c8bbf95cc4aa64aeee81ded7440e842d4d36677a8eab28362a5a9f0d7f59fd328588ee0da1dffc04904ec021a91 SHA512 d400a3485b858e082fafa7396696064b80da4c9bd27e8cf81061451d9edd39a829a5787ccf818e44eca0b11501a1db0794a23409e5c60bd17ed8f1c0d9acecbe
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/memcached_exporter/Manifest
index b7a2a71e7f04..68841917a5f4 100644
--- a/acct-group/memcached_exporter/Manifest
+++ b/acct-group/memcached_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached_exporter-0.ebuild 146 BLAKE2B 39444a4e322352755f0a14a514ddfad4f5dde5941d657a375d69517a2c36d168ff40cdebca8f5edb7032cc916ff08798e71a30881f7d0c6cd7e868c7c95e87e2 SHA512 13540e7c40192f1deeef6841d4d65ea483de64077c99bbc68f0edc4dc3f3ecf9ea81fd419879eef3d6d0777301e3fe81069fbf7e95e6a8b37e208f0b4babfe9e
+EBUILD memcached_exporter-0-r1.ebuild 151 BLAKE2B 2cae867ec21155e7de106eebdd98468b41d54d0b0277c6803ec352e7d757b4e757a8c1575bc508d8972c049120429d55ad7acbaf49d11eb3738a33d2be25454a SHA512 6b911f75661d757f2780b3e3f6f6a3b711a7f85eea1a2a777d7f79e535c1bd79b27e476f323bfdc30a4fbcc0b1b49a4dcf6112f8eb6e2573253fceb2439e40fc
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/messagebus/Manifest
index 13509a039216..b16002a23dee 100644
--- a/acct-group/messagebus/Manifest
+++ b/acct-group/messagebus/Manifest
@@ -1,2 +1,2 @@
-EBUILD messagebus-0-r1.ebuild 151 BLAKE2B 97d318e579efa38f0bf37441a9e1abfb719437cd3431f33bb23c5e631f90fcc6a1e51de2f35ef9798df68e3a06faf08c8548921251a5f9132722a50ca34d3aa0 SHA512 fe3d52fd76f3062aecde533c81c7228188ef2c5baed52fd5818f32e29496936438d706aa61a02d77fa890535eda007a8371d672ff38ecdad93e0c1a67a2450db
+EBUILD messagebus-0-r2.ebuild 151 BLAKE2B 9a9cb326ee0d5c3e094d90a7b1a2e90d07dca4bd141d5e7e3ff0ba8b8c87f25e703967a6d3bcca38182446ef18e396ac51b86a375da9903f661d8ddf57933959 SHA512 2f35620327b0577a6b35f6d468d2c6adff973b6161a4c8a384193a653b40ac34f52acd8abeb6b841115d62289eb94c2fc22cb7e785b2476de0cf31e8e9029028
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
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/Manifest b/acct-group/mgraph/Manifest
index edb4c97d3ffd..bfde5f8e4b9d 100644
--- a/acct-group/mgraph/Manifest
+++ b/acct-group/mgraph/Manifest
@@ -1,2 +1,2 @@
-EBUILD mgraph-0.ebuild 194 BLAKE2B 97db15c818972ddf81d2f7540a47120b905a64dc33a568b5021644d702fa813dcd274943248635460f5861fb8c1943bfd660c86fe5e86e4f738fb31a97829910 SHA512 c8cbb644a61ad684c22ad30c525be9b35fc79fd195c44e72e2b202ba7779b2298003612f2c3f4f9a85200dad353b181d77340367e237b06ea64ba97a230359a0
+EBUILD mgraph-0-r1.ebuild 194 BLAKE2B 5e3a7495186c000aefc7966b42f3d4fec0cc2257ab4cc6692c9fd49b4c19c1585fb1e894c03bb89b3250b9ae3159764a1aa79a43f9af0042ef70ce5e696257c3 SHA512 3d352867cce0de41083529148565f65f20872b4db0548bb048f1aeedd752d5f15851cee71469d9765d24ef7afedec525cda1029b508e495d3d11ee04c6449d3e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/milter-regex/Manifest
index 47a4bd5c8957..21cc077694f8 100644
--- a/acct-group/milter-regex/Manifest
+++ b/acct-group/milter-regex/Manifest
@@ -1,2 +1,2 @@
-EBUILD milter-regex-0-r1.ebuild 200 BLAKE2B 15ed5702911bb43a23a101c18ef136d147e29993ebcee2d003e83a5f57b077ce5166f691383bf94ad6854c197de8e2b04a6b9985e87934645f7fabe812c01d89 SHA512 233156efbadbc807f7e4064479a5cbbe5c3f8527cf635605e1c3372d78ae3351a633f27992fd878edf881d8e475697130cb6b0a3de9cc5da66ca2df0ef487365
+EBUILD milter-regex-0-r2.ebuild 200 BLAKE2B 41ef87e307c71c04d377c81c7608b5589e120ea7d82afbd47d9cd63b375d015ef3eaa06293b9203ae831ed6cbd6ff3dba82bea1086633c748b2c6274c22f51af SHA512 a0423b8776f10488f36e9838da4cfbf3bef33a884e14109c5bc562cb81ff573a3db6e63d3bcc4209e380384d3983da375ff761ffb579f4bbe3b47f815c307a74
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/minbif/Manifest
index 92411e912580..c486154ad442 100644
--- a/acct-group/minbif/Manifest
+++ b/acct-group/minbif/Manifest
@@ -1,2 +1,2 @@
-EBUILD minbif-0.ebuild 192 BLAKE2B ca5de1baebfedc683bafb75490119456b3cb5c5c4e969f6d6c40d6a77869c709986c77173308d0c5a6bd5ab10be8cc29cf8b19e1b352fb90bc1b47e49921ec41 SHA512 95c7c5d129b8d53c238b44736458238eca0f13a53c705b563c9ab81369d57a21b53ad70b3c2c056eca4d8cbe870a77069dfbdf2290fe596af2980049574e52d1
+EBUILD minbif-0-r1.ebuild 192 BLAKE2B f5adcee63eaf341b62b28ea217d6c78fb203e904f388dcdf323c4f1f633e1600e3e99771d6be754e2175eeaad0778693c54dff4b5546555942cb459f6ea9b42a SHA512 0692244f87a56af8a7e56ceb90c2aaaf747236fbfaa105d864dc10eb3e6a10242a13bafd6662c674f756ae87d380763d87ee1d97a9d0ec0f9a4238c8b7c1c78f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/minecraft/Manifest
index ae70cc428329..e50e148b1f72 100644
--- a/acct-group/minecraft/Manifest
+++ b/acct-group/minecraft/Manifest
@@ -1,2 +1,2 @@
-EBUILD minecraft-0-r1.ebuild 201 BLAKE2B 6d4c95bc217af4456092a7842c9844e8a422bd4ef6b77fc2bba6444aed46edd0624978e4baf17c29b16d1141987d4372fcf86cc272fee1c33054a6832aa625ae SHA512 79a32c21d4d41f05f08828fecdcb7fbc724d13010324450c4bef760fe702544f65a9864b1496af9a656e7d7e1b78bd4d59d981f42770e950d34a503fda37c2fa
+EBUILD minecraft-0-r2.ebuild 201 BLAKE2B 8a571dc255d15b3c4e5b587012e28fa9bfdb205cbdacae76b2f132d81f0470df258840168a493953152478b61e06a2c8d5cd9498df4376ba470e2d4a53571e8d SHA512 057affbd46f27ad7ae9f1784c4dcab390d11cb8390206bd57ba6431cdbf18c52b2cec76d21a04c13cc3f1c02e67fe637a9eea223ba3c551982def285e0f84424
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/minetest/Manifest
index dd0a7164dd07..6b2f38efec91 100644
--- a/acct-group/minetest/Manifest
+++ b/acct-group/minetest/Manifest
@@ -1,2 +1,2 @@
-EBUILD minetest-0-r1.ebuild 200 BLAKE2B 79bb71a778624c35e295efec8bb1573bd5cd0899abdf9130930a7d9ba9a454e77ea444069f53b56938b48fb3c7ff0c57f502281feced3c8aba5983d46cef2b81 SHA512 f6177b5bb5bf717b555b74eb6e302c1ed1751cee578a86a4eb0a2faabaca5467eed579811b463100053d986a4d19896819e184d44baa6fe0f60b5dbc9f1c3fa7
+EBUILD minetest-0-r2.ebuild 200 BLAKE2B 35ffd374b50bf1cbb77e73098c5bddac16efde760edd34998b25c627b18a7a530e06c35525bbe8f845e194306eebaee93e68a54e9819eaec7f7703b7365e9e9e SHA512 cfce77d027e548c42efff4340a039a301643e42a8b26fc11b5309317ce6b994458f78754dde2bbd46ca6160994fc09ee093072266b50107a4ca4d4e9a6c4ac93
MISC metadata.xml 360 BLAKE2B 4867d8ae1f68605b01a06a446474bf19088f0cc57c5b381dd3af707e32bb7727c348b2c59b4ff654551be2ab78ac7ded05a0e258d0601740d27c058bbc08e863 SHA512 db7554cc1f206ef22ee9748d3102d40cb5b1085f5acf3f2cbd732ea11e122da26d20d2065d7184ea4a6b94105b4e53794af339c869f5432cc005e46b4b506545
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/Manifest b/acct-group/minidlna/Manifest
index f3b248c3bb1d..50db0c921061 100644
--- a/acct-group/minidlna/Manifest
+++ b/acct-group/minidlna/Manifest
@@ -1,2 +1,2 @@
-EBUILD minidlna-0.ebuild 151 BLAKE2B 9d505dfa50cd5799df0ae483cdc727ac6610d18a9218a65faf81f9c3859b8bb79b0a68e9cb0ea6d39f53f13bccfefafe39c111df55abd7ceb3cc0922bc744ca1 SHA512 9231b6a9fc1c3996e9a45dcad3999c3e8665fab0c30f30cd13fe36f3f1c8e59436472f5698189ee71993b968d46b8020796a754b63d546eecc51fe1e6a0e45ab
+EBUILD minidlna-0-r1.ebuild 151 BLAKE2B c1d1f2f79fc20a53a1d88badbdb75c30ef6b60124078f3c37d2020f0a6025d6611ec0fd8ced025a7d5395adcc27356d3bdc5c91c6d4ac60b16837e5a93038050 SHA512 dab8c732fb97177bcac9fe97d3ed0c619d83f1bdecf0ba9103f1f97a87ac8ebdb410bde1bda9c4af2fbbf278abc2de6359ae7f6d7c738de8a65da9b1d0900071
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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/Manifest b/acct-group/minio/Manifest
index 36346b25c58c..cd433b6f2bd1 100644
--- a/acct-group/minio/Manifest
+++ b/acct-group/minio/Manifest
@@ -1,2 +1,2 @@
-EBUILD minio-0.ebuild 146 BLAKE2B 672553ecf3db4df7649b99519adbe1554e926b9063aa2709b16c50eebe7cb7748c09e62c2305d18cc4015678f5beb71e6a7110f4a6d2a5a774e2cf468e0ac4b2 SHA512 1e167eef6823066fb3bdf7de039b8afb2fc08cab1adb45b7257adc0c2a6540ca142bfc4f194d651da8ca41e5c678f4d67c4994750ef550b5741dfcae42e5f5a2
+EBUILD minio-0-r1.ebuild 151 BLAKE2B a1eb2387786c441ef267100e082d57a23e1e218c5c4733d9c48188c08a29b655bd0f047eb3c396b38286d2d217480c9afe16e1d318c5ce8ba18febc7a621df36 SHA512 5c19401688f509f5782a53f7c30ed290f0751051c999ff832d95a804aaeaa4258ee10ef56046fadd3a478cedeabc115912a7a7e6c12e20557dc7520aadcef553
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/mogile/Manifest
index 380f50904a75..290da4bb4364 100644
--- a/acct-group/mogile/Manifest
+++ b/acct-group/mogile/Manifest
@@ -1,2 +1,2 @@
-EBUILD mogile-0.ebuild 180 BLAKE2B 437a74e6323fc20b2e356a00c63ed6d28528871efd86ac2a68413110299c4c969a08a414050a350735b753dc177d729a9470a20239b50f5afe1e004d3908dc38 SHA512 a5f8a330a8fd2bbbc9fde1c5aa80c7e6f5c62074607a0a2fa7b4222039e7c49f9c428e5829f1a9218c327610f9cd696ef52cfa569a0e1960113a72b5811e37ad
+EBUILD mogile-0-r1.ebuild 180 BLAKE2B c527b575ce262e8ca3c8bd43ccb7a816af12f1d55d5752008c6e2c62b3fff597da90bded8e1bca3c15f8ef9b5b8a62620e4fb8e964c790a852062ff649ddecd8 SHA512 32d3eaa1186e80756b5fc736823feffb396c8f5fe2db7c0e8ce007b48b313ae472515c32c6477b325ba6b3851d2d22430de851c49792a7734382d0cdeb4cc1bd
MISC metadata.xml 296 BLAKE2B afccbded98b241e31d1d4810d0213d05e04f65e55d77540618e3508976acd9cb381c5ff54ffe36d0d88da75c22d66b0df4b785c33fc5b3f5a8c6695f1ce207ed SHA512 9ee502a57c0e4eb85ae2a1e8b0d6d2a3ba2d8e96d22610728441201d1ff4050b447a194f0da401e33c7e4ce91b5abf04b85f08e70c286e2c739edda5aa4dbec0
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/Manifest b/acct-group/mongodb/Manifest
index dc7c4c17d91d..641db92e49b2 100644
--- a/acct-group/mongodb/Manifest
+++ b/acct-group/mongodb/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb-0-r1.ebuild 187 BLAKE2B aaf15e283ac917d6a293267fd1694cf1bddcbdcdfa3e17509405426a449c2f2d6d82fc4e24ee4429e8366ecf92c965cf7d5831165c444fe2b2743c062c6699c2 SHA512 5558890d1ec1b4978a145c1102fcbfb0a4baccbe0b2f5b098de9ddf7bbe78dc0cdee18578fdfc21a79fa796d7e4c0ad5ed396c0825d8c07649847ff0affb718d
+EBUILD mongodb-0-r2.ebuild 187 BLAKE2B a738bf7fd489811052893d4b104ad55ef08e3059f94ae062b7170bd803ac6127af42c58c829f7db9dc5036687df29aa60d6aa6b898858faf79fc66a5d31724ca SHA512 2f790d5c4b2fb7fd96f19b709cc3028b36b4bd7291115b5849cda06585f39cf3fdb02d83b1e5c3d4c0bc37d4fafda037a988641748da017052f804aba45b6fe7
MISC metadata.xml 506 BLAKE2B 914c508b2299ec351b57287f94ab25b016f8f6459a5de86da19b40850a9a90c364218a867589963d471becd19c93b73adb668787aa0134ffd2005b4d39fca7ee SHA512 d94bdd1e741af6d113f86aa60e837c3249ec74f11c6878a6932ecdf8c420968e2236a04bcca8e33ae77d7fd3029e7dbc78054167ef6feebfcab998ca527a677f
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/Manifest b/acct-group/mongodb_exporter/Manifest
index d5b87401a53b..708ea1598b82 100644
--- a/acct-group/mongodb_exporter/Manifest
+++ b/acct-group/mongodb_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb_exporter-0.ebuild 146 BLAKE2B e270af01bf868143b87fa65a08349ce9a48c4ed9980aeccea0211e8c8fa2e9427387ddeadf4640a7be867c0232159a879075f53ae756ea3f7cfe2f2377bf0ae1 SHA512 e7d0ff072fa4103d5f605410a51b636e538d1d32f6b7a84f0e8b1c42704550736fdb3cdef91e90ebe74bd51e0422a58d68fcf23482e50bc258928a775e21dad2
+EBUILD mongodb_exporter-0-r1.ebuild 151 BLAKE2B 71e441c4245978c8163ee794ce76f5bd6da309a2a2a94b61d92d126ed7ccb3dbbde2e3ca80bc069e63a9cf0132bf731193d02ab89cf3acfdc62d12a326a8b0a2 SHA512 82ad5f1a34e11337597150d630940804f9cec971af780e8f6b3f2a3795b5a0b784302f46734ea60c7d598c0c0e640d95af8edbd19943f4d7b3952ab83de353b9
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/monitorix/Manifest
index 6901b5548e9e..ad42f2c04827 100644
--- a/acct-group/monitorix/Manifest
+++ b/acct-group/monitorix/Manifest
@@ -1,2 +1,2 @@
-EBUILD monitorix-0-r1.ebuild 188 BLAKE2B 4347eca1e5330bc5f1f2c9d2e516e7af08bbe681ff416249f055f08606a75f9c09b877ede39a66e355c1d08a9a9194da856db99d780ee9b1ed6437a0b2b28e81 SHA512 ecce9a44b19fa8b20da9f2e74d243641d845af8d7ab60222159ce95ca345744cf59beeeaf484983a691d2d5837492835262a149d4fa7d11c5ea7f9ae8c498b63
+EBUILD monitorix-0-r2.ebuild 193 BLAKE2B 9a842b9268a317e5938729742829d92ee888ee122ae86489a688db160b24f14e4df1996b83966d755d1e44c6b17cea7a1b2d219e4b063c3319908b0fb3c376a9 SHA512 e554d6cecbdd2551799847172d7a436e8920d0539413483e6dabb9b791b5ee80cdbcc4cb85a18821750a7a002af5711f5ef112ea48d8d07f190524dfd83937dd
MISC metadata.xml 391 BLAKE2B 9ead41308785d3c5c7733cf997c688ae1ee8584c5eb379d8a03f14921a7597aa28951510c0bff8d5a0ec80df5b13864f34dd2b2ed962ddd870b3777187b0e09c SHA512 af160187c0209c791cfd8d497da9a9ff4b6fc3762300e309d5d75df2571fec2b52bdba990b2d13667d3fed5cf50e6d3938b70683e53d0937adb15e4897ca49d8
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/Manifest b/acct-group/monkeyd/Manifest
index 7df066a9a7f9..9f8519016e7e 100644
--- a/acct-group/monkeyd/Manifest
+++ b/acct-group/monkeyd/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeyd-0.ebuild 200 BLAKE2B 6d586274beb543fe6774793606ad298b19bedbf4a1e4f72353333047db8ba3d09f1d589b2b33f020d4ef9c74f2c5412a248127660ee02324e95eb8bead6efd18 SHA512 8f77053946db48d3a523ac5319a4955ea554f458da68bfe4c8ecbd4243a43a106966c06672ca37ce51ff96fd6164bc43540319e9112947370aa3d74a93d6efcd
+EBUILD monkeyd-0-r1.ebuild 200 BLAKE2B 6e5ea12841f0a4beaa05224e4f878da3ec36495a63641bc8a805b1d816c1682c37bdd89f221f125a99d8100f206af95d0ad65560c111de4b42e9b6b951546217 SHA512 f91f5a3e593933768d2e6e3db79070c77df53f3810721c2aa30263235146f64fa1c396cecefd5b48c7a949c7feb95296658d394515a087d82de12e04b3559343
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/monkeysphere/Manifest
index 54eaa10c6a8e..37721c4cb712 100644
--- a/acct-group/monkeysphere/Manifest
+++ b/acct-group/monkeysphere/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeysphere-0-r1.ebuild 188 BLAKE2B a5fa947fb024afc08bbe0dd4c2ac82fcdab9d2c56d7b350acd4ac2901fd82da140034fd0d981ea47787442bb424d5bb80b5ba9a95b1ab8fc4cbdc67f45234db4 SHA512 74225f94940989e6424a54a0cd9216f24fcb9b35c2f23cfdafe85ae218ad6b9296d8082de0c3b497e117799e8ac9922fcbe95069ca6625d8c932beb17424bfa3
+EBUILD monkeysphere-0-r2.ebuild 193 BLAKE2B 9fda991d31b7084520e0b3fb171ad02cca6c0e26d385779c695e4314d62b2aed52f6d7a57d8f8009837a21ee498631f4cdae22e19135383e4dc8878865fcee01 SHA512 b1b4af84ad1873c06e147bd08a60b59470fd73f9cb8d93a8a63f3fc0270784e91595a09d2434d591fab0c68dd4db8b57ff875353b2747d5741d4e00f54e1fce8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/mosquitto/Manifest
index 8b22f9325dff..b7246accd4f3 100644
--- a/acct-group/mosquitto/Manifest
+++ b/acct-group/mosquitto/Manifest
@@ -1,2 +1,2 @@
-EBUILD mosquitto-0-r1.ebuild 203 BLAKE2B 96dff333d4c3f641940f7a16af6115168305ad14c50c861bb5be3a00539a21fb2f83afcf527fe2a796c0f6ede56527e6c91984629245568aa3d6671afc8321ec SHA512 f0d953d1d855925abf4f747e083efe4a8cadb0bffaca50caa4241c28e780de6fbf5c2ee4093a812609b32fe195f2287d0a271b363c3e796c863898b365c1f7fc
+EBUILD mosquitto-0-r2.ebuild 203 BLAKE2B 35eaa49b7aced977eda6e5cab85e8713aaa7de3df1bcf8b03367afca40b379f3d4de98e7aa9547541a7fdfd4c1e3b2cb900eb513ec99eb156474c8c1c2eeac95 SHA512 424bc3f91dc0cb0920f3d3bf4c708a0fe7fbe1e2e7fd46318e06f95c6dcc7171ccf2eed4003e2f5d300acbe56eb6dadf15fe10c1b6d745ecf53521da1d0eb4d6
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
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/Manifest b/acct-group/motion/Manifest
index 19fa6807dc05..0f10750ed971 100644
--- a/acct-group/motion/Manifest
+++ b/acct-group/motion/Manifest
@@ -1,2 +1,2 @@
-EBUILD motion-0-r1.ebuild 146 BLAKE2B 578075e210c48d0089d306ccee22081474383c156386e1b25f2524f98250aa29f82a7091608499a7c6372209718995c1bc75db3af62c516c31511d257cc89d5f SHA512 5b20c9f5a214b8fa077e331707a9f9fa9ba3bbac2b5bfd19c12938d23170a098eeb8bb5c50736a68a919da5d6097e5fa29d03338ad696609a44b4ea50a96a4d0
+EBUILD motion-0-r2.ebuild 151 BLAKE2B 879a78638edd8bdf2c021011aa06f742d9c5ace061faa2653e69a865f63b34c18f899a1fcb4b7edf7e4c8cb74909b38b8f2f830a386fd12c9c79b0825e3004cd SHA512 bba5badde514a479e82fa9bd041aa971eeb966653f19e1df0d5c951e7ad5481cbbaa2223eebd06c1b88638602b8c79532aa20ab4dddfc6caf0dd56a51bcfd19c
MISC metadata.xml 396 BLAKE2B c23e0428f6d197596409734471aebdc88231ccdc6abf3b132414ac1c4a2aa933017b5d6368b018e8e91ca1c01f38c49933af23888f2a6eb3b9e333eee0677d81 SHA512 c5fbc86f53d46fda14e9268883cad59049f01e2f356185af9a0d0ab8d5e76de69923768027bfd0d3fe02af6af2c008adcfeed20f3d312a8bf458fa655376d19e
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/Manifest b/acct-group/msmtpd/Manifest
index 017783b8692a..a363bb6a757a 100644
--- a/acct-group/msmtpd/Manifest
+++ b/acct-group/msmtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD msmtpd-0-r1.ebuild 151 BLAKE2B b4421a820cbdedb643b4f8e29faeab7f9f978d30cb386af6e58f6b237c190351da29b9063b7dc408fa83af456472f2385b663e167247b976af1e821e6ff6807b SHA512 1203526c8655d0e41a0b3eca8b90cc8cab126c06915246dbf3f7c59068c78488375f314065455dbf7378d74ee43d8be2d24cc7a119dc002f2caecc4a57c77598
+EBUILD msmtpd-0-r2.ebuild 151 BLAKE2B b4f374b2908ac29ee42602422bbdbb9fda9c5949025976833ee591c3f4749936e1ffc3c3929c1ae5004b1523811789b1984c5fcdc288ad3df3607a85004c889d SHA512 d21d4b1a5cdfa3b4c50255c34144d2e3718940ee2a6bd3dd7934dcf77516468cd60fc04cb77d2a523e5ab8219783e454c5268ddeb960f32a12223d7cf6a71d29
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/munge/Manifest
index 5e26506d10d8..2ea00f933bfd 100644
--- a/acct-group/munge/Manifest
+++ b/acct-group/munge/Manifest
@@ -1,2 +1,2 @@
-EBUILD munge-0.ebuild 195 BLAKE2B ba7588db342e2d031b3d5a4ea43755f98fa4e9ffdfb2cae8abb93904d818720f56b91c59353a9cb0518a6b43b69868979f98ffaf023908aa59ef419735781560 SHA512 ea0b09ab44300d1cc8a4f6d8755dd2dab64dbf8adbb1f22bb725163129352cf27498c0ccb4b588718bd8cd399c09b01009947232da0f5b3f87f23208165d908e
+EBUILD munge-0-r1.ebuild 195 BLAKE2B 2238d5fb768ae5f63e1a10625d6950174decfafa014b3bd0918ec919d4cdd727897f270737a076be1de52b7c10694908040f07624243a72a0bd69666fe30917e SHA512 39613934c915a38330186c4784ac32c5df35650e4f786b6558311f198aad8c75edce7cd790755928bb0f1d8300ea67cf734bb62b5b8d937b14a99da47cfaa65e
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-group/munin/Manifest
index a552196afaef..ee6a04cb0855 100644
--- a/acct-group/munin/Manifest
+++ b/acct-group/munin/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-0-r1.ebuild 151 BLAKE2B 3ebf44ee080bd2336747d1da660e1bdad2d274bcc7ef2383d6df192985aa909e17ac2e2ebe845ad76410b3bde4c9907a7f61c5e72b0b6e1d7edf7bb90e821e60 SHA512 5fbb18d85eb9ccb62aac4a11814e6f5b2c1152e68e114b736979171fe802811e8070407685325403cc1c0d45555a41d60be5f49f1fc7113772a9299584a787a3
+EBUILD munin-0-r2.ebuild 151 BLAKE2B 69cdb0e071971eca40d11ee63073d88229488693f8266d385e5aef456e526064cfa85cf6a0e29a8012fba5d9a4fbe2ace74cef949f90ad250e754ea129fe670a SHA512 68629e012acccb44da2830b9d732b218e63a3e586f7e575631de8fb637cb8f3be7ba5a2c03e3620ad18fd20e3e154448a9fe563eeabe8c16277e021651bf66e7
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
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/Manifest b/acct-group/murmur/Manifest
index ebc50e858c08..65decacce58f 100644
--- a/acct-group/murmur/Manifest
+++ b/acct-group/murmur/Manifest
@@ -1,2 +1,2 @@
-EBUILD murmur-0-r1.ebuild 151 BLAKE2B e63e55bcdeb536f3e9639259292b8b3ac5ec7930fdc81686acf8e95d5799f01598511a39cb6a83609e6134d192c232f994ca147dc7c7affe2617bc011febbdaa SHA512 a14a5341cb986eddafdaeba3e2e50ecf64e48b468cbe082a1ba5ed850ff57aff1125666a9e6ffdaf8243eec64d68d58026b92c4cb11dd7beed328dae0697a525
+EBUILD murmur-0-r2.ebuild 151 BLAKE2B e1584b186618c544502ae5d2e7d4f65187da705f1a2da66c6233fc1b47233cdc7ddc68bac94f0c90062e69cf9dccf580ee24aa58e1ddd33457bd813f671cadd4 SHA512 a64c980306d0456aa68a2552c932b1749b7b84589bdc213a8311d623c8289f5d9595fead47f357557fd5749e31264fb4642daaede2da2f5f62b6999022e35a54
MISC metadata.xml 259 BLAKE2B d393fe53508d06da051d73863657c1cf9f63ba80d8217c3c17ed754a7e652bc90be692dbb619d2a5e3e1d0dd258a6019c7b9a7aec0597bcc0f63e2f16c60774a SHA512 3292858f61d9b06b284b4cae18383cbd9cacbee726291402e1b3cd104f9498dfeb4074c6550ff64b5ef374f40d3d329b04f2f3010be782ff06e896d4c666c925
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/Manifest b/acct-group/mysql/Manifest
index c7315bd7866c..912c8dec91d7 100644
--- a/acct-group/mysql/Manifest
+++ b/acct-group/mysql/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysql-0-r1.ebuild 193 BLAKE2B 49da2816d643868d9cf15e3fc735acaf2d7ed2f26deba6d28583a943fe2628862cadd30a0d9c2a2c621acb2afd24c7afc0b63f8fb459e2d13ff4ae2f7e96ce3d SHA512 1fe3ec73a00253548a1fc6bcd861dd9c274c6f7fc3a0f0b3a435347bc06f2d5fd0f5267c496d174f970b54299d39c4fe97a106eb28b763a8892ec0d42d356367
+EBUILD mysql-0-r2.ebuild 193 BLAKE2B 9e0d8188d9cee1e819944deb8b857e7d5bb4d1aea79a54d67cc5c1a1d993e01892433cc04eeb48772963fe7f309dbef28e96e4264da1a354e03049e23da7d62f SHA512 533730cf488bf85c92b565e0969f4466bd84067d7cfd1a8d78c9e8b7c9075fd128bf46cb1f4c7ba7de73980112448e8a94d7b050f7f257bf2f487dcbf89a9dc5
MISC metadata.xml 258 BLAKE2B d72173be6096a07ac4d2cb3e8cc161e6d817e7bf3f3b87c82c8c490403d67487ad3f4d65edb951b3a9ddfbe38a5c2a28b335436fd14f7af773d630a61d34f2e8 SHA512 25f8d8e566c979bffdcba13749feacf7d50ed10ec9099018bb18984d97dafbadb4787b4e49e618658390afa31c86531d08d27e13ff8119a39195d6dde26d9b6c
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/Manifest b/acct-group/mysqld_exporter/Manifest
index 7cf08842385b..cb14eef77bec 100644
--- a/acct-group/mysqld_exporter/Manifest
+++ b/acct-group/mysqld_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysqld_exporter-0-r1.ebuild 146 BLAKE2B 579609b1c39fe382bd1a39edcb95807d77cb3c64ed3b88255c114bb0fb908d88b7adbc766b451d258186f640af282fd10203b8f2fa669a9c2843b4afa630219a SHA512 db0633ab47606e06653193476952d4e9f2f500eccb899cb1e268ccf792f485a9d67f2d0b40785071a311eac1dc70b9a5251c8f3129a2b4bb9444da52d7bc52a5
+EBUILD mysqld_exporter-0-r2.ebuild 151 BLAKE2B ea6d341b60b80f8d00cd9490548d80c02d5af148de0534787464e0ac3a1c83ff54ebf8a11134cba8b8abd759daf85b44ae2fbe5020948474efafecc37c0eb595 SHA512 ec4d59c2050b1bf878fa930fb53c1740fec25f36e16d01612694ddc7db69828e5ea1a1ead7afb7b3bf5f6f82212b65962bbaa33039a1e1ee76e6a6d3cfb98f02
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/mythtv/Manifest
index ecf7a3c4fdbf..8372f0f821bc 100644
--- a/acct-group/mythtv/Manifest
+++ b/acct-group/mythtv/Manifest
@@ -1,2 +1,2 @@
-EBUILD mythtv-0-r1.ebuild 205 BLAKE2B 6ec8e3e27a08b26192e1de51b800d478839b609a6d671187a61eec9a3958a0e55b53ff90a055b7810783763b89712b5d2a473c3d5908802d90b05c65e6de8f9c SHA512 2a679c86bb3f914ab48be0eafdb9c62e3a7b38c47a2714695983ff284b1bb2489db9e752619d08b0f313462b3defef66184632c5d8aefd1b84473243bfdb6de8
+EBUILD mythtv-0-r2.ebuild 205 BLAKE2B 8c13607a964fc3b615d33b76925cbe7e2346c22d38db06e005138826f2b88510dcfe40a4509c8478f979e2745cf919944a10b2fe4a59fd3cee695b3ecb6363a4 SHA512 3e2e48bbd71d2893f212ff1c4392842be5b8fab6357b86a15a96681acf6590ff077af2227d68cc62870ef869ef230242b0912056a4824d7e6d6a9cef414b19fd
MISC metadata.xml 496 BLAKE2B e22557387c28a1116ab1766aaa52ffd256b079cc8cddb3930c112ce912947f32376129b579e9bd80c9f11de245b7fbe1ff64e1ccf26ee575886b0cddc0577cd4 SHA512 64909e19b147996b6e0798de36c038148169be312e0e3546f9818baead0adfb264a6184a37ede327ba3890881f39fd38707ee06341b140d7589b9a9021c2026a
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/Manifest b/acct-group/nagios/Manifest
index 28e1a0ad27ed..d814944d1b19 100644
--- a/acct-group/nagios/Manifest
+++ b/acct-group/nagios/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-0-r1.ebuild 151 BLAKE2B dbffed0d81911eb858097a037e6d4aa9e47b971a53c49dde628ca092b7b3ea554f10b3f44f832873e7644eca1bb10989b299d4d8033e00b4c7410f64c3e4d4e0 SHA512 93e70152cc37fe15fe60ebe6433f73c9d9fd73f68f3871d94c92ba0231792a4000ab1cce088b582adde0d797013bfa21a2074382dd7ca988d1cb1ec02bf1e2ea
+EBUILD nagios-0-r2.ebuild 151 BLAKE2B 9e0290f1fc1ce30d1998fa169dc39379d303335e98a32cc4b770c38fbec53039dac071f2328a360483ef2e428924c38192c74d8beef04d907a66389adb27a6bd SHA512 d2cd587dd157eb0018302230eb215ddd0c16602838e1c817cfda483195a779783ee160936b83bb4f7478a00dab657fe7c468e9fe5840429ef9e3ca4282eecfc8
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-group/named/Manifest
index 75a71401489d..aeb94135a7a9 100644
--- a/acct-group/named/Manifest
+++ b/acct-group/named/Manifest
@@ -1,2 +1,2 @@
-EBUILD named-0-r1.ebuild 145 BLAKE2B f2dcf872885c94761dcaedca38434160ae93d9f28c17b80f3591ad2b5afc59319e215ccd73cec6e6d23585fbe6cae2a1e00a254ec0278ae3e14e89720aec0c4f SHA512 a243157555f25dde112ba4850cacc94d4d9a0f67545c4d72d6d68fc5596fafb81412f00e2f235307cf791c8b8473f511b7857418657c9cf2b78f73d1f265a791
+EBUILD named-0-r2.ebuild 150 BLAKE2B dd80ba8bc1f3cacc2355af066bd414aa8bbe9167a929d3a4f8b2baf7c7774f414a34fccd1cdc597fcda351918fa87c33cd2dba6b039f1f3fecd2bd613140ab7a SHA512 4fde18850b6b9846ec645bce7781ee61081f8fe0d31b90e898e951c0ee44bb8e3fb7a65b2e040da540237d7987984d8ebdc1731ded338750d721078f3399af31
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-group/netbox/Manifest
index 499f32ceb8d9..99eb89b7ee88 100644
--- a/acct-group/netbox/Manifest
+++ b/acct-group/netbox/Manifest
@@ -1,2 +1,2 @@
-EBUILD netbox-0-r1.ebuild 146 BLAKE2B 9ba1fd4f4cccf6fd843428c0934f0f76f1d8cc0009c80c65d00a451be31c7863e0da5e2a7bd8f9b757251eb38cc2f8f25602883ff8bd93d96fc8f2df8971f84d SHA512 be9b318a14c33d35222c416135e756f8eedb13f857d452d3934e85184e21ede9f81b2c68ab7343d464dc1972054e4c12394de3d125bb9cdcfbaac255f0027964
+EBUILD netbox-0-r2.ebuild 151 BLAKE2B c95516ed796b5f2bc89a3d6d336e3437a1969d86265037e37ee465581af3361a2f79175b5ee28cd7f957656ad9b7af3be62d469f1dea52b08398a987caface14 SHA512 1dd833a3fa35f1e611780b6c25615e0a74460bee7d10f9f9c566c9bb2485612dbe0600d8f695073be16104eda8371a9c18ada85fb7c08b4e6f0fb3164886554d
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/netdata/Manifest
index 7feb3b66cb57..eb1cf892f13e 100644
--- a/acct-group/netdata/Manifest
+++ b/acct-group/netdata/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdata-0-r1.ebuild 151 BLAKE2B 2107243979f441ef2196817152ee98b917cf72d2618f6e92d90c4bae545d19323e36ead5d2730bfccfd775e36d0706ca370b4fa2662243d1670d5778e70431a3 SHA512 14c4f110574249858b65185909808c3bf63f939728f059e33b2b2cb6f2f84e9a4a542422858de67a7dface89336e3293297439d274e8ff6e9bbc7ea4d1526f68
+EBUILD netdata-0-r2.ebuild 151 BLAKE2B a4d4fecf591793508bc2c311d6ea8b04a4aa4d280333c158b5315609a109f1c0545daa58542645438e41f29c39bb71ea6cb275d800f68865bdd18ef26018711c SHA512 30ce78c7ae5b204bf503447767b4ad1681f73779b0329fab26649a37f880dd31089fbef9dbacdbaea03901b1898e5b95e846af6e05a27e61c29d9ebe7d93140e
MISC metadata.xml 255 BLAKE2B 5c405696da1838a5ef8da4bb3a32993157261b449cd28da0cbfb24fa2f33ea1a15ec1415fdeee87c2c051b023c58208065b0cdfdd5de15d648ab675420d9a2b6 SHA512 df4870842bef82cb206492fb14b03f0195dab3fd6aa1eed1c6aeb9c57978bfa68fb37a523ee3d8591937e750dbb52579e24b245e0213be6805b5ee461392cc12
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/Manifest b/acct-group/netdev/Manifest
index 20600b416720..1b8c0b781c2e 100644
--- a/acct-group/netdev/Manifest
+++ b/acct-group/netdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdev-0-r1.ebuild 189 BLAKE2B 50c5141f0361f0ddd62c6eb0b71b6691f35ed7e72da485cf19b29e6c0c10ed890fd1cc3cdd39252ac7693e004ab6bd587aed662153313ad5bbe8f9abf941491e SHA512 3a3de6f7da7bdeab9048541470222f8899765c76864c3e0b7f41a32d96e3f0376bde5307025907c1f31a65132a5e7c5f6a6ccfd610e96affcdc9d1e5efee48db
+EBUILD netdev-0-r2.ebuild 189 BLAKE2B b94baa6b4f55508847cf836bad51b52f27929e584a8845054126d0ccf910737643b93f6f785316d76f25b125d880b826a81699700dc2e01104ffb3dd8631804c SHA512 6de75999b6311d41dafd3d3dfa86e41d5e05b6ec40a8c129ebccc765648e66adc18c6a90a617c0e985b694f96c36abeca8c501c31e404f4f63b04a6b304156ef
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/netperf/Manifest
index aa1cd9c94580..550feb56fa56 100644
--- a/acct-group/netperf/Manifest
+++ b/acct-group/netperf/Manifest
@@ -1,2 +1,2 @@
-EBUILD netperf-0.ebuild 201 BLAKE2B e4910d32e12de0f9ecf4014c3b92b6a405fa0bb5f106c5aba2c741c1f6601d3509ed90ab126e64982c8ab3083490da24e5c674f65e431116a0b76f725dbdba94 SHA512 efbdafe04392a0e340a938efa062959dc249235acf50889bde6a9f1447d84246dcb2ca7dd307feb378cb74527faa81611ec7a676938ec493178c7ffd83f06542
+EBUILD netperf-0-r1.ebuild 201 BLAKE2B 3dd426001c463c6236e1852cead04d68d76ee966fbdd2a60d1c3250fd7c5f8caaf819fe7a3ca80afc18697e9fbaa0f0d4413ea771df4262d92acdefc6901d5ba SHA512 f9dea76c3ebac8d751b92ea816548906823eeabde18b9ca5d2cd8f6cdda34fbee8bd0f8f52714c521d74aca8a15bbafbbd73573d4998a2c88c00f0a4c1a42cee
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-group/neutron/Manifest
index 4f9c217e9fec..be7133b272da 100644
--- a/acct-group/neutron/Manifest
+++ b/acct-group/neutron/Manifest
@@ -1,2 +1,2 @@
-EBUILD neutron-0-r1.ebuild 146 BLAKE2B 32629da4e9b9e59a55418e455ab77037135d6055715d9e5c6ba7adea17a4ca80f5f0fa9d6d6d33bc733b5976cc6ecf94cf00401df72efe55576ee3255e51205d SHA512 a73186f848b8a3eca8fed271c60c8e8ed11d93219a6ccf3237c52364f609be2a5202ae4fb1dfa3e59e635e40769fd6e1092e45ed9572db89caf504a1108b3264
+EBUILD neutron-0-r2.ebuild 151 BLAKE2B 8b0c674b688cdbeb4087c1192f75ec993c0f90c29ad1f630c5eef2bd9a57d397a83589114a9e552d3a4924d741f460c85a270dfdbcdb41c6bb063e55395d5da7 SHA512 fcb0dba91d0ed37ac2b9bcd0d2c7befcfa337312ad0c0475a7d91f7ecfd4928b5b8d3f7ed768c8475e0db01bcbf1f58abb961164777dc244cc602805e1b34686
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/nginx-unit/Manifest
index d52498e59f32..f9339c755245 100644
--- a/acct-group/nginx-unit/Manifest
+++ b/acct-group/nginx-unit/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-unit-0.ebuild 203 BLAKE2B 72830e2222621769e42d9ccaab77d6b0574289a6625fbd627936e72e6b60351cda6ad753e3342c071a1f11ebee7fbac4b6e64f5e625a929d15a829f39a91f065 SHA512 626e6b8eee1bbbf2bce0db0a122dd842e914f7db8138ce4039923dbd7ba52faca1d1684a1f9b3fbed24eb0d5ee0449fbb9bce0b9d49202272948ce7f151a61cd
+EBUILD nginx-unit-0-r1.ebuild 203 BLAKE2B 72830e2222621769e42d9ccaab77d6b0574289a6625fbd627936e72e6b60351cda6ad753e3342c071a1f11ebee7fbac4b6e64f5e625a929d15a829f39a91f065 SHA512 626e6b8eee1bbbf2bce0db0a122dd842e914f7db8138ce4039923dbd7ba52faca1d1684a1f9b3fbed24eb0d5ee0449fbb9bce0b9d49202272948ce7f151a61cd
MISC metadata.xml 223 BLAKE2B 095cbe9aa757b7e872656ee3f17c562e1628cbcc794c9776c46c6edb22e30ee62d077a5ec6a59f26fc453bea96c643cf710e773a399651bedebe8a5178f56344 SHA512 33143373e4f170a675d3f9edd8439432444e03242e1e9cae2166e5e2b189ba1401ecbf93a7496999faae23851c4de60b705b9598a59b97894dc89d6aabc4bd6b
diff --git a/acct-group/nginx-unit/nginx-unit-0.ebuild b/acct-group/nginx-unit/nginx-unit-0-r1.ebuild
index 004f55765547..004f55765547 100644
--- a/acct-group/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-group/nginx-unit/nginx-unit-0-r1.ebuild
diff --git a/acct-group/nginx-vts-exporter/Manifest b/acct-group/nginx-vts-exporter/Manifest
index eae4d347fb82..7cb0fb2871cf 100644
--- a/acct-group/nginx-vts-exporter/Manifest
+++ b/acct-group/nginx-vts-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-vts-exporter-0-r1.ebuild 146 BLAKE2B 3b1466fedf886daef1c928679eba89a56d77bab4fc417ef80a12281368b0a4548b35b0c51ce074ba0d3a9339668ddf5fc6039d6099b79643c6a21b72ddbe3f86 SHA512 4d7c015bb913a582e777202ce5722d8fb9e27280959a3da0a8dcdf3e32ed0f784198205547cbbda6a2fae531dbc61d9797fa7d0bfa5167b1ef0a9e67c4271947
+EBUILD nginx-vts-exporter-0-r2.ebuild 151 BLAKE2B a340d114305c1e9d4e8fab39a6765b2122651f9e99515d9f1e91b4a3371eae67fa10ae1b648daabcf7d0bf02c7fefc74a8636255d37246008248778b08fb7689 SHA512 2b56183b19cfe40f5dbf8013a44608dc8e30bc4539b5b719cf6ed31a05983a06b6c0ba5dc45f3a1e72ca9525f25e5e11dd1a932c6376ac01929fcc28e9d06bb2
MISC metadata.xml 258 BLAKE2B 14fff3c5ded754d49480aaad0bf53ddb8cc4d824c072af60647f5bc179aebe8902564c877b9ac0199384d2823b1950a6c48cd2c6297c604e0d2f92c276a9768d SHA512 2d2417fd604c1e3dd12bcb46d06e08b1acdf2117eea460d115f66f0114a6daf2a3dbaae7af7ae74625398d336f5759a6e5456f4f1d0104bcae4e74265f6a0e54
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/Manifest b/acct-group/nginx/Manifest
index 08da48c4b9c1..657e04180764 100644
--- a/acct-group/nginx/Manifest
+++ b/acct-group/nginx/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-0-r1.ebuild 197 BLAKE2B 9aac7743c1006267a372c60997947739a656de576975f9dd8a90add559d1819b151579a2c5c264fae2e683cfb27c7ea12ded6c9dc39b7baa02cf7bf23819bd24 SHA512 77579daa5aba7b5717c25627daca987051f733790f4a2ff2949fe291600d184e6ef033508531b262e74aad484d7d354bd707e9f456b203278c3f3ad2c718c228
+EBUILD nginx-0-r2.ebuild 197 BLAKE2B 6634aaf47ef5981a2da844e54bae5649291f20476989c82c2acaa17225e609ca6cbf26941adfaceb3862fa78eb85b2202c21de559f7c49f7333715c4265423b9 SHA512 527afc6785f6103f7a557faf3c4ea3a62899963111ccd79fac56add44b5f1fa9e3ddcce891760e3028b7a940bb1164cd6db1e8676140115509da5f94af73e02c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/ngircd/Manifest
index 9f6a75bbd013..e310207ca511 100644
--- a/acct-group/ngircd/Manifest
+++ b/acct-group/ngircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngircd-0-r1.ebuild 190 BLAKE2B a2eb4052a88c3d82aa3ccfdcda10e7e539839c54b4d16d71f5e2f3495be4db86749093d9377972870d8621a6b4e98d9d2d6a2aca1389334717de387ddf9ea39c SHA512 b3a581a9dedf0dac14ccd92a275553c02ef981b2f923008030f4a363112fb40568d3416a8687486b1093bd5aef997ac5bb52f32063d582ccd3365d4d370d9b52
+EBUILD ngircd-0-r2.ebuild 195 BLAKE2B 930e996afbe43d39069242a5c9ba5a2fd0718ee96b53e36717dd502c0586241f4c87b0f65276e9f2941476e466fa97b250a391db1d12537e06d79bb0a344a307 SHA512 2d90565b1badb5543d232ee4af180d86a4ffde6718c80c19120fab8fea1bc5b9697f5b7332fb1b12d2e31dbe2f97331c4be8184586bf237cb94c6eafdc17d9b6
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/ngrep/Manifest
index ded4fc145221..577dd1d6324d 100644
--- a/acct-group/ngrep/Manifest
+++ b/acct-group/ngrep/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngrep-0-r1.ebuild 199 BLAKE2B f8df4a2844817902ce9c8d9e88c698dbafed83067e064dcfb41ab2ed8ea9b8778ef2604adeb13f927bf2145f3b6ce84728b2a619b9393e39cc450f01e8fecd65 SHA512 c87cb919c6e986cc304fc13240b45ec7569fbbd3c2e27c4db50c6e80a03e72f70b1b6ac685c94872f5a218369e450533927c5503c3dbecbbb45ff36a7f5e7e5c
+EBUILD ngrep-0-r2.ebuild 199 BLAKE2B e4b224fdcc2f43d364d1011f0d5abf78f0c2bbf2acc5d080441fc422b3725b1c54f3e8e3c9b775253443cfee3f14d70db2361ce95264437783b9bcdc661721a5 SHA512 5ce1505baf110f1177ec8b0f26d9fd9984056104f3ae7480515b81e186a4e6367cb997348bc5fa6d09563205a9ebaf9a4fdaea2b2e59ef403fc4d7daf2b81d25
MISC metadata.xml 625 BLAKE2B dccaf7134c266c36cbb22380e96e5dba09a7b9ce70285cc21c10168b236c7b17e7dd52e3c84dfe4a311ab600263159f7acf04243edefdfa00937bc43d54b71dd SHA512 3f7d9d8ee4647bded5bf3b73b7fe5489b19b82e27a8e0150f08a6f3cb1a2dfe9292591ab4d378f897e09d98d77b276960aa756d22af7affb4ef2e40b90737003
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/Manifest b/acct-group/nm-openconnect/Manifest
index 5a0306cb39c2..8d497975fb2a 100644
--- a/acct-group/nm-openconnect/Manifest
+++ b/acct-group/nm-openconnect/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openconnect-0.ebuild 215 BLAKE2B 3a0fee76befe88ccb1dd8581420fed87c926ba5308ea64676ab754a2736d043eaf4aef24a3c77c8eb35f0015611c5772115d426e19a4f233fa83293de929b183 SHA512 6f0780ae8f0c6112e84838bca4fd3f21d5dd38738fe80829a31c3a1831a71a6dec93ec16fc846eb746c338d2a2601cd08aea0a86b1cc46b55be0aa3f8f72689d
+EBUILD nm-openconnect-0-r1.ebuild 215 BLAKE2B 6bffc326b21029fe47d9321f1c2faede45ee33122ffd869c8cee28e33454f170d9cc97dd46d14d76afb92c2d58b0f363fcefb22f970345a3b70a2924d4185b7c SHA512 b2c9301dd582208f449e493ac724cebe4b9ee1c1e806d0b7d785892961b44768e0230f4e892af87787d7e2f3c5e1b15a39c10216422c0a16bfd9c22c983259d9
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-group/nm-openvpn/Manifest
index 3649f31f3cf9..ca55ff3291b9 100644
--- a/acct-group/nm-openvpn/Manifest
+++ b/acct-group/nm-openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openvpn-0.ebuild 211 BLAKE2B b490a9fb057d16fece1720e2e50b09d6f81a71fc0520fe932f979068d1dc78b3819e882a036e887056c9a32fe254161b331a56fa330529d5b9d788f93fb9d5e6 SHA512 8cef0fec22ee80dc3d9b3f3c334be6cdfe16549a0aae2df4eb1c3e2b9a9ee72559fd8566711d3fa520099c43e30eb6bf7f533b1e2a2d7984a42b71fd6fcdbc4d
+EBUILD nm-openvpn-0-r1.ebuild 211 BLAKE2B 740d057dde0a44b165e5a20c7fe83ebeb85dc1854677e5f2edf29397ddd05379c3aed5e346c0b5973fc12c15c15c6fcbeffb143129260cf71e39de0258035d2a SHA512 aa492b649e9cb0e88303a655d887c808f555ae3f47d661ff226f0f0597116ee738cf69e8048449d8d9e92ec29a4a22d7e9667a39a5571199c9bdbe527f1af4b3
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-group/nobody/Manifest
index b4d86f5a71d9..e4e586c3b705 100644
--- a/acct-group/nobody/Manifest
+++ b/acct-group/nobody/Manifest
@@ -1,2 +1,2 @@
-EBUILD nobody-0.ebuild 174 BLAKE2B 530f12cf22e355c0c37a3fc2840a283e67cd99b7602130eb68a90eb8d9cc5286b278d5c62c983a440abf16534c8a3c7e01199b0458408b8ff73a9a3cb56467d5 SHA512 158c3040bbf6ee4061027b477eab8eefee93e6e34b5cceda93e19b4791e24ff3bb60c86e38544b4b4ed29a44f5b5a9b470a6a1572b31d264c570f9b00c255574
+EBUILD nobody-0-r1.ebuild 179 BLAKE2B 02f2ae52eb2de462d52b91fe1ce45ad533f6f98ab32c0b64f62de469f858107b4db859d0d1b67641a14d88b91a8f6ab5ce2fc00ea0b22874819fce0f6120ebed SHA512 c8f60c0c04d106c2e1223834663832ebf363babf750067fb047f1dc0fa57e9e21239255d841080824ccad347d35ef3429873a94c1b6646afb1abac2fc0e58339
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-group/node_exporter/Manifest
index cb61583af5b6..41e2b5646558 100644
--- a/acct-group/node_exporter/Manifest
+++ b/acct-group/node_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD node_exporter-0-r1.ebuild 146 BLAKE2B 866b51e4b252048085cbae84c29e023febe2f7af6952bcfc6cd0f391385de92fcec88c8eba9d52379413f9386e33849fd71f888578934dc3d8ed3c5ef448a129 SHA512 34d3cb8b13015b79657115a892c2334b2038fa28afb8f24a5d4b1352e5f6997a218b20e95119abc28d6eb685b3c48adb2b441aab87012f9603160a10cca9b0dd
+EBUILD node_exporter-0-r2.ebuild 151 BLAKE2B b2f06f494b6aa14abac46ce60b6a1e42c93be7dcd58ed4ae2c43e6dd660ad9b6eb57a1fd7f188f4f2ed2635a521fca6cb21750b45d23c4375c831a7b7fbe857d SHA512 8f683e29cfe061fd85f80463ac72bf2138b52ffebe2a950d9548796ac110db9a1116b8370a5342458b0ce73fd36a33ff80459aae701576240bef10ba739d79bf
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/nofiles/Manifest
index 3c9106dedc60..2188276178a9 100644
--- a/acct-group/nofiles/Manifest
+++ b/acct-group/nofiles/Manifest
@@ -1,2 +1,2 @@
-EBUILD nofiles-0-r1.ebuild 151 BLAKE2B eef47639de66651b0df1b4832fbfcba730ebbcac4e8377fbe99bda10db4c5a70f7389ee45d79fde4a248e904089e4f1a35014164de2379d1c5ca8a5cfc76bbe6 SHA512 9f57107eb29783f8fe30a8c9781ba335b786c602188a65538132044ccee6f7c96db5d833edc439cf6acd605c85de467e0570a86ac95f7e549efd53d491cc8153
+EBUILD nofiles-0-r2.ebuild 151 BLAKE2B 4339829e393785c4d3465f722c4eb5bdc73215578e0dc4b85b1543013a57c8418d5e6354d41e1632a49c2d7531d3f305d6b2cbfce08c2276d1badffdb86bb5d2 SHA512 3929ea68268072d39e00fb7d2f97697c8b4a09f52a28a9a1b40d30300bd7896cb26c26f492caad846b7f3031e509134a303992eaac7c026ac360c8a40b5b9330
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-group/notary/Manifest
index b5d965dda7e6..bb06522bac0e 100644
--- a/acct-group/notary/Manifest
+++ b/acct-group/notary/Manifest
@@ -1,2 +1,2 @@
-EBUILD notary-0.ebuild 194 BLAKE2B 4a44635a55b46c192e0d2118d692318d5a0a3eba826ba15bdf351130ab79433f56a6eff80cc74c12e23e86ba948df06711405efc01aeb640c5062396733677f1 SHA512 a3269e5e1af4079544eddf0743e2e8d7000ade30655e111728914f2c039f13cb8b28dedf7860034c844c2315583fbf0e8f97d0f133a3efc13ecc024337a33a0e
+EBUILD notary-0-r1.ebuild 194 BLAKE2B 2aecfdf6e2a7c6f693a70ee2b1a986ab30d38f7260db292714af35141e21d1179591cf282949c15b461e20bc10b5b26fdd3bf047bfeef3e468a589e2aa1f7ce5 SHA512 a7c3125ba91e7b3c05ae8d3ffa6c76845688ab1767cd12b48046ee7ad6f488446e3362adb59ea014d88b3e15360ba094cff078f2bfb227d2f2f01f8c94f4a6d0
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/nova/Manifest
index 561dcf15c58c..6985ff0387e0 100644
--- a/acct-group/nova/Manifest
+++ b/acct-group/nova/Manifest
@@ -1,2 +1,2 @@
-EBUILD nova-0-r1.ebuild 146 BLAKE2B 6549db6cc0640dfa32cc470897a5ee0f2d93055b3ea691c3d8b20b4f363293cf16b8c9e69d5055b0141802fb75bd1de7b341859f34611d6c626b6bf41215e763 SHA512 caae9e1b15ee500f2d4607421973bdb7d072365fc57dbaea14dac614ec75ef9aeed919fb0ab62c937ac0a6c37be9a37de9ebed44bd13f894ac57a11854e71d98
+EBUILD nova-0-r2.ebuild 151 BLAKE2B 193128d8568308493e97f9ac889d6b17e95a940dd3b2a6527d7aaa915c73bcf77d8dbc8f00b2ec374a4eecd1103fb99f47bbd920b9da2fadb1de5aff3e6abf0f SHA512 8e157d5ce751bbcbfa6f916b01a9f7c7bdf976a3d21449e910604fda5f131373b8fa0c69cada73294f06de3927733156ab70cc04a6b084dbeb03d41665a3958f
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/nsd/Manifest
index 342c8947540c..0bf757993a1e 100644
--- a/acct-group/nsd/Manifest
+++ b/acct-group/nsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nsd-0-r1.ebuild 151 BLAKE2B c5ed7c63f353bbd136697a2208ec31f2d5bdcba23bf044208a6f0b0053300df7a847ae19b37bcf5a0157df339faa38d66dfc8994012d11e190f82c590d200aea SHA512 1c15aabe3bd0270bb7bf9f26c318b368ced7757d609fdfa4fee54356bde99b9949c0246a6da0e2fae95691eab2c0cbe9fa7328c9270d68e8dc0c0766e1da43ba
+EBUILD nsd-0-r2.ebuild 151 BLAKE2B 7bbcf1697dc27d0d95efe7a6aa3c60566e9b87407d05cda72048f18b284d95a682c0ebba5ee21703b6fba6a2f084aab6a16a03c74461cd38805d497ff31fc688 SHA512 e472081321ee41b1060730199a0b94c3c6b6267de1eedc375ad0343572ff7d41c23ac0837775c9005fd6dff6e0458328cd42d2aef6f843a1fe473562ac4d9657
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/nslcd/Manifest
index 8da6dab790d8..58baaecc0c7f 100644
--- a/acct-group/nslcd/Manifest
+++ b/acct-group/nslcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nslcd-0-r1.ebuild 151 BLAKE2B 5db2a75f4b9986aa3ac7eeb19f35116e4c7cebe43c50b4176f4adee20ac81603d17845a66b264dc8d2c18cf3666e2ecef514b68f7cf2cfe2f3882c675d7bec3f SHA512 8d33a0790a5e2b0597cad6a3218e3bc05ecd8d07c64ab86a248f2df9a14940ad85ded346af6819326b5d720d507b46c69e902cc369f0a37c06ac59cff03b710c
+EBUILD nslcd-0-r2.ebuild 151 BLAKE2B e219cd39f60144a42efeedafeacd496a160b2b0ddf840cfb163ef4460d3f8dcbde30292aa7a07bd1ec02d2a90695ff52685d87fb65ce5c10d1314db2de3aac36 SHA512 b259de362952c8642887244a23e057474bcf800d7b4c7ac35873b9b9ad6ee9a9a5c5c5c890c29a5cac4a569b6089d3efde41e4d5746369c557566470b780c406
MISC metadata.xml 377 BLAKE2B de37a4550f576438d2d9e50c63d53758876cb174ec6a40846b0c70f377cc1d0928d24951fe803bbb28dcbffa5a30dacf89c05a814ae7304b61ead2c115cc9b25 SHA512 29c89211671ec281f5aa38644ba64d43c90dc32251074e6c0a399b8087e3d5085f0277b1f7899ea278389b406270c0b35e18cbf30cec9fa52cbfa5e7ceb9038d
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/Manifest b/acct-group/ntopng/Manifest
index f2e45fa449d4..145dd0612f70 100644
--- a/acct-group/ntopng/Manifest
+++ b/acct-group/ntopng/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntopng-0.ebuild 151 BLAKE2B 13dc0b1f28e7789eb18373363803ed01b7fdb72da80275df004b831cd90f2618b891caaca2b334b2b309a5b1b436cfd4ceceb3904a4373fd9939b3a3173ffd75 SHA512 8aa7ed4a78fe90a03fb5f72f0b952339db9f3b97034079eb3f76b0d4fcc60428e2dcbbf803862de938bb39ea38e686c8c737820bb69d04a69c53839d01c5bb01
+EBUILD ntopng-0-r1.ebuild 151 BLAKE2B 4fef83e8c60800a059f8439c6a48b618511e307710df770b2f9a3ded8c2d12943f16d740940e302b024b9328c8928bd0f4df7cc0b7266bc57f06549a5d9a3d58 SHA512 aa7917340a2b0c2b2706b7a049a477fd8cba253a8f9f9a61635cfc10468478e4cbced45c6ff34cee05ecc902617b1f81bb9ae686e9f7f98851bc60454241422d
MISC metadata.xml 219 BLAKE2B 5a19926bd602ddf2021d79fb07de89ce03868320d23f61ec16b122f9ba23e04bd24a71be898b22d9518d5792fac5d5860a181f3813a1b78727117a6a3bc93e6f SHA512 e55af6d159cb39bae94cf8b8c9adfc62ef53d56aa11c024e8c4001aae58d9b9256b059f1a4918f55bba17b231ff7725a002f67a5642f92f3118835f3036c2fa0
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/Manifest b/acct-group/ntp/Manifest
index f6781eb440b8..46f4652595dc 100644
--- a/acct-group/ntp/Manifest
+++ b/acct-group/ntp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntp-0-r1.ebuild 151 BLAKE2B d5e97ea0aae3b05872ec0eb114ec6b878b9a0b564f16dd15069bbda7e1688a57f3b05d18a52686930b4708459c0d43e6af345fb937677ab987ccf7be71064d7e SHA512 f2f9f06cf11b51ff082ae6a3335685bb7a9f04cfa8b13fa1cd086fb6a774767c614701430ecc2cc4702474332be2073123e01e62f193bb6bba2db2b8104b8a6c
+EBUILD ntp-0-r2.ebuild 151 BLAKE2B a07b679dc328260ff4cc5f8ce52c57a4083aeb4473b5cd2aff22ee3fa8e45602d8e9f3b983488803014f5a6a2f8808b4fbcae18a7f4d5cd7c1a555955a09f022 SHA512 e4bf6d97ac8cd994e06aa5842c91fbad7da8a5d4f8867ee95b612099bfc53eb9c3dda3fc60e87c16b34880be850033aff89a942c53aa73e756e579e099382500
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
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/Manifest b/acct-group/nullmail/Manifest
index 50f4e20cb6a3..2d1714647085 100644
--- a/acct-group/nullmail/Manifest
+++ b/acct-group/nullmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD nullmail-0.ebuild 194 BLAKE2B f414bf4100a4b26f99a1ac67ed435639419e0edde7284f2eb54dc65cc60908a74ff5170ff93ca57004eeba589d7e96176a6740ce614aae3e880bbf83d5992f84 SHA512 7f5a59046b6ea2d68da7c77ea8b75eea2e03103c8a11c615027b5abbdfa6bd326c55cffef219e0588cf1f1d53e2f77f53e3a7ce3e8bf1ad9b63215d768818d4f
+EBUILD nullmail-0-r1.ebuild 194 BLAKE2B 80cb08d06c3433d44217ec1323baf7f52dd3bf6082fa850901f04d737a4c7e6f32b1fa82aa9c66eb13c236f8741ffa127b10c5fa1f78b66a2458e73cf23730b8 SHA512 c4eba6605bd36ac2576a569cd4892d5e22b161bf605acb43739f79a238bd020da195e209437a2917cddd33652ef9422a562c08d57f8ede9ab12fb29888479bb9
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-group/nut/Manifest
index 1dff8ec2d360..9dd54b454fb6 100644
--- a/acct-group/nut/Manifest
+++ b/acct-group/nut/Manifest
@@ -1,2 +1,2 @@
-EBUILD nut-0.ebuild 201 BLAKE2B 9a1844c43912a891f9a2a809ca457868236e34dc70da4442c5e069713310a75433741b80a49f90c4bf3a7776df3d9ff3fb785c178a180bf02b4e21df1a9a459a SHA512 c15551287466b6dbeb7a6a9215a736ed63b2cb6baa63600baa6627e179bf431e9ab367bcf5628ab85e3dc28dfb076ed794470a9792a8867d242509ba8e77c71d
+EBUILD nut-0-r1.ebuild 201 BLAKE2B 0653c3ce2c220e15afa35e916fdaa054041c3f9f444c700933478dcb2b30258f93c49da5712bf53bf700840a427111826515c334c448c69ff34d84c963af9eaf SHA512 1774db2ffed5ddd306e3da8f664dbf1205e3a3cc00225ef3b7e0fd3980ab341465b2fd161592f738c450dc1eda0a518981fc58a28975e8b4571f1cfab15508e0
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-group/nzbget/Manifest
index eaf1b8b3005e..9af850d834c0 100644
--- a/acct-group/nzbget/Manifest
+++ b/acct-group/nzbget/Manifest
@@ -1,2 +1,2 @@
-EBUILD nzbget-0.ebuild 186 BLAKE2B 5699c191b20400aeda6110bc751a7e7f76aee66e61f69b0d1af167c173582fc1ac92e9c68ad711fb98af547da3630f076c4e181fd5080f8bcc6451067b390d96 SHA512 40c7246fc7bddae620e29312745717eefdfd049849b4b2cc0b5194b88ae49792692dd3baf3a1aa80c61e074558860448bee61ecd9d6b185264886511f4cf24b0
+EBUILD nzbget-0-r1.ebuild 191 BLAKE2B f15bcd9316391f4f6f8be64a4637361e8cc668e3680f0b636d01a2fd719cf3d25ea341e46b968c7fde3f5cf66f68c8887dc7d1cd393588c4eb73f3986301da05 SHA512 d85411457e3fbc3fa1da702df6c30196c48354b3cf7be66a1d3c382035ec85c3b8d5b64c98ef665a29251b7a13efc561ce7137aea522b298bda6cd2e2542831f
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
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/Manifest b/acct-group/oidentd/Manifest
index 1f2cb309cf9c..69ecebdea704 100644
--- a/acct-group/oidentd/Manifest
+++ b/acct-group/oidentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD oidentd-0-r1.ebuild 151 BLAKE2B f69fab1ece33dca539758678aba81ecdc631ea2485b18c195a4553094bc8b9d97a8067ca263fec520b2ee4e63584bb9f4ea3f2cc52e8f481662a14e9fb9c9281 SHA512 d7e9fc7d5a3220945acbd9aba79eaa1d2c53c09d73d9c3b6c8fe65ff4737b9f078f3123a9580e3f7507a87e26c102a53ffc6659e17c12ba397110ed922a2a1c1
+EBUILD oidentd-0-r2.ebuild 151 BLAKE2B 009c5a3f95ef2c335ba0342ed24a291fa324354f1cf8bc7fa629889623ce93bff98da7df58e21f73ebe89017f29370213736d88fbe4afaafb7386bf7821520c0 SHA512 2f1b0a2509fd41242678420d0ed9e0d98938ecb366cf2b73e451f01234cf4410596847fa8ebe1d93fe093e3b480d2bb4599e7fa3d56364a6e479a80c85cb4dbd
MISC metadata.xml 393 BLAKE2B cece790dd0310b08c71dfc107e0cf9d28a86714a8d14361140f30820be5987008fbb1f0954db16c6686a8c087bc54f0935960d4ce718e2f61240d2e83e67823f SHA512 4b60a9a9e648418f7d7eb82dd3f5d4ab28caf622f9f84cd8db5a782cd5db5e6bf1b20a4dae54b65f27998db671aa1ddd64ddd3e9ef26ffb1d786bcae82760cb7
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/Manifest b/acct-group/openct/Manifest
index 7f6d7077a92b..a1982d71ace1 100644
--- a/acct-group/openct/Manifest
+++ b/acct-group/openct/Manifest
@@ -1,2 +1,2 @@
-EBUILD openct-0-r1.ebuild 145 BLAKE2B 333ce4d44800b1f61bd10706824d553b66cb5993538a395c5b77990964ac24ee013cda085071c28293147cd78c2b2efa9e2eb934dd57dcb1d25a7c78d30fa130 SHA512 c0413e424d9c423a2422ade65283d2424391c9dcfcb81deab0c19e43f6346a4e155dd55c811d457306f374c63ab1c9e73ba7166752c3b456295eaabdee99204f
+EBUILD openct-0-r2.ebuild 150 BLAKE2B 43d37aa8de1374725fcbd20dd2d3244f38b772041a72433689f005dadc33e3b0800a06f19413477fa3252c27e679efc1c39101e527d001e8fa5301ce8627f2d4 SHA512 1e1b3312779312023094ec5bb17e728154718e34767fa534083e9d5e3fa0a777f51ebf43df11cc81b13c1b11e704acb883b1417a00c625e11534bd000b2c61b9
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/opendkim/Manifest
index 0331739a2847..fb7e0b536245 100644
--- a/acct-group/opendkim/Manifest
+++ b/acct-group/opendkim/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendkim-0-r1.ebuild 184 BLAKE2B 6a3beb733dc0857ffef956d53155ea84f820ef385723fc49cd8291200413fd67ac661bdd08495f819e9e0010ff0669f8dff99d5c909be78dc4d13c04603e14f3 SHA512 d3d6b2d77ada1983b4c76f352cb50a7d5538b0c6e47b6729b5c1b35f638df7d9d9ce33ea99f9a4c8fe21ad316b0d71aa4014e4063b524911088378b4b9481193
+EBUILD opendkim-0-r2.ebuild 184 BLAKE2B db78f98946102aba35cfb6bd5a0c0e9b4e3ecccf48140c9008caff7952106f9aadbf238ee619fd49b3e70039fdc6d379a4ced81a9efc8f3c5b6ac4596ec89b70 SHA512 3e6eb1ec5c9ecffe697872069581f63eb6dcd3589cc12ba0b056d6c43d2a8878adfd08f9f9d59e7b343f1f02157c8ae88c2670b1ec20f742ca72b228ff53cd82
MISC metadata.xml 247 BLAKE2B 4846dc5414f3478596a37af6a99c490ce9ac8dc341903d8fff794c05354b7a73309f70aac92faa801fff9f8a6aed87860af87e5d227fb2c6425b907038bf0052 SHA512 7a189fd4e7c0f67664c0788b4769a1c038374eb224c259fc206dd1d2448eaa1deab71c612186cff31cd380fb445fa4ba066a0cf881028191e8adb0aae9d862c9
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/Manifest b/acct-group/opendmarc/Manifest
index 5d748fc46f20..f25ec1302ff9 100644
--- a/acct-group/opendmarc/Manifest
+++ b/acct-group/opendmarc/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendmarc-1.ebuild 197 BLAKE2B eac1c3318c8e3aa126053702d44b3a2ff0a3dd8f90e3a596a4a0d0b8ef986ac48c28521234527e21c0ab7865bcbe3226bba1fc77fd7fff64ccfb5e9370ce2d23 SHA512 f380801dab4e85a1967e20aac046cc97831ee4d3c2a2151d1ee9fcad7193f90505c1d816c63d77446501dc033c673e7f9ceb3c2745c2485583c6227744d19fc6
+EBUILD opendmarc-1-r1.ebuild 197 BLAKE2B e99cf1a893e8ae464a079df062a343eaa79bc707c3f758652d972df62edc2901477a499641d3e332546027c603087094fc9617188a5fec9aef92d5f3792a91e8 SHA512 352a4e841db96fa11d65c20a4f076cbd14192471550986923c23839284db6ff67abf951f3e64678f7f5ed1112a13697e2a0e907f907a190f3e058b57c64afa2a
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
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/Manifest b/acct-group/opendnssec/Manifest
index 7f273c7c9e6d..87ecabd4f8e6 100644
--- a/acct-group/opendnssec/Manifest
+++ b/acct-group/opendnssec/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendnssec-0.ebuild 199 BLAKE2B 456bea0ea1fd33ace88925e18ffaad5e9706e06203fd3ceec15d5d5c0b6ef91c0f4621c07ae0fbb99376c5abd0af1a04b6ed3853152736d0ad83a65d9c6af2e0 SHA512 9f39dbeab6105d5d27228ce6480710f9fcaac990b43dce28e305f96975e3888be5730ae16abc4bdb6c4cc91cd35aa85af06aac37d35e1c37118fb6e5a6e1aae4
+EBUILD opendnssec-0-r1.ebuild 199 BLAKE2B bb1b81a91ed5ca2623ca3e7a5166ace012cbc8cb528733c43ac4ad9b6eca5f8c84864a46de365e1cf9b112bd3e4afabc65e574f5a1ef397ce8fd0c4a4eae1cfe SHA512 9901e2d05bf7c5bac8c13fee8b0dfdd99875cd70fb1d2e54a0be51bf19766bdce977c0b39c112dc9b25155682843752ed247afe2b8ca819dcbced91dd4353471
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-group/openntpd/Manifest
index 0b0fdbdb8063..bb7667a5c281 100644
--- a/acct-group/openntpd/Manifest
+++ b/acct-group/openntpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openntpd-0-r1.ebuild 151 BLAKE2B b1acb5b39795218e081cb5f75c2c5a4acae8937bbf11a826a2f874facaee03c5da5ea7fc05c3d4eb3339f6542b497df90d6cf30200f9b542134982ea16507080 SHA512 4ddf4bba82f52e88d8bf87e32f513bddecca9380a517ca7568dfcbff3f3b6d0a1ce2c582133f5fe628e06ccf3c46df6c5fb7a8f4868812e1ccf92c701e4cb058
+EBUILD openntpd-0-r2.ebuild 151 BLAKE2B ee5d94a5731250d9645b6101c3c5bfece480b5b08793f68f18023109299d0d1268e3ae8743dc52f6662be60a4e5ffd770a2509a7b8ae0cd248942cc0ecf2446a SHA512 048a83640265ce60f09acae5d0e290f37897e46b7d893de6d4011e16c42053fb1805aaa12e9d09ba707ff849f4832caa3948553e3b86cd4a939b0bffe6ccf1c3
MISC metadata.xml 392 BLAKE2B a875ac61061b518231ca2dc61e92dec80b9a647942ba08b241bd897a2232a6b3ab804f875de8a64a1d323f4b289193571998d867279ca135dda95ab1f056abad SHA512 4418af84fefa90044cb549d2195537df74dcfe7a8c02011b8e0a975f660e0226c942da080b20529fc5752fe0e87928479ac433de3d7ae2947182672e3508a030
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/Manifest b/acct-group/openrct2/Manifest
index 9b6ed84841a3..d3610f3f001c 100644
--- a/acct-group/openrct2/Manifest
+++ b/acct-group/openrct2/Manifest
@@ -1,2 +1,2 @@
-EBUILD openrct2-0-r1.ebuild 210 BLAKE2B 8ac07510bddbd19b7a5e113fab10425819d75b519978b317339273b50745451b9649729ccbe90748b5a3106d30f4f34f3c308107123724cbcbb018eb73ca3c53 SHA512 9abe44089e89cd7f45595f6a9164bd4554d8a3943890d7d28e78f81349ddac5e15ad260a71e35d4d23a22c11c7f47170fcc30c3e82b88d40b00f93c405f0b888
+EBUILD openrct2-0-r2.ebuild 210 BLAKE2B da1059464e97e2b6644a16123e815013c805abdc9a1617d3f125a0bc7d723d1efaf2393eb397489d0f75beb0c261c54fcbc30debf8f585a7574ae01cd7bb4ef5 SHA512 1017a5c1345dad02c9b4fc4158d086f539270123fe837c9e53fb0b6da408ab4cc539654e9222f46469c92338e2b023dc35bf158adf6d7aa10993be9bd6a8a66c
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/openttd/Manifest
index 27cc6c3d5a88..238edfa26b5e 100644
--- a/acct-group/openttd/Manifest
+++ b/acct-group/openttd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openttd-0.ebuild 205 BLAKE2B c7019c412dcc4d1bdce15b1762166398c79773785c43012abb5e1897b0f291644de1129ae4fc4df73be11297f0aac99fe9fe8f02e45c570b34c6d3796b21be78 SHA512 f15a8dc96047d657402fb9014674eff80523fe45e2604ff736924b4878ab4022f16a79e10cbf59d36135c0703b1a58d01dba6a56e7208ec0b68735add4419ac3
+EBUILD openttd-0-r1.ebuild 205 BLAKE2B f0c7f97fc881e9d18bb6d59eb08b66b1e61488eb849dad9df0753074a1e9ddfefa432035126953246ab9992dfa46540976671ff8ccb8e3f9766478988e10602b SHA512 eb321725e3c19bfa565b14693aec366253f9359f0442155d75fe49d56b44ab942e7d03a2f8ac5ffca80425ddde47739ba026807f2177890a2964771d7e682486
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-group/openvpn/Manifest
index 1daca1f456de..278441f8f7cb 100644
--- a/acct-group/openvpn/Manifest
+++ b/acct-group/openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn-0-r1.ebuild 151 BLAKE2B 3968a30316cf1bcd41ffc38ba26c8eab7b112253e891239fb57ed45dbad2a92ee229ebc9b76ea8056eed176844eb77ff306656acbbbebce3c3467c283337a390 SHA512 cec9c03da4e14be96de2c49ccff3b5e2fd990ef2b44f64f2576eda34262161b008e420b4b94b6c4c33fa528e4a4244ac6d5e2e39201f889fe41a0155e333fde7
+EBUILD openvpn-0-r2.ebuild 151 BLAKE2B 18fd193096556d89b0247da4df265b517558f9dc93f228a687626b600192307e49fbca5fddea4447a296df48b66e2958161528e5602946b552b8dc797f5130ce SHA512 f8430a4d813ee9ef3f84a525af0eb56d7a83e6b694338061b4343cece1497c5786a9b67c38956162b1777e23b02b321f33e8a6988ef01f3e75895736a492864f
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-group/openvpn_exporter/Manifest
index 535780724808..63dbb3ca7c97 100644
--- a/acct-group/openvpn_exporter/Manifest
+++ b/acct-group/openvpn_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn_exporter-0-r1.ebuild 146 BLAKE2B 6bdee6c03c51e61e251973cbadc6eceb3cb6c81ab5f8ca8e9925bdb41d1b8599557f5e53c1da8e3e7c3535ec547a43b976d45ce082bcb1d06a45299dd6b89523 SHA512 c56291d801ffd45e2dee1445934de3cb3f665ad0a5eef88225461e541098b5613e3051bb163a230ef72d446625887b778c783ff2848279ec79359479365458ca
+EBUILD openvpn_exporter-0-r2.ebuild 151 BLAKE2B 174b95f5663a534f459d8269c3f09248f9186ee3da2854032b895547404f6bba19c4b2fbc8822e279f8a6c446c2a85a0d54c457a3c71f6ad7d0d5387c53bb241 SHA512 1ec6331b77f2b555cc6d99e050c7173a38bbed77e8c94fbd6b544f6871c7572edd4ec7930219451379f0f1eb8e1e8d5a0e86c842a26bdc2280fed361dd25f327
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/opm/Manifest
index 4722a3e1cf9a..b9884e7bcca2 100644
--- a/acct-group/opm/Manifest
+++ b/acct-group/opm/Manifest
@@ -1,2 +1,2 @@
-EBUILD opm-0.ebuild 192 BLAKE2B a84826ae442a9e80bfd338351c9a4ef358c6654c618f8c2d3e31161cbeff3d726d2490a5c1d2b5ff843811c5d82c2ab9141c86ac4ef45d9e6713296f3f2ad9eb SHA512 6fc91d49469e011ddd8fdec918d81017146c407b95b2da8ce5e7ca7a8aff2345b7b8b3163f7cd527f3e82284d017a689fa672c7609bb6629dfadd88e9bc33911
+EBUILD opm-0-r1.ebuild 197 BLAKE2B 6f59deab551c6a982ce48d144f0162b7f372f09a7c4320093cebdd4a4e9f2359893a4e859938bea9193ccfa73297aa50c88d9587febcc370bdb15ef90e2dd7fc SHA512 f92a81198ecfeb5290549444389cb3a3eb57168f17c07395187ef5c9cce8e70efab3122e0665e62dfa8494a835ab2fa4c07bc439d9ca2d86887756746df2792e
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/oprofile/Manifest
index e93e6c5be255..f8e037568003 100644
--- a/acct-group/oprofile/Manifest
+++ b/acct-group/oprofile/Manifest
@@ -1,2 +1,2 @@
-EBUILD oprofile-0-r1.ebuild 210 BLAKE2B 19b343756bbf2af8e1cdc84be3ad8ae55ba3c64a8977184ceba51b54adf4e9050ea8eb6a1591ddbdc3077e13406243979a131a9e365846fff31223dadbded15b SHA512 51b4d81b6571d39e031d7a82868689fdcd80585093be51ba194abd04a20888dce328916063b5a63691d697184890f4470b64486ba16dbdb291017d0f9c16a6b1
+EBUILD oprofile-0-r2.ebuild 215 BLAKE2B 9d2c4ef047a1f3d5b1f44406c6164dfb0676ac529c1f536f58c7d0978e12e0a8b1a635e7223929ee3b2240243af69f71e1961df9b039cee495594d77bf288f70 SHA512 c948502825e595e7d2cfe474a8c276faf0303c7e1cf6b09aca61d36dce6c89a292123924b7e50ec3edb67e0ec0c047621c3196006d5fe3ecadd0730db4be708c
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
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/Manifest b/acct-group/oragono/Manifest
index 84e5853e88ba..494813736582 100644
--- a/acct-group/oragono/Manifest
+++ b/acct-group/oragono/Manifest
@@ -1,2 +1,2 @@
-EBUILD oragono-0.ebuild 193 BLAKE2B 17663dc485c76bccd97513f8975dbd598156c3271279bcf303f710f74b059b6a1e04837cb26877452e5b4f926b8182a7e3180c00c74b102c7e1ec02aa72f2baf SHA512 64b5178411bc76dd8124da152d51ede1c6eaeb1b430f5b961b39a9a5f25c474affca3acd41a829a1d832594c5b22cb70abd29e4cf89c4a007656eafb71bae538
+EBUILD oragono-0-r1.ebuild 198 BLAKE2B ec9a69902f9248fd319f046063597ebf14de8bed74e79f8f0c6962528fc52ad21ad4ced3e07a668dc6a0e6d2238f7ba74cd2e47685185778d2aed55e79bf4f34 SHA512 d6a1a60821b3bc41b553ac69832c59fdd9eff09d7b877dbffd188cec05479a093928c9b957ccb4dd3a0880dd0c0cc449fd023a7d15ae0c39333cda83fa498f84
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/ossec/Manifest
index 955704cf879b..39b4059ba1fc 100644
--- a/acct-group/ossec/Manifest
+++ b/acct-group/ossec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossec-0-r1.ebuild 194 BLAKE2B 6217c683976cb8cc6f5618949736bbbd97f1bf1d097dc24154f3bddc2882227fe933c7dfff2bbbce60f092429c09984862e9dd9e004c125d2067ebde04290f84 SHA512 60e12f1b6663eeb3bb1d489aa95122f0ac8fe099f3077b3de6a012374e3e8e2176ac254751c30b00081a98976291da37ea1a78fc0a3d3622f84e2fae79922707
+EBUILD ossec-0-r2.ebuild 199 BLAKE2B 2ec1d0e61385cd56c4876e6c2d0f2cdb79cdbb6dcfde81fcb6127a1dec0fdd1c005316b2e260da3ed290e964f847361d8c4a583ba3abb2c7adbe0568d160eb13 SHA512 8b704f3422a55e3a29526714be9a2dc24ccec53c746d8c2af1150a7ae7afc7eb8cc457fad3eebe754fed68dd84d8312ef3909f9fe094092dbe3aa2d9a207df09
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/owntracks/Manifest
index 28ee4e5bd5de..e72e1ceb691b 100644
--- a/acct-group/owntracks/Manifest
+++ b/acct-group/owntracks/Manifest
@@ -1,2 +1,2 @@
-EBUILD owntracks-0.ebuild 205 BLAKE2B 1d1822467c4ed2ee1e06702225885855a2e6a2c63c73e76411546ed272d8b1635786841e6f2b2fe680aecfdfcd5e38cf66730a4743b5a6221fb001bd22d77f40 SHA512 f68bb964f094bedd2e37305145e6b18a978843377c44cb181bc625686205e50a2f54126ab56cf3e35263fee8ada63964cf0fbe391898374b6df644eafc550a84
+EBUILD owntracks-0-r1.ebuild 210 BLAKE2B c9a74bf7c9f82b769024c32b75f92e0e5808f347ecad51e6b6e8cffbd9e2916eacdd12edc997db6480e00cb15e68b21d2edf3134a0093de679b1dc2fb0b366d3 SHA512 83d1c0be3d22745264af3c267a5f96054d4b0d373bf5f6f24d243a1127bd73db5e6cc699766847e062124c83a57decb76787d0aba480ed010c1f1f6131334ce1
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
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/Manifest b/acct-group/p2p/Manifest
index 2e6a94fc16b6..1a2a6ea95ecb 100644
--- a/acct-group/p2p/Manifest
+++ b/acct-group/p2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD p2p-0.ebuild 184 BLAKE2B bb96c33604a99f1d9ab0fe05b5a8d2d7d4fea24f50d39216eed1c6f2347dc77df60cbd0c097903231bb2f74c49caaf76147cc5e2797711d16004465a2308e597 SHA512 eabb93c889280cf9e48bf67366425dd74774497407d545ade7f95b8181a5f5a574228656d65dfc4961681ef4a1d9c9c49dfeb59d9a2e3305ba4cb8d02b9bc91f
+EBUILD p2p-0-r1.ebuild 184 BLAKE2B 9897f845d1ea6a4d854d6f1465b93f6938a14501a67c3f0d0123c0e423162f32e0c21bf476110db01769ca7c2b0aaa997cf292b1b5eb4a688684cb9fbc3a46bb SHA512 8e6b811f5915f7ba52637030d14b13e05af0b281e78a2cb0e826a55d497a4f3ec5167b3ca062b56110e17b950aa4aeecbf13708f9da443de10827f1141fe79a5
MISC metadata.xml 407 BLAKE2B 6cd79e7645acb510b97a94008e57434ff0e0c1a6e01f0b26a7f1d1f9904b3eea8cc1039f621ecec6512c6bd463fbed7a6472b7fb9a61f7d94b9e6643fa443bca SHA512 d701b4402b608096a4b6aa7b89c6e789bb86d8c84cf07ebb0525d67a8f32b9db650da91ae01c7051d53e09137eb5a2c4734008eab43f029c06cfe47f9761272c
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/Manifest b/acct-group/partimag/Manifest
index 570e76af2802..af12edff7323 100644
--- a/acct-group/partimag/Manifest
+++ b/acct-group/partimag/Manifest
@@ -1,2 +1,2 @@
-EBUILD partimag-0-r1.ebuild 199 BLAKE2B d04bccd7067c82923be93bc23a2e6b634da06e5b4de0510af9d12d1aaa7d2ab244e5730de9529bb28fe4d124686ccf502d7221c5e29a3eee63807745aab7111d SHA512 9c703271edfffa572b50cba4582cd5642ab0efb2bc8bc09754cc21b02feaaca439e2f09269d971d3e152d0360031d2628e7ce3ee8cccdc66bb896218d7dae4d8
+EBUILD partimag-0-r2.ebuild 199 BLAKE2B 9f4e8869633a6a34685827708deba2c5048cbedd359b59d489500ba4817070b8e09cbda18f5bf4603e3d473191c2f4d2aefbca460ce17ad72e894c2c9d625a61 SHA512 59f8f1fcc52e2994d4a0bdb720d95f6e1296122e529c2f1f5a915c2d3127c88f747089857c075b23e9fa61d1a41072f3284ef3716cd166fd4e25609f6838ade0
MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
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/Manifest b/acct-group/pcap/Manifest
index d0cf964a7b53..888d4147ab55 100644
--- a/acct-group/pcap/Manifest
+++ b/acct-group/pcap/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcap-0.ebuild 201 BLAKE2B 6fcf91eadb676ca86e263112d3d4c097f98a839ec147211a7db58611293c0512fa1210c2617ae73a986e94933a2d553784c2bc9e4ba14b5c30249cb41f6651ae SHA512 fc5a51956c16ff9ca2e73ee286532a41e083fe7cb5963d5a911f2eeec3bd8e9c9273a02c76de3226b7a2bdd09780ddd6ad2b95147db79dd4a4a4be04591cbaf0
+EBUILD pcap-0-r1.ebuild 201 BLAKE2B a687828fa1e2874af4e7de0d80f0ad1670e7589f78699bd2338c6c00d54f340abbee2aa6cc80a9872b6f815c792aefbf785c7536bfabe846db0be39a2283026f SHA512 72fd9f043c154559b757de86e5dad74c87270af3f39a53a7d69b222618736124e47464a1aed44ce616d062c923f73982652ff31a19a1d165659e03e018e94af2
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/pcscd/Manifest
index fcb81e89da0a..833131829a45 100644
--- a/acct-group/pcscd/Manifest
+++ b/acct-group/pcscd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcscd-0-r1.ebuild 145 BLAKE2B 48573d7944b547f0ccaae5385d2350d378a9da96601a43bee4fac29e7fd007b074aaa97f813ee5b5cd566db8155dde73e2d56f1e4a6b288e7d399ea483894335 SHA512 2a648a8658f5cee5f35ca032a37c9079c6b0267dd313b22fa28396db11ad1eb9f5f1b171073ef98ada3d4409c0b01293b2feb4ec818395ab3588c1f9bbc4c61f
+EBUILD pcscd-0-r2.ebuild 150 BLAKE2B 6cf563a89da076b182f7267017f6ddc96e1a92941a51742f6a17d63a1c2d942c3110297c8737be1777402e4f9271859c4f462cb48983425d08a1bab0ffba120c SHA512 6577587824482acd281589433d993cbf028a4d5b50e2e97fa825f4e59b5fb17a69aca226c4969056bd323480a635a3a43eb583c57b3545e75f7b019e434af9d4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/pdns/Manifest
index 66676edeed5f..5f7e04cb5279 100644
--- a/acct-group/pdns/Manifest
+++ b/acct-group/pdns/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdns-0-r1.ebuild 146 BLAKE2B 4f62c9a763a94b693a38085f2b8e8b27acb08db934bec0b2894bc13d8f02586f6f70fbfd94a491261e1714791075ec889a37bf7c991d181a63d081d3b13c88c5 SHA512 5383eb2d31832155d6a81938101a114ac206ae1b73e6166fac3c9fdfc8e4bc7052ec9701d3d391c78822e66466767598aabe24d3d07b18d47f436bc502f5d994
+EBUILD pdns-0-r2.ebuild 151 BLAKE2B 5ccb0f5f229bf7bc729a74486d5c7afba5975071992b10e6f40e54891ad2a4b85dba3c034e8daa7190d5c0ee1cbe809f3e3860a024e054076dcf11445d903ed7 SHA512 ddc6bbb85d117f90bf496fc097aaa3cce4d357383b52b456a563fd8efba355cee63e1bcbb7f5bed99e6094167c54ab4974706d48c911681ad4cd61842e8256ab
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
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/Manifest b/acct-group/pdnsd/Manifest
index 210d9ce608e1..2e92b2e0f38c 100644
--- a/acct-group/pdnsd/Manifest
+++ b/acct-group/pdnsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdnsd-0-r1.ebuild 151 BLAKE2B a508c8297de8588c8ad53cb6285ff9a53a6e045e37f30c2dc54199907830f5bfe5edcc3c7b078044ad837ec033682f60c7edd14d0b3bb1d873e0b92d15e012d0 SHA512 b24ae3c454c9852828e30be46321a562c8bcee74f045bbfdf353163ea953d1be8c0c20f59fc2fdf3eb059c5a87152629eaa24e3a1a9aac4fe3b43be69e262a01
+EBUILD pdnsd-0-r2.ebuild 151 BLAKE2B c47ea4171f32203184c44fcf0584c3f545ed0c1c1a3bc69923da325a30763a3a051a40e42e83ffa0f1a3dc5702e5eb332e9e9c1fe54be9c917174ff1988235f3 SHA512 cc6912f792b9daa06fc8df93c6ac36a6e10ff7c103f012d81d057d75a6fdad94b0ef187b9211eb29067adcf1d5b79e0de308c12004d942e07c5296faf144f1cd
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/pgagent/Manifest
index 02a2e596f3b6..63cdf96048df 100644
--- a/acct-group/pgagent/Manifest
+++ b/acct-group/pgagent/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgagent-0.ebuild 195 BLAKE2B 237e57921dc02b2289aa4c032e23115c8be30188bec4de08657047ebade6819c093ac00117724af524096a116e1cd7ab120a128e88d6614810f11cca90312636 SHA512 58de205afa5f66a6c9a219db86681b4281302f4a484798ca0c8450292eaf1d8dc6be8967246f057cf470471a665bc1c4f0879386e687a14ee00db0373f1179eb
+EBUILD pgagent-0-r1.ebuild 195 BLAKE2B 70db29c7f03e8315c863a7d886e5bb408ab16d361bbfdccf541623e1d5311949d68d6b66d26bb94f033c85bb7c6c3aa35d140ace2bc39187a7bf4178492892b5 SHA512 8e2702185d19c973062436444e46bc47c5845b4aca10382d86b868a95d51950e9cb02f5f7c8c2d12a2d9d7d5433824002b98c474d7f8a6cdb7f794b242aeea10
MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
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/Manifest b/acct-group/pipewire/Manifest
index f35ccb06857a..1fa3cd4e5b06 100644
--- a/acct-group/pipewire/Manifest
+++ b/acct-group/pipewire/Manifest
@@ -1,2 +1,2 @@
-EBUILD pipewire-0.ebuild 151 BLAKE2B c0c119f25a34290b1230891cb5d33623b76c8185d6d6723e6a3faa665d9c4e0211d4de1eb56e38eea6b359b9c5c6a2702a6b1f8f4409c816e9ff97ed608dcc84 SHA512 e65e2b5b834ee6db7c9179099be08c7372eb1a6385849908df5d758cf5ffea357bcf11d1639c043c57af672209ffee0661c7f6a249b65fd6e92d11a070c80ed5
+EBUILD pipewire-0-r1.ebuild 151 BLAKE2B af1da4f0b494abd4ade100ddfb027d4a2d4961c01a59a5e32f326a63762af8e1034daef468eaca33799ee2ef8b313d2baced627f4d6d5a4a38a4be4cb74a0575 SHA512 655f62b8ae8ef800b042b101487c062a0c455c097e079f7ac83202034cc42fee740bb57d9e01b9ee1282d11b3ad05d251dd98a5e1e29e6117e71a4c7568d9dd2
MISC metadata.xml 345 BLAKE2B f519f452866108391c70c15f93d9c861d4d2abc2d7e8abad79bee5e5e2649119643c9563e2c256c5fa194df4b2bb8b641ff62136215ea3d79564edffc849e9f8 SHA512 1fe7551246560d5f17056ed4d8ef3b88f080d7beb1285054cdc691e392686b62107695fc35afaa4bee308bcdd850ae69d1302bb7127fec149854de58b226f469
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/Manifest b/acct-group/pkcs11/Manifest
index a79127e3ac3d..3174dea1339f 100644
--- a/acct-group/pkcs11/Manifest
+++ b/acct-group/pkcs11/Manifest
@@ -1,2 +1,2 @@
-EBUILD pkcs11-0.ebuild 200 BLAKE2B eeb91b7df5bf9023e621de9046533b3fddeae2333ccb634e826e052d65deddd9bad40ecf5607c2811920c8be75671459820e07cf0eb5b9f949d95bf80287c09c SHA512 e2328030c63476b736000b6fceb23ad2c47c98456b827c491efed89fce3a82661d7a2b0f88a9cbee3702ba457223463049830ed1b2059bdcdffea8a3b921a924
+EBUILD pkcs11-0-r1.ebuild 200 BLAKE2B af7cf5740fa3174d5313f1f31544a7275badd5f033061dc37baa7a601c893b4ecbdce47bf87411a1cf8c0a4ed038d3070060b8ecf997275286d7ca03a8dbf43a SHA512 053cdf7e435f58810b56e41d3787e1fa9bf41cf371bccac3edcbd53bce11457803c98f416651db7673d6bb0db664dc07c3a5e5c9377b9a19db5d705f3b1f4cba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/placement/Manifest
index 671998d02211..252370b86778 100644
--- a/acct-group/placement/Manifest
+++ b/acct-group/placement/Manifest
@@ -1,2 +1,2 @@
-EBUILD placement-0-r1.ebuild 146 BLAKE2B 8efc80a4ac166d43f4d8c1c17e3948722a193a8ac01f1c24d65f75dd61b7e9bcbcff1b46b2e2b800591c2c4db08010b4b6385d777262b429270e1b73be30c620 SHA512 dd45c9c0754f964be66aecbf017503d928b5a6f72076317b6264c1d55bef105745953717697f36d0c7c08727726396e5141c66354d5e1ad88337f3cefad9dd1e
+EBUILD placement-0-r2.ebuild 151 BLAKE2B 970a6af0f350ef0d96488544ff42e0359ebc1989fcb14fae8435848c9d0cf2dc713fa98d476aa522ed3afa0ae33acd45426f6fd27cd775d5f19c0e639777bdef SHA512 847aa08b2d4ae93ca62e1943255723f017f696b3d367a3b9de7be49d7d370435c3b51997aa6f7ee52d8e20ab8a2f47e571acc03f835fbd455d690ad11fd22c6b
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/plex/Manifest
index f517be322a13..7f088f5ba2c4 100644
--- a/acct-group/plex/Manifest
+++ b/acct-group/plex/Manifest
@@ -1,2 +1,2 @@
-EBUILD plex-0-r1.ebuild 189 BLAKE2B e86ad24b0cdbeba3d1590d737bf1e22cd2c56e1b13d9754400b68990e28f048bd96ccd11d41942aeb5086e470d84b175c7716099de52d6cf993129ce9fcddbcf SHA512 64677da0c0cb9124e1f49ae6fa19e48486a4310005172c7c52ef30bf0740a445cc7c2f01852556c3d5b05cf1c71bf2f42ea5a0aef29991cb8c39365befe73efd
+EBUILD plex-0-r2.ebuild 189 BLAKE2B 01596048ad3dec7d47c05b8f6a18cb1e5a2cdcb15ecc71a5a695af7c0981799f450c384335ba12479b8943cb80a3ac593086cc3839690911e6643b57aa8df3e5 SHA512 9f27b5a873096ad4fd877e6093c07c53751ee4362c31dd321e8ef44117bf69d9d2af1ce02744ffe1c6aef90c2faa6ec1b8fa168ac512ff8f21d5300c719036e7
MISC metadata.xml 398 BLAKE2B b0364533e5e51af3ff46cce6e364786496e4a93a365d7566da1fad2f1a7a262cb18a2afb43d3e3f02d9a7e6a6f76148ae49c40653b63b3d11f242c99f113cd90 SHA512 c05d31ba64239181f746b0d3c66dbca84895f310378b754431ff3b8e27127a02ae3372c538fb21c23f94d4ad7331c9a9aa90b001a1fe581aeab2ccd913495a8a
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/Manifest b/acct-group/plugdev/Manifest
index 5f9b71d6d4ce..bc92340dd0b5 100644
--- a/acct-group/plugdev/Manifest
+++ b/acct-group/plugdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD plugdev-0-r1.ebuild 209 BLAKE2B 680ffebfbb8aa140a1cc83b909f60f9832c695994a3505a59d822a365170e8b96f66cd57833670f587463900102062836b835e7a44c34f26211daaab1827e392 SHA512 0403744e2f993bfb6003c8c86f2d1ad798cc20361952634fef55ee0fc31c3a916c1af39c03487bca6ddacf0c411d33e3e0c6c02334bd781bd52f652036f23224
+EBUILD plugdev-0-r2.ebuild 209 BLAKE2B 8fd9464ed1bce96bbfac6f5cd9e201a23c9aa04da0575f25129f581751acb7b6ae6615f6bf7caf345f14ba59926ab62c9e9f16e014a4cdbe362d78178ee3ffe4 SHA512 60c5239e296d682e66c8a10c894f9999159964d19431f51b268854cefc0fb94f204358e9644a54047df4ef4a1f1e835b8005e955f77724a87dd24006f2a5edfd
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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/Manifest b/acct-group/polkitd/Manifest
index 64be670eb65e..4601809bd373 100644
--- a/acct-group/polkitd/Manifest
+++ b/acct-group/polkitd/Manifest
@@ -1,2 +1,2 @@
-EBUILD polkitd-0-r1.ebuild 151 BLAKE2B 6489d1ae2735ebeab755afe6c9a837ac2d1440c9696f0f67d26f6a15a8099bebf4e5bf08c25aac580bb49cafcb8d36ccc4ffd599470922b93b27900219516467 SHA512 7c530aaf5859558db0b8c5ab4b3ee6fd523cb4076d61b56c40362ae33c8b85f643c98a31e40c8d737f121104956ac835553e66d13c696a718285fb4985ad9ca4
+EBUILD polkitd-0-r2.ebuild 151 BLAKE2B f4e8357ddf0c81a5d2551cfd8c5ba814acc5391c9cf0b82913b3a0817be64a579cbeaeba89a1c8a1030bbaf32460ee678df9ad8c211859075fe402e782f533ae SHA512 f778eb02bb2bbc0e1476973c17c5e20225569b7600396075d635c58b308c4e94b91c62bdf2c1ac1e02047031ddfb52a757a4eaa5f900582b869189cd687d9404
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
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/Manifest b/acct-group/polw/Manifest
index 9f3a93b49cb5..75c6504586b8 100644
--- a/acct-group/polw/Manifest
+++ b/acct-group/polw/Manifest
@@ -1,2 +1,2 @@
-EBUILD polw-0.ebuild 205 BLAKE2B 0c56fb727bb274ace2fdcbadc71c07b01a0952d9168981b87938652ac116f23b19e126566a21c5bb7fbf01f144b3d2bf61cd86d235c3d652d322c91493269668 SHA512 ce23a4403d8c02a5b2fd98658fca95cadb7524e4659643513afdd77332e89f064c1a49510638bddcb61ac6b330057c774a6908beb188442cbba0e5e44667afc5
+EBUILD polw-0-r1.ebuild 205 BLAKE2B 1985cd8eaf2a152801d15f7182019fe61f2740f9004d6275f5f43853496e464ee904271053049372d25faa32cd0dda5f8d46a7d8a8fd2d8a54c05d7ae668ef85 SHA512 08402171a20806e25c843c115f60c3f7cd6c52008748526b8073f2553e2357219de63c7ce7bfa4193cfdb7a0b7fef1a83921d8a10ceff45f83619dfce098949b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/popa3d/Manifest
index d3176a370fcd..b34d46a21205 100644
--- a/acct-group/popa3d/Manifest
+++ b/acct-group/popa3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD popa3d-0.ebuild 191 BLAKE2B 5ba52905ef0388645142e265d5a0795fd9249a966280cabdab0cbcabc627a47e375e358ba0ee8025e4c9129f100ecaf2e02cc97784adf722c9032cebcf7dd70a SHA512 946d9e70c9b2e768731f30185b5ca366a7903c98143abb5e6b7a7296e12536664e9268b8393009cc12e12c11e855e6cc95a7b6252e4c33e642ed9cbf3424a57a
+EBUILD popa3d-0-r1.ebuild 191 BLAKE2B bd9eef847ba8909ff43d5542f332c8df7984b4d8480111ceec7c55c5189fa0b94c0054487f3b867ab7c2e6ce5acbf13c4590b8330f3bda7e3e59aceaddaceef3 SHA512 73b5e431c6738c498f601571e28afcb0f402891c8237003504743184469256448c8a85709bbebe01af3c83d4322ac18eebebbc91662bad0e7cf4206c43f43bef
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/portage/Manifest
index 2d0ec8a3ee24..890ab9515183 100644
--- a/acct-group/portage/Manifest
+++ b/acct-group/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-0.ebuild 146 BLAKE2B 45dea68faca3534d46e980fdc60ebf6f13cd73f84e42f0402e3b3f707faa8ab5c0a7d05e7a23434dbf60f4a1455492aa0a21c379e20ed5369212d2abdb4e991a SHA512 f5752a736335714dc1103c4354b32fb38f826d7d9115d209a3bb607703859ab8700201c32a5c7dc5069b6ec74877106f81223285258e6e71d860a3a63b2382ce
+EBUILD portage-0-r1.ebuild 151 BLAKE2B 31062297d69dfd137a09d1391cd48d2df91abe08ff586aff11c8bc444da9822da2f903ecbf473fa084b2e06b56ea1de5fe767e34c097d3ae3165efc9488df4a6 SHA512 2852394f4b77f6492024732eea925ec22165c213ff50ea0fb0b4c5d6b42fae59d89d8ae5f96aad62cb1275ea7ef21c7988e4f517ac7bc197a0ebde1841d18949
MISC metadata.xml 224 BLAKE2B b8b01962c2bc1d5abaad41f5f9c1af011244a3a3c73ca8544a532a151b5afd90cd1a423ff4d796bd9dc76ac7504a385a850c5f6ceb4c8a5d76e44aa52452d24e SHA512 fa9628394e8600bac8ce6f6f75926875f02d5469f9f5e33f4ab3180504d1a4f614a72973fffb21513b73bf93e22e97d03a4b3fa5360c52e322a0d2919e1f47ae
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/Manifest b/acct-group/postdrop/Manifest
index 12001db6514f..da11bd773346 100644
--- a/acct-group/postdrop/Manifest
+++ b/acct-group/postdrop/Manifest
@@ -1,2 +1,2 @@
-EBUILD postdrop-0-r1.ebuild 151 BLAKE2B 5cee5470da2a82de26d3750c36202ee07d8755a2a0e31ce74cc3a5ff89f0d19cadc4dc85f13381678c0424435842c091aafb2b5a9e1f4fb29af82c6acac0502d SHA512 850fdf163034cf424b6db895bc4704831341d893f89b43288c2bf02f27a562b15c6ef1346b920bf5b1dcd085e2cfa863bf5aa3a81923221b9827ce4c136df27c
+EBUILD postdrop-0-r2.ebuild 151 BLAKE2B 5fa66ee5bca9886f86298c7a6d944b88860652e3693a8ef7a52cddebc03ae414d685ef299f6fbe18a78f268f17d3f4eee00acd6305e737b36fc749bb0016ee33 SHA512 dec47d888619d404acb350889c37919c78162e138b549ee25e5453bb161855a54b401e6d65abb34f9dca8a038981129b5f613e4a858221f9fe9836a1db9ecc39
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-group/postfix/Manifest
index 96d55fefc3b8..4f26d3e9b833 100644
--- a/acct-group/postfix/Manifest
+++ b/acct-group/postfix/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix-0-r1.ebuild 151 BLAKE2B a720939a64e2234c5f4d9df8c78f3e4af0c614a4fadac6c1c71e5d7cb2681844cf325a189d4b8a060373f77762e3c68393af0bcb7ab1ae3553cd4f59387370fd SHA512 e7396631ed0748f7d0207d8b4bfe35f73b8bcdd01e513ae2e5e01d59c8255eb9042db36551429e3078ec2c151b73a5db5fc1577af2bce4cd9e7d7b03d14e2996
+EBUILD postfix-0-r2.ebuild 151 BLAKE2B 7fbc22dc668e039bf2c353b6cd044ce6778ac8903be6d618d298e2c3f3a99dc7ffbdb2ce8ec51727cc221962360d132d683da14a6c9958c00680a79b31102b9a SHA512 7c6953fa73592c75ad276aa87d61e2b2059fd40ed8ba0d4d1b6193d379b787ca4139594280e0fc65e68aea8d1915347cbf514c0aa7c06183fc415c94ce688e3d
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-group/postfix_exporter/Manifest
index cd1dcd3baa84..ca0ff60116bd 100644
--- a/acct-group/postfix_exporter/Manifest
+++ b/acct-group/postfix_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix_exporter-0-r1.ebuild 146 BLAKE2B 89d3e632d4468f3d79da5b1a0bcf9fe002e8f137daa8f700f66da69176570370b3f932e7f4304c626412a8ccfc221d31b03fde06e1e77607d6f7ddef3fc2f36a SHA512 9a2e42aecfcd2857eb81ee847190484bc4435b857348284452e0c0e11dd5efa9407d3e9c2175ad84beee35dae59eda383b1c4beefeb0a43aecce09b9157b46d7
+EBUILD postfix_exporter-0-r2.ebuild 151 BLAKE2B b84a9fce0505845646490b0630ffe2dbc6c0a441b218be3b7d6d5c873549975e25f97c50685be167f337732568c8e082fc4f57ecc47df75ce0e2110499665f24 SHA512 8d02df57851f10e949aff08ccac9fbb735971dc6daa5bf3634bb7facaee145ae8d862b5ec1ca530a6ca0762341375adb0557ec18397e1d4212e8643f4ba06556
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/postfwd/Manifest
index bc411bb0cede..845e3ef7305a 100644
--- a/acct-group/postfwd/Manifest
+++ b/acct-group/postfwd/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfwd-0.ebuild 200 BLAKE2B 229a795ea0fc775ed744c5c410292be94cf47610131290382570e0387a855d44aff984c67e58b01615445327557b840f09608aaeee56f78fd138a2bb2f6deb6a SHA512 ee4db2e19682aa9df06b98c041dc72fdc6e91a29feab72c3b4522b91927449de2205059927c70f1bfe9e1dd3c30e28173c29716bc0f3f76aee1c32fa2167c88f
+EBUILD postfwd-0-r1.ebuild 200 BLAKE2B 1be93455b40f2549ddd921b6134f16f06922574c3889116955329cba4038537eb0b946020e1bd221dd50fca93175d89e222e8c22ac5476716f83f2ac905b4466 SHA512 28b42538067d4e4b241f32a6a93b1178c50764ab466d7b02a3a18bb5cda2b97093e30be95eb7498e246b7ff587052005eafdfbfae707e15cb5100c435b32ce95
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-group/postgres/Manifest
index a56673d1a46b..364eedeb97fc 100644
--- a/acct-group/postgres/Manifest
+++ b/acct-group/postgres/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres-0-r1.ebuild 193 BLAKE2B 184bbfb968a2471d685abef0f6dc5857f1814b26aa65cd36b91c399ed24aae29b98e68276a34e72fe8d246d11b74501461532204dbfbef96fab0ce0ab6d5417d SHA512 e4c1221dedb5458ad69d41c23d21b837fbb9aff84a4b315824a7a2838cfe592102adc74d03b41f203530635b44dfc692d34bbcfaf3c9008da1b005d907213961
+EBUILD postgres-0-r2.ebuild 198 BLAKE2B 5e9f4afc23025b89f7fd341ce145b88ce6ff74df710a59d4c3d84d818455a6f6c07e183b7e25553814215642591022f03536ecb968dabe09c66edf4e86e90e03 SHA512 e292e64eacb6cd5524ff32fb797f91ebc996599ec42cc08995cc607de5070d2fe7e85b3330876c9c6055de4d8618bb85d0a8bd3e879e58ca0410228e9a526530
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
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/Manifest b/acct-group/postgres_exporter/Manifest
index 6fd00d04f2dd..827a8a083a23 100644
--- a/acct-group/postgres_exporter/Manifest
+++ b/acct-group/postgres_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres_exporter-0.ebuild 146 BLAKE2B 5a968eb9a1b2106045583bc42ace0492072ed98b70d9469b5bc2381882d67871bfe4c6476b34c113af4033adc5774899e194a241ef428fdbe090eb66a0429dbe SHA512 5f8c3badaa3bb9647f2065a9c5f1c9fa538b4b7dbb0b388a4723922c583f23d395f8bc1a935e5fc7e240cc1b0d0d1d3542a42d2a901a466e08d95c7817036aea
+EBUILD postgres_exporter-0-r1.ebuild 151 BLAKE2B 378b0b64df68680f7b668a864c2b983595169cc6d3f3a0c65041be4f5303939b9994e650f2e1907dba1f49f88ef58acb914c917ea5357e2603ee4b24d589a0b1 SHA512 e0b419e4a75bc6093c2eece61050f550b13b17cf0ccb119b06caa0ca9fe32e09a41b9bb58a298b15eba4491f2aa8e80ae8c633bd1e60f463b8d36c6e8ace3b10
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/postgrey/Manifest
index 7288e07f97de..691b55f5bee2 100644
--- a/acct-group/postgrey/Manifest
+++ b/acct-group/postgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgrey-0.ebuild 195 BLAKE2B e964ad5d109c6c87ba8e4eab26f39fdd7f79c32cb2ee1fefad4eb47b710d0564603f8093860553e2505900f4aa8dc118981d1f18dc85d89e0c525eef5ba3ee03 SHA512 8831175b0d37e9035f570024a87481a42b5f9d411fb6ea2801a3bc97e1d9dc2e86369c4550b2a94e53ce06ed0f419f7aee80d9f9cf169c6b7fac369a6136e750
+EBUILD postgrey-0-r1.ebuild 200 BLAKE2B 48e488a18a7aa337d4a8161e870cf9ddffb15d411fbea20c2954ac8f7a37bfc2220047ccf22668bd6b950691f996b9d96c5c9ccf724570af5b0d00defb4ae233 SHA512 0b98d0a72051752fe3a816384ed46bb58a831290a3588f1c891054c19231b799142764454837fb30a0c74253d96adda46824f146b132d506cd876c1e0e78042a
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/privoxy/Manifest
index abde1c9c0ed9..e58c695e2dab 100644
--- a/acct-group/privoxy/Manifest
+++ b/acct-group/privoxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD privoxy-0-r1.ebuild 204 BLAKE2B 64de3e3733a663bfe5c6a2e7143c5f3d04a0e909926b99d2cbe4b2d00a583a4af4d4732e1d8b1611acd7fd048620758f073d676b7c4a3c1eea7ff94e2cddafe2 SHA512 5028c425b6acb601096ab1acc100b638a81f71bd12b5431758364ea211b5e458cad67293816e8155fe388c6af2841f45a0f2fc7ac69c401e7eb0436de69fd595
+EBUILD privoxy-0-r2.ebuild 209 BLAKE2B 5e28cba94086038fdcab1bbef14bcc9ca848f847b21bd2b9674863d2d6318f10306ffcb9c4fc896ca6e488d915ce0ce8645bfa73f9322217d0065a4ead22d65f SHA512 6493c6ac80f7f8a4b0d981b6ab611184b8d7e6bee738d7c37b7c99a017d607c54b149d5a588db83318fac854d7fa9a347aa90f662301bed39116baca03539404
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
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/Manifest b/acct-group/prometheus/Manifest
index 25f184c96802..c906e6c17c89 100644
--- a/acct-group/prometheus/Manifest
+++ b/acct-group/prometheus/Manifest
@@ -1,2 +1,2 @@
-EBUILD prometheus-0-r1.ebuild 151 BLAKE2B 18f8df19c8a6f156d07abb65e5732b656ddec1c201cb572d57aa544d9fe4d3cbf54e9165cb0b0464a75775b17a88ee9362c2c2bc1a67cf2986a2108943210e8b SHA512 69bea8b81238e6ece98d26f192086f1e15bfd40c0f78ebed92ccfc8b4e089e20e85661c0d8de4d64ea7384e187a975cc5e7c13c1f4118013bbfcbaf50d48b9fe
+EBUILD prometheus-0-r2.ebuild 151 BLAKE2B 969dc4025933244f908fa2066ab0415894e7755273c8b3bbfae7d68349504fa7d33edc2d07801eb896df258de3ccb1b0043f0bbf2a9566fc2b5cb0ec6d8d0e6a SHA512 269dd0b42251e23ea180df0515751db7f76061836d0a0ddb3dcf4c3566eacd24c769ad16ab97aa4c5cbc907e18332239ef2b8f7e1a4b5ba00c35b20730045acd
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/prosody/Manifest
index d841ec91fda6..5c3bfe019baa 100644
--- a/acct-group/prosody/Manifest
+++ b/acct-group/prosody/Manifest
@@ -1,2 +1,2 @@
-EBUILD prosody-0.ebuild 195 BLAKE2B 71c9575e6535132f641a5ac49e6ff84c7b8ad0c864eb215c03069d1c0eb6ccc35c53792bc2be34fc100a2142ba123a31d3d5dffb490983bb7323bfbb46968905 SHA512 f538f43c2c2019e881832382e9b9dbe13399da80b9f979feb6f491d1588e1394c7a1b347b5150cdcb280ba2bacd17d9c2326edabeffc71f97f71762ff5f29461
+EBUILD prosody-0-r1.ebuild 195 BLAKE2B e7921d58312b1af15ee44fff7da5935925f2b39bfb0564d4403313110f7e7a49a1154ca23849c32f60c7c5a0c1730d63e86f32dcf8f3cf97dc76911e3d572d08 SHA512 d3acd68530d7dedcb263a2d4f231c942afff366b1cd40510c2064e6c62e993c3dfd013481f32b46edd9244626de4f78fcade690ae3a7caeaed34168ce3294c5d
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/prowlarr/Manifest
index a4ab1029204f..d212a6b11eb0 100644
--- a/acct-group/prowlarr/Manifest
+++ b/acct-group/prowlarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD prowlarr-0.ebuild 151 BLAKE2B a5531dd979df6afcfa53a518dd9448c07841d4f3b3da8cb3d8b53f5819840d7bc45bfe42549b56cd56de022316902101d1ce63c652309d774674d75a188910d6 SHA512 74d1d8085a805a4857de9319b2509ac720c5115013ec411891f1aef9b0ec136654e16c835b6cee81e97658d694c7f6137392bbc4ccb3a34dcbc52ac04f396519
+EBUILD prowlarr-0-r1.ebuild 151 BLAKE2B cd96378400cd217cbda3f010e6f37e4816e5cacb4fcddaeb679921bca3af541d970ae659449957b4caa0292963ddc6238970576055b20ab481c3f1214715699e SHA512 32177bc48a816b94d05b02807cbb1a009bdd919eef5bc2e5bf9e2c9976ace97f292b29abf34344ee7ecd35c6dd7e6edbfad9a255f88dc0035d6819617b36c1f3
MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
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/Manifest b/acct-group/psybnc/Manifest
index 7c74ed89b69f..bc432ebf650f 100644
--- a/acct-group/psybnc/Manifest
+++ b/acct-group/psybnc/Manifest
@@ -1,2 +1,2 @@
-EBUILD psybnc-0.ebuild 193 BLAKE2B ffd9a5b83312bff8fae6c7e6f1d80274810e842fcead821c7cbfe327fff8599f04628d74fbf8389ce831197d7fe0bd93d3544036ecf9afed071315cf0c696e16 SHA512 5b27dc65541c6ad2a16632246b934500e4ffbe389fe1d6c5d322f65d0d3cdd5483fdc8c886353a15d992913901cb7e07bfa6b895bbb4d9dd6f6dd887be5d1ed0
+EBUILD psybnc-0-r1.ebuild 193 BLAKE2B e1666a862dd9af2772b7e2c288dc53d6cce1d055d34cc8783b8240ee01a613fefafb763f0a87aa0c9284ea416c7edf62f5ca6427fd0511c653f7b23e18d11f54 SHA512 dea9435be7686bf63cadd0142a89159a2a22af53da0529db13aa97b48454438de1c77604dab0d53b81c3ded46236fed5dfdd78ad144da521aca3fbc429806d59
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/pulse-access/Manifest
index 4be7eacf54a4..74569f357e55 100644
--- a/acct-group/pulse-access/Manifest
+++ b/acct-group/pulse-access/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-access-0.ebuild 151 BLAKE2B acafaf537e4f681967f2844146f98640a66ec78748178ef21a60f8d20ed81761fb526ee55fe75919fb608b7b9f52a82a5bdc8d2f7d4f3e5472c8b77ccef90a1d SHA512 acd9f99ab41aeacdabeced2eb860d21223d1fc87c4ad63ae300261d8b75ab392e96c87a88d02abbfa604e777feec9479d8457c6892894057e6155a5cce7c39f2
+EBUILD pulse-access-0-r1.ebuild 151 BLAKE2B 7ce9faa3217da58b8b3b50ac8a5a386018a88e1e214d8aa6ed15cb749015453fedb57996953ef93b7babdfe44a982d25ce2f2f8c22cb2605b744d9201e897f86 SHA512 39a4fcad2548ce60a531bedd2ad5c5906200a44e772edb04c5f9f7bfc96db3313dd23eaaf9c775d54d84d795f162e23df879174954061d35bb2416efc170ca9f
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-group/pulse/Manifest
index 3902acba44d0..6d802d7f73eb 100644
--- a/acct-group/pulse/Manifest
+++ b/acct-group/pulse/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-0.ebuild 151 BLAKE2B 608cb62b89a61e237617b5fe742c5f3407dc0363ef6154115b155468cca648ed07211479ea1092da16b247131e37ae9d2115e7892f855ec155e9d52251ecc56f SHA512 d8e117f912a87621646e38277405bb13bf0a92cf23d178dde990f0fdfb1c43f7263e9ede5cbd241520cf1410250dabc1b3515ecd9edf5c139468fcd925d4177d
+EBUILD pulse-0-r1.ebuild 151 BLAKE2B a2fe121e2c18839aa6e3b67fde98dca2c405e9d320d2b484befae0ae609b3ef2fc3249128cd6feb31577677d3923aa2017c71f40972bda4445f46e1c8582d519 SHA512 428e3b373b7e4e9480aff65abbe0a3bc1df2bd4826b08254d42762e836f0295c2921a33cba26036a8f4d0d30d74ad0ae514a6ed24e81a4d35cf99a02cd78cb62
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-group/puppet/Manifest
index 9d376011b47b..03c538f0ed4c 100644
--- a/acct-group/puppet/Manifest
+++ b/acct-group/puppet/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppet-0-r1.ebuild 146 BLAKE2B 68f7d3ce618a61445c27874ed1bc5205422598e3798041fd48a02950bc09fff101819650665b2c9e55519c4652892d6ea89399f9e9cf2fc1e0544240ddb207d3 SHA512 0a73713b27365d292aa4517e5ac52c5ea502ae10c1f3c39b56a286f355b5b7672d23f701b299e5793f326df6a6f9114056430c5401eadefd78658c8fa06716c7
+EBUILD puppet-0-r2.ebuild 151 BLAKE2B d29adeeb70056243c82224c46a1718974def17655d11a98e05e9218cd33e1f7ddea0a0be9367aa3212340613561857b194acc3b9925aad26c660844a35c62427 SHA512 6d463c63447a0112a801ebd1e0c3562bb65a9dbf0698b45bfea420972e16a0a5fc69a0bbf41e5fd5e1123859b81f3aff2493d31124b3298b035984e41d8fa1da
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/puppetdb/Manifest
index ce104cd0b266..4f612a19c050 100644
--- a/acct-group/puppetdb/Manifest
+++ b/acct-group/puppetdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppetdb-0-r1.ebuild 146 BLAKE2B ff6a419a3e9bb86eddbf1051c523e1d19ad75894852189b7296127493ebcf0c80397137cc05af220b1ea8c3a0a13e9e32dc9b94f5f0ddb87ee596e2e347a001c SHA512 a3f358c0eb70f61f210785db9014d1b97bb96173ee096c8283781b38a9aeee16ee94db1992e8cae16e5b51531835fb68300157ae405322b1ae14ca55fe1130ea
+EBUILD puppetdb-0-r2.ebuild 151 BLAKE2B 701b9d6f2eefed1e3e75ec06d864cf4b22ebaca364d2bb5c9e89f574c4d3c93e9dd16aa764d02e04103217066ae134c59d680f3b0bec8755dbffaf2923b2015a SHA512 3a98adfe05768ef4c15b3c655375d30949c9a2347fdbc4c744ec33cb43ea8e2ffa599325656de9e120605a370dce84a0a9aa2ffd4ebe96c6f3a2f39d2c446462
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/pushgateway/Manifest
index 98bee9f0503f..a23e954d6657 100644
--- a/acct-group/pushgateway/Manifest
+++ b/acct-group/pushgateway/Manifest
@@ -1,2 +1,2 @@
-EBUILD pushgateway-0.ebuild 204 BLAKE2B 193c8282ec16a5e026a3c632a4fa65f3359576355857f9a36a1c08b3d452ca3b734f566b67962c1be0b5732bbcd571b962db81a6f72ec1e3ea5f8b3e19d3eee6 SHA512 f3241947a68282cd2f770ffc534f9df5b0bddb6421139d87681d49b10ac43bac6a683b8c6f8407220899430bbb9aadfc9382f4a419d6b284a08e7e04f8b6d937
+EBUILD pushgateway-0-r1.ebuild 204 BLAKE2B 4fa3fd7e4742ee8f87672e19bbaff30c925f950e8fd62b63f92a83f8687ee71269d78ec740e0f8763658b090853df8ec76184e67682dfaa23f967d8f28d52cfa SHA512 9f5381fa062d40720e250d1fc3d0d9649d0108c73e6c9ff3770c006374e9273936aa75e9d63f4b8cd0f08a0b0cd048cf84a4cf505ccb37a8ec8142c6896041cc
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-group/pvpgn/Manifest
index d8afdf9a364a..66638926c337 100644
--- a/acct-group/pvpgn/Manifest
+++ b/acct-group/pvpgn/Manifest
@@ -1,2 +1,2 @@
-EBUILD pvpgn-0.ebuild 226 BLAKE2B 41e96958e5df62b47733fa67c0ca638336ba5c836df2869990ad7661fc9f02725d14d344a9acc75850e371f2f90aa52e691486cfc200d3101b434da7c7963176 SHA512 4d59a231420ec7f984c21a2881912fe891623059148eb980f25e916ccf91927117eeef16d173acf7a860358dbf03252df0d36ae5b17e85fc689e2b054f79515f
+EBUILD pvpgn-0-r1.ebuild 231 BLAKE2B 62d8c7e38ed258fd3add75681d9051df7db7bbc268a53751ca2fb3f3b43d7061ea41d2fc975d0cb0da741e9df8783c9c1438e2b945559f7c66aa1fc2ee5e3743 SHA512 3c2f80cb741b0e53cfb716a2095d86ef3170e6c09a10ae59456c571c37df4a02c1ffca52d66bf9252a9b6d37d0523eb8899e8adb634b7961ca5c288a0d4e9b28
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-group/qemu/Manifest
index d5fbaa5da8eb..e2af8d9fdc98 100644
--- a/acct-group/qemu/Manifest
+++ b/acct-group/qemu/Manifest
@@ -1,2 +1,2 @@
-EBUILD qemu-0-r1.ebuild 150 BLAKE2B 69e90cf97d3d0fcb711ad8f527d755f303c39d36f7f7b87a1175bf283a25fcab62a851136eedd5730b97ef6f14869fca1d0039db733ee1a7be80d849822b60d7 SHA512 97171f553aac0144c20d4f0cd343d52bcc647785e1750ec8b2482ff30cc31ee02c66c5406f6141d1607d947d0cd97f9c3c9cb49fdd7201b1e188a2f7dded60d6
+EBUILD qemu-0-r2.ebuild 150 BLAKE2B 0c731e9d674b09f92ce157803a962c2f07936981962792cbe7cc3614e9154cfe330bcf839d3f4e5094740483d4e29dcfaaac2d43019c19dc778b9070035b8c62 SHA512 98c04716a1131a961399f6622aa617fede4025d65a38f81d4be386f13cc61697c3b7a738a9a7e40b20e771d6784ac804e96b5682afcaabe96aa348edfc351f8d
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
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/Manifest b/acct-group/qmail/Manifest
index 88ee23f05f98..435627e40a46 100644
--- a/acct-group/qmail/Manifest
+++ b/acct-group/qmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmail-0-r1.ebuild 151 BLAKE2B c2ed534c65c644e3956200ea297ce767210c53aa751a8c2e7b324e84ecb02ca5f26a19fd16b612ea3c55529fd0cb8af41617c40231440a99704d2adba0a9f341 SHA512 50add0e6670ca64b3491956be8e792e44449cfa02f0ab330a1f353151a58cc71d7257e04e304d374916a28e63ff85b264af7126cfbe569756ec972f96d683169
+EBUILD qmail-0-r2.ebuild 151 BLAKE2B 10392d9f6f07a41e0e7bec4af065cd72af9c846a1a53d36e047cfd759bf8f5d90142d3b1e82ce88d5ba9cd205a28533ed85325649bff160aee775975a0d425c1 SHA512 2d12b46f74af1f3a70e7a9e9c89ceec71f820faa300bba387cd44d2854bae2806d74482146c44a4b316fe63c998f6a6ed7eb48de9bb61684bbded0554ead20ac
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-group/quagga/Manifest
index 2626ac4e524e..f6a66708f141 100644
--- a/acct-group/quagga/Manifest
+++ b/acct-group/quagga/Manifest
@@ -1,2 +1,2 @@
-EBUILD quagga-0-r1.ebuild 151 BLAKE2B 0b546c65e580136e175fd27025e2d6e09b5c896baea3f3340364e13d99eedc263c0ea2d8cc611e312a4994399dc202be710eccbdc5e65818d3a520eafe529952 SHA512 3673808d5bf2e47aefb8d8c93e3ff3f0468d30564eba07941e63ed6cafa55b50f10edd272a065cac9d581f25affacbf6fb24054c84f0fde4f19f3df6fad498fe
+EBUILD quagga-0-r2.ebuild 151 BLAKE2B 2c247d5e3c8da050d9f558dee7e2e2ff7204de7421a449a18711172aad1390835c9a04b6513841313f0eb3a60bf52f2f92c415728dd0492a3c0b801de044e0d6 SHA512 741c9c51c655fe1333ff3879d31d0c1a4d8c288ea53968c9be6dfc2f05a0ccf8688c798b8a5b36d590ae6e38d2a124daf94a36930bc159b7bddaa17abf2e68a0
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/quassel/Manifest
index 497271f2df52..d1020f147868 100644
--- a/acct-group/quassel/Manifest
+++ b/acct-group/quassel/Manifest
@@ -1,2 +1,2 @@
-EBUILD quassel-0-r1.ebuild 146 BLAKE2B a07c0887a4a070c4e7b626369b021fd20880c06b9579c3b813fc21dfe9e643c1d8d39c7d91d6da750bb0705b6e342bba7e8ff8aadbea60882401d1b2acc7f619 SHA512 5c6fb5801924f16665c8cd3c919320eca14efc3928ea5e5fabfed9123fb0644a3ec5b25a093ddc3093ffc337dafc3f4d5f814c4cbbc4633eef183a27b0a1afe0
+EBUILD quassel-0-r2.ebuild 151 BLAKE2B 1f51ead974b7f09748b3bcd2ec9b83ec9f0a4e3198009a8a46f2d39f5af0f3a83b2ec776b17307c423b7f33781d843512a52e830bcbcb07d3c626b77a68b9c80 SHA512 e7c4e4c09b0eff59a89f2479de7ec3f342561fa42926fe13b05909c91341015ad39aeb6a6d0bd27aa1d273b45e74a0aa540edb4420306f509b231b4dee4cca8c
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/rabbitmq/Manifest
index f871f4aec4ee..5b659e1dc75c 100644
--- a/acct-group/rabbitmq/Manifest
+++ b/acct-group/rabbitmq/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq-0.ebuild 205 BLAKE2B f8896181cbe6d286636ffbfa52e911c25b92f78488c7564faac59042494c165a75e092fbd14ed0d6b533b88fd20d3daf5a8b128f253f046753ff79fb989d5f35 SHA512 4f8312deab54040de08ecc51e0d1d2f1949e2999b0e0d96bcd1da4ba3189f9254b5e0891dd0506e5a30c7db2c91719f259890541a81d342aa1f96cbbb820dcb3
+EBUILD rabbitmq-0-r1.ebuild 205 BLAKE2B 8dde75d4a2899add227a6074b69797f4fba2abb2e96ab4f579583f7283a33d240eb2f60488e50dc2d741e452bc36f7c1868fb7ab2f475b25550bf138bbb5b30a SHA512 007ae8f2373b42e0ede66a938450b0078f70598633a0b9fe9f866feab51d9905f805a9fcbb3dc29017b28f9076d219509bb4b157532fdbe03443c4f5f8faea33
MISC metadata.xml 244 BLAKE2B 7a5cfcea42b430285e098019ccdf99eccf96c5ba82feeb5354a023aeb0c197c9e7c138b8329bc20a0080cc028c546a0fc52b74c383a64645aef2eea22b894522 SHA512 04757d267b2495bcc0f50cd5354a9bf2f5093ca396744f4cbcdb4eed249e94333226c52e346261ba8da975d3d5fc7bde3c50a5627875a15247b338bb1eddc2e7
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/Manifest b/acct-group/rabbitmq_exporter/Manifest
index d70979b6674b..01289c4d0f2a 100644
--- a/acct-group/rabbitmq_exporter/Manifest
+++ b/acct-group/rabbitmq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq_exporter-0.ebuild 210 BLAKE2B 44dbd22eba325fcb068d6e3e82ab84604ac00d284563ab603ed7b4fb41e069bce58cc291157d9afde836c0f32e8545aae8f037085a71ef1c50fee42d7dae2751 SHA512 c4ddd655d87a51123bb0db20bce824b0f44baef6325097b26fe34c44c4a537a8ada1939524702b397ff2d5628653780f9e88d20628ea9e4b90781a1e80a8d176
+EBUILD rabbitmq_exporter-0-r1.ebuild 210 BLAKE2B 0553f0bfbdc161ed8fee25bd749db44f6c4e2d5f82bde712699960123f55a8c106683038ff012e37c247ebd6ea3df18a94d17f43c529e49a873676efe25d7967 SHA512 ec0145cbbfd53e41f031d6bf12e306bf6b6cd32cac16c4e59df8ebd2ac0becafffe0c0e0352af8c5643e3b4cce64e0e4a345e48c6e5c95883ccf4711a6cbf175
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/radarr/Manifest
index cd1d6e95960d..830160b26702 100644
--- a/acct-group/radarr/Manifest
+++ b/acct-group/radarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD radarr-0.ebuild 151 BLAKE2B 27c7624723cb9eb6f70bc6a0a54fb754e789b754d31771376674a03adf124bf4f192190263132deb265f0b983a44dadb71556ae5ce6bfda975ce499cc9d574d3 SHA512 3c6f7003f92cd89f185fb24ca4ddcea875982011069f8eb81a99a393c6747131b7a3b29c24a03e6ba9a24a2b7b69983fcf1c2f00a1aa89b8c37fcc984e5ec1ba
+EBUILD radarr-0-r1.ebuild 151 BLAKE2B e3ed9c8257e3b5cc95c6265c621c6b2532bbfa65bc876054cb353cace4d9b0f1b4133538060d2d0c4a7c602220f5ccaa40a5f04d8250bad01eb496f9bb87dbb1 SHA512 0b2a2e555913dccc3c759843460ea643692219e8d944016af252df030b51ffeaabcac2989344a3276653f3c9fc6ea96ea9560096047a87587dc9ee84ab4b5acd
MISC metadata.xml 702 BLAKE2B 6ed3e3100f5d2b18f6468c6c5ea176bdf5ead4ce42adedf104f216c8dba37d2d795437e9e845d08a2dbf95ea1c653e2e1df850f73a631cf8ec850e8b84819311 SHA512 09b9d356a54fb3f968534ff5be9904a41d97203adc008378315b4faae8f7ed19dbe39ca33958f69cb219954710a3b390749e20247d2c86093bedc168df29cc35
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/Manifest b/acct-group/radicale/Manifest
index d290c882111d..50f870144432 100644
--- a/acct-group/radicale/Manifest
+++ b/acct-group/radicale/Manifest
@@ -1,2 +1,2 @@
-EBUILD radicale-0-r1.ebuild 197 BLAKE2B 2c7f118a22b17a08262b34dcdb074c4336d26c66f8601fe691af03c5d72bc1e91083b13ec552bde26fbd625ffca5128e4332985250cd1ceab01ec6a520746ed4 SHA512 840478f0a3f9b114f821801b7c7cd088d6f69b53b2ab20f3986212e78649107d1b1c87ff6f285436c873e3f7bc725a44bc8e19cc2e9b9e87ed6f334d993a18a4
+EBUILD radicale-0-r2.ebuild 197 BLAKE2B 35a1508c8d49961fc354cb8574c33609ff26f09c663e6d99b21deb6a2ec80587cc3962591c08e1789716164f400c01fc7495bb4697467a5c1361627c8c3c02c8 SHA512 694f42c00a07221ea1e653b9ad1f66601d6c7cf7ceea64e22e8799c1e5d3324b605b53da7bc0ef98645779be8696f31f8b7331a292330f4837fdc600cce1c607
MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
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/Manifest b/acct-group/radius/Manifest
index 268e5811f8ec..f2c2f5d9089e 100644
--- a/acct-group/radius/Manifest
+++ b/acct-group/radius/Manifest
@@ -1,2 +1,2 @@
-EBUILD radius-0-r1.ebuild 189 BLAKE2B 4e65282da73dd41a44294456141015d186c85adc5b5a9dae7c7058869a4d79afdc5a7b52e8b2ae2484ab669fcad954954c98ae81d331d21bef05d69e4538cfe5 SHA512 1b2e8e1ea7d9c708dd4a490aa5c1a9f9e7ea0a0d2dd658b6ba8882a246ab7fbf4d937f797bc843712842e722776ff0d4ba4d1d964a857a335ac30e174ea5f628
+EBUILD radius-0-r2.ebuild 189 BLAKE2B 14f35032161caf3fedcfc6bc01bc59d1c4e487ab3bd68fb5f01a730aadf91ab416c5f2b90311777b033c9bb1036bde801de895f5c0f8247f66841d3dffb9b127 SHA512 c9649fa9af04dbd8a01b1cae66e0c6bfb9803b39b23265ec59d8fe5d5d21e0034ad890bb31321a9b6f1ccd8e308c2619cc5eb6d2b6349c447225121e91281580
MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
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/Manifest b/acct-group/radvd/Manifest
index 742dde2ab3f9..2041cf3fd6da 100644
--- a/acct-group/radvd/Manifest
+++ b/acct-group/radvd/Manifest
@@ -1,2 +1,2 @@
-EBUILD radvd-0.ebuild 212 BLAKE2B 1b199af40d7631b36019935fadc708881bfad2fccf3c0274fa79c0ddb6e0507cf71d2627aea6653ed1299aebb48475719c4bed11c5c3f2870dfd0de36db38331 SHA512 2e094a78c0908b5dc39f3ef287d3f44db7c16d2e2647dde4adb254248c16002679a357a7e693db41f1cf726eba7571612ed436bec62667b81a79dab2ecd70d9c
+EBUILD radvd-0-r1.ebuild 212 BLAKE2B baee93531003ee315ea3baee0f9f4b71adbbe50b418361711a33f8d43f0300060e12116ea237fbc0c6e0d0737758a33bb327159d8cc68653d3b9b77a18d89c0c SHA512 0365bbaea4b316c755a5c26537543458e2ac419654726794b2721571d8bb2ea3a3e6be9022eb8a36b134b96c851b53be5ff410f5a98a5bd909578fb8eae325bf
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/rbldns/Manifest
index 62b13dd235dd..59d1c003e76d 100644
--- a/acct-group/rbldns/Manifest
+++ b/acct-group/rbldns/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbldns-0-r1.ebuild 151 BLAKE2B 4b4313edf465676fa90cc4a61b6e2dacda62542c457448df38522af8daf1bdfd34342f9bad64e4ee27651cc81dc00db6a49696bafa9d6cc97a5429950bb7ba8a SHA512 0dc016c8a7a0226b5315b0f66b4f213b05b68824285ef0183c892bdb39f00c2f19d3882fcb97a3a9b5dacba64e1fe5121fd3c705bb26146b14db327a2c314d48
+EBUILD rbldns-0-r2.ebuild 151 BLAKE2B 2fd5c6a1da137baf0e0e2127c56af49e2d61fb4c18834679280194fb75d0c10f1514fb6a54356fcd10634b637f4ea7b8da33be8cb9a29c59dec7fc9954dc32de SHA512 72d3b54aa6cb5b1b277057b255b8b0536910255ea4d8a945819047df648284981ca1ffae5a9ed4ba1f980c6e2d67578201b2f3ba8856c4b4a13edbd98a8f2a18
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-group/rbot/Manifest
index 07217b66b8ca..4dbbaeaff994 100644
--- a/acct-group/rbot/Manifest
+++ b/acct-group/rbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbot-0.ebuild 193 BLAKE2B 42f069dcd54e57f4799206e10451f5c3104654e426fbd860d82691eb5cf5f4860a6ec504e49f097521b74bc9ec923310140dc34487416bfd56959185f8eb232a SHA512 549ed3658c753edcc78e75c8508ff669d70398b29b285b0f823e1492064560cae1ce13752daf8d9ba5b55034dd63f3e6130240601c866e5058f586d4a7e4edeb
+EBUILD rbot-0-r1.ebuild 193 BLAKE2B 9568ad2dd3456d5193894d9d5402ebc1995d0931de60a6ab1934d47df70efd42e0a140a47fe3761a8faff604c9b0839080313ab74e4a015370ff089b960dc7c3 SHA512 6510b31039438833649f931764d094fb9092d7b4988705d7dbd8a23cc3878227bc01a3c2e05574f0eb686ef2ecc8ed0b7f800ac7107fbd54fdcf187604958a3f
MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
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/Manifest b/acct-group/readarr/Manifest
index f9da29e5dba6..443961bbec2a 100644
--- a/acct-group/readarr/Manifest
+++ b/acct-group/readarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD readarr-0.ebuild 151 BLAKE2B f6b07cdf6dae2553be12bb07f07abdbc8e533c9e403f6b3add0393f8cffdfa730ea17bf9aa51617a9595fef814ce6292476851dc41df93c6f70e6fa235bde414 SHA512 d2302ff767f32d98b296c95faf40b360acd45d3789db7a080ee7bd877f009d1cb02b8741c34eabd4e7383fd38ab592a059cf9ce0094d94e3db47c5e8700ae9da
+EBUILD readarr-0-r1.ebuild 151 BLAKE2B 33ca226fa2ab89ee316213b74b82b865e57e566c6e6b04b506f25e945b728f8e5fe327fb5c3805d1190bb16fedd372e7570d7b489f97f67564faa45c585afb1a SHA512 df8fb03207b210b8d72255510ec7762402716bc5c09bdd2a6a649d5d08ec61071b02f3ce21ff388ccb5a38e554b31e2deb6dd5a3546fb625f70628950204f08b
MISC metadata.xml 702 BLAKE2B 6ed3e3100f5d2b18f6468c6c5ea176bdf5ead4ce42adedf104f216c8dba37d2d795437e9e845d08a2dbf95ea1c653e2e1df850f73a631cf8ec850e8b84819311 SHA512 09b9d356a54fb3f968534ff5be9904a41d97203adc008378315b4faae8f7ed19dbe39ca33958f69cb219954710a3b390749e20247d2c86093bedc168df29cc35
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/Manifest b/acct-group/realtime/Manifest
index 7599a735f43c..2391d7978172 100644
--- a/acct-group/realtime/Manifest
+++ b/acct-group/realtime/Manifest
@@ -1,2 +1,2 @@
-EBUILD realtime-0.ebuild 187 BLAKE2B 5c6319f542bf747b435bc9c216f7871a33a96e5ae8ec95dc6dd8a3af47621b0d46c39200bef295f9831e2428702fa39dd9c535a2f6adb46b8991481c41f1162e SHA512 c9e55eb2b4f0a8f9d1a79bb61c5335f2325a6a109ac2e25c99d887db3377458e2a9ce4debae966af0ada6ae625019ff3d1d9f60d5c504ff677686f6673400a13
+EBUILD realtime-0-r1.ebuild 192 BLAKE2B 838801f713222458043a3f658ee09de6a5baba75558cf63396c2ff9a46d4474629e757d66ed8f3a344229305161070bd3398a7222a3a3ac29dc26604eaf85e56 SHA512 5c545555c277b397ded5ccf2cd4546555b0434fc8febd1d103dc2980bab747c04bb0614c6bf376b64b568577e2058988bbeb993f728640e14f96d4807e5b13a2
MISC metadata.xml 260 BLAKE2B 67e6833093739454709d11437f08f56992d87b35e1f70405c5667ce6f35164e50891bd5a590f67a234c7a6bcfaa53bbd3b0034324a70aaabf1dfbdac16c20681 SHA512 ec587e23153929573978a938c94e2e87519f5e08fba1e07d0aedfa782f6ce09480299149ad874c04f7f5acf21c1ca8275efcb2a3589d16842041ce1c11cb63ab
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/Manifest b/acct-group/redis/Manifest
index d066acc89707..8e2dcb822400 100644
--- a/acct-group/redis/Manifest
+++ b/acct-group/redis/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis-0-r1.ebuild 184 BLAKE2B aa157cd9d72f21d426c80fb895be5feae718f01039d35758376b82995b068a155263f6b63f1f95808392aa81978f390e9f2fedb33ecc368c56680cfbe1dcf34d SHA512 b18cfbc9b6f98dc92402d8bbcc6c2df1c2b05de09ec97077a1488bfdd0424eccaaaddaa19190362331b96f20ebaaf2f04d562ef1e4e0d4a030509fdb9d0dd864
+EBUILD redis-0-r2.ebuild 184 BLAKE2B dd56f337c5e0b8243f670dd4f7251d507a8058b6b6245c63483dcb7a2731eec11c9d9ae21500090394934759fc6188f284a87380990c37f25a3a728d1977a258 SHA512 f84945a149c7692bb17713e1b6e6847cd262bf014e49e1a1a0ab218b1b35d35a2259efc7a91c42f0d85396bec7192f048c0da8af9f7b50ba3fd8fe03f9e73a50
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/redis_exporter/Manifest
index 10432745d96d..d484fe62c8be 100644
--- a/acct-group/redis_exporter/Manifest
+++ b/acct-group/redis_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis_exporter-0.ebuild 146 BLAKE2B 0fa09b4da1b6a5434c0b3da78861b7001b8fce1eb82aa6a8dfc368f3156b4b9b991c296f2fa4e05317d13d00314008e09c7ed6e4f60b12b60414179e40ea2054 SHA512 6d23d6c453272484a49a56538e32baa13dcbaaed36333725056b1f36a1a8aa17c634ac439fbd8505c5d757132558bbbced25f6db2888403832e68ac25f6d2e94
+EBUILD redis_exporter-0-r1.ebuild 151 BLAKE2B 2e31dd57d34d4183a34be35a3d5b628dde96e0f2ed53c17fef48872ee68c9d89e02e3d5161ee621f3db4399fd58ea5f23dce8641e3ec48dc4fcb1f62a89b5a2f SHA512 8bb44851ce025f0cf9f7e877594649bd3fd6042a259c0c4bdc8b2b5af8c8c191fae84d56d410eb42f0531747612a42044ef172de989ca71b90c46627dfe6c3dc
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-group/redmine/Manifest
index 45e2e5fbfdaf..f99df3b5811d 100644
--- a/acct-group/redmine/Manifest
+++ b/acct-group/redmine/Manifest
@@ -1,2 +1,2 @@
-EBUILD redmine-0-r1.ebuild 151 BLAKE2B 0300c2ef1a4c3659951455937a831f0f62330c9d77135bc2e41f04bbb636695d0adbedb606d96da3092d3adeb8850a80b186db9d5c7eb60718de20cbc624bca8 SHA512 bcf8ac5f65bf52d4af62dbc0044db1c510bc36f80a019dbf7d021216602c195bf365969408d2545bf0547099ee0d36cd97198b18c7ec04399c66e2dae4585684
+EBUILD redmine-0-r2.ebuild 151 BLAKE2B 7000074dff875ae7be39f11532ee9f50dd5a0014345d69ff75c48c3dba173b62d118951c6ca03420ce35f3b4f1a135b3b054c3379260ce075f7daed9e5d4b8b5 SHA512 a82f0b251973c78061128eba7b2852228a68bf378615e579fa696d6bc992bd4537fbb883a420e47d76bd15bafd443d0c86887c7a01f52fa24cbe1aba42ae626e
MISC metadata.xml 419 BLAKE2B 2c84505ed1c07ec955c61a163c3b3a400f1c01aae3dde0973c3e84a5462a7f7cbdbeb2dcf06e7fba91b49c97fc363ae5fc4af182bb26488ae98becbd548038a6 SHA512 d2ee91c4509d8d2e07dbca4a37eafb9186247aa3f37d68eb777bb0b540cf40ef5480380ee81ca69ea778f7b8b4344274008717190d2ca9c0d8f4f2566d1b6baf
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/Manifest b/acct-group/redsocks/Manifest
index 2ede650844ba..05d62e68896c 100644
--- a/acct-group/redsocks/Manifest
+++ b/acct-group/redsocks/Manifest
@@ -1,2 +1,2 @@
-EBUILD redsocks-0-r1.ebuild 199 BLAKE2B 6ec5442a800d1f45261821439f30fcc7ea1f54507fbf2d114eb2b505346c265ebb21a8febbf5800a6f6e445d4d3626eba86e3706d17085e09c489cb9aa6ed323 SHA512 d5f088c8291c2e2955912f3ee05e0f69d86835ce760aa282b787b752ac41234c503176a0627f1cd7c9ab2ed2f22fb995f746a736fd942b41ab6be9f69054c172
+EBUILD redsocks-0-r2.ebuild 199 BLAKE2B 4cf43fb765a21f4e898138827ce66bde2acd414e6941b52051515663b084f50c1442653c91789c4a9de79d10f4e8610d41640fdfa7d38c48575941cc70eeb29c SHA512 79e1f2407dd747e1f08824c4d2be07cad42815acd5a04d513fff61de6a08d80acdf439b100842e4c3399de5717f290dcd9773c7a8d7a71a07aadabd1ea3b9a3f
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
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/Manifest b/acct-group/reg/Manifest
index 7027d6dc2c71..bada0d40c647 100644
--- a/acct-group/reg/Manifest
+++ b/acct-group/reg/Manifest
@@ -1,2 +1,2 @@
-EBUILD reg-0-r1.ebuild 199 BLAKE2B 5464f03c30e36c9cd7b1637cf9d1750db74c8734af6fd6a265ceb9bcf28e56b3b7b7f718622e0b8b315c0fdf010df75640fc3a580aea88ec89b475305373a7b4 SHA512 6771827d2a89fe77c6fd19878efc7c395c162e71362d474a7473581f3d681859ae37c16e5e84ca4d6e4504e15ec032204e71c08797fca667554f88fe5f96d7b2
+EBUILD reg-0-r2.ebuild 199 BLAKE2B 7eaac7cf85987256035cd4e8256a09cd5ce526328597601db6b9113a8629d188c6b4ec6bf2321955e0462e56bf6640a3c7fddb089535da6bca031d4dd4c6a1da SHA512 7533957ccd000cd55ce08fa800d3331ad3d292cf8b9c9745d72f5fe8f9f1e29e37abf30f3f9494a8349955c8b769155bd2364f8754c0d61cda0646438df775a8
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/registry/Manifest
index 794556b81c68..7574451b771d 100644
--- a/acct-group/registry/Manifest
+++ b/acct-group/registry/Manifest
@@ -1,2 +1,2 @@
-EBUILD registry-0.ebuild 211 BLAKE2B c6f056fbdce331d52e27b8faa47e8a735c545fd8f9a590ea9e907e292004653f51ebf81669a3c193033aa12b57536c935c1ab1103d3f09095fdb4f85a065563b SHA512 194efa635fef21226cb8cf08077d1b42512f42f9680380cdad16a6e212b3f79e32ee3ee723f49d62fa2bcd4b72e5e1d4ae3568919509dfa50789517b16ffd896
+EBUILD registry-0-r1.ebuild 211 BLAKE2B 5c191c0b4d54fc620f98aaeb1d9a431a8ca6acade0571600785f07164443dfb1a96a68902ad5f7823f37283d567b4304a54f1e56b23fdfcd063dcc6b44098e26 SHA512 428ae33717f20fd09ba351e69bb12beed70d7a4648ed98d7cbc2f84df4fc73728f6df517dc1988e948bbe0102870c944ea8dd73b9202b4a3d2bb9923df387e0a
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-group/render/Manifest
index 04b7ccbc89d4..9ba762b69ba0 100644
--- a/acct-group/render/Manifest
+++ b/acct-group/render/Manifest
@@ -1,2 +1,2 @@
-EBUILD render-0-r1.ebuild 150 BLAKE2B ca2fce947680874905b28583d9b87325f6e8137f17ee0ca8a50a0f62222b9af2460c693ed73e502d7faafff1c518f89bec9a238b5e4e5ff3903c5e1bbb531ee2 SHA512 ea7a2749ebaec33bc980b281b5a09c04979235f01ecda174d9751e1b14a68a8cc7aa138a2c6531696fab3699b2726c5c6c197001e72b5863ede12bd1f3935191
+EBUILD render-0-r2.ebuild 150 BLAKE2B ab7b9e652f999445d5633b6706043c019cb52d8cee22033041998fd62ad47d5c8349c3e66d407eb56aa70900e46771f14e427e5f9a9562f25a13fe651fe2e9de SHA512 522edbd56cc0f83c03224cad824ca21ced3b2a4514474b8e6cdeef00d14e8f903ee60502046715340bbe812015fd0ee7ed076758a6ee220fe0a1f6a0ddded3fc
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/roccat/Manifest
index 0e026601897f..632850f14b30 100644
--- a/acct-group/roccat/Manifest
+++ b/acct-group/roccat/Manifest
@@ -1,2 +1,2 @@
-EBUILD roccat-0.ebuild 202 BLAKE2B a3305df2b97ab57f4e46e2a14ee83194ce28de85d1bb1b83be878fa9c8ea74d1a7e3c981c90c7b19bac77e412628596262e7024136ad815ae0a86242f4b03bba SHA512 c31cf6808281c7108d8bd251a3bc9ba8c49a2deb3eab0852ee1a021213d489e14793b1ae28594be04f036e7a60ed86b0b10545abf04dc67e85dd07f0f703739f
+EBUILD roccat-0-r1.ebuild 202 BLAKE2B 738780807a93a23195d9a100762b0cb422eec3102f0f10d48d558bb356e7cee615983401a15c3a446cd28fb3196de9afa233676e61c64fbfe8d19e6be5731b9b SHA512 a440eb67607195dc5c61229ec2b6db9c59fd872a76120eb62954ee55db259ea32ee60ff051a3259a130139cf1751ee3603345b0c80c16950d80c69d84d92042f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/root/Manifest
index 945666abe38b..fd53b27396a3 100644
--- a/acct-group/root/Manifest
+++ b/acct-group/root/Manifest
@@ -1,2 +1,2 @@
-EBUILD root-0.ebuild 170 BLAKE2B 8e32ca43e41577230c3ed3f1cd6f5081ab155d4d229a4ad5727765885026ea0c5d69e1f1d98f997d1fb9e96dd824e9c4f499060029fcff3c21ec85b75a1924d2 SHA512 cfced5a1ad00972160aa5c9c426a03b9498608a7ebe679a036ff55231acbdbc2eda6106eba36486996bc3419564a045c777c68b19c00deca0eefbd46bb7653c4
+EBUILD root-0-r1.ebuild 175 BLAKE2B f0b811a24db05785a1249ebf05767b44ca7584cd2c2940cf50dd8d4ef12d2ca1f033833b458eebb00aa553bb4a43c7bdae1bb85e94406858af3dad4195acf071 SHA512 9a15f9fd18f6292207a452ca4881b14cbb690c7b537fbfaaf84124e86cb0be75c275095d7ed1deda32ddcfbcce32a0b01ff922f488cebbd966fbdcad7fd793cb
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-group/rplayd/Manifest
index 8062d1b8bf25..bde514423cde 100644
--- a/acct-group/rplayd/Manifest
+++ b/acct-group/rplayd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rplayd-0.ebuild 198 BLAKE2B 3b693da3ec392f259a4f3311ce811de03e43aba4227f9f00569347a44ace689d802e81e68fe34dfefa22127ce30333d799b427f44f9e2cb2000ce3df8790196c SHA512 a1eb32fb45332050a918dd99bc862924fcbd769214d7a6b7dbc1f6da15af37e85ba60db8c9d38bae0e865e4c3162cc7e0553ecd9ae8602226fbaabf672e9c28e
+EBUILD rplayd-0-r1.ebuild 198 BLAKE2B 3697cffa636e3c19480ae9b53a4ab074ca305f2de82c99e79bba5861ed8ebe8e6b2d247258ec851ebeffb31696df13993da030b0e203fd4700b05a1530bdc308 SHA512 85addb45566ac74462db45a36d58d6760b9eaad6da844f0c12f018a0617f6929913667f3a7dc7df4ee96b356c81fef8018fe8a012c4c38d9982bb68acf7364bf
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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/Manifest b/acct-group/rrdcached/Manifest
index c413101239e7..abb3d8cdf9f4 100644
--- a/acct-group/rrdcached/Manifest
+++ b/acct-group/rrdcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD rrdcached-0.ebuild 153 BLAKE2B 312149733bf32026cb4208224efde19970ebe38256d2b47a176525275823dae8bdf00b2d839d8fa12fa9777dd9461e1cec0a97995c9906c51be3fde76a01b9eb SHA512 4b23d3518ab872e4423cfb20edc001da3cdde7ac53f359f9431f242819df9eca8904fb15ca5f76278b471a0f262e34da032120e661d7a8d1dc49d565eb33e28d
+EBUILD rrdcached-0-r1.ebuild 153 BLAKE2B 6c04bdafa3b4aa953029c8b33e9568a57959bcde3918ad83b439b29ba23ef6a03b7aa4a1aa9cca221bb041d85825ff8bc52068f2e5fef3f5eeafa69c8d2ad1bd SHA512 13fb4493707edd832818e5f5b6f56c45c6e020b38d21a3c185b62cf4df90a6a02fcd1a035e79393d306fcda1a4a63155dc418c5e8a382adc03cf14bfd11b3fc8
MISC metadata.xml 392 BLAKE2B 96d11acefa9a7cf18f9240f08a5b1c36e769f4e7000632301d3f763169fd15e20fbf3adac95e2e0463d3184ea4baf9792b0f061c95a6b79d3f95da03dfb3fb6c SHA512 c88eb6c28199d5baae394310b0ebcd6ebc186642d4700735eb1f712b176a7750acacf2c8d5a417d2c716bc43d0cdf5f3e11ceec1895f84dd1ea4f0186e3183e2
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/Manifest b/acct-group/rslsync/Manifest
index dcf7f05ef93a..1293689abdba 100644
--- a/acct-group/rslsync/Manifest
+++ b/acct-group/rslsync/Manifest
@@ -1,2 +1,2 @@
-EBUILD rslsync-0.ebuild 201 BLAKE2B 43f9e602c5f5fb5a359b9ea833520b9013c398aebd5230dccf54c5cf47c3e57a7946ae002cc56f84adb0a823adce82639a2ee9c71b0a418cbc79df670bf38e4b SHA512 da5aa392f91b19c34f80aaaeedcc0bd713c0ae1b76cc942d22e6a38997e9fd077d6e8fce853dac76afaed5dbb78741f46693e45a1d5e300eba3f2345a6de4107
+EBUILD rslsync-0-r1.ebuild 201 BLAKE2B 690b8b40364859c7c4393fd928348f3ad5b5b40d592ea557221fd9e8072efc159fb40ea25a012d14e210f2e425ebae8c30420a893cf1aca4844bc0f3ab7a6ee2 SHA512 b3c19ef2e84ceb99741e45c71612b6a3a92d2489230d01a7aa7f42e0dc165c1eebe168390a03df568a6c002637131c8a178280812423370e0489e3496cfdad64
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-group/rspamd/Manifest
index 4fdabb86065a..083cd73d14fa 100644
--- a/acct-group/rspamd/Manifest
+++ b/acct-group/rspamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rspamd-0-r1.ebuild 212 BLAKE2B a978ee58d3930ccd3e8202e423289d0bc1a0cc7643fe180ffb11bfa09f062e8148dd49294502bea10f16245ff94ed0f0dcc81c7d73c8a74113089699a68b67e2 SHA512 4d18a1fd8dc429fe53111a3e8999c7fbef08b0725b6a2d72658bfbc1c24e210741beb95618f65999d4225a33c12e78f19fe71c6bf1f483bd9675c60fc5f1782c
+EBUILD rspamd-0-r2.ebuild 212 BLAKE2B fcb153611b74b49edd4ac182cea02cbb64145e31d03f57ba4024dda1d17f666b15039488839c2e67b56acd32e5715b5c1625d7b652712a07b999d68dd9788b80 SHA512 accb0a26d968d1ae9765ef6c7667d487477d85e5c0b8f5a2376d60bbcb91ba4ef41ba89684546fc50e469345dbda225be2069d073af216afd90266230d11fdf3
MISC metadata.xml 403 BLAKE2B 73564783a1a9e3c1822097309be28fbfdfce03d09e2ba8b1238693ef4fb59cf01542dbecdf41ae5153550d17a39943e6e966ec1a69757f4179c2e8f756de5534 SHA512 31fe521e9638433c2c57240d7f9cdd037ba099c19f62b3b28049a730afa017107a21e5bb61603ba6aba98a11b05cfa8911404a154233269c0ced1ed53669504b
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/Manifest b/acct-group/rstudio-server/Manifest
index 76afd8b32c60..120a4aecf6ad 100644
--- a/acct-group/rstudio-server/Manifest
+++ b/acct-group/rstudio-server/Manifest
@@ -1,2 +1,2 @@
-EBUILD rstudio-server-0-r1.ebuild 194 BLAKE2B fc49deab7c348330c1789ce20e0c36d598064fc02791b1b20236aac020faba189c24b16cfd0f7808015bbc25ffa7cc38e9e04431b9035935b60b18decab4ab88 SHA512 218065423074def237aa78461eacae0dfb709c050bb1aec2c1b27969ad135bc3df95325cd415d61eb319be74972e625327356b09581b28a8ac6cbcf4ea38a395
+EBUILD rstudio-server-0-r2.ebuild 199 BLAKE2B 4b50bdc7ea4e2c0888e07b82a0e48ec89268df059546935fae70132132d693de8c38d715d6fb4ff976103f5cb24e6b1ad73da0a8a5d8e8ab7d0c6155630ad8db SHA512 d29ac3633ac96eaf837f6adab8a562bf9203981c8ebbc95948850db07495103e056ac31df718a22e87ba8229b72fc918f9c2eae2d259dc884389d8bbc9987434
MISC metadata.xml 245 BLAKE2B a7cadf465163ca1df604d88e904902634f1559b696dd48e5a57ebf2b7d27917f6ebbef65492ffdf5b620df01825f242d9311161f5624adaa709eaf7eebe0f5fa SHA512 27160785fd59931535cbc1c56f34e2f7e79f477bc9157eff9a07bd7b3f49f1c8c1c20106c9a7148123dcdc3b64411b9f706d49b544eca4415d8d13152fd05c9d
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/Manifest b/acct-group/rt/Manifest
index 85a728244134..db60da045af2 100644
--- a/acct-group/rt/Manifest
+++ b/acct-group/rt/Manifest
@@ -1,2 +1,2 @@
-EBUILD rt-0-r1.ebuild 192 BLAKE2B cb5f47a77c0b8b2a034b25ef93e2e8e01da0ccc3b2255a1d6f29c86241585a95d1141b3d61e6e5b3559b9481ecc298b83962177b702c5e2be29eccfc1f60104c SHA512 4b4cb712da5752062e1e08a737d84390df7d7079845372a316d135bff5a45a8f7f02295aaf6a20a7762ce154f8c9debbd052f768ad27d8c70516d4c50e82a22d
+EBUILD rt-0-r2.ebuild 192 BLAKE2B 1e30e224924ecf7055a9f6ac60d1a7bda25ef754423ff27ef4d753ed517087c719eb8bcc30415ff022b826bc9dddd89c488270dd231f940041d71a4b4b3bd0ff SHA512 e8c3e18f287392c14ed1140e1ec70d6dab1a6772e81a703b25ca5dd3357c0ca05ccf711be7873545f618f184b8e10b940e4c940b71b8299d74889c12921c65fc
MISC metadata.xml 365 BLAKE2B 525d0782e438a536ebb72d196efcaa8ec809b12a1aa3be17b4a1171cf3f41282ccf1a000fbeb3bbc81a296a7c97742c6c5a6c4794d10859566b2d4c927caebb2 SHA512 e527c901611d310ce54e32b4ec518477b8421cdde73dbb9b2d1e8cadf3de8ff291229556264a5275d94952c5b7e77ee7cec80febccae455b253a69b786a63c32
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/Manifest b/acct-group/rtkit/Manifest
index ebd40aa7680e..b5e2993033e6 100644
--- a/acct-group/rtkit/Manifest
+++ b/acct-group/rtkit/Manifest
@@ -1,2 +1,2 @@
-EBUILD rtkit-0-r1.ebuild 215 BLAKE2B 55e640f1290c3e6a6e6359b7ca7262efa48049a4e53fdb9adf60c7141e2d448ed761a3fdc408a241d064336c950b95c6e7dd1ffad274917c935e28ccc94f9890 SHA512 48a295610f094822b86eef9a33fdfc36f8b5736902e0272352500a6ca751d5f86575b431c24297524dc847b70889620bf74a9a902a632b8902662941052024c9
+EBUILD rtkit-0-r2.ebuild 215 BLAKE2B f5fdab34443c659d326769a189d72f6188ea72d226cbba74dcfaeffd74cd2747ffb3b038f1de6d6137ccf4dae37062838dcdb5321e3451a748aa84f2592756c3 SHA512 236b8e874906735206a64ee920ea818c8d97a00e981bbd58a2abd2f46d5949fb8e2b701900ad2e8cebf8efe6b79e4b13520417aba91e8f4b9c2ffa0696d23d98
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-group/rundeck/Manifest
index 2b7cd2baa2e8..64b780fc7bcc 100644
--- a/acct-group/rundeck/Manifest
+++ b/acct-group/rundeck/Manifest
@@ -1,2 +1,2 @@
-EBUILD rundeck-0.ebuild 201 BLAKE2B b0f579e4be3fde229a44722c95f835fd2971588f36a3e255de8b9ba92dfbace65da2470fcca144d834bc4f89ff01181c7dee310af09d4899195aa716a9859269 SHA512 2b2ada083da1509384d184c90568ba64151c1c78b9873d62b15a78e4dafa0b66c83aaf5af04fcbdd664553f8976f027433cba8a79e9f2fdba7b0483e6f43fe16
+EBUILD rundeck-0-r1.ebuild 201 BLAKE2B f2605663a7d31d6cf055bd984996af94bda81a34b30839cb7130b9d410c329ebd86d8fa03f8a03ea8c02e19d6d00dcc6810bece9c101951493bd6daccc7e8eb0 SHA512 50691cc48ebbcfb7594c31c71b5d403a59856a5d1046e368797809c2dd8742ba76dafe51dde86d1f2c0acdbf1957abeeb9ac4a3299a2498a27b0cb847785bcbf
MISC metadata.xml 358 BLAKE2B ae5834e1df4586133cb14f64d4a664aad482c14d1daead2d84f74885c501e64fc67a63cb065b2eadefdc29cf86fc8690f9434b37cb7d41efe09baa2ae23a89dd SHA512 b710971ec9308e2511b0ef403dac067e885db8a4e5dd79a2b4bb0c8c1db7a688b969fc60493ed9bb1c0f531190cb4c1ea478a3d277dd3db20d942d68c9792fe0
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/Manifest b/acct-group/rwhoisd/Manifest
index 6cd572f8d288..2c8e7c053b6b 100644
--- a/acct-group/rwhoisd/Manifest
+++ b/acct-group/rwhoisd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rwhoisd-0.ebuild 195 BLAKE2B 0f56d0ee389b2b849584bec8eaabbd60c6614309e3509f37ae12596ca72ff071ca383df04da74206edd82ef8f8594efe6dd980e9e86642c7e47180b5218b9538 SHA512 ad3ddceb1a076ae463f2d5ba89b4664a9e465ed98ad2d77f568f3e6c7785d3aea2d31b77eabadce838a9a0969e234f14204836752e48285e21230b5ab01e8540
+EBUILD rwhoisd-0-r1.ebuild 195 BLAKE2B e40a688215f03d68ef09a306cf60fdc8f3274c382455dd6cf8cd392731209453137b44d5369ffbdfb8cd3104ffc41dae7422a131d6c16c9930511311534db152 SHA512 6e1b0328f2926041fa85b3a6318fbbc56c5c12551b7645929faf86e1f0a2015f25f7fa8a17047ac637e9cb7b7a2e0f226f03c45d4084addc31644c759b986fd9
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/sabnzbd/Manifest
index 5e3cc5ec0d3e..8167cc374136 100644
--- a/acct-group/sabnzbd/Manifest
+++ b/acct-group/sabnzbd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sabnzbd-0-r1.ebuild 183 BLAKE2B a9b9a479ed75f32a3730744b719401b0e30c48ab1e58b8b3d9003217b139d2b1eef63841f019d6518884e3adc1cef38366c67832d9e64077079a530e999e17a6 SHA512 d3bda34608cda5f6cf168b409d76cec845b7cb967cd4d4a5c0057f27b2228422bdd7dadbbe6e4e9d253e79f2c0f0e6ff4e1a57890a15f2350c63e4c212cb7443
+EBUILD sabnzbd-0-r2.ebuild 188 BLAKE2B ec1e0f7cded708fb66dd3dc89dec25cdbccb3e6283effb399285d5a0cc576a2cb56b77bac2251cb1bbb773af044bc7c0811f7e9b340483026224baf1acb30ee8 SHA512 0852d048466188e9fa768ca98ca79445b033f337d390fc0a5b81872356c03005ff686fc14f1fe4ed0df64b17e1979c028d4ce7b8a6a3054d9f09a61405838b79
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/sagan/Manifest
index 31189214d64f..12a2809c7467 100644
--- a/acct-group/sagan/Manifest
+++ b/acct-group/sagan/Manifest
@@ -1,2 +1,2 @@
-EBUILD sagan-0.ebuild 202 BLAKE2B 95fca63863e259cfe774bbb45fb941bd56206cb03944936606dff39c7c2405094a878ac5f67cec7baadb3abaa925bf2c13a785ae8b18d5efd4c12ae4c08a6efd SHA512 b7335d23cb10c9b2aac3918d182dac714f53f4ff334c38fd4ce1efa21f655ee41114797908fea06cc161249cbd3883c43db70e5189bce6547886e5ab0837c2d3
+EBUILD sagan-0-r1.ebuild 207 BLAKE2B 7246aa03af69c27085b85a20e9c7af8c3b7fb6e0bda59b9987d5dc80985ffd69f627d8610d7041c05a7b821489af8d0fc41d9d9465b27c6a04d4b3a4e532215f SHA512 9a11c8574a85e653dbbc35ada279889bf6a054dccde6012fe8b162aa701ebc359aae9602ececa6394586e66bac329d0f4ad30953780efe28cca94e199b475afe
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/samplicator/Manifest
index 2b221baa99d7..eccf9364e4a3 100644
--- a/acct-group/samplicator/Manifest
+++ b/acct-group/samplicator/Manifest
@@ -1,2 +1,2 @@
-EBUILD samplicator-0.ebuild 201 BLAKE2B 650a68d9383cef0cdbe5bfaa1ae8005894d1f9771dfa273e859b24912086353bc2b94c614f251b7974c23cd5041b823d342b87be84d5d868b9694e117b896cf3 SHA512 c447a67c7e5074c3a13bb492cb5773df3a33ba710f45ae2d62a5464cdeacc931fc6d3ce58eada4d8d8305b5e2e51f26c0672a4eb3adf607b516e079f2329c4cc
+EBUILD samplicator-0-r1.ebuild 201 BLAKE2B 3d35637a3cd8b18087215a080d3d0b35c22b216ddef0cebc7725143b137261dd5d671da0638aeb6c055359b3ce93a751151906354020cfcfe78fcdf24e1db302 SHA512 78e176a6f1bb18f0e9e2bb7b865c18af785752a5b01d761159a0fb08dcf7b62057c0bd1060692214b2807ac9bb6c7c474bccb4fe4359575fcd17e09c31df8c6c
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-group/sancp/Manifest
index 5e2b4ab9d77e..1b7fba6d6565 100644
--- a/acct-group/sancp/Manifest
+++ b/acct-group/sancp/Manifest
@@ -1,2 +1,2 @@
-EBUILD sancp-0.ebuild 188 BLAKE2B 46348d94d6c756e5858cf1bcadcd314a2bee6683905d89408e8071caf58cce4b793cb4b53e007219128ec977ba2925e21c1e1ad6ba90e959f480d978c07609c7 SHA512 4bc00281e8881d51539c0490eb6e1fcde569149014d67030008049991231a589bf92f0aa752c4fd58fc5bfbbc8ac10299f258d74735b6ef1c45113f5fb9132b4
+EBUILD sancp-0-r1.ebuild 193 BLAKE2B b8aa08c12e9cd585f68503f1f757a8bc1eff0bd31c064cf5db0470f6b0a25455348cc5c59d3e38bfad8f9652198602efca527b5067a38b0538059fc11b32a163 SHA512 4762626e2b010066b97fb37c0c6bcfcf9c6ed5d21b35fbedd9691154876fb2ccedc8df96d6f11ea53fdc500c35a90c7bfb832b7fe7b52df14dd4451995519974
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-group/sanlock/Manifest
index 5703876af8f2..9364361fcc36 100644
--- a/acct-group/sanlock/Manifest
+++ b/acct-group/sanlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD sanlock-0-r1.ebuild 188 BLAKE2B 01843c38209950c66a3544e313809cc257abfa8cfb1aba2acf6ef98c19a6899fa45a4ac63d47001d766a7ef89bbf099e7447272ac3ba1a9711ad73bc7ab8f805 SHA512 95708c292555a3defa7bb66c153b979f14f15816f196e28e04e214c2de9ae6e0ed8fe06b5d02ccb6c7069234142b54600da63bd8383b5d935f3a6d70819c18ee
+EBUILD sanlock-0-r2.ebuild 193 BLAKE2B 64a6b5033ee21ca8c730786fab7302d71f0a0e3a805af9d226752e157e9d8132608c61654a1f8a992b63159f0b777ec22fb0b4acb48f924289a132d1d2de802f SHA512 a555bd273573821bede0ec7d3332da9c77fa605f88620e7535998aea6228bc0a0fe57867d1bcb0c94892ffdc250a4cac6a3ecdfaf685fea0e58348fafd16e56c
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-group/sauerbraten/Manifest
index 57b96c2abbb6..4b032009de33 100644
--- a/acct-group/sauerbraten/Manifest
+++ b/acct-group/sauerbraten/Manifest
@@ -1,2 +1,2 @@
-EBUILD sauerbraten-0-r1.ebuild 210 BLAKE2B 2fe2276242a31a04ff62c936f98df474b99268878d96bfef84a215c633457d1742fcc6145373cacd2390c8ffaf1d4b51cebcdd358215a48500b8eb2d48133b61 SHA512 dc9f5f67c15f10356c5ee9b625f12489c36c30b6cdccc8db526977760ef25b1b092c81d75b6658b675660710dafaac93c9883ec9a1275556ed0c78fe9aa06705
+EBUILD sauerbraten-0-r2.ebuild 215 BLAKE2B 0561a0b3ae3906edd8f70386c6c5125ae84410e34adf1955b972025b06f7f2e242461dc2b4c1d169558b7e02c0864ad8ebc6ed54822f35b50425d360903be703 SHA512 2a814030d86c0353497f08c3ae1073108d82f559a2141505e0ce44b37cd03c649a489df253ceacb28d2cbe6a6c6465db81be75aed49d62173b93ef758dbeb0ef
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-group/scanlogd/Manifest
index 4e5ea8c51e0e..b676909b28e9 100644
--- a/acct-group/scanlogd/Manifest
+++ b/acct-group/scanlogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanlogd-0.ebuild 202 BLAKE2B 0632a682e9aa2330f9ca0368f45ae408fea262d3eb876e18d2d0e24d3027151aed1c303dcc3486b084f8b98aef8a3e0affda5783b3f520bcf599679a2d865369 SHA512 bf86ba312bf77e5caee19c74cfdbf4f838291b3888eadb4c8b73c7789ad95589993f2e7df4d1b1926ee200a9de83d6db328b85ccef82b27db3a63e78053c6c0f
+EBUILD scanlogd-0-r1.ebuild 202 BLAKE2B 8d36db7fa52c100d6dd76dd7d277c4c1f5840acf3b1de7fc8b9fb059cd678e995acf93c44afc4d31cde09c38a40985ad4a246aa1793760505ee6791765f026ff SHA512 977606b349f6850edf6797d7781d380016ead3ec9c8c2979b47565c2382f499cfe57cf27f89da2ac325f0e8ffdf2e05c77f7e96cf5338c33cf0c2dc5f2be6c22
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-group/scanner/Manifest
index 68d1bef9367a..570b43864d9b 100644
--- a/acct-group/scanner/Manifest
+++ b/acct-group/scanner/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanner-0.ebuild 202 BLAKE2B 53f7c6c4d81079d9c78fec9793ca10cebb8f53e59b5f4003321d3280ae17152fd378b0e9bdcab91464c9c16aeefaf4a230fc47cc502d08d28cee0d58e7a2c644 SHA512 266bbf1c22b39136f7081002f21d11dddc0f4d9d09b4bda82cdcdc2386319c01d1a2e23e4d6c34c33a6e5a19fdecfef3485803068b9ed9428ab467bc0e1cf381
+EBUILD scanner-0-r1.ebuild 202 BLAKE2B 7eed3ac2e03aaa2b5f941746a5ab3705ecb71357b5adc5f77da273287ee831030beeccc45ecfec1ef840e61ef13e372ba9cd399a8c3617faf747d048c389033f SHA512 16e4abd5666e13063febcfab435fb4496ae7545670774443d46fb7a4dfe3fda2852af0df9badadab970736d4a659cb0ef4f61c9430647e52775472973bb64f5e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/scponly/Manifest
index 24e6c6cbcc4c..3078936ec033 100644
--- a/acct-group/scponly/Manifest
+++ b/acct-group/scponly/Manifest
@@ -1,2 +1,2 @@
-EBUILD scponly-0-r1.ebuild 183 BLAKE2B 2c995e1a0a49fde7a703114e93377661507410782cdd36320cbe0fae473586adb79177895ec4d7e1a98b7640474636730d913bfe954a5db9cd49c17d9fb72029 SHA512 2900acb88e2e188cefd370a767b8a9372e50464e8fb4fe14d85a8161a321f489c71014680c7a54d9de47f3743515ea0bb736ffbd8de86288623c675e7342deae
+EBUILD scponly-0-r2.ebuild 183 BLAKE2B 6bf256a5a563334e1b748cd8867772a2999bbd91bbbd4769d879ae94f9952b432ee662b1db3fb9a7adcb6e5a7bb836b1216f714576dfe3bb2cd0daf207d0a3b1 SHA512 0ca1400d2c5dd5211ee33a46d04f89777094a9260b774aacfec1a3e783e8ed8b7f953fcf1fc9f35a54a3f0885051a2a18be58904efb89dcef73e9cfeaa6b8c35
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
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/Manifest b/acct-group/scsi/Manifest
index 6f0877912016..fe5875c0610a 100644
--- a/acct-group/scsi/Manifest
+++ b/acct-group/scsi/Manifest
@@ -1,2 +1,2 @@
-EBUILD scsi-0.ebuild 151 BLAKE2B 1cd6f3bfa70a3212d37353b74465074102d76f4c47dd5a8d3c158a5ce359adb8f1f79cbeaf911b317aefddfd5b69311c0395c58d027d30295463cbedaebc5f10 SHA512 ef325624a896d4d46463679619d4e4b5c520dad153365b53d92e80758e8f4b81dd2c512afd15756be2e9fc460a3de2cbaa9f14ac7e8f420389c13dee7b4ec310
+EBUILD scsi-0-r1.ebuild 151 BLAKE2B f232e73bc007231db73c3858c996a5611d8d3b773c66bb47d80232062716a27c47525362f01f4b355ab216313cd695d95660f226a18b5da2aee91c2a527719bb SHA512 d593e894ea51588c237360f0be7ebc31b9bd80c15b9b9137fa3c73468f23cd50c13c517e21224cb538953a605afe14486225815a31f7b38c11262d49dac431eb
MISC metadata.xml 169 BLAKE2B 4307ce25f2199f9cb772e7740a911318479c0a7c122eb2c91e5c908e1e51bde7c261d0c9681dcb5095d0c8d9dc97c5ae40787c13ca971f705c5b471bbb1ce6b1 SHA512 9d7035f8acb273b0b044a4d8d04b395ddef6d5eb62333af0c232b7bdc112d90d5fd88913a60d4e0e1206d113d5cea77b5ece4defa421af52b2bcf3bf7e35d7f1
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/Manifest b/acct-group/sddm/Manifest
index 0eeab307b808..e01f4c07433e 100644
--- a/acct-group/sddm/Manifest
+++ b/acct-group/sddm/Manifest
@@ -1,2 +1,2 @@
-EBUILD sddm-0.ebuild 194 BLAKE2B 6e9bdb2df04e69485fc61627d2fae81e40a8e922ecc87636c751587916c19ad5a601c55aa5d2c752ba7e8531ea41cf3f41af54880ffe1b1d90a1aafbb1d3ab6c SHA512 89436a12a085784fd093cce68a519eab143e04c8296613ae693aec0e7420de040721c801187beea1cf0f5d7b9188873b6ea2c1990a272e40084701690a0627c7
+EBUILD sddm-0-r1.ebuild 194 BLAKE2B fb7168344473c3e68c9af0c1ab6220c52ee9b46a5f2dd795693ad8dcd9d7dd0bf99ea71908cca8c3c11dbf035f1a23cbd4098c9d2e7f89d2c15a14723517e600 SHA512 e11bafeb6b3e33df965774f40078487dc3be1a3c8ff5e6c966690d3d3ce6762650daa5cac13ca4005becd9c4bf915d3f30d6c1d7075f0a1581055882d3d9770b
MISC metadata.xml 347 BLAKE2B d35c41092c587e21f53b8622fb40c8d2625f2ee7b71a645ec478f1e90eb2645eb87b6cb8f06b7e1a317fd9074594da44de68642de0ab45ee748aa93106dcdc89 SHA512 b9fd27f1b7465b3fdf254604066d230ce01eb1713354ed90f95f8963804d32c37e02ceeaadef01a4019abacbcabd044dab9ca0b55e9709505cbdb7d7415c2071
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/Manifest b/acct-group/seat/Manifest
index fecea503330c..56b6b18f2e92 100644
--- a/acct-group/seat/Manifest
+++ b/acct-group/seat/Manifest
@@ -1,2 +1,2 @@
-EBUILD seat-0.ebuild 185 BLAKE2B be6dffb8cc37a688be351ddea569584a86063fe174237965fc304cc8880ffeae0763fe3e7ea5679d474a75d1104d50f2a2ab264de13c3bd5477f2cf68388dd83 SHA512 c6c4540f630a5e0253ae8ae933629f4c361aea37d70a08de31ea9449e786311654f421336c80e101a1bd81fe1593cc6c6f26745adc4dd7abd8cd679578c72a3d
+EBUILD seat-0-r1.ebuild 190 BLAKE2B 66286d5f5aac5e3f48920b603ed9dd2f77cc90616910c8cb5ac3c39343f0205a2243e86a70f1b9608d5581c5cdb579c20077c4726f3397ac8ebc7703514a2733 SHA512 1217f1ce5915984125dc5c9f236d736b168ad9acbc0025bf549d01d4672f333ab7d40468423c6182d9d15a46e33f0a9c112414bd2563e6f4b36767c4853b5680
MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
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/Manifest b/acct-group/serf/Manifest
index 1d4241f07e2f..877f71bfd889 100644
--- a/acct-group/serf/Manifest
+++ b/acct-group/serf/Manifest
@@ -1,2 +1,2 @@
-EBUILD serf-0.ebuild 195 BLAKE2B c16596e3e4fc2c359d0ef88e26aef34f44c759f64f0662212223e4e2f72cdd33d2cc5c387513469a386a89b2a208bdef0bb6ff52bb5491e2d1cb9b99fee039a5 SHA512 7379a298931d34356efcafe8f9227413937de82ff1e6ce32e5f51470c214c2917f2e8d1ef17e8a45a1d6685c306757216ae24093f786acf7b4005c8ec1c44346
+EBUILD serf-0-r1.ebuild 195 BLAKE2B e68f412af048567c78ab9c1f18d9c24c242f53d043b99d4b06388d01eee1d9e626690a0469b8a3359112261315f0caaa4ffc12b4743ed6ff01f716b8a842f7db SHA512 3579536781f21d580b6f616b5cbf6673f00457e3c45000ed69b7f81a3946b0b4fa451e3d81bcdc7b4a7dd8f501cacde3ffc6cc961a53ce656ecb5ee5f0105df9
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-group/sguil/Manifest
index be45f50903be..9087c6a75beb 100644
--- a/acct-group/sguil/Manifest
+++ b/acct-group/sguil/Manifest
@@ -1,2 +1,2 @@
-EBUILD sguil-0.ebuild 206 BLAKE2B 590a8f105d3f5f3c2c6cfacb60c28852c41193e94ae79ac1f5d9dc6c8c2050fb1a02b745e7ecde4343a7000205fed82fc43260bed112f9a6c606ddf3127e2255 SHA512 e696d16989f91d22e7a671ecc4d5ffcbc1dfee25a6e41ff562dd500f749e414252bf4ec2089afb60dc4e04d469d12dac761fdb9d13b0bce2651d6a5c0ae3cf30
+EBUILD sguil-0-r1.ebuild 206 BLAKE2B 2860b70370dd323e0359ec4ec2ce18352572f99cd16c5d979d4907dbce07cf8a7fc0322efa90c45043976990d8e5139d459a65570a0a6c79c7861213fde8b4aa SHA512 ba39ac9fdc5083203f261d11e3d5a5a5969436a223fb34d11f1539f8ac0e077e55c0948b829862fd460b33e20beb60150384a2143e37c46c1914c7d3db3d0c35
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-group/sgx/Manifest
index f03d48d7b2fc..6e6e93119be0 100644
--- a/acct-group/sgx/Manifest
+++ b/acct-group/sgx/Manifest
@@ -1,2 +1,2 @@
-EBUILD sgx-0.ebuild 197 BLAKE2B 26ae8a395265b92149224ed49d13d1bb6eaaee69dae8e1c3a73591da2337c1005eab43700545e8c3a026652321e0dc4082211fe23a7e7e99d0d2d05d8dd33ddc SHA512 f8cff00e63c5132d3267b5228a29c674e879004d829aec10a28e87a5c412c1cf8b8620535ac7426d3ffa61515e785afd8ad7063ccdd1d83b1720ca427982b453
+EBUILD sgx-0-r1.ebuild 202 BLAKE2B f84ed6e9afd0c54d8810d0e1c30622563ec4e92c8ccd0afc85048b0f3cf08ff63ab5f12419ff8bc7f7521ea0e168f30670bf7f091a3cc0bbb3ceb747242504c8 SHA512 1a1ccf82fcf7c3e3b19223fcc0971ba685e99557cf694d6f9f365d8d3a3b16c3c181d13c2382ded7fcde8b866ca4609730cd7423a0c7994340f9e70f058f78ed
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/sigh/Manifest
index 828c8049e929..ac347f575f5e 100644
--- a/acct-group/sigh/Manifest
+++ b/acct-group/sigh/Manifest
@@ -1,2 +1,2 @@
-EBUILD sigh-0.ebuild 151 BLAKE2B 0ab7e99af571ef263ead1dd322a5f80f798927fc6551f30d39b7b428369f3688ceb5997a4d303430c027cbfbf101278741cc458a40f03f66078781ef84e21b55 SHA512 84f012812b0f710d47dd84d73ce0da3072ec6178eb5fa44518672bf52e1eac5446853c18c65baf3ff76cc80714753516da2cd85f3dd89b7a95c5a3cebd20993d
+EBUILD sigh-0-r1.ebuild 151 BLAKE2B f5878967aab38daafd5228825fab5d30439c5c0d0a69b460ccb625c34671b297e1895ca37aca69cdc4c555693c6a0105142b72cca6e87c3f957b436b1ce8332d SHA512 7e19e5386b2dfaa761bb958f8be1d53dd6889799f208707ad20b7fb97a7695157e9cca0451a79ffe9aa291d13c8deb1dfa904efd0f1bde6acf83ac76d33e6f9a
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-group/simplevirt/Manifest
index 2546b5b91fd2..4ae783bace01 100644
--- a/acct-group/simplevirt/Manifest
+++ b/acct-group/simplevirt/Manifest
@@ -1,2 +1,2 @@
-EBUILD simplevirt-0-r1.ebuild 146 BLAKE2B e3ed3ba0e82a7ffa91dcf7888de167ac11d918b0c5880ebcb38d97b7af7d8ff49371829135f02533b9ce44eea39b76366c8b642df18c1b3d81e03c44ed845283 SHA512 0710eb59efb4a20520af0ad291bb466a0abbffeb28c14335c338c2619bd3002664ac1d40eb6ac18c69e6d657a9d1621e496319f88a96ee8873d498125d33b7ba
+EBUILD simplevirt-0-r2.ebuild 151 BLAKE2B 225fdffa80d2d4cba4c9cfe6a7fc69af3704c35121cde8675cc6fa6fdf64af218ac8917875594bb124ff4a394f80110a20edf7ae34294fb33352d8fe1866a42f SHA512 bdaba8de8aa9942b08a50450c7141cebfb5ba21790e7e07441b014aa8a30b8b14e319a16ae8f302fdc010eb7ec433c3b15073df58eb0d939177749d8dfe4506e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/sispmctl/Manifest
index 5cbf2f36b94e..4e6a7a703bd1 100644
--- a/acct-group/sispmctl/Manifest
+++ b/acct-group/sispmctl/Manifest
@@ -1,2 +1,2 @@
-EBUILD sispmctl-0.ebuild 197 BLAKE2B 7cedb80a452bbdefbc15e95cfaa83a079b19f9b3b3e5bc311b7e2c4756a1b618f7a79714fab9d3e1e69b9788dcf40d6100c954bc134b5c32853ca6d7e061e74a SHA512 422573a06fa294d7757ab30f34fd4b5a8a771a384bafa029704234e7ef9b39ae7fea2c1b726274942d5a0d280e5d4509dd77ca8702cf62e9f8a8c0e4c1242244
+EBUILD sispmctl-0-r1.ebuild 197 BLAKE2B da019a7ffa5080e3a400294941148d4da363fa5b2027db868c577bc53fdc3ee55c5c97534e234c311ae710f0da483bc4c9292c0cd623a57a793107af51415db8 SHA512 dd3b997b70a6a624534a2c66f2a3abb46a5405fa2afa6a79dc128334ac1cea435e99962f1e628e4f7817be512d884b05ac4dc9f9936a91534e0efca85e5365d5
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/sks/Manifest
index 1fde2191eadb..854ec1264c12 100644
--- a/acct-group/sks/Manifest
+++ b/acct-group/sks/Manifest
@@ -1,2 +1,2 @@
-EBUILD sks-0.ebuild 192 BLAKE2B cde6513c6f7e065059acc3a29b9f755e39c2de842503109a0a71e4b54e991ba0ba6ee851008b25f58a1addcb183b08b80a346577b5e624341f6d414dd1391a61 SHA512 0488ed39591f3e880616d7fdb1cf052cc456d0131ed9c45c9cf942ebe30fa88e373f89b3847811a51ceb1870f068e21239e661713f9066b73838de3236487a8c
+EBUILD sks-0-r1.ebuild 197 BLAKE2B ab85e0c0217d5dfdb69ef907d608683178eac24b1f4cb6563090947148392c183149ffaedebe9354dbaec298b960e87123f11dadf24c2133a692e558727e6737 SHA512 b7785d6e2acd733e4087e58248f0fb28cdaff0fc5d8221c94effab9a5aac2c78f9a07985f34152a4966ab63f2a5e885246db8717af58c27cb25ae893dc89de11
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/slurm/Manifest
index 09f96d24b28b..6d8d0df69e2d 100644
--- a/acct-group/slurm/Manifest
+++ b/acct-group/slurm/Manifest
@@ -1,2 +1,2 @@
-EBUILD slurm-0-r1.ebuild 222 BLAKE2B 4b25eb6f204c63252a4e551964c31849e82dc1a09e57250d140742372a8f884749d0ea8f0d2e674cc73be8c250d8d39838f3d8a1d151c94d59f67973873bd814 SHA512 704e8e2002e73d09521bd4fb64b0ed82844c638608a3e7cd2f468d4f7c3d1e431a9e874befc82acb6ecd6271a75803acb2ec8a302f3034902099fd7b06bb1570
+EBUILD slurm-0-r2.ebuild 222 BLAKE2B 26cbd503117d77bc7cb7fff93f9e46e3e8b4d3a760395da9b27b9e180bea98023645cab749ef091d133e5037b6cc23a0dfb28ec6c9b64a4930e75611f2c4bce4 SHA512 4d073c8a785930f0e80518a8272f63f0de078f0b62f7bc933053e64bb28fe5105e8e5b0ad1f64fc1d7f3ee5115305d42684dd6cac1bdc9a9811ecbf985c10949
MISC metadata.xml 367 BLAKE2B f7377cc4c8ab6161736e0b676f04156059b020ebb1bce3eba0277b419458a520c595dc43dcc2ac7545bd91a93630d5809ab8194757dbdb092d06473ebbdc9bdc SHA512 07ecc9173013e5b0d47c90f5c5fda05bbb127e4401ccc2bc2c92ca04c4e300f1b6fef8f40f12ea58db212e3f66f7f9085af42ca8e0c6fb1e7be5d193a8a09831
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/Manifest b/acct-group/smmsp/Manifest
index c16293c11109..127092b4d4d4 100644
--- a/acct-group/smmsp/Manifest
+++ b/acct-group/smmsp/Manifest
@@ -1,2 +1,2 @@
-EBUILD smmsp-0-r1.ebuild 146 BLAKE2B c592d38d99685bb681f580f911c7995dca6f3a70edcda02491e5bee816c06f1382f241c8250d2f954b518180de72e8ef92173592a3c517c6790f7a5082b41473 SHA512 2c20a79e4dc2af45ca56fc8241b6965911c7a8c7132dce385c5a7ecce5683349012986abd06a65b7e5740ce0029b400b1f7bc2b36f6c42cdb54b99377eef8980
+EBUILD smmsp-0-r2.ebuild 151 BLAKE2B 631eeb908cf76df13ba171d5dcbf187ba592dc597dc6c68d54078be9abf2e8b012b24ec175c7ce69063221d9b9117631d3dad9610df4164266b069a5e7e7649d SHA512 a95b06e4e65baa649633adbdf6da73a164bc4c415d299955f88217bb431fff71405f975ed4762e2bbb41a4c4b52f2f722317a9997dff4d0020ff7771e891b8c1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/smokeping/Manifest
index 8e140d75788f..6ad82a7b1aa3 100644
--- a/acct-group/smokeping/Manifest
+++ b/acct-group/smokeping/Manifest
@@ -1,2 +1,2 @@
-EBUILD smokeping-0.ebuild 203 BLAKE2B 6a1784d9b0d200ffb64008cfa9eb33a03767fd9c186711b04f3c15860f58007eb3a829ecae3201d83d4906b8debe74cddd78e6e4845ba83e53d6236840c295f9 SHA512 c8544454f12dbb11f28aab193b3dbf9563f548ea71a892c6f5ffe59261e604d0cf8a5e37955d335bba7572ac42d6ef56322cf9f73784b2bd8323014c1ba0726e
+EBUILD smokeping-0-r1.ebuild 203 BLAKE2B e26adb53879a07fd216706ddb23eb6e2749bc4ce3508371688eb191b426fefa035e0d0270b65d064212399d336ff6582503e45f65ed9f1c1f9ba41a1fd09d828 SHA512 20987ee173eb06384ab975046ebfecb394a0ca1e3c1127205d7bee658131097526c2a398e12a064f903bcec6b868adec3b71c5fb4dd5254bcf42046c59fb8d58
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-group/sms/Manifest
index e4c7973969a8..818712591f51 100644
--- a/acct-group/sms/Manifest
+++ b/acct-group/sms/Manifest
@@ -1,2 +1,2 @@
-EBUILD sms-0.ebuild 151 BLAKE2B 2bac3d7ad2382918520dadd6fc79f1a62d8e4884e2fc5d5b024a8924483b19fbc49ce23be9ec2c74e173ec20737579f7bb6e41a25685ad1c6aa0ff2139f33918 SHA512 dbf0a22ff61cb231cb369e6532dae36b613b2f9601d22e30d6d8735289499c9a250b1f3fc3bc7601690d239c2c52b79710fc3692cc17c6c664c4faa2ea2581fb
+EBUILD sms-0-r1.ebuild 151 BLAKE2B 976cab984911cf08824ba78de251139ad7cb78608fd15c0c327e031e117f3e107524571f3c412667f580dcf6ecd0b66231ee913b4d0b5e720542a69dd75e48a3 SHA512 41aa77a9a98782f7e51c0f0e87cce90280a03b44e7e6a166aa35d5361178a25663d71d6a021495268483953300753842134039853be4f1934804cf88cd6a0256
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/smtpd/Manifest
index d5da98d590c0..d3751b46c33d 100644
--- a/acct-group/smtpd/Manifest
+++ b/acct-group/smtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpd-0-r1.ebuild 182 BLAKE2B 9672093f68123084b19669cb5f5d0b6805211245059ba3c0f2745e8ed9a028a517740cb8a6672b11865a606400411d6d823fa67a73cfa54b6c9343db7f655804 SHA512 4cb094e58b3413fb8103b85993958d5a66c8bb6c60b06e882ff222d71fde026da94acf4722ee5c352d9de2634259341a64e3ad9320f7a3aa9d70b0877bc16add
+EBUILD smtpd-0-r2.ebuild 187 BLAKE2B 847e763b2bb6e641c089d0fb9780b06caf02c4a02c9008cce09da0d519eea477a94b8a8f0e2f83ea931255d0be3a5b3eefed8bb81179c49e58a320620e078318 SHA512 8831f90e5ffb95d75dfc05a939ffcdb1a16ec7a512ea61cdc38358ef1e51469a33696012520eae86b7d539b13e3f84a3580f13836bd6fd9fdebc2ddb8dcd74fc
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
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/Manifest b/acct-group/smtpq/Manifest
index 4b7f8c1a6eca..317513080681 100644
--- a/acct-group/smtpq/Manifest
+++ b/acct-group/smtpq/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpq-0-r1.ebuild 182 BLAKE2B 9c22945347df6d29b6b655840d4585a59854a7976bafd1f52c9bf0fe9dfc6f6c900639ffd76700c968587363664b08be4b65aa4b9cc189c9b190d3fc83a162cf SHA512 e9b0f7adfda94d49455f6f6e7fd0fdc937b9544d61220a1ba7363ee9ad04e45efcb3754fa3e4441249419b4f8ca95db03405fc938ae6247da88d170bad3eff0a
+EBUILD smtpq-0-r2.ebuild 187 BLAKE2B 33489d5794405aa9ac21c614a253e00da5af06e4ddad8724b8ab20581fff3c1e1f4de2f1e6aaad32b8d906c1f57243aa11c8eaabc3542b34faac72845d7aaf0f SHA512 4bfc674e8392bd53c1f67893ddf80407b360f0548002fb9489ee2ea305c2958fb4463bd6c1f00c97d5eb32acf39dcf192f62550f46e71375d24c319b40bce84d
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
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/Manifest b/acct-group/snapserver/Manifest
index badc77eabdeb..97a127ea3384 100644
--- a/acct-group/snapserver/Manifest
+++ b/acct-group/snapserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapserver-0.ebuild 198 BLAKE2B 1028bd8dccb6520b37a1de03b2ed964cd7d7f4e7a3aa456ff03af0048c00c4e03814b0cdf79185157e4fc8941276ff46dd9e96ef4f363a7cbb82f512efaacb50 SHA512 eb6169e1a13c0bf7f922d643e2c14c847f790c813602df99358a2b176c75f9cfad68de671cc876bb4099474ce1a44a0fb522659181f06767cf80ddbbff1a6b45
+EBUILD snapserver-0-r1.ebuild 203 BLAKE2B f6bbc96d20358390eecf073829719cf8ec2cec81d031a909a84c4c6a882caf8665a633e375f33f290cde18f8cd2fb95226c77b0c318917287605713c1e89a5d7 SHA512 33b76d985c3eeee588b7a390e941ffdc0159004ef73e96e7fff1b07801ea2d5d79e876677c2300381ddc7d8462a3ce5776c3fe59b3a0a0df5faabc81b7e077cb
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
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/Manifest b/acct-group/sniproxy/Manifest
index 55a68610fcd1..9625b28e158e 100644
--- a/acct-group/sniproxy/Manifest
+++ b/acct-group/sniproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD sniproxy-0.ebuild 151 BLAKE2B 35f8c5e3a14bf946acda2a2a4ad7b640b7038c5fb230fdcb41ece3b715b0813f8aa6d005969fe65f4b536df8df21a590884c229787bef3c1868aca331c1bc562 SHA512 bb8db76e5d95374e5549757bb7931c1f154f01f82fb61c816f0877813ea420b292ad80678c787abfd07221ce268e0ca9485bf7197897e5fc2385ebdbd35373fe
+EBUILD sniproxy-0-r1.ebuild 151 BLAKE2B be39028ff064e61af597f99d207b65671a0150e8b5b995347882052757fad29c06a33b47390d6a9d223e612355b4526cce7f83151e201d4553d20be10613e5a7 SHA512 4dc8765e65c676b17e8eabcb044ec0362a003381e30230d95502236f1e6ef2ea3a2e8148788e689f1d3719ff96342568f80f70edbc5ee23de3a1fc1861601a59
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
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/Manifest b/acct-group/snmp_exporter/Manifest
index 634be54f595b..c95f2c11dd56 100644
--- a/acct-group/snmp_exporter/Manifest
+++ b/acct-group/snmp_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD snmp_exporter-0.ebuild 206 BLAKE2B b83bfceeccdf6167771d4286816727164688c25dfc73e683b825c1d242e33f4bc2b5e7f364c5f4ba29a5a942100e886bdad69db0110256a8b8bb7694bf37edae SHA512 6483e633e558569d1fb500c06697a2f93de2771705d2d45dab11863c0378356ce229a936f3ad8562210ef25a3f59fb57f6362ff22b4114e312d6a055ec68c89f
+EBUILD snmp_exporter-0-r1.ebuild 206 BLAKE2B e583223ae1346e89340723f70324a82b84d2ef9c34c89b62f8c01141a46c4e61370c87c52043c585bc62da1588d88420a5e8fde71821966b8ee675dce620aa25 SHA512 7bf3f11a795f260aaf3415c5665e2007686a6935ed50dccdb7c40b4fe7a598b07a9a9a16d1cce7270ca7a1ac109c3ae8c77333ed35239d6d639cd7474ef727f5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/snort/Manifest
index 3bd548062a6d..54bad12ec3c9 100644
--- a/acct-group/snort/Manifest
+++ b/acct-group/snort/Manifest
@@ -1,2 +1,2 @@
-EBUILD snort-0.ebuild 146 BLAKE2B 005f9cdceb0dc59cc49721fded69e56a6b23e4c66a9fe1b12319aec9a73d9158ecebf00f67d98c8e4b06ac4217f50c1a3fedfd7debb5ecb5f7cccd9c68acf1cc SHA512 06eed08d803f36aabd9b1eaffc6207bf2c5be87a2696acd64d019a6c2248a1561ed8b28c249e019f638b6ce1022edd91d82aae099518fa3beb9e4f619e3a6b2b
+EBUILD snort-0-r1.ebuild 151 BLAKE2B aee311c453167531018ccca5c9468d2399b8e1b5af18eacf41d33ba5ecee878d10fc030f99c0000ffbd78ae5b77fd8cd0774442493e88e0eb36aae3cc3f8bd0b SHA512 85716b7613961341721b31effb95ec7e6ca225a2d71b072af0e2d9f8ee02f0628d3a7220621de95489a895d40d1fea851bb3a0d548b8b15f4b60e934748e0d8d
MISC metadata.xml 389 BLAKE2B b2f0c48986e152a58902a98acda9b6ebc253156c5ac3d13bd16b71ea428ffd7456bbe58a8565c5900a581242c11ea482b4f71a65b30962c96c4b7f26c292a86f SHA512 bd0a333026d7f5448f2451950ec3c2dae9a8fbeac03faf2fa9f516c331913e5eb6bcb8c43bc935d25cae1df5a275cc43df301e8834e585ba174fef4d336f8392
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/Manifest b/acct-group/sobby/Manifest
index cb8ff73e195d..8de0a2c1e2e6 100644
--- a/acct-group/sobby/Manifest
+++ b/acct-group/sobby/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobby-0.ebuild 151 BLAKE2B b5cd4ed3d1f1b5a3758baf46d53ef4e7af5825b6e3dbcd6ecd593e0e151eca3e0561efbf7d588dbe7b05741f88409269dd901bda041b9a7aa8b7fe82d2900c23 SHA512 7fcebb1ca9fa2e6467f272d8a593ad6b970069af45a5203b5ede9b572dd717f96e43326db88569201c5a5100fb4f5fc6de2595d12b7acdc0966c754850751e6a
+EBUILD sobby-0-r1.ebuild 151 BLAKE2B 62a3ee546ee9fd86d1860da14a4191add1cc6356778caacd63f5778a3388132024c6589c65be3bf019de2532525a72649601e319a8dea0a2b1028fd37083457b SHA512 c268e4bdca1a351b82f241dff347807d92b5a4a8b1c02446a6ad27236f532e415450ff5c879a393040e3e9f4020dfc0f38475bef3fe641cdbf2c85f9467b3b0c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/sobexsrv/Manifest
index 0a8d00b26034..c564faabe00d 100644
--- a/acct-group/sobexsrv/Manifest
+++ b/acct-group/sobexsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobexsrv-0.ebuild 203 BLAKE2B 5218b235c505dddcd3c99916f21bbe46963d968312e44d128502fe9fbac8648eef109c4f11832beed6335bff50c691e4abefd942bcffa1ecf10a339acc59189a SHA512 285a5dbe6b3bd07b543445c3b3319e386c3526deba245006f18005e2d2a0d4e57928fb299de2ebabc1345c14845192be3b9c76e94b8ab94384cf8091b15050fc
+EBUILD sobexsrv-0-r1.ebuild 208 BLAKE2B eb64c13702518de31f2c436f2f7b9d3661b07063e3b666c417c68fd29544d2b198032e8b1d0fde1ffa9a541c7ce6b90e593f134e925e6d5a3ae43e45fccd0d47 SHA512 7d5049401d0afd1c4bcb9c279ce0336d44d45945cdf07d4f47630ca6b93391b7fa1eccb1b137853497adf2c839316baa72a34984ca3355151674bd7444781807
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
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/Manifest b/acct-group/sockd/Manifest
index dcc206654e43..ddb3cd9a1c9c 100644
--- a/acct-group/sockd/Manifest
+++ b/acct-group/sockd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sockd-0.ebuild 196 BLAKE2B d0c5b212d64591a95031c10cc93bd604870ef164d8da3cce4e0cb90160f6f3a276f2f3e3edc4f1f95aadadd60778cdb8904223e0cd3eba6a108bceff350613f9 SHA512 51976f99d68693914731611917f6a62be7969ee61e7de67a78686b1905bbad7739d81cbc4ff84887756acec662cee5e40f36838fa7cc3e39d0bfccab5060d163
+EBUILD sockd-0-r1.ebuild 196 BLAKE2B b93e855bfa19ec6f08cfdc0d46a2085282a540594cd5b48d707111ebc7184331bea376207a28ef957d162cc1cd61dc2a492002533b47e3196037c57e775f8e35 SHA512 cacd55e2cdb9024944f56c91b38d7439c32ff51f7f33815057301b1912ffe13c969f538a6c582f89fe2e38b382514efa8208afa0d5addd9c0b9ee5ae13fee415
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-group/sogo/Manifest
index 8337d096d92a..6ba2825df55c 100644
--- a/acct-group/sogo/Manifest
+++ b/acct-group/sogo/Manifest
@@ -1,2 +1,2 @@
-EBUILD sogo-0-r1.ebuild 193 BLAKE2B 4a33c860f9ac6ae29ef15ed47a0671140a4905fa86577cbeeab6c509cbc313968e71b34450e067c704640a80da91e8c364ae2122cc60b0dc2eeeb72dbd674f88 SHA512 ba44543f8e8e9e2e0674f55f6aa53a6076acfdb7640e7c1494ea09542f069dc26c85bbc3b6fae3481099022773e9a5ac7200fd162948b9e2a4db7ea93ecebb2a
+EBUILD sogo-0-r2.ebuild 193 BLAKE2B 276777bb9cafc56739252f6fce69ba6d5426cfd77adf4d72e74c465aa1a1e6a658291daa7ec6ce0319531528ea83d2130db5e575d779e4e7720a0a6d8c9f73d2 SHA512 5820a31161b4b5a28cdfca1ac5d85b4a13f4b0b6174d56a64d57fa7ad5b295d606502fb635798fc6b532ac38568d638ae002d1375880e465297ca0dfeb5da2a3
MISC metadata.xml 254 BLAKE2B e0f44b5b45dfaee5d78327c0a786de9629c29eb26b6ef1e06e499f8ebc1c72c0d0cee20d68992fe79df2498d1664a49f2bae19b5a115b97896300d741cb4a0d1 SHA512 48119cf18eaf9e217ca2203ccbfcd28aa8c6d2f7de7b21e347ba3c4d5f23147908620d158fab2bf0b0211670d091949b5ee3bed0044d4c86656703d20bdc6ee1
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/Manifest b/acct-group/soju/Manifest
index 71e04cdf75cf..5c4b62f7f44f 100644
--- a/acct-group/soju/Manifest
+++ b/acct-group/soju/Manifest
@@ -1,2 +1,2 @@
-EBUILD soju-0.ebuild 198 BLAKE2B 476fb3db0c91f8567e8b08528e00a7f7d0a409f5119c6d58b1f4a84122a36366e0cb703fa7b2a9535c48160eee2b946b1364c6dfafa8da82cad24d805f542a51 SHA512 e6a7309b899fb58270d7f19e46b04a49753fd551e4c668bf925c53d8600db44c49fcc958f2ceb3dd7062985941746e998b2d6296a1c0d14757a1ced46f533f50
+EBUILD soju-0-r1.ebuild 203 BLAKE2B 4a2e43da67699564b17da8c7028a660ba3f7c14139d2934f882effa8cedfbb660a3e10eed7d61ee396b2bdcdf0e507920de3ce33ae7f86ac2b19899550c572b5 SHA512 d8f9660d58fade106460791b7ecaa43f812ef4dad330c9b8d138be5aec8a0a53840c9415d95f644495cb72ede75cd7fa44660ddb26f0a17675f4d579879066ab
MISC metadata.xml 422 BLAKE2B fe4d62d0b24cded0b5aa967f6a05c6ed0bf70dfe8a50910194ef9d6de170b9e9f696854839207417e6f4bc4cab2d807133efbbbdf9c6ab30c743bda5bc749e2e SHA512 c3375b49d2d26fafa1bfbd91f4ff00c0c57f9bc0def840ee2e20c8f2f45ecb5e1d857c8170261fa32faa1afc6b72b2a975e9a6b11d38d6f8e9cd3243951fd41b
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/Manifest b/acct-group/sonarr/Manifest
index 0a9841eb1211..323cce9aa178 100644
--- a/acct-group/sonarr/Manifest
+++ b/acct-group/sonarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD sonarr-0.ebuild 151 BLAKE2B 8a0fe293449c1a6093c01edee1bcf2de66cd1ff3da1ff7009c0aefa599fb806b4e0f0f21df4ae22d18462646191bca8c385505d443424c50050ca1c41022d25b SHA512 1e8ff835c84e9d182f4a8477c4a0f33ca528eae0faaf2c4760e8718530cfea54bdb6e769c44beab590edb09e4893c58eedc65f3ad32dd8400b0eda07c9b7e5ec
+EBUILD sonarr-0-r1.ebuild 151 BLAKE2B 10521c1e4195b376fb0fbd62a2703c9848cb4a19dfa60636a82376b9379bcd796ba7de242f9ffe714169fabde41a83198d9c8bc944f050a54e41fab5b109f755 SHA512 1d54be500115258021938518d49645327b81964e543638dfe94c6d71ec985c6b470b0d990b2e8cf20400ddf83c5f344e9b1944ec784a7d18267c60db5189112b
MISC metadata.xml 689 BLAKE2B d4cc28788adc55219df30bab3de5d17ffd2fbc6cde4b8c08693f66d493a26850cad7cc0f586a4345b90b095acdaa7a9dd31c98ed3f1e06f57f5fd31f92ec3e75 SHA512 9d601fac9272d2fe27faff86ae960dd6e40e6d6941fa0abaf8e211ca03660169aaa81bb55e582598cd0d235d7a9c8ab9f603c20f9f8c862e974170d6fb3d927b
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/Manifest b/acct-group/spamd/Manifest
index e05e4b68b12f..c37cff2e3b6a 100644
--- a/acct-group/spamd/Manifest
+++ b/acct-group/spamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD spamd-0-r1.ebuild 199 BLAKE2B 0093025869e6c67b61727b0eb7019227598de142f0e1fa21bf51c86acea15f2abecdf2816f392d9dfe4aa10ba06b65345890c24013a478ca3161561e2338de36 SHA512 03532b212f3dc3058e811df44c45e69adce3753beaf40ac96281aa2879105bf18b855f2bc3659d509c2e4ff3bb56f24d8f8900696f897306c2afbc45e6b54e80
+EBUILD spamd-0-r2.ebuild 199 BLAKE2B a63633c111920baac3b17faf152fdddf67899b02d1d0a99ad82efbd29840c83e160007f7ce4a437d1ef7534580b02e1256c6456e76bb085e8ac10f0fc46f26b6 SHA512 56d0fea61384d5cc7e768d42d3f57d2c271b8dfef937f5fc117872ee66f2a810e214c3f25061fed21ff6a2bb6e1eaf2418322e25b28353370b71f6e826cc7c38
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
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/Manifest b/acct-group/spectrum/Manifest
index e9dfac1122ce..02310bd8abfa 100644
--- a/acct-group/spectrum/Manifest
+++ b/acct-group/spectrum/Manifest
@@ -1,2 +1,2 @@
-EBUILD spectrum-0-r1.ebuild 213 BLAKE2B accbbad9effbbca4e25cc4de30e4045ad2da9feac1ff09fa5e06b1d2f200e75e13f61d66d1b3364d343190c2314676fdb4b95e86dd3d8d7047de21a1a98e39cd SHA512 faad24f637140349c62ca437e14a9e3d7a440296f201ab39bc8fad72accb00851799eab670c354c3c8b0f158c810f57608967b70f4d1e88dc234e71db1069425
+EBUILD spectrum-0-r2.ebuild 213 BLAKE2B 830f0c0ee6466e9fa6f4d4bee2eeacb483dfc7688d62eb1a9667b96fbc7ae7cb330073421c0348ce3bc2069e897cb9995f0f9266df09ea041be69f9cca42e27d SHA512 f79406afc269180e29bfec6a76bca5b0d588f7052efb9f9af49780d1738d27b72d10e49c0e21f5341a4f3c0048a7c2e295cb40b05dbedb52d433120a30b7c9bc
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/spi/Manifest
index cb8db231263b..6767e0b92abd 100644
--- a/acct-group/spi/Manifest
+++ b/acct-group/spi/Manifest
@@ -1,2 +1,2 @@
-EBUILD spi-0.ebuild 153 BLAKE2B c94a6f2b549c998dc8197e39bda6fb050cb009b5cf508f67f5e3c68a1e0d21327bf39ec22cc62309148cbd258b20d088f04e5cae94eabd0b5b8da7cb87df95c4 SHA512 a7d6084894132a3a8968bdd45ba6d1eabd7d31cbb76b96562c66e21aabba6e0c07d794355ea68f93ee1bc65c0cef4ebd42e0d039fb02ea59a2d883bc4de0b86f
+EBUILD spi-0-r1.ebuild 153 BLAKE2B a62f4c21c6d002385318058c065d633eca2fce95bc4fffad8070f5293b0ef98483f42bf8c07630cf5bdfd6a17e226d47360ff3405d910f488ab47f0fb06b3ef9 SHA512 bf8ebafeafcba80977b209637b68eda583d1ef5e3e457433dde6cfcd08345a107fc4720188f3fe3cf05d692d3f72119f7b5ed35ecdaae544db0d4ae66d09a991
MISC metadata.xml 409 BLAKE2B 6a6baebac33f399b23cd4590a69ddb17a3057d8613b02f7091a6d9f61608bc13668bd5fb213381af1c33c98f7af44a44595c27a10b643968e4498263b7f71191 SHA512 8df55146c11610024c0f330375b071b8e548d7e7a4d6c46e363fd505a8feadc6921f6e0badb5a49a214e0be46f483b776ca71ba6c4e5f6c6b727818116a6c889
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/Manifest b/acct-group/spire/Manifest
index e1321ff23425..2451f1ea1972 100644
--- a/acct-group/spire/Manifest
+++ b/acct-group/spire/Manifest
@@ -1,2 +1,2 @@
-EBUILD spire-0-r1.ebuild 151 BLAKE2B f11011fa65f3d9ab363dfcc79aa532dda2a6c466df0f15b86d632e29063fdb4258a604150be31a75e91a98861541ada770a44d49e88d06e555b4723f432e9752 SHA512 34214a89cc2b8e59a8ddbed1afadfe17ee40ca030cd4dff1de1d267d3a203d92f6e00254cdfd79b8b811a1abe17fc2c7cede8d0563a9c5b2223ef2f5033feb43
+EBUILD spire-0-r2.ebuild 151 BLAKE2B a31246f5b0dba7becf0c0f70e0d05d313d13ecf23c792b2aac6e9579f212ad3d9a9c36cbc152e5aa9931ca148daed891c38ae77b7e57dce6e3f3d0e03e233dc5 SHA512 3a0890ee421b9f359c5fe065d2915615f07da3565cf7b6458c7e9ea531611eb48d37d68bb972e0e84c12dd6f401be9df2aa04bc37dcedec9bead435022f426ad
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/spread/Manifest
index b488ec36ab9e..a10a2e0bff90 100644
--- a/acct-group/spread/Manifest
+++ b/acct-group/spread/Manifest
@@ -1,2 +1,2 @@
-EBUILD spread-0.ebuild 196 BLAKE2B 887fdafacaf92e3b4cafa7f0c1992e3cccaafd7f6719e7adbad1bbe044e924181c7c0286f7b0a6510620e511bfddd00aaefdd6f639ffa0ba8e7ab03c0bcb169b SHA512 af939665ed6b8ea9d56c54ccea9629e221786a95d534af7408a7a8b3fd7be9c64517d96a8e8bdfceb0a4ffef2561686a34d7a925a9be7faa29cf2ccf5ffc47a0
+EBUILD spread-0-r1.ebuild 196 BLAKE2B a386b43ad0597fdd64b5a0fc00edfde77c1d9c402663458c04a602bc94acce98541f650768f4e4180504ead7c207dd01c6a186957e6adafafa882dd4c1e0e242 SHA512 e3416a2503c8c2b3f6e67fe5791bd0d3cb527ee8f27eaebd4f476c2f6d6cda8af697c798dc7686f15c8d6575e7b650890ba4680be4da939ab12e4d9387be1373
MISC metadata.xml 246 BLAKE2B 8c6c4ab0f28d2c1596e95ac77be8fc6cf749d8729b00dd5020e45d3ffd91fc171e6785bb8d4669d3ba6384acac52ab891092fe4b02b70d04241a346e5af23c78 SHA512 ab9a981b4aff83ec5b1f003eddd7768a0d74a7701ce47ea0f813be72552450e02493c8705561b02975776537d0896539537bd95b89921b15cd2faa501339998d
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/Manifest b/acct-group/sqlgrey/Manifest
index 118882752f07..2251410c4944 100644
--- a/acct-group/sqlgrey/Manifest
+++ b/acct-group/sqlgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD sqlgrey-0-r1.ebuild 183 BLAKE2B 09078308be11e29fceccd07fc3925c9e678ea3166928a0f63154a8833aa6a9afce3498a9803d0afc335d2c3f3a93111776fe76a292987f9b904e91e5932846ae SHA512 a4bec61f6bfe1494b2a46c4a9853875fa0549f2ec7f214a6962274e079cc603c87ac9105248adbf0f255b912c57000231e0e223625db6aff2f33b309379f6244
+EBUILD sqlgrey-0-r2.ebuild 183 BLAKE2B 04881c0bcee9b238f91fc591097969f63f60df0d599fa7d1633cd26593587c4319457928cbdbc26e75539479d6043ecde82188dc67bb7f283c3d38971717a518 SHA512 1e6a15d8a94c6c7169e8301d121a36627fb79e90513082d6a0566fd2e8a3418c60107f871a929b8a344398729ccc7b73a199c81f98b5c49709d03fcb02e2b0f0
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
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/Manifest b/acct-group/squid/Manifest
index 111c447a868a..c11ad0cd9bd6 100644
--- a/acct-group/squid/Manifest
+++ b/acct-group/squid/Manifest
@@ -1,2 +1,2 @@
-EBUILD squid-0-r1.ebuild 146 BLAKE2B 97e33f7c900973579aa8f30605a6ffc083cbcd212def08ba2cb4be2b6cb589a4576806e49a083d8d87a2cce9ccaeb2d32018aef06e7f130cc70cf4dbb7bcec41 SHA512 3e27a860e4cb3fe8c25c752e55530ce9d1cecae28a8785f143aba640e68687f04f4b054cd98dffb73a6d434f1db585ad4a7575a3f0925a351177bbae24b0dc79
+EBUILD squid-0-r2.ebuild 151 BLAKE2B 086d19e24ee9d19794a7cc4e1790c9f6a8a66f8bfed35e272b299c88080c505f61f9c3d8d67fa82fe0ddecf9e8c0cc0143ad6460648bfc3e4ab3ce15fcf3354b SHA512 6b7b379518b10237361d6dc02c38944308942b59fff50f823f6694af0b083aff21c080f805945c01eb47286cfacd755203e838454c46c2278fc03158ad84147d
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
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/Manifest b/acct-group/sshd/Manifest
index 511e7edce07f..6be4cf79ae6a 100644
--- a/acct-group/sshd/Manifest
+++ b/acct-group/sshd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sshd-0-r1.ebuild 145 BLAKE2B 12585bcfe8e0ae18b50915a423db065088bc6a0b6ce45cdc44802ada20d2d4d53a742c6847754d6bcaf064a0027c47f92feb98123cdd45bfea2f649801bb1355 SHA512 7bcb27e5642e006d78c530aabe1eda1bc89bf4dcb36f9fe765188dde9374c659185aaceed0c54e115cc6f47bafa22062c296011433a54aecab67c028bb369e8b
+EBUILD sshd-0-r2.ebuild 150 BLAKE2B 79144ff7cae6f447120dfef13c4ff1670993acd93143399f00ea2a0152ed8d82b3331df623be2dda5f6ef3d3f144b6b2a33f01886f0ee92ebbde644c25560e7c SHA512 ae3b9334d5fe6f39836b7af29ff42590f3b5b82901d283aa408a5a718fabfad2c3c83ef4754865f935bf07e22877e53bf02be1593f358bf05d3cbad69644159a
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
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/Manifest b/acct-group/ssmtp/Manifest
index 5d119973af67..2104a9a3ddf7 100644
--- a/acct-group/ssmtp/Manifest
+++ b/acct-group/ssmtp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ssmtp-0.ebuild 193 BLAKE2B afb8d2ef3955f71e2c91c56985134acf1ddd28ef80b13b91400252cbea3a0bddde2cd78e41968b176943672f5b53d9fc94e402bb36cbc14905ecfee1dc87cc00 SHA512 f73c33cbc35b8f23b825482fb45de6f377c7b77ff783016e13a98057447007eaf976eb4c71f84edf597d4dd9e16a46756a10dedb3937f06942c2a7ae5d430863
+EBUILD ssmtp-0-r1.ebuild 193 BLAKE2B 16bdeadedc9f4069c9daa0f14bc3b0ccecfad6a855f181e92fcdcf81408a558d610821e8a390bdf00ed7ae33893e9cb38c94edf084402006eb00f7935986219c SHA512 d59dfd0641bcd303ad5d9bccc0a39d0ddc5daf49ce875ea3a09fc454dd9cb60ac142fd960ca7f2f8d5162ddc864d66346d02e6acc4dc8bf711ecc37da223c7a4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/sstpc/Manifest
index 0e5eafe864b9..29e3c9d9fcf6 100644
--- a/acct-group/sstpc/Manifest
+++ b/acct-group/sstpc/Manifest
@@ -1,2 +1,2 @@
-EBUILD sstpc-0.ebuild 199 BLAKE2B 2d02f7a97fe0035637fd23a87bf1542b338bb49a40829d2d25dd038aca0b7a50debd47d2fee86957a76ef434644932890da2a62141c7435f8a2d9478e312d81b SHA512 157a3987d1adf915437972a5ed263b8cac47ac98114a9ec62f59a4adbec86fad04d9b46be72629a226f242264fa284f03c0996e0129f43ee1ebd9991e7ae4d55
+EBUILD sstpc-0-r1.ebuild 199 BLAKE2B 623d3062bca2b2ad5268488597309851a154f3ef05cbc6ce7b20ef79200061988f37ccc1f5d3cca76e18e33c1c4169f14f2bdd748e07ac85095813ba04dde2fe SHA512 524dfd0921da648825db4bc1e2e5dc3d1d7e3c4464f81ea6b82afadd2cc71d6798711bea0fb9b984916cf6ac5ce32948b7b322d8dd9e5696f6ec7ef156c1d7db
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/stapdev/Manifest
index cb3e98d6dbaa..47891150841b 100644
--- a/acct-group/stapdev/Manifest
+++ b/acct-group/stapdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapdev-0.ebuild 146 BLAKE2B 4c033fdf329bd36419a5a36ff6cb36ee3115c9028042da3471bfe8414b49ec91f16cf5bd25d72c734e85101a3ff95f07beab7c1a8c3327688d4564373141df48 SHA512 124925efe3ab847b566611ca10906712a2c716d7486a9ce566bcf209ff81c31a5b62eb710b8a0c3523870d22aad09bab7e0214049169903186fa39f1aa38cd55
+EBUILD stapdev-0-r1.ebuild 151 BLAKE2B 72b4e18748bf09d197e7b22df463d19057304750a43136585d443f5f020cff40a6bfdf0c4025bb19521b33c4f05184cc3e05612d7a99cfe75413c99cd9a45a8c SHA512 903f195c082a272f2d43b5af83e4519b2d456889b16c57ac9592038f849d37de0a5238a728a5e2066c8b834f6b02f64d48b7375096f123e393c1763b48cce03e
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
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/Manifest b/acct-group/stapsys/Manifest
index 2d1fc0825d09..ef4673541a7d 100644
--- a/acct-group/stapsys/Manifest
+++ b/acct-group/stapsys/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapsys-0.ebuild 146 BLAKE2B f34a8baf708a89dc1b24bfc488e492f5aa4dcdd282fbb63e1fc7ce5e4970853e9320fec98f15c067fa3b2a9411a2fae5717b25bad635460f289b388ae1357883 SHA512 5f3e9a836692172222ff6415ec254a05a7680ad258b64013262f24d58ae37c2207719cbea7551427eda7c4c2c7529f44254872758e86bcf3dfeeda49c3e3ba01
+EBUILD stapsys-0-r1.ebuild 151 BLAKE2B 9dac690ff017f30ccaf78c0f1540694f0900a90c5d3829380b561087aa2389eecd9aedd008c03ab7bcaf6006080bd2ef8d50aca6e09e39960a304e8433fc22b2 SHA512 6bb736955fe457e4300b48afb051bcd7d8f99af1a31296c220ef7b2b972d1e089200d1cd036b719984de695fd070db37d56ad74f2c071eee961c13631f5879fc
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
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/Manifest b/acct-group/stapusr/Manifest
index 5a56f3e907dc..4df12e523436 100644
--- a/acct-group/stapusr/Manifest
+++ b/acct-group/stapusr/Manifest
@@ -1,2 +1,2 @@
-EBUILD stapusr-0.ebuild 146 BLAKE2B 556ee4f474c158303cd0971d1230c63974de5f43f01f4f1f0be3767942cdc4fa01347071377be5de64fee4eac68617746d95e8d881dc86def102fc1cebf2d1b1 SHA512 e20fb49869e37ff4f99aed70842f73bb687024f02402d5e08658e78631bd4e5c7d4b4bd17fa2e8a849d5ec957d76771acf4424d39e4bc5ec7b902e1ea06acc3c
+EBUILD stapusr-0-r1.ebuild 151 BLAKE2B 68d5d9ae9a47325776aa7b9549926e1398d378636993934649b67143614bc28ea68064da9c48f69767ffffe91a34b07505b7150c024ac65981e1c786387907bc SHA512 4ab3e1c8492b9b4e4ac9df2ded025f909afc8e6c906067440d807f0156e0453271d042887c02d73fb2961e2f60bf803c3ace10369fb59d57f347c50d4d837957
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
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/Manifest b/acct-group/steamcmd/Manifest
index 283c70a9af76..d5ad39bd0f00 100644
--- a/acct-group/steamcmd/Manifest
+++ b/acct-group/steamcmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD steamcmd-0-r1.ebuild 200 BLAKE2B f0bb7082d6217f43fa48e8e44a903f487e200a02d9983044ba93619cd9119e825b51de3ecbd363298e3ebbcca6bf5c10bf12a36c051c2577508b37ab3843371a SHA512 50d9fa9c75d0163c5c070b16eeac95d3ebd3776a5d988af2c7dac3b6c84b3d1982e9cd2532256647711638e98ec9f4f87e2c869324b701509493c22ce1b5f64c
+EBUILD steamcmd-0-r2.ebuild 200 BLAKE2B 45f2b501ac929a5614a40bb14ffa72f8c97845097188bd176c5dbee62d4bf4bc9d325cfc4f66532404280ce9b118f3f98589da9ab77aa6412393d1e7eb74f984 SHA512 4435784d2295085afe36938fe95a60f151da2341b4409809de39cf4b6eb7fa576b3ffb52091d1012f347a96d3756b555e556e57e94105e1c14cc911cf6743532
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/stg/Manifest
index fd6aee6be9ef..cdc28719ad22 100644
--- a/acct-group/stg/Manifest
+++ b/acct-group/stg/Manifest
@@ -1,2 +1,2 @@
-EBUILD stg-0.ebuild 199 BLAKE2B fe5bc757fb0d02df0ac0e70da2a2020475e67edb9e6188dbf557faffb04e1f9e7b505ae133a70ecac77857574b7b2c48db359a74d254b862eb3c8ca78b42e9a7 SHA512 c24f9acc3c44da232e29e890ae3a396a961e75284072ff732f0095424f6a3d86913213bfa324c21430e48126dd2c7f5410637767c83da5861b3ac20b2148c20b
+EBUILD stg-0-r1.ebuild 199 BLAKE2B 364bd8ee7ba632258f9db9c18b32f4b415e6e432f77acf4f5c87cca54c0e8971ff4401f1c21abb6206ed74572a0ef59bc2cc0e162d39aa2c2c89097a7ab82098 SHA512 d1c222b09bd872fb9613719c7bcc0a5b84f830e25f78872e15ffc4b76f8868233e55b49f522506518711bea177534a438406b586a7ac82a5f65fb0117870fad3
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-group/stubby/Manifest
index f3939ff02f29..63f0a07bfa82 100644
--- a/acct-group/stubby/Manifest
+++ b/acct-group/stubby/Manifest
@@ -1,2 +1,2 @@
-EBUILD stubby-0-r1.ebuild 208 BLAKE2B 507eb959e9c422cfff963e27cf3a1f8a2b06f8787fb7c78d311fe67ecd80fcbeeca6848d5b9a3974045341783dda28efdb83700d614e5e42efd15a5b2531d8ff SHA512 bd7495bb141c65b72a1ca646f3a5ecaef205cd9316f0bf19f6cdbf58ee05b40e6de818d48c0e7470967873c5778f7f0b01e4ca170577f400f956f00605345b57
+EBUILD stubby-0-r2.ebuild 208 BLAKE2B fc464d97fe409c314ed36386c29698a300dd06e6a153be3cb74566c74a81c565c69d08abd3beee4b174ae2b38d3aedb50f1e4bc0bbc6fbe5eb7062cad86ac7cd SHA512 3cf24c6d0b21e350d4b957fad95e79d1fa03ce682de0e0a165ef52a3943e01ed806a29addfb7f53ab11a391c4ecddf9c8b37da918386445d852d7c0a5c7f583f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/stunnel/Manifest
index 17e7a6e4a149..853ef5388990 100644
--- a/acct-group/stunnel/Manifest
+++ b/acct-group/stunnel/Manifest
@@ -1,2 +1,2 @@
-EBUILD stunnel-0-r1.ebuild 183 BLAKE2B 492fd8dd125ec4c6276d295f3fceace435187704355ce098087c6198be10d9c853debae44cd6008f2eff4768878fcae59fac0b3742a68c674679c3111f474469 SHA512 3694a4f2bed34bfa0758d34141593600625906df1597132ba4cc1369d64ccf687a5a409e0b404f8beb4443ee3ee835fa2825261682d93bdf41d5413acc26a2e8
+EBUILD stunnel-0-r2.ebuild 183 BLAKE2B 994446851a385671a0f66857ffdc172ddf8b53333e02974bf861d35d8f69d299eeaf4eba1939ae006befcab66df530736230495f0b5e4de345a73e8c5168a7e8 SHA512 6807d7a25b9d0feca96ef87e53875a53229b6e6b5219becbed46dd176da337939d340eafc27c3849395665cbd7a358884e9fbe21cebb8be8d883db8ce3e205cf
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/subsonic/Manifest
index 4016b22fa0cb..414156cd4bb1 100644
--- a/acct-group/subsonic/Manifest
+++ b/acct-group/subsonic/Manifest
@@ -1,2 +1,2 @@
-EBUILD subsonic-0.ebuild 205 BLAKE2B 2f8febacb48638a2ddaa1b7b24a9e0ade43327bbc800d3fc50a3fe9c9cf15b8c4627596528b94680c9192364fa145c59ee012656c1cd15554de1b054946679d5 SHA512 6867a68856f7e0b62de69e0af1ab01b6cfe38f02f1cf6494cc10435ae5cedfc1b29dd6aa4c9402200fecb847329e3ea7ad708c0ff8ad83826bd978674b2fbfcd
+EBUILD subsonic-0-r1.ebuild 205 BLAKE2B 787fe139cf7faece2ac0d901a2f26b922a9292724b0c3850be1c53ce921da5de2dfa86be7448d3baaea88c114af0ef1a04b22567c392fe4abb6a293bf1a79708 SHA512 3c4da8ee17416366f9358d7c3459efc4c5045fe598bc2b222b5db28f7b139aa5dbd9f42f43a36fc90090635fdf92f7fd7336434b2831f467034d8828b44cb688
MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
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/Manifest b/acct-group/supervisor/Manifest
index 27d2185b1a64..a358de1d4afd 100644
--- a/acct-group/supervisor/Manifest
+++ b/acct-group/supervisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD supervisor-0-r1.ebuild 219 BLAKE2B 94b65ca671f06db6d454819a953757d163f6a69b7ff3993979765517591f9de974b07e1aac38f069a2e3c64a5670b8c3eb3909195c65869201ac8f072396914f SHA512 ad113d17efda9b41ba018cb85f50a5fae31e082a45e4f7cdd92b014b135f6e57836619a87726424edd0910248c843ec50862c6c8edbfba7b822c36f6bde417f2
+EBUILD supervisor-0-r2.ebuild 224 BLAKE2B 0c1d7aff1c1664315387b705d8508e9401f90cba0b11126dc3c88fbdb6d592cb2aba20623f243199efac4e6ac95c06b64981885125d787b9081b0e094f9ff8b9 SHA512 15c2d2cec0dab6e068a67d1c1e2d88e572bcb2a34ea0776ab5a1934bac12d148b217afb6573b024ea22896bcd3e44effc1cadb8221ec80616bcd9b8d368bde2f
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
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/Manifest b/acct-group/suricata/Manifest
index 49491e48619e..b088eb34a4f4 100644
--- a/acct-group/suricata/Manifest
+++ b/acct-group/suricata/Manifest
@@ -1,2 +1,2 @@
-EBUILD suricata-0-r1.ebuild 188 BLAKE2B 743497eb05006786d0ca3b801fca1ccca67a8b83b60db46e593fc18acf7cbbc17c89954d732d1ec7edd07428d90651b2806e6becff1811a6a01df679eb9b4196 SHA512 519c0dc4858962ed82955f52453b630a8a435214fdc5e393340d78cb78726b5c788f482a2880b40712314728710b79b971412b0b07894166bb8702b992532f53
+EBUILD suricata-0-r2.ebuild 188 BLAKE2B fa04c4d4147e3d6585cbeef8fc4b586e00bde8f8362041a67615069a205a8b9fed482be3365eb9a098a2f175dbc5a83eec487903c77c72a52762e9ebff93b6fc SHA512 13d0366aa2555d3e08654c1aaf7f35a072fef559103174c0c33f686ba5f2781bf5d10f30530e5d2d145fcd23a56d528ddead97e27f99025e11ec149ea0f6ea3e
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-group/svnusers/Manifest
index 6db46230f2f9..c2b88be5c2d1 100644
--- a/acct-group/svnusers/Manifest
+++ b/acct-group/svnusers/Manifest
@@ -1,2 +1,2 @@
-EBUILD svnusers-0-r1.ebuild 151 BLAKE2B 8f9f0856526b5b0122b0d9de8159cc979e90845e75b3d93f3c3ed00483cc7d8a769f5c399d7be737d8cdd361d6b92de1d05d9209404674658011138ef7d5babb SHA512 c2ebc113e415e10458aeb9268aba7079c32db64ca768566ec9f3b723c6c0696ee9ab0eece6827a5af47d155f81077c37f8b86039884043430a9e2460f267ab7c
+EBUILD svnusers-0-r2.ebuild 151 BLAKE2B d8cadc511c84fd7f9e4522ffe70ab4e9992f4a60e585dfcb051f8a05b0fd876beaf906b7dac56a299090fcb8d816cb84c092e3070431780f2550903d1597f0eb SHA512 758b514e382e47af334a68c1533041151fefa4a704290f3d2da5dd232424db89c40903a54e5ba9abeb49a6e182bc24bb9df1f67a9eb2000c6cbcbee3bc61b798
MISC metadata.xml 255 BLAKE2B 6d9704c53f3cb2feb306acb4fda9d377fd979897237080046e5e5285bdf057281bbb32309764e654c06cce3f6690196f39896508ae6c1dc937e5d3e632fa3cd3 SHA512 ec50c1a81ca10bd96a826462eaec981359cbc400462e7ba7c3d0ded5edcefda5433c21be5df7644adf567e518bd865775e298e48f7d13c92740a80e5be044be4
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/Manifest b/acct-group/svxlink/Manifest
index 6cc3b5b03385..31ef4cc1839b 100644
--- a/acct-group/svxlink/Manifest
+++ b/acct-group/svxlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD svxlink-0.ebuild 196 BLAKE2B 2a89a3e52566f7345934150680974bcde6e707ae82aa579e7fba7a2fa8df65c337fbf6c71bfb2875e3fc0da98295694811ba4c65bcbdfbe3c333856748dd7e23 SHA512 b28a3075fb8b540161998d208ec38051bed3e5f03f573f5ecef8021a0f0356eeb1d853dd30d86c3b154d34432a093b0a9044ed69997c26184ebb0a015768aed9
+EBUILD svxlink-0-r1.ebuild 196 BLAKE2B 93fc7952c2c2f9fbe32bed27e3816ce0724ce6cc3bc4d6fd5e44e10246043831b5cfac837cb9c247a40f9f53fa3f4f5c6c6763714cc0d8426d4ea986c6ee9958 SHA512 2f9268c53afdfa51fa1e3fb12f7b8a21c2ee9b0f7bde33e1f0d092165c7f3c5259f4db897ead65371588709a5bed4aa4d9aed3c67eabd6da25c4a106d0612c4c
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
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/Manifest b/acct-group/swift/Manifest
index 954d67964ef5..3f49278f9613 100644
--- a/acct-group/swift/Manifest
+++ b/acct-group/swift/Manifest
@@ -1,2 +1,2 @@
-EBUILD swift-0-r1.ebuild 146 BLAKE2B 8c55a2522e6a6db4ad75dc605dc2a8d84fef0d8df4c13a0d64ad4bebb9e4d675a31ab6fecb2ec55f8f46b5851705e58f105ec0c5b535b804bada33e2910f9efc SHA512 50a1bf79d6d542119163dbbe3af425dc3bc579e98b82591105d50b897645edc74e643c73b32f43f3629c5125d0232875b63ea1be4380be0fd03f49fe5b015eb3
+EBUILD swift-0-r2.ebuild 151 BLAKE2B c5849461cc8ee82d17c4fd3e2ee624e3fa6b8277094b8c6de6a10c27869e37ee2a5f8ddad2ce14983471c454bc461f996af5732b10dbeea784130e090cf79093 SHA512 8085296c64fb969c1dda8651f21ebc60fdefaa5bc4d11259971f19496d7ee65c2c266179c3ad56d74d0078aff542873bcc9f2273bba3c3db928e2c775f647d95
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-group/synapse/Manifest
index 66398db05d5f..ad9bb0dc24bc 100644
--- a/acct-group/synapse/Manifest
+++ b/acct-group/synapse/Manifest
@@ -1,2 +1,2 @@
-EBUILD synapse-0.ebuild 187 BLAKE2B 5c4f0280e094c40338c44499f56faf75baa25822270b4f125428472c418b577eb081e6f8cf05b30c6d804efed77c1fa5986d857a1995497da6864b67265762d2 SHA512 e165bfe799cf162ed76cdc6083f53c266fd01eaff2ef7f6ecc7f5cd369cc51412a9cf3d352d81348690a59da472b241ee81a2537d87ab1c0479cf620a9f2ac8f
+EBUILD synapse-0-r1.ebuild 192 BLAKE2B 3056aad4e01f564273f1f74875ed9360cbbd9f3bcd421d296162f6d4c41408a51acf24462c2f225230bf9048e71c4bb3b0cbf8186fb2cf55457e794a4c0c902e SHA512 ed280abe194226209cc4d7899bcf46dfbee87fc4d3741fd1480710fb971b09e45fff406cf4c555b9554a00f455ada3661da180b33ccf63e7b71db9b094d3ad2f
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
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/Manifest b/acct-group/syncthing/Manifest
index 4f04154b4b51..de700ed0c1ba 100644
--- a/acct-group/syncthing/Manifest
+++ b/acct-group/syncthing/Manifest
@@ -1,2 +1,2 @@
-EBUILD syncthing-0-r1.ebuild 216 BLAKE2B b0b06cf17a5a10341865a4b193d317b10ff9b4374a244faecb4758677d0209ed7888772b204a01d5062411c9bed9b07e9e3d0818f5cc0ee331ea2efeb2f62e9a SHA512 81b583732e3b461962dd96650ef3179530b0d1007f2344f0cb9e5ac82bd5cda1faa8fab4807cc39f3427b51743d7b3cc12f5a4a2b094d86f666cacf9c3fb2255
+EBUILD syncthing-0-r2.ebuild 216 BLAKE2B 48ae3599fcaf34c207b87e2f94c470b721b971daed3ca7ee5cda0279adc6be98a2b85563cd1e0995ea58765a5f01d83e8c159c8def0f6ad2a59628c6c09128a0 SHA512 a7ccb4e558dd0b7ef8b373acd55ece3b6532cf61c3d5556227ee04bd400e2bb75a8359f4f912666d7d36ceee05aa0fe2f4b56358b3653b4f4a75b1407cec7139
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-group/systemd-coredump/Manifest
index e1cef957fa7c..d0fff5f3298e 100644
--- a/acct-group/systemd-coredump/Manifest
+++ b/acct-group/systemd-coredump/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-coredump-0-r1.ebuild 151 BLAKE2B 3b0b39889e41759867d07958f99afc7862323dd08d51fdb325bd893bc79707f48246bcd026b013715fcd6a1139186590cb1bee7892e8765f5aa640ccd2a27777 SHA512 2127bd3cc1d314cfdb12bd51ef390c5e0702558bdc1840bf3b7276b66fb0e5a45203166a1907861547d5e4b3de34dad00cea93e330f7a5aae05cfd1229a53ffe
+EBUILD systemd-coredump-0-r2.ebuild 151 BLAKE2B 4ea3a13f639d4cdc6f97f0f69bf541a6444fb96d653357f7400f9f5f8b829ef93b9dd3a9283eaedb1955ef175b56243e2aa247165fcc0dc3abc6ed20ac2b1da7 SHA512 a0069a6017f81c8c51ddb2413f3c25b5ae54a82ea433ce3e934560c4cbaa20e7c2ff35dab4c32b4ce8a6a89889ec7bfc8d85ab3de7878abd5e52435f064eaa43
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/systemd-hostname/Manifest
index 9e7027c167b5..7a09f5ddc889 100644
--- a/acct-group/systemd-hostname/Manifest
+++ b/acct-group/systemd-hostname/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-hostname-0-r1.ebuild 146 BLAKE2B 1c0a3afc7af703ac926a78d66cf1968b27fcf36df2861428482d451eabc69c176e02ff69f7891bb458143cc8d6bcf848bff075c2adecd7e3fa7c0d31b923718d SHA512 59be2e9cc4bf052f475499cec0e2ab568873ac294809b9a23c8559a80a23090129c2b1ffdac2c43f6177c9296001641e914ca2316df2b90909e859baba106922
+EBUILD systemd-hostname-0-r2.ebuild 151 BLAKE2B 3bd2778cb9d55a77ec519eef0af3c744994b13012056d98f6cab0d2bca15b4bd8650991cf8bcc41bee8e1c511aecb7727e0594a1f9d41a1b30a62d94c6471281 SHA512 afc8253f56accc3864725367ab8a5d96e6dfcd6b3585713752fbab754b01f550862e3961818c8a9cd33463a9ee864f2274716412c408d9dc6d6cc0ef41e76c24
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/systemd-journal-remote/Manifest
index 0fd0a74ff7f1..74a41f2caa3c 100644
--- a/acct-group/systemd-journal-remote/Manifest
+++ b/acct-group/systemd-journal-remote/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-remote-0-r1.ebuild 151 BLAKE2B 7fefc318385453312b75ce31a5eda7e1a0ffc5539f081480c15746beff9e04f447977ce8ad904a524f302552ee4d2aeee2397ec03e593f26e8f93be0ae925124 SHA512 0a64b85dc12a482804e3e9885e0975c1bb3bdb1eccec5d52bdae3761ae8af9b49f26c0d837c8aa758bbe24fb8623cd6aabadbc4f8d64631b12e0efed67ca85b7
+EBUILD systemd-journal-remote-0-r2.ebuild 151 BLAKE2B 44c33c505d2228efa8f62facd9ffd8d70e7bd37c4b6f8dcfed14e374452f82fb06cb01371ac2a3e8a6f0bb7947f8c4fe5b326b4023e8ab93f6e5a33143e23404 SHA512 5900dfe994df089fe65e10048a3da1bac07bb7faba42f18671b0a319f83dff2e92be4cb5e79e20cedd75517512c0d10f0f679285e8bbe5a160f8d86b4079e217
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/systemd-journal/Manifest
index bc442bab0a98..a2b6feb61aa0 100644
--- a/acct-group/systemd-journal/Manifest
+++ b/acct-group/systemd-journal/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-0-r1.ebuild 151 BLAKE2B 1ccb1f5a7bd26314b864c55a129db6fa316a5075fdfb77c63d17cc4fdbba2978fc3115cefd6421b4a4ca172eca97a958f876573bcac20908f56e1a2f9b8bdde3 SHA512 dd6e0ea32c71c1fe8c8fbafda30e23bcc94da490b8b970d0d1c4b2d2d59c0c73e7cc744026db2d879013b71960557d7d8f2598c63340bce291b3f48050b1ce09
+EBUILD systemd-journal-0-r2.ebuild 151 BLAKE2B e0627ceced92e707852e820b3505f928d15f96b72f74580a5092e97b08440ad01ba048ca2d2bb69b62c2305263c38386a9296835db2d91250f68d8c021a966d0 SHA512 e7172b47ecfe205811c3af31b094c493a3fe7cacd2ef56756f61256b98b1ed0c6737c3d7425a34a646314a6643e31ecfa2fb0f449b40c237117177648be1e5f2
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/systemd-network/Manifest
index 991d5aa83051..2e9876ca709c 100644
--- a/acct-group/systemd-network/Manifest
+++ b/acct-group/systemd-network/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-network-0-r1.ebuild 151 BLAKE2B e7ab0b006ab91772624dfbb88e00866f7b7303873550526027ff70cde214c549ab1c0bd727f8ce3a8f9c0c5cbf0ce717651409c51580a7f7d9848b1578c8eba2 SHA512 0835e4fb71a73651ac4effe983bdde93b421a6672abf67ffd4ec676e5263ef2074364c1afd716c0ecce2031bbb44f33fb77f42f81fb349698c58dc015611bada
+EBUILD systemd-network-0-r2.ebuild 151 BLAKE2B d600976caa02c880a538fee0c462616f94b3dc49e856f3ab1668e03f3acc8737365c26dcdaa0de5c32da4cf082e9b00d9c373b646d865dfa14a84f3905fdc483 SHA512 346a81ee81f37036bdbd57cc7ca88ffdfd7057f59de8b47a0dbddc5e464281301887c6c94f8b5621f8451ece5d894e0c11e2368390663c945169e2cecd98a5c6
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/systemd-oom/Manifest
index 13d800ad899b..117007794ec1 100644
--- a/acct-group/systemd-oom/Manifest
+++ b/acct-group/systemd-oom/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-oom-0.ebuild 146 BLAKE2B a0f6bd5e26033be3839f680dac57055fa29507309bd27296fe9c7c58cf4b64be03a4f455538593c0f74aeebb5a846e8565f10c1f4f6e80e6183fa2244b1d7933 SHA512 d59ffe68875adb95294a1291877a40733b0b50186312e02b30789ff1c0c2b03e94354ac61d8760258ae33663d7ed5efc92666f7ed20dd763fb814531cb7342f2
+EBUILD systemd-oom-0-r1.ebuild 151 BLAKE2B d2d65dc6de36c11031447499f619fcfb58e4ab0d10741215994ce376a37b77a4b41bc8828aad165683138cff64f42ef5b4f65620239a69bf9dc5e2e33f54a2e9 SHA512 b92144c103e3757739b5b57eaa00bbc940884d955badc42deb33131da6d9b8c3b557e60127664b2d10c4ba9222e94d2aeab47ac522acae7f6f6afe744d1f6337
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/systemd-resolve/Manifest
index 5bbf637a7d3c..a183d1ac2f17 100644
--- a/acct-group/systemd-resolve/Manifest
+++ b/acct-group/systemd-resolve/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-resolve-0-r1.ebuild 151 BLAKE2B e185d4c71572cdcea5ef346f443ded85bb2281cbadd7374acb85f5a06731bd39bd4c0d1fd150f30f6b68c0525d6c631648df5d7de8b9da92032a041bca997b4a SHA512 4d6d558fd8d1acb9b865e59e8aacfc9015627b00f408c95da253112564eec0465478252b7bce8612bec2bb74816a5560637d5b5f0beeebe69f6d2e1a33c106eb
+EBUILD systemd-resolve-0-r2.ebuild 151 BLAKE2B a146f51d1cf9ca9eb2ee266df8b46c6b01d0daf3acc1389790f72fce8b74e2b05b53bc14c2028ed52e9f56ac69c712e5998f9d48e7c60d15af64024bfa4955eb SHA512 481d7c657fa37db95f8b43af69730b0ef172236b228cd8c3411eceb9ef842fb993346d212783119bd40684a7bced500a4facc663fb1ef1dec965b51f3e944d1a
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/systemd-timesync/Manifest
index adf7867a8c22..bca0ed2f2193 100644
--- a/acct-group/systemd-timesync/Manifest
+++ b/acct-group/systemd-timesync/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-timesync-0-r1.ebuild 151 BLAKE2B 76a25c18a6cbe86e8d8db3e49409867ec6941571c4612d7ec2ecec00cf2cf4a6ffc3e52639f135852871eef2f1aeaebad35267752eabad73262feee953f76a4d SHA512 e68e4d3deaa3f0b44c5f5681dee1a083bb9ee6ebd0b2cd0e15b689aa4175d852d220cc63ffa9630342da29aba3d1105135f91e2aa074c03cf0985f1f1711059d
+EBUILD systemd-timesync-0-r2.ebuild 151 BLAKE2B 2b2c8138994aad2189601ed5b22b02964532c6bd79a07f0aa30251609a0c77d2ebc170f7fb7095e377fd1ee57d3af2a39ebebc9afa69f8e890c65da02101db61 SHA512 a16bfd2df40aae66a0eacb7118d12d877eff474f856ab09223b3fb09393a3b85a89475d68fe61f968bf43a4da8e14d12b2ac645f110659372a94efed073da780
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/tape/Manifest
index a8947a26dad9..e2a04261d81a 100644
--- a/acct-group/tape/Manifest
+++ b/acct-group/tape/Manifest
@@ -1,2 +1,2 @@
-EBUILD tape-0-r1.ebuild 150 BLAKE2B aa9ce2978051cd5f1328e5ddeef5be59d9cf64cff2dbb5ad75dec7a99f3e5b02ff0eab63a2119a929c2fe87475f2f2e511b1faa7355663ddd4f75f7372a63b9b SHA512 0d216fa99d58841aace66170f0c6f0d7daebbc722b2123fba535c881ba81def723bfa04f66ef55ef15367a63d582ac3868d00b8737535dfa6bac8d65c7ca22a6
+EBUILD tape-0-r2.ebuild 150 BLAKE2B 8837eb6612772caa5893cfb8aad601b65ba452520795a91e2dd256723e110b76fcad7b59cb895ad55c8af44e57fbaf1839d9a1efd1a82601829be750116eae22 SHA512 af89d6217d68c0853af0aa8c16905127e8c23803531b09891dd7ffd3c0bdab167ca976d4867cd0179d61a25ea4976fc1206b2edc310cb708bc9122780312357a
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/taskd/Manifest
index 860726172501..6ee6c68b6a12 100644
--- a/acct-group/taskd/Manifest
+++ b/acct-group/taskd/Manifest
@@ -1,2 +1,2 @@
-EBUILD taskd-0.ebuild 195 BLAKE2B 9ed344a17f1a4febaf83b45f5bb2e6e415d6a99a23ee6e9aa4b6c073e560e1461763e4ff703d03fa4d66791e9055182b7482d960951e76ca09a783036f2f8ffc SHA512 53603cbaadbfe27fb848a5353b958532fa7ed23aa52a6afbc753c0b472b5c9af28549ed86de1c58586a37e75c4070039a1ff74119e577aea2100cbfd6243d8ef
+EBUILD taskd-0-r1.ebuild 195 BLAKE2B 811973d86e393d626a3092381b40bfdaf966c10ae8fc3e5dc1c5c0bc5f9b0f7664649fb3417efcc0ca5a60285e81e2ea3baa56cfbeb43c5ef88671bd7e26c24c SHA512 def45afb18bf9b4bbef2b950bd55c834214c2bbd38dd26303acae94ab9e787c2ba79f0f66d18ef6b1d1817318ec98a581b821b31d160d83b9edc1f81a42b081a
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-group/teamspeak/Manifest
index 4113474c69be..2db42c9160bb 100644
--- a/acct-group/teamspeak/Manifest
+++ b/acct-group/teamspeak/Manifest
@@ -1,2 +1,2 @@
-EBUILD teamspeak-0-r1.ebuild 201 BLAKE2B 96289dadc78f99e79f6e682b3e2f2c428f1be5ce0642791daa7e58ecb84dd2fc7afb596532fba6d7cde96bb9788a36d76648881ea331ad95cc28eaa84b64d90c SHA512 b12dd6832bca06c4a0f1710bf52a4716b436fbc4797bd7424a305aa416c10b4893c130806c9b1bcb10ec0761753887d48f77f89061161b8a06eb35d855a409d2
+EBUILD teamspeak-0-r2.ebuild 201 BLAKE2B 9954ad269e8d3ff904300cef195f1b378e8eea7b0343b6bd08e8ff4baaca8cfdcd144b1cada40a5b3a4cac64d8c873fe96070825550918c2849cef437a10d150 SHA512 105c3aa3ca6de3678816e503e95e8fc4a47ce9e9b979e77dd418b8a90b833fe236e1502bf18cf54b6535a2a4375aa6ab9171c0319d989ac169784ad80a5339d2
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/telegraf/Manifest
index 21fb8f4f03e9..c05f34987c63 100644
--- a/acct-group/telegraf/Manifest
+++ b/acct-group/telegraf/Manifest
@@ -1,2 +1,2 @@
-EBUILD telegraf-0-r1.ebuild 146 BLAKE2B de107f39862925fc34cf82300a80071679df72e4d016f5c864b951d4e15f49341d777a9395a16ba36e3ff3fe79c971cf4956ad1feef744492646785d9c10a680 SHA512 cba7b6141024a9026e59cfc2a3bc4fe768e8cb71026643aabf4c09556add5bd57288d67ff44bd79bc48d1be3cc5dca23b071dcc99830edb306b0c10d09683cf2
+EBUILD telegraf-0-r2.ebuild 151 BLAKE2B 7197afea3b7e95d5455d83b36a528ffb962697363b114483ef1abc5dc78700221c2607f39891f902adc97ae8f397a611c872b51363b7b061da89239b862ff8c2 SHA512 1f6bc299f35097682589b173be60857bdae380596cbd2114b751370d13d5fb08684a033552dcd7be60496b34c8220f21a7954a4b604bc469329c5f8bad82059e
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/tenshi/Manifest
index f0fcb8dc6fbb..c05a0f77655f 100644
--- a/acct-group/tenshi/Manifest
+++ b/acct-group/tenshi/Manifest
@@ -1,2 +1,2 @@
-EBUILD tenshi-0.ebuild 195 BLAKE2B a5b035ee0b2c9da5727bee55590dac7c8b9272434c9791d621bf05830bb845e9142e9120bbaa3efc6045cd4dda14f23fb5193ae75250bca9dc080694bf5eb28f SHA512 65f9d1491a84198c6441de367f5dc409886e5a37ad456a924e8a89819196b57c1ba6a2f73d4f45f0ea0dec0e75dd4d78492910c97f7a46b50c7b84bb50a14eaf
+EBUILD tenshi-0-r1.ebuild 195 BLAKE2B e8c2564c93742297ce038ec86e3c87b6c6f3fd9233ceba809693737caa5c0a651c2cff9f03af4547eae78d2d030afcf5fdb2d9cab2ab5789306c24079f5fbcee SHA512 3b61dfd27d5c0e7695640f29768915a9a3d85e6c01c07298f285d19beca97046de7a8c974f5db753282bb56d2741dbad595b90da17841e5622078845fccee99b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/thttpd/Manifest
index cb3be3066959..7fbd1d76b622 100644
--- a/acct-group/thttpd/Manifest
+++ b/acct-group/thttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD thttpd-0.ebuild 199 BLAKE2B b74105cf658b121c1e5e6ec9cc59f46ad699d60b2562e295adfb1b7ed8e1705401adee59b2dd3b5cda4d890fab10658e779c07d733bcae6198d543fa0133904a SHA512 fdcbf9892cf372fe3fce0cec357950106ec79749cdafb1d56f8577f7699bc01163b6d4a540ba588e3cd2beee3ce053e9ae7ce4d5e71668fedb2f5ff7178fff6b
+EBUILD thttpd-0-r1.ebuild 199 BLAKE2B 6b895b73e8c7cc661d7864eecfd3da7c53ad9dbcaf5141be41d5f92e69ee4ef825b4a25b1204b9141f7d4456cf5eb5367ae24ba6f0a857b8cb21e34895703b0e SHA512 c6de2f64d0e1abfaf5d3806602aec98293d5f9c21b1608dabf9ce35c903a37424fd8d33b4bd1eed563e68d8242a26457f0a14bd2a4ba10b7de001035d902d8ae
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/tinyproxy/Manifest
index f3d35d634d45..da12eb22ec89 100644
--- a/acct-group/tinyproxy/Manifest
+++ b/acct-group/tinyproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinyproxy-0.ebuild 189 BLAKE2B 4a19ebe0433b2cd553b5f842368016d75091c84e0a1f2419a597b8232448f374f9547e25e9a2b8b8a5ade65c05b2108562c74308d9551ab74c0bf717444cc562 SHA512 c1d166c2253f11ad27570cbc2a9ac3cfc32872e5f2b8d82d573c5ea44cbbd673b40fc95b2a5d98b10cadcfd425701541ee27faf0258a6e5fc41395dac040d0c0
+EBUILD tinyproxy-0-r1.ebuild 194 BLAKE2B 5931d01745e1a994d64a91360072e0f57551f43593dd8a65de479b60076c21e99fa39e225cb5740eec604979ec060ef0cc8b0a8c27c11e6ac871b04cdd30a9bd SHA512 72eac8f4abf5feffc0063f65bec2e665a07b1f5a645757a53f5f6e05176f919245dcd19fc70a51de26f32299bf16c072c2bfea1261d967aedd08a4dcc20a8d1b
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
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/Manifest b/acct-group/tomcat/Manifest
index e4988291e97e..e06db9f1b56d 100644
--- a/acct-group/tomcat/Manifest
+++ b/acct-group/tomcat/Manifest
@@ -1,2 +1,2 @@
-EBUILD tomcat-0.ebuild 189 BLAKE2B 419a27f9dbf2fe8498e1c08d5b08ab3f91f3c13cff0e25fe62e8ebd6c3717e427618ab8bdaf640d52b4f169d9b95f9e0fb35e211ecf3248d9c1a4cbd187e42d4 SHA512 a7f0e2bd4d70e2084ab60db76458a673771be91b2c84b24445a9ca5630650428f787b530fd7076e9e90c285c7eb0ef24f59780a012fc84fe54d644135c04e4be
+EBUILD tomcat-0-r1.ebuild 189 BLAKE2B 5d512a8428fc19e9bc25236b4c6d0da5b4c350fb8a7884bfbba382469be76db8bb8670afa2b949f3735cdd179637fb6086bce2d306dbcd24496fc66282e88f15 SHA512 798ba9736d4531e7c035b993b2e5b3dad988bf6f8856cf69d21df4e192d90439e9711a86b2c9b5451cd62291213ef84dfab7aa996a11e663f23df9ad9aca6db8
MISC metadata.xml 252 BLAKE2B e978e2d30d81f57b533bc3620751605e0fd123c669e280af424c68ebeba5f7e61391fc59ddea55598107aaf3c9f901e38de6bfd4da55e926a9d3567de08e7d2d SHA512 e509c95968c64f0f3cb9c16a437f100e3d1f64ee8e1d412baac733f4698b7a0f0c91136c480a9078eab6c3c6497eb93b7fe891f9a28e43e31f0bdb73eb3ea9a4
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/Manifest b/acct-group/tor/Manifest
index 2702f1e91cb3..b46b5dcfd61e 100644
--- a/acct-group/tor/Manifest
+++ b/acct-group/tor/Manifest
@@ -1,2 +1,2 @@
-EBUILD tor-0-r1.ebuild 185 BLAKE2B 4d38190adc96128f24a61d75b17a581e56670c23933a92ed16377ed59634ee366e8560184844f3177e307e1acf23f76a727bff4048d5b2435b28fae74eaf0201 SHA512 26fdab0dd7d894392ec8d45f2a1d8762e95cca413bd2fc3a0d5c2de551b5acae86523cb8cba66f14b1f6773cd7d072873523835a0c012fe6335d9794ddc5417b
+EBUILD tor-0-r2.ebuild 185 BLAKE2B ed654ca647d3fdb313791bd9c2f0f464ed75fa7357489b970f0b0ff8e4c89e1ab7cebab1d181c1260dc56a3f98af8f82e72b3b3da738ad2b2a4a21ac5f567840 SHA512 490b0b9c8b1a7424ed364fa9952e771645a91740f4ee32e885fdb97569417eb9b299940ee917ffb52174cfa12d4c75efd0c2d9ba2915bec8185462a53101cbef
MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
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/Manifest b/acct-group/tox/Manifest
index 2168da6086e2..42c8bdcb0237 100644
--- a/acct-group/tox/Manifest
+++ b/acct-group/tox/Manifest
@@ -1,2 +1,2 @@
-EBUILD tox-0-r1.ebuild 250 BLAKE2B b69c209571bcb7fc76376f409e85e5a4bf596d58b4e45ebf9b901a1905ba315b1334615efc3845d77f65870a90702b127eb4ab0b92ea032c4e770f867f928782 SHA512 0f448b925bfebf2b9a0d5432e58eeabe5d2eee67b9aae14f40fad889d422744fb99f21421af28a0c45219adeef9937cbd970899ee9f72371960bc7081b82010d
+EBUILD tox-0-r2.ebuild 250 BLAKE2B c85ffd39d442bc96690958d5ec4ffaff801dd4df3b3a2dd9684d1ea3838bb896f1781a847e035a289d249deb2e1163f1e16ebd0a8c5c7acb36613289631bb7a1 SHA512 338077b194bc6092fa9492dd580d83aaa02b6de74bb1d56a9345485a33ef2db4a2829cb351203af08567deb55f0135f91207da29cecd6defafe60ca934a0b4e5
MISC metadata.xml 401 BLAKE2B 0a0d5a25868d5ad4b1b9b6212ab038e94628f9b2428fc62dcaf1e0fa672a6a4ef4b555767dd6d1ae1e58f82e31a194e6ac5f914fcb21b7a4a5f52bee97ad2eb4 SHA512 58b858736e5503593517b113c9e5417306caf20137303fc03afb43071c088ad5314495f6203e401544e48a87793a0d09d8d231d6f6740639836415c4857a22a2
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/Manifest b/acct-group/tpm/Manifest
index ea113b8fcef1..fdcf90d453d3 100644
--- a/acct-group/tpm/Manifest
+++ b/acct-group/tpm/Manifest
@@ -1,2 +1,2 @@
-EBUILD tpm-0.ebuild 146 BLAKE2B e6ca31414dee6de893fcefdd2eeeb1d7bbb50166091a5540e4accd6ea05a98f452bd8d1fa99ac86711688ca3b23af30f18988a9d408d7f60951f24e2422af95a SHA512 85c14d81dbc74bb0b78f79517fc233d1a29406b1298a53cdae07dd9f1e6dcfd5aa8d25ce52fa810627b79c5b5c928b0cdd7cf23ae02a32cbbc466c71072e7425
+EBUILD tpm-0-r1.ebuild 151 BLAKE2B fcbb42e888b8a1655f58596035b8c49401d48a05ec63c5119f8a3ba7787749361f7aed8305d3177605aa598601c4a31e29b8fe41daa7d932b347a238989fb091 SHA512 1487f44ff864442c0c56bc67c0e3a8af7c5a47a9d25405e7f0b7f2a499ef540ec8172f7639d64350986585d8f9291027ac400e0094c462835c557cc204647499
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/transmission/Manifest
index ae83f7785d13..77e2ee62b05f 100644
--- a/acct-group/transmission/Manifest
+++ b/acct-group/transmission/Manifest
@@ -1,2 +1,2 @@
-EBUILD transmission-0-r1.ebuild 151 BLAKE2B f243fc8f45f6efa1a67c2bfffa8623b929834ae2832735d47e7efba04bcd4a2728c331a5a3391b9c594e8a2384b3a5c9d547ecf9866caf085f0ac6f9d7348cb4 SHA512 14d35d596429142738a866f043da8da01bb902768fb2d600b94ab81693bc02dc6d1622ab78923e2057882f60fe7cb470066579043e6c91c8cf1d568431b8e361
+EBUILD transmission-0-r2.ebuild 151 BLAKE2B 92f6efb13c384b365c8d4f105bb2ac7570a4fff57564b6a5b5007380148b805bdd98858bb20e8544cffabe65cc01f28afb95386fbcb5bff2d81fbd906c628c1f SHA512 fe61b89ef80e081c9940d0f1c809520d18f7f17a30e8f1257339f8da97e9da2a6db9d90fa8767c29931d394dde77cbfe82991cc4880ec9c1000d5660aa69375d
MISC metadata.xml 247 BLAKE2B 9dcf90d404c84f0ce3da367274c25984b6497a2d8fb68496f497e76c7061c9c7ca7f444f7e4ccb62ba06223caaf0eea4d6aebbb2409ba1f08bb57123e72f0836 SHA512 4681b02c210bf3f869157694af1f80cb3e9b2dd619283a249aaafa85d3bc328c1306af5d61c69040fc503feb3271490bdd2e38e61479a94940fa225810b9e8cb
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/Manifest b/acct-group/trickster/Manifest
index 9005276f86db..873c1af730fa 100644
--- a/acct-group/trickster/Manifest
+++ b/acct-group/trickster/Manifest
@@ -1,2 +1,2 @@
-EBUILD trickster-0.ebuild 199 BLAKE2B 459f60815906d19191ec56ac0cb854cfed5be34cb67c7a8fc97e639f75ceb67bb3ddeb5306d54573a9d6f01d7191e76626a0ed10b73b588079d00370605c1fcc SHA512 589173af42c5bb1d365d9a731730ede3b1b75dc812a86c36db89fe952ac0269efa67487f7497e667e4b51bb9cef7c34b7e57d7615c1496c5333c502094ea8151
+EBUILD trickster-0-r1.ebuild 199 BLAKE2B 5f6ba7e91daa719f819184ae9206c3c7acf54e8137e19159eaf2fab45ff620c8d9609cfb044334f012f8d66b83c179c5455889a14635e20a6f7561e63023dca1 SHA512 61e1d8de5a7032a49539f854550845a2096afcf17717ab31982e0cb1145839ecf0d863420e205b22f14912693087968ceec3c88cbeb32dad5695311dd063f8d5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/trojan/Manifest
index f38e1de993c1..613fa563af3c 100644
--- a/acct-group/trojan/Manifest
+++ b/acct-group/trojan/Manifest
@@ -1,2 +1,2 @@
-EBUILD trojan-0.ebuild 146 BLAKE2B 63e13088f28df4d993958f214b770c184816a7ac30d11e6eb7d3604ae567bcc8884e98a4c2cafed427d2d9a376159ae7ee6feb639e12d9670ca54f8c66a65bd7 SHA512 7a8c1450ef540aa44c949f581facf894268e25904b7e391bbcae77bceaf220509d87f3a1a2cedfd7f7d4e207483ea96234e4962f8f1703e5f04abff7b644c10c
+EBUILD trojan-0-r1.ebuild 151 BLAKE2B b0caf43bfd078a1ab3faf1d47188da3810fd15a7612292341cadb8ff76297347dbecd75f12864474ca80f987a0b22c8278f61218a3c30cfa5f2af6c28727a526 SHA512 fecccbda1cd9f70733853aa5316c0e4b25a2c8f4e82d79725caabd5bb8bd62c1c00aec01065fe55698c7e45e2195d03c7f7f8630760cc0dbfa3b4ad069aff146
MISC metadata.xml 243 BLAKE2B 4dab510dfc22f0316308b8d483b8e96c7c0653d3bc091820de0d8208213f39c165322c661abfa6fafa50977beb3839a0439079f949cd6a3f590122dbc59e53a4 SHA512 917ed98b7482f15c8444aaec331a88ef97bf689d708489c3bd68ccc1f2f4093a8739930081dcae9db5eac912c638c0ff286015b8bd9d51da866878e64e0f7248
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/Manifest b/acct-group/tsm/Manifest
index 0bc0b33ff0b3..042c68a3252c 100644
--- a/acct-group/tsm/Manifest
+++ b/acct-group/tsm/Manifest
@@ -1,2 +1,2 @@
-EBUILD tsm-0-r1.ebuild 151 BLAKE2B e6457ed32c91ddc0ea5ac8412c2885ccfd1e74b63558e0c511716a68dc007c18f6cfe2d2d8c77c697fb43294dc43af2524909fc09e973d875e42f4a0b9c018df SHA512 88e4eb80cbccee365f80a008311a9451983f0d1cb3fc2dab1072ee73b4a67f840025f3319cb51f7dac8a90db0fdfff638ac6b5ec62db02311b89476918f37090
+EBUILD tsm-0-r2.ebuild 151 BLAKE2B 53a3824ad1c2302b6aa7dc8906d83e4be3e6c55e91a4e53a0017e1531267653c3a6127584f9a04cca3ab026337626983e43496c10eff1517270aba2ba7adfd2d SHA512 e0fc00398574603111d67135374d5263fd8bbfc88644ac829ffd661f3adf0dd85ed0d621258fb464324cd5826966ce03b3a9f3883596ea50e7dd614414242cee
MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
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/Manifest b/acct-group/tss/Manifest
index ba436384b1df..e18d54f389e8 100644
--- a/acct-group/tss/Manifest
+++ b/acct-group/tss/Manifest
@@ -1,2 +1,2 @@
-EBUILD tss-0-r1.ebuild 202 BLAKE2B a04de6601efb2ee966caadd3e4c5f6897dde07d40d6995cd5b3475d21e37bf62a3fdf4524fd93285ee2b0aefc40dc38adc282d20251c48ceb1a1f600b88a9b86 SHA512 0038f0b3f1d8d83d7d2791eef108f9c92f1fe544c25e1b04a135e22b6082a8f026a6cca5c9ac0bbb90b80b4b592f19d773135d064e2d1c17eb186a6f2cab2ef8
+EBUILD tss-0-r2.ebuild 202 BLAKE2B e8ee01b70a82c4bce6e80f41e1aa6bacbc2fc3d63431e4f290221aaa78e4a8345461b13d04e08bdd7796e02257b5239a3adba396deb9f3dd61261c20c1616ac0 SHA512 0286df408299ea0d411b978bc85eb8b20f71a762b99ce872d59d85a0da875c340ab238825e77b8209ad89350cd8cf06a3c2853bda24782bcdd4d9fcd1ffa7e90
MISC metadata.xml 404 BLAKE2B 08ad2d09bfd3697b69bcfd85280cb3965aff26e91a49f0840c2fe81d02a5795254a283b95124bfc97a610034e668332d06abae1db1c34657d7aab8ed6963654b SHA512 9b8ca2c33c33a1f4e3f30244069486fb1dd970555c9bb719a5bb8c4e2bc979745e0511216ec70481f0c3b1e716dd631662a1986e1c89628b29b0a85d6b4b9f76
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/Manifest b/acct-group/ttrssd/Manifest
index 03d7908511f0..79836a6397a4 100644
--- a/acct-group/ttrssd/Manifest
+++ b/acct-group/ttrssd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ttrssd-0.ebuild 186 BLAKE2B 5724e778f961f3f86223e43d20fb8ccaedeabd42fd9489680753970ec952a92b9dc8ecfdb4ec9069f984a73781e06928fabadb73a8db91366231e752f024e29d SHA512 0dab9558571e6fa1a25a4b33551e68da79a7f982077fc82011f66ae1c8f895d495335fe8e5babacdb8752dc2ebd40823a0393a7d9f4c48c0c13b278cb703a59d
+EBUILD ttrssd-0-r1.ebuild 191 BLAKE2B a887dad328b21a8a5defd3e2a5d2413e539a9c1fa8fedef6f886eb7fe9e55bd3ccecb2c68055afee98c7d91a21d5c9fa105b7006f49b66372aabcc20d9eecd54 SHA512 836c814a6341f548c86f5d3ace96a8137fd74de90a71f1421819222e0fdcdf8737b42c6f3b09f968d49863508ff12ad20bfb0b718e146b23cbd287a2edf4d5db
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
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/Manifest b/acct-group/tty/Manifest
index 7e087536d01f..bbb52a6c6060 100644
--- a/acct-group/tty/Manifest
+++ b/acct-group/tty/Manifest
@@ -1,2 +1,2 @@
-EBUILD tty-0-r1.ebuild 149 BLAKE2B 7ca4dcd292411317d564914738a42b537e6edeb0c47aecdfd4ff56567ae8c6acb542c0680ae0a7e87ee1e7e86ad18c49c8211af74acc992bec4a64e1455ae9af SHA512 825341aac5bbaf2dc5f2653bf7a9a3282f62121012d056b96b71a5542779842d6cebba163b8df6871630168c83fde61570b668084174438855ee3452beb477c4
+EBUILD tty-0-r2.ebuild 149 BLAKE2B a640cb1baa5b4c90c0e3124bcb97ec60a1c3f516dd28c516fadafc964e278ab49a01b9cc541562a9f0d4a27559260d23678d44b5b1ce8edb2c3ea204d8ae17a0 SHA512 37b805e9fdee538e0ef6509346e9a60749894aef5ab57e2780feabc403ee9594c7f00b56e4db4fed90b600eb3493edf875568ee77595c9b2c9d0f7dc0b81b831
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/turnserver/Manifest
index ac48e8873ac2..7c00e3e2fd29 100644
--- a/acct-group/turnserver/Manifest
+++ b/acct-group/turnserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD turnserver-0-r1.ebuild 201 BLAKE2B f07bc806cca463a2f3742a44d1ffacc74815cbf74bdfe88bcc0fa2b85d6ea1769cbca0ff799bf5cad3bc696c65f9665c3fcf4f438a986f8068d73b29be3c9713 SHA512 8a2379cf27af14efc367360508fee63c2673309a14ac711bfb0d5ffe85fa7d5deb0a3055a34bdd87131e946c2c5608bcff44f74233e7d45cfc02b521d125bdd0
+EBUILD turnserver-0-r2.ebuild 206 BLAKE2B 24c74a3cd1672dc137163dd3e8916afe7d76924c78cedb165a28f738b817360dbc18ed3ac100a1954de642373b4c82510e78d121ecc5b07b6790997efa266f5c SHA512 66c125c68f4f23bb285048725381baf1b11cd6a8ce8fbbbb37db575d6dbfdecc1990d0b9839f9d30d38784989988ab7022c51d24c21e8a9ed40db00ed3688a36
MISC metadata.xml 253 BLAKE2B 48176bf4d3261fa1fa73f54f89eb55371dae1f30f8b6fce3ca78b404418583f11c35e1978342d406e1918f737bb8e971778a780d4195f4a1936f866a23cd8423 SHA512 26103b425624e485d98f014bc88d2574fad61a638f750ff21507690509c78529885f72d410975d4f3586b11192d86d8b6457a86330e39d64312c24ce58aea7c9
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/Manifest b/acct-group/ubridge/Manifest
index 03351c452447..8e0d9dff0d78 100644
--- a/acct-group/ubridge/Manifest
+++ b/acct-group/ubridge/Manifest
@@ -1,2 +1,2 @@
-EBUILD ubridge-0-r1.ebuild 187 BLAKE2B d7907dd0015888404d921a85019b989e7a0f408e76a05cd610e6060d6a09b8fd77e0a7e7a0dd6302ca788e4ca5721bd5a60ad7268b60f4ab8b855cb08b0f79a5 SHA512 83cb6b5a8016b949381b1113c9d850e5590a8ca3d29e75c55ec79d25e94cf1a20377c7667d38a9c78fe75ce09d28e74002cd0f7902b83edcf5e33a341eacad34
+EBUILD ubridge-0-r2.ebuild 192 BLAKE2B 91d9ca9e2a4d379d6100b762dcc3663cad57d232a1afa5b52c0525a3afa2da0bfe5901e95c4c7fdda46db281e003dabd88f3c0c8e595985ba3cfa9ab97e34fa8 SHA512 001827a7c6b2accfc0e07a79c7c08a05a12c1e55f710a133061ecd351299fdb39a5980c11dbb6241532843a0b04a16a260239f716bd64652b815880aca460064
MISC metadata.xml 403 BLAKE2B 540d7c483a9186f4ca9978cdd0d0bb3dc1a2746819e3dc895bf415c42ec19205649caa3a930c9db9f4efbfb913eef7eddc3e1b51ce7b483d3ed0ba0a25d1feb4 SHA512 440a7f7342142224f72f63e887d8fb1071dd2446fd16ee68074f2a08255eba500de9865f48427da8d215c644a1cc6206052940b4ad3a0131dca4b9582c443426
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/Manifest b/acct-group/ulogd/Manifest
index 795ef1144dfd..01ac76464881 100644
--- a/acct-group/ulogd/Manifest
+++ b/acct-group/ulogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ulogd-0.ebuild 181 BLAKE2B 97910a15b3d03ca8ac63d251489474e9c4f832f79f628d9235788b3a21e738162f36edb81132637fccd5ab12fc3710f275e1384e835d50b91c5c98d42c9c40c8 SHA512 a0c71601200d074d93be7622c12134d293bb876f2fb351b54d44d7a44549d296b1610918f07f114a473241846bfcbd55c83d1f7f22beb7bc361c671e12ea2522
+EBUILD ulogd-0-r1.ebuild 181 BLAKE2B 6c30def491d8da2aafe8b404f6b02eef11063550e3aabb6e30ffbc5f24c60610e76596d1539d420878a5a5dbf7784b181f5aa590e8e1fe1f05a45cf9f1c0cfe8 SHA512 6abe409cec070791bbcb8598135bc98f8693e20e74b55ae5f8d054d5ca6412d909ce7b37021520b4862d610b398d9f63325609ad178903aaa8fc7f4f35726359
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/ultimaker/Manifest
index c53e5bc8ee5e..3e1ab96494f6 100644
--- a/acct-group/ultimaker/Manifest
+++ b/acct-group/ultimaker/Manifest
@@ -1,2 +1,2 @@
-EBUILD ultimaker-0-r1.ebuild 180 BLAKE2B 221924b4974142fedbfc22ef83fca119cfb646efe5c03ea9d61c00daa7e82ac0fdcdece5eacdc1f49dbc8b7edbbdbb774538758729cac7c932ab72400aa2ca81 SHA512 96eafc76d57d004466d3205ea6714e89f90cf466068f275eb11470d7ff141188c532c7f1c1235624ba65bd67ea1c4060d07346b870f846adbf3efd1bfd178519
+EBUILD ultimaker-0-r2.ebuild 185 BLAKE2B 2364a54d483cb5820bbfc9b208acdf0c5d17f8ad2f2a86e79eed76d0e9ba9f9785b909dc85c155ebfc323267a6d47e6b8715444cce6a25e5a4e0ce15492f1dcf SHA512 c256e146a00d820d17af92f4ed58e6991a63172221828eb41def99bf1b199eca6f970de80576fbf9b2e6df6a489e6aa537af2a8e65282497445112332df38456
MISC metadata.xml 261 BLAKE2B b411d17d40b41f8f5f79ed195f3d7ca29655c5c6a7da8284c4d111b1ce405f2a881bcd675081561a606bb37df59e3344892ed4277cd5a0fc06f9138595c30f80 SHA512 5cb7f83ca6a8b52b542c4060c67615c400556b98837f9e6fa989cf60999446c7e14c91a3d335734f835652019ef64fee3f9ef57a403657df21b09f843462598f
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/Manifest b/acct-group/unbound-telemetry/Manifest
index 44901279065f..575c24dbe1a2 100644
--- a/acct-group/unbound-telemetry/Manifest
+++ b/acct-group/unbound-telemetry/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-telemetry-0.ebuild 146 BLAKE2B 5870072ea522f91c3cd138953f2090cbfdd493d8111055a7fd00fb066ada9d6f283777b2d34c92a064731320059a04cac998f75339a63d00c1733594a8510964 SHA512 932473aaf22aa3faef94169e435ea42a04e35d9b68773c5755729d8c36ec1959c86aab01615095be728db448bf3c91f36f0583f08df5bbd81771060b3ab4757c
+EBUILD unbound-telemetry-0-r1.ebuild 151 BLAKE2B 1ae4b254ddff8bb6dc5d710daefa9ae93dd9e9da76c5221660d1ee0695c52d9fb623ea50b0991579e9e8e0c6dbf16fc547ba1f2221c1007c733be912f43c5028 SHA512 197f24b6159729e4a25a4b8217661b7cfb539f327d444bfaea9142a5c15998eb1eeae1e92626ea575b0a58b8d700a0a5bfc8bfd8f74d61e8b42a2e38fea5d913
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-group/unbound/Manifest
index f11e4b20eda6..a1f605ab1203 100644
--- a/acct-group/unbound/Manifest
+++ b/acct-group/unbound/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-0-r1.ebuild 183 BLAKE2B 1ee8a392311cf7447df33283b232ea23af7b5f544d51379867f399482991527c8bf9ed2b1dda98f7f500776b4f5fe788677f2a1962a05a653e3781a96b08dd35 SHA512 b823dd2f2d38a3795a3ecd5f32ada5d0484dea74726cc71b1888b8e959677706e1e055ed44490330ce6a01f82d28393642fd30d747a61cbe1b99c391d928668c
+EBUILD unbound-0-r2.ebuild 188 BLAKE2B 808f48587fda39d06045820bc1cf24ef86b6303e35c77a2e60bc4f9c004628c9482ee03a1c67492750ebe46b20be5877880bc4578d9ea1b5772731715ac393ed SHA512 6a3461755e88819b83afa32cc28312f4081806b34ceb012f57d201adf1a37347c44164735cb45817b1c9cac1451d7cc9c6e99928e83c931bffbb61f423d5196a
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-group/unifi-video/Manifest
index f2bfec3a8fe5..4be02fc4e125 100644
--- a/acct-group/unifi-video/Manifest
+++ b/acct-group/unifi-video/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-video-0.ebuild 182 BLAKE2B acdde57c8ca76b2af1b269728498e4a82209e4bb9d74bff4384a9b40b08f49713cc5db1464dc1c46b58b10ea3806bb2b666df4d4723cd3ff6d04db085829f4b2 SHA512 51fdeaa4c241f45a7fd39bd22d39dfa71d631bbbf9e5141748f4d080e49b837c114dc50572e4bc0da355c886c9e0fa77011f88ebc969bb18205c4cdcb07666fc
+EBUILD unifi-video-0-r1.ebuild 187 BLAKE2B 973851f1f48af6337f34b79cc8e5766a253f347d404b343b84740dbfa4d8069039a72d4ae49d860086f0018f7c1eb1e63c0517ed8efba8b8008db691df9898d0 SHA512 76962ed1fc0928f67affa7af5fe9e6a02f9e9ad0fcee51ecd76d9480bd4c729afc6bfe396694afa0dda2f26e64cc6203f89431d8df413213f2e814cf7b46feb4
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
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/Manifest b/acct-group/unifi/Manifest
index 975fbb95590d..685fb7822117 100644
--- a/acct-group/unifi/Manifest
+++ b/acct-group/unifi/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-0-r1.ebuild 201 BLAKE2B 5564f0f9ff927ac5bac654ec2caac1e7b445c4b8c451a11e1fda18eb6a7aae9d2f1e49a3514cf13bf4ee7412152ea21e8f1668c5eeb9928b7340305545ea79bc SHA512 f159f2aca0d6cfff3646564c6342d4c68747a75467f1d0efb7883448dbc6586cb2a2dca181074fe1dac1ee7c9d02466f02367c137dd528dd264c104d7bc6e045
+EBUILD unifi-0-r2.ebuild 201 BLAKE2B 2e17de492122e7abd80443864bdd212fc2f53a7ae57578cac8ef5efe339171b9c5884af97322cbdcde84577fb9fab2e0bf329513d9bee51af3d79e75474e52fc SHA512 b3e41bb8039921425c1c6b2331629523bd642561796f49b631354b29c62222f5b2aabdb358b3f6569af7c5e679c057abe5ead9647592033fed436926a2ff467c
MISC metadata.xml 580 BLAKE2B 29e2c3d6f265a80010ab1c110bddcf2b32d0609c6cba665096ef1842d1f964f26672fe4f1fb051861115b7796888c98b8f458cdce4b5bdbc1ee94d5c2ea69c47 SHA512 87b708f2edca5e9b1bdbecf9ff34ab59ac4c2523840dd011e86fcdc91c7fa9cc7a908ae55b11eb09f3dd435124cd5689c1d370eeaf62ca163722ad75b9bf1e98
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/Manifest b/acct-group/unrealircd/Manifest
index 0c009e1d33ef..e3577bc14121 100644
--- a/acct-group/unrealircd/Manifest
+++ b/acct-group/unrealircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD unrealircd-0-r1.ebuild 151 BLAKE2B 1e245b890815920593de450281f7c4b3122e21d39648bb0a5ab8de807ac6fc208e049cb42f72a6d5f8b85fff109bdfb4225c5e6643c7e31e9e5b01dcaa67d0bf SHA512 89e8e8bbe7d8e4e350894c1078cfcb5bde9d6cd0461fdc21768e070a53476739d6c97cb18b10bf46d925702c592e28a0e8b47c71140acddef3ee5c7957e20f2c
+EBUILD unrealircd-0-r2.ebuild 151 BLAKE2B 1bfb0067b3888df1088f9f08f8b484d0107e17e11038d9ac8be449eec7c38fd48d4e62a0f32e05ee1849815503c0ab690a69c695c844a833f73caff8ef4e641f SHA512 87cb82c8919aa8c808200d5953a8cbabfd2bd8d0beb0387f5144b31d45685c798c990f2d0c92a9e10160355542aa89705122fa9a5039862d1834925c86a0459e
MISC metadata.xml 354 BLAKE2B e6293be3ab53054ee019e6f1ffb7d9708ac9c484222a3c8246f071fdf330f5a55209e5795b94bf54ceac52d914aa769fb8be9516133531eb656079efe5f8b507 SHA512 3e73bc21404a047c69d7144e7c1daa0bb1b2203778bb1f98d0de1e6298b6641fb1e02c3dff88ef9ea11f60198a4fe2cbb6e884bb914cdfb0277c018f4406538f
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/Manifest b/acct-group/upmpdcli/Manifest
index 951618163f5c..36b8595fab1f 100644
--- a/acct-group/upmpdcli/Manifest
+++ b/acct-group/upmpdcli/Manifest
@@ -1,2 +1,2 @@
-EBUILD upmpdcli-0.ebuild 179 BLAKE2B e3044b852f3e13f33a7a7dd7bfb8e288979011b24bb12920086e984ae9e152977704c29bc147b2bb8f0171432b8626708832a01406f3adbf07e169f837868723 SHA512 293d269e5d88841a759fe71042c31ed80d485f80c33a271c02b5b3e25c5ecd0ad265cb5e06b9ab9055898dd32e83a8bccd0d8741f1ae62b9055fb0222393ac30
+EBUILD upmpdcli-0-r1.ebuild 184 BLAKE2B 3517baea465a902eac2e35adfdeb536819a3f2718cfd9a79ebf34822fc996bc32ee64cac5b68891fb0575ae58b4cd710974e34e06fb5b31daed6ac590cfd73cd SHA512 190a825e5a0ee959d9981d57d22e520311211b1708d8b459a095213dbfc2623a757d4de5f3d43f6191d5cb9c93bd5be33bd4574a1c6a81b84994837e44ae160a
MISC metadata.xml 221 BLAKE2B 2d476ee9b4f837c436a8d48ccf3e1701c26fa9425db522f35db7eb9900b4b138e44d9f268157ad2158798ed289514445a8d67215d52276a040273bb390f54a77 SHA512 8ebc577b68909c54481d68bac9ad40cf736dd58107bc714adef6782eca59cdde7aca08edf3dd8f595138c6a5cacb8c7ff6af9633321f7dbf37a7e865da37bf0a
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/Manifest b/acct-group/uptimed/Manifest
index bb58fd5aa905..ee8431b9e70d 100644
--- a/acct-group/uptimed/Manifest
+++ b/acct-group/uptimed/Manifest
@@ -1,2 +1,2 @@
-EBUILD uptimed-0-r2.ebuild 153 BLAKE2B 88defd41b3bf2e8b89c32a7d25af3dd0181606b689b7af49198bf5f2920209760e7975b6d11327f4d794c3095e16c2227e189304d0eb4c8f582bacff3f761f22 SHA512 6f95959dbed87ac79d61f97150e447d9eca3bf7b9742cb17d118d62fbded185f1af7ed6ca2389fe7cc1756c634031ece6bd6251adb2c3ac735e005b27a2e0ff5
+EBUILD uptimed-0-r3.ebuild 153 BLAKE2B 378b9a48d791c9f169773bd0bef7365acee9e44d6b0038aa3f7f7a197343ec02e38266b793ee6d326d6b7bcab04710710583b84f0d65c12a02f599bf7cdf2a1d SHA512 7449d052b153cf69c4314e841941cdfd8fd1574a3fcf3298ff1484711ee06d54c51b93b1f533ef94c3aaef21d8b13f76b204cfa50ca2338b6116ba74d6df30a1
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-group/usb/Manifest
index 858d7df1090e..386f72ac86af 100644
--- a/acct-group/usb/Manifest
+++ b/acct-group/usb/Manifest
@@ -1,2 +1,2 @@
-EBUILD usb-0-r1.ebuild 145 BLAKE2B 2ab1c3e22cd30c143d93686c4a7e071213e81b40d4ec213b75ed1020d665cfb5eeacc707e8e1a57034532712e081e94fb750c49539d7f3954a6d68d3739224a6 SHA512 963759fd019b9e749f48d13d953b2b78fab11b8a78a65ceee698c5dcf369472c243d4cce5559bd4eaf72375688a1e62b28e26d91232361e0fd46adcd04c48169
+EBUILD usb-0-r2.ebuild 150 BLAKE2B e4008cf7dbf83d2d9cafa1c5e91e47f137a49a977f61313a56d21e5b3e1274559306a834ac7a17ad2e0209646217c812c4e8f8710ef660cf8f1e7765d9695b53 SHA512 d7b2eeda566a681bd0fd6e9bd102bbc047611d299b284b23bd5460eda0478e299b4d908f3d2340616e8a58a09e4d13435b86a607944c5dfc8d7dfde947cdf2f6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/users/Manifest
index e1399f053ce9..787e86cbe311 100644
--- a/acct-group/users/Manifest
+++ b/acct-group/users/Manifest
@@ -1,2 +1,2 @@
-EBUILD users-0.ebuild 146 BLAKE2B c4a4aaeaf3584733632091bf7d3a96c52070aa29cd251e328d0bae55fe63e10bbebfb18204a24046bdd2c0d5c0284de5569baf9f777bdc4b24e4332ec63ab5cd SHA512 731c8799c865e542f265563327786445fe9651fd9e598aeeb532a86f699c50190915b5998caaef1b4c81fe536e0380ad6033768530ff23d728c16e2925ddaef3
+EBUILD users-0-r1.ebuild 151 BLAKE2B 2d7ef6ea09a7705d6fe03b621364f658f9821c19c1e2f6197239f3f321c7bf8ad08e3e09e96a31693f8f62b87bef35fe915805e24d00fe09021340a9e633e859 SHA512 b9fb583bee7c842945eddbd1afe6709b29aacd2836980403fc439ef293ddc978e271763281064b55a6cec175ee2047204ead2302f52d7daf0c33d34ce0bfd81c
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-group/ushare/Manifest
index 9a4d0c477e2d..27e475fdf384 100644
--- a/acct-group/ushare/Manifest
+++ b/acct-group/ushare/Manifest
@@ -1,2 +1,2 @@
-EBUILD ushare-0.ebuild 177 BLAKE2B 4bcb1e5aaa22ba3ce775f66c9274ad41cb8232805bd65d3a361eb45c7b84dd88d0282c2ea5acc3668112b20a0c9c60a844bf7bc9725b0ec596c87ed2fb33361c SHA512 2217e74204046f01a20397d9dd4e8f74a5a3012641b34fd9ec1f041c1a3678ccb9bf6b395a25b191f68e0a8f47b1757ecdcab38c4964e6edb6e17030cb4c897a
+EBUILD ushare-0-r1.ebuild 182 BLAKE2B c8455c24a937da477950b97ef6e2a861d264e8e2f069d06912b6c65ac8455c7c21cebb3696147c2ec3682f49304713d5bf97df5eea4ea978511c051c0871d5ad SHA512 3781596c0471938d0d7237580090ab698c95b2bd328900326a3a35131f0195c3a5fb1488a3c2b9db350848746cfe569779a05f30aad8f28293500b54bfda7ec6
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
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/Manifest b/acct-group/utmp/Manifest
index 162bf8b18a22..b69fbd58238d 100644
--- a/acct-group/utmp/Manifest
+++ b/acct-group/utmp/Manifest
@@ -1,2 +1,2 @@
-EBUILD utmp-0-r1.ebuild 151 BLAKE2B a51cec78adb0f69d3df26fcac2a84e642ed9cfe5f1cf1589d70c9ac65f776ee17cd64fec33fbe79bb73e53d4a02f4fbf6b3a167a7ce13d2a7c62fe1fae6eace4 SHA512 52616c17a5b00bbaff9f25b49ecfb34630d79bea3cac153b2639a7804092d574f5309cda690a9c890c5ee8d04adf0dff4fd27393922a5e1425d74ea5cb367767
+EBUILD utmp-0-r2.ebuild 151 BLAKE2B 1b0455e23248d518445789208048755d495b4ed0230018cf26efae0a79a417ae250e8d2b1f9179176e0a8ae258365c9beb56c9bd9d5ed3ca9f562372c15d1288 SHA512 bf65da29c7ecf0d6dd23e429755fdfba37258ed5e4f3469ec0bd9f201f04978a56606c3f879bde7ccd1449fab4f1727279871d7882cff5ec7c723f58683003f7
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/uucp/Manifest
index 516cfdb694df..816f17f4018a 100644
--- a/acct-group/uucp/Manifest
+++ b/acct-group/uucp/Manifest
@@ -1,2 +1,2 @@
-EBUILD uucp-0-r1.ebuild 150 BLAKE2B 20579c48bbf7052848baee0a3d968e212b564a9f47619388bb7dd26e52890d4f934ab220eb6cb767020ad0a0319960135f2822afe3b2f46a5a65a0bb5029c770 SHA512 df7377e23327832ebbc055c2f05983da5cf52f2a0a5d2b220f7cae28585c36f2df8efbff96f92255364b95b438d0ce1b478b261d0c0cc39278cd2c5a19fbd7c2
+EBUILD uucp-0-r2.ebuild 150 BLAKE2B decbbb641e19e96fb1cb2c63cd527d4b00707300eb839eb3cedfcfc9f2c861f93e80fedeb7795ca58ccce3f732fd08e85295ac35795ee32604f5a2d39a3c6964 SHA512 287d6ab34c410f269a7750d8d344e4f6f0eea95e450a1dd2fa557c5a3724d15528195b88194493f1920aebc81fcf21daafad66eae9c263a45452324e9db4ee9b
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/uwsgi_exporter/Manifest
index f4181bec3e9a..4d985d5ce24b 100644
--- a/acct-group/uwsgi_exporter/Manifest
+++ b/acct-group/uwsgi_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD uwsgi_exporter-0.ebuild 207 BLAKE2B 80cc391b4c0d7ee7e5119e0bd02a9078cbaadca69cbc70078ee597c1c645e32a2a24628d0a9562f37b3a28ba4b1e3287f01c11ad46b50ae3e1a45ab69735ce29 SHA512 a616c801d56e29b68f541d3d7059be1627b088314818bd6a060620a9656cb244a2d619858a92e72fef4b18b1e42258ea47af5021ef71aaa2c1ad76d96464e28d
+EBUILD uwsgi_exporter-0-r1.ebuild 207 BLAKE2B 9a306afaab5a91d464ce55917670fa8c4d5ea43a79503b2333ab0250e9c18e2048e4fca00ab908944a062cdf338be5e32159bfc3aadd546befdb3a363d729db4 SHA512 1d49291fbf3eccfde79a394ea20797c69e5447686e11a37c1b7df12f73880d08bf191221daba527db9b762bd74e435790fa4c753f1fc66a9a4927cfec8b66c92
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-group/vacation/Manifest
index aa2d80014839..55a9ea515a82 100644
--- a/acct-group/vacation/Manifest
+++ b/acct-group/vacation/Manifest
@@ -1,2 +1,2 @@
-EBUILD vacation-0.ebuild 202 BLAKE2B 9d5a031f8918f93846e9e7ad53b988b47f0fabf2a8d31b1f94fdaf0b8d28f80c65cc4455ecea1b1378e5495e334077242302a3ec411588f413eafdb0881b718c SHA512 46296c551ab2d2b112589d84039a9a7dceb6820b75fe3545e37e1da6aa51f491db4d633cbd5c5be7ca62bc2c085ec35871a4550448d3a643e7cce20062720777
+EBUILD vacation-0-r1.ebuild 202 BLAKE2B ec3d19e0a87a65491d9c0500b4619fad2074de1c931fed82c1b11ed9485716904a2cad082cd61ec72c22118437ee744beb97f2fc662ea83027dbbf87021a75be SHA512 c6eb275c2da76d4317c0fb269a3ec26418597ed72057709abb9911fd27df49c8881fc76fcddc5b7d32a114a080274ce2ecf7980a7b3e5afc4b2a5d4b9fb5459d
MISC metadata.xml 365 BLAKE2B 525d0782e438a536ebb72d196efcaa8ec809b12a1aa3be17b4a1171cf3f41282ccf1a000fbeb3bbc81a296a7c97742c6c5a6c4794d10859566b2d4c927caebb2 SHA512 e527c901611d310ce54e32b4ec518477b8421cdde73dbb9b2d1e8cadf3de8ff291229556264a5275d94952c5b7e77ee7cec80febccae455b253a69b786a63c32
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/Manifest b/acct-group/varnish/Manifest
index c4f8db8f946f..eb607d6d594e 100644
--- a/acct-group/varnish/Manifest
+++ b/acct-group/varnish/Manifest
@@ -1,2 +1,2 @@
-EBUILD varnish-0-r1.ebuild 183 BLAKE2B 24a0307f9bf440d43d020f593224e5c445d216218a598bdf3d144967a583fef8c36825778700649c6260836217bd4e7ec036bf449e040da08f322afb499b9bdb SHA512 4f46403ce1002ce697108debaf7695521be283db40cdf1abf393cc08910b777639a55dbc5692b9f805c39d10868bdf7cb12e1b858f0ec1169c1445fc65e274b5
+EBUILD varnish-0-r2.ebuild 183 BLAKE2B 6f8733fb61f7c9521c0f9f9442c54b1c7a9eb46bcfd1ccd0e243bb218e69eead01951a6cd4c598cec0e1e59c6467048d2e007ea6143d7fe347681db0f4859b4b SHA512 3a5922dff413fab90e408525880266e98a8991c2cefb989af2b1dd4f33802d4002274518913d8aec5a2e5144bbc96beb122e2e13360bf7d447ca13802412f25e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/vault/Manifest
index e856e9542fa0..c43d46851972 100644
--- a/acct-group/vault/Manifest
+++ b/acct-group/vault/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault-0-r1.ebuild 146 BLAKE2B 12c2f95581e51f868012852d249670a5fdf52dda2aee8367e214df15511aefc769b10943ed157058d4f744b9a146e84a0b3ead7a65944cda727b56fe143157cf SHA512 893aeb6273528b04128e6e20a4a1ea7cf26fca9dd80fc891ebcabda0b9fda00c46229fcd490ab5f1854462263594df8f0029982de669c613352d84024bd29931
+EBUILD vault-0-r2.ebuild 151 BLAKE2B 70410d1bfb12d8cb811c8ca35991da974791ba397d97c47dc1ceacb7b0c08671adc5da2ad6527eb8d139d7ba282071c296efec2fd79e25e41080e0482a46f848 SHA512 e712b1d284054785ca2e7206d69753a942fff2720483f77d5aea3eb9e18c5cc58cd311f8bfa9b086cf0b330178f6ed7c06f641bb7610fb440eb19604e07ea15d
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-group/vault_exporter/Manifest
index c8a4c8a8a26e..729befaae5e6 100644
--- a/acct-group/vault_exporter/Manifest
+++ b/acct-group/vault_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault_exporter-0.ebuild 207 BLAKE2B 9f72438ef4a298e48d9ea94dd02eeb2842170394394bd26793ee523187ed4c1bd8ac36f65821c634ec4aa1d863515be67aba81d51980ff0089a29346eaf9c2e3 SHA512 c352021660d01de67065361f3cc78136d4221e8ab449768e29a524adad894787b160bfd4db4617077ffb4ebcf9dc970a186352cf90c9f302dfb48c61ce3ce1cb
+EBUILD vault_exporter-0-r1.ebuild 207 BLAKE2B 33029b82bdb9520c4da9abd68c58af54874f346db8b5cdc5fa19c3c75652c4e0286a82684a2a991324f5d1afa900cf3f7b732bc612c22f7a67140b2b4e510761 SHA512 e455408cddc43e81348f7b7758c52ec0a110bb0b2c11f69b9eafaa92b0e8cd418374ee938c40b1e6d4faaa7230d27fa58061807e8331c8b5bb002d3faeddb7ba
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-group/vboxguest/Manifest
index 94599d7d7aa9..96745e60f191 100644
--- a/acct-group/vboxguest/Manifest
+++ b/acct-group/vboxguest/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxguest-0-r1.ebuild 151 BLAKE2B 142aa03f577f4cb0bc5c3d9f00f0170024b0931e96bcdec32f0298a0f2eefd1f204fa99c99951f8c21c729d357cea8b5f6503ba654a2dd29ee3a82c4e8bf317c SHA512 ebefbfdca1bee6e6cf26022ada080cea2b3aae751a0b47b15474ea983c7318baea6d3bc81779b61b09ad31600108238dd833c1ccb12c1edede7c32e2b9cb4acb
+EBUILD vboxguest-0-r2.ebuild 151 BLAKE2B 33728c89d068713d432e646c1acad58287eae12e61753bc9b2827f77347049ee3ef7fa5d38db322808006615d580eb2561720fbace767182ba3409cc5013e39a SHA512 8d621f4a59a8cdbd91a216bf1988b6b1a69a509418afbb4b5121a7e0a2ed7b84636f20b529cd8ab8950bdd34a6cf2cb8e2691511841a02b1323b437d821e11ab
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/vboxsf/Manifest
index e0d269fb903c..829ee89ec027 100644
--- a/acct-group/vboxsf/Manifest
+++ b/acct-group/vboxsf/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxsf-0-r1.ebuild 151 BLAKE2B 937e9d5e2c72dfbee04c0079b7aff13a19a076652edd81dada10484d8d0c0e3a3e81fff01eb175cafcd268f8e0d8b108318ee9e34db62f1d17f3ca836478a933 SHA512 0b2ce1453edae56057c6aa6a3be6f0b11251fd7d708572a988c43d927a008cc83f84e6d0141b2ec24c98452af4974b42d694d054f29cb64d23b0547779bc6848
+EBUILD vboxsf-0-r2.ebuild 151 BLAKE2B 12f6fd40af950124d9508fb38cec43bf4e82b661e806e7ab40a5b579271c7386b408ae66aa9c97a92377cf0f768bffdfeff02aa93ccb366c25e3a1bc2a472915 SHA512 7601139026acdaa7e7c35a93a5e1c156c2ee3ddf7c08c62c2579f8823417eb352fe26efe323cb56b16846ac1f308dd6744592912202da82c4678d5dfd9fa6573
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/vboxusers/Manifest
index e54d12894a94..f546fdc8a8d7 100644
--- a/acct-group/vboxusers/Manifest
+++ b/acct-group/vboxusers/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxusers-0-r1.ebuild 151 BLAKE2B 4c973b9fd6f057d27376cad70f9186dbece01c7ba137167cf833e7925f206799629e8f791c702c451d057767e67290dae1b37224c0a05dec3f8e2e4d3f7a68f2 SHA512 53a1823c8212f61efacced2ac67a157a5def80a08678976a26ae33b160d47655cbada330d91b30a3863ec37200b0f509e0192aa9d0f394a0c479ef89956a93c2
+EBUILD vboxusers-0-r2.ebuild 151 BLAKE2B 29345d8ee8afcb19a6142e33b755a6e00c24b7bad4c7ed698155937e82ef9613ca09df71b8fc77d45761573969765e9a0e800adb02139599959c7164f32384c0 SHA512 588748d5268c5a9ef92a6d2ea6447dfebdfd8902e594533f1233f85d7cccb2b921481b59bf4d2c1b39b7af58b4b999ccc9320b59e5c409c0a4b3636610d0dbd6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/vdr/Manifest
index ceabc276633d..668373976a86 100644
--- a/acct-group/vdr/Manifest
+++ b/acct-group/vdr/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdr-0-r1.ebuild 208 BLAKE2B a55bd513896ec5b08e9a8eb9d1ebf8b7ae925aa5614f4c786cb4933e40d897e1e8a44ff61a723d411b2c0cfeda40794eb7cbe94b7755ef5ec14ac2798caed7b3 SHA512 d6be4ca4431c873ba1c733bf2c36e6ed9cfb5883cca934926574508bc076ca1322a135845cb917461c4b574d84b84790ccbd96f75b6df08c072ec66790317745
+EBUILD vdr-0-r2.ebuild 208 BLAKE2B 0db8986d109ff819b6e39f77330cfb9c89b0006348f359bcee3b352b03aac923bfee1cb31188dcd7fbf8ee1d1ef99f66059fb926d5bd21f5941ac0ce7424b466 SHA512 f2ccddf86e748881cb2aa9a5da7926a69edefe14ee5bc65169c2b4a10d8e7d30f0ae3526636b9a00ef165a9f2d636fc2142fe169ee65f3e29c63d16e8300221c
MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
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/Manifest b/acct-group/vdradmin/Manifest
index 156b89443a39..e3e5b5ba215d 100644
--- a/acct-group/vdradmin/Manifest
+++ b/acct-group/vdradmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdradmin-0-r1.ebuild 192 BLAKE2B a76f6b3faa0ba02e4ada02bd864d3355bf7f2e58670ed3c6316e58f3af7b1538dd6e09885aaa928d895f503580e05643fcc5c36a4d16357569acd5f81903000b SHA512 e5a6ef898ce8c250a20d5296072e39389b5c225cee124fe6c4a49b2ad2011478c1880551de0b8c80f4e87504d43cb134c7334a27aefb7031895d8ee707d97c70
+EBUILD vdradmin-0-r2.ebuild 197 BLAKE2B dd5c45c1a8a084d7d8d1c37976077b77d9000a736ffefefb7b0e42031b2007378bb5d82c532a820d58ce1001c250de7eaa7db58d23d410a100acebaea0da7a35 SHA512 2210e0818fd3a251b9b21e7d0ce3246b4ecb0e6aae624b1d00d73a7adc36a1c20bb9c615b23ec1d7ef3a5a4572784f139af71f267dbe5ee08adde0d59fd59604
MISC metadata.xml 246 BLAKE2B fa708d64ea2840e21fa1a00402de140be19ef4c1cf90b00fcd40f2ab10fe5e1397e5bd0a259162c3571a01056535d42d4cb492e97e6ae1756d38831019463db0 SHA512 503c7151fa63101f3a082546d033ecabb7f5ac47f752200d450faaa46c2cd6dfdfc387aa029ad8cb5786d91f7217a3ba64d92dc21ce9268de823fd58feed7db6
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/Manifest b/acct-group/video/Manifest
index a2a443ddc797..055b62e8bd83 100644
--- a/acct-group/video/Manifest
+++ b/acct-group/video/Manifest
@@ -1,2 +1,2 @@
-EBUILD video-0-r1.ebuild 150 BLAKE2B be60f47b441ae5cf16f55b9e63d6f2b086c0692cd72be81e3fe993b4b3e12ab448ac52098a382704f6a225796a8ce03dc2187ebd7238ea84f5f891a114a253f1 SHA512 5aa1647de8517f1374c0b1728c6970f7475cdd47e80e23b9bfeba7e783768bd06ad0a80cf7cf7768e5cc168a0db8aaf03361ec211723f40e71e327bdd186c95d
+EBUILD video-0-r2.ebuild 150 BLAKE2B e19a3d6161d312b898d0464864fb02109950b183f703069fd71c81d3601b9eaa458b473efbed8d31d53b0912376b886717b23ae10a8baafc49b621a38c2a8b67 SHA512 4a28cf20576a27380ee5ab02101b16fadd0f5fe8d12be4a67a2f2838976bac7c7972d0858e2ec589105fef816a28090bbb9b40befc7198765fded99a9ae03b28
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/vlock/Manifest
index 5003a2c87fdb..cb70aa170c8a 100644
--- a/acct-group/vlock/Manifest
+++ b/acct-group/vlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD vlock-0.ebuild 195 BLAKE2B 941304bbe86c06e31bad40820f3adad16ee4237de3984e0119c7941b87bd51559ead361fe25b7796c7e77e2634f8467421f708f841c49564f3268940f12f735a SHA512 cb357cdf25e2e02dadfd14452eeae047f484ce2adb17f699c4c730016902bbe8095ea439ccab0a428b879db6aef8231265dd5aa9fdd828bc6b0b930aa9b9587f
+EBUILD vlock-0-r1.ebuild 195 BLAKE2B be39c82a52657adf0d7f320e18d0d7824df3e1a6a2a2de2c1c0a86711a7c4353d67272021c4e8875a08ed25ba993d4e6d3ebe40d67227ab8d16211b55f1268aa SHA512 17e25e209c226d14711f6fab13d579379b8456efeb91985c6de018c88129a9d55929ef673867af5f11a4125359997f7dfc4a99dcc116c5372d213c58aa662889
MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
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/Manifest b/acct-group/vnstat/Manifest
index d125949420e9..2adb1ac11c1a 100644
--- a/acct-group/vnstat/Manifest
+++ b/acct-group/vnstat/Manifest
@@ -1,2 +1,2 @@
-EBUILD vnstat-0.ebuild 196 BLAKE2B 489a1d3517b03f3b20c854aa7a05e130723a686a23e7692a500a684c83ff38046d9aa302480fe064bce8ba1621fc4fd08332221126752201ead937df397cebb4 SHA512 84ba2a5a2d67e3e9b3581ad9a5bae116b3135ffd8404d06a8ad7f6002748b244c69a271bfe16211291054f291361513b4514cd9342337362aa9bd9a11112bf09
+EBUILD vnstat-0-r1.ebuild 201 BLAKE2B c70292a26ee3444688c9cd508c6276f4064933feddf12482c9a739075328a7d088d08c36a38f9edcefffcf78f89a1c5d2ef14209d34aa048422e497a1c68eaba SHA512 991a5df1efa3634a93a1d0152471beaea88595a438bdab50960590a604a12362c35bfd444f2157e8ab3e249128903a951f7abfff6e3c551ff228d12424fc1238
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-group/vpopmail/Manifest
index ed251f96e992..2481536eb926 100644
--- a/acct-group/vpopmail/Manifest
+++ b/acct-group/vpopmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD vpopmail-0-r1.ebuild 150 BLAKE2B 388466bd112e73a95baba51483e3b5372b8d9c6a6e7a354df14445feea59b910e15b991c57f4a5da4110bf3365e15aa42f479445e74ab8419fc56310671ffe88 SHA512 06a3012d292fe0029e7686781186df86bd6a9a578b9b2885c968f88f8fb78f84caf4e5308aed3305112b76957ed9cf1ba9628ea9a2e7fdb74338ca921b78c16e
+EBUILD vpopmail-0-r2.ebuild 150 BLAKE2B 31279202a990e3137ff476fde27265c6eabf82b2b08fad162a26c0a20e4d25378c4fa9a3300d40f65065a8b3171b33b5bf7acb91b7b52a11e5c9f6eafa922d97 SHA512 573fd8827efc4ec8ddbbe36cdff8e360322aa3c779f6b4ce13b397ffd0ea4b54ef2f4880a5a7cbbcd17c0a5e4659227a6245603a0590fb10cae03a7a5a31e53f
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-group/wesnoth/Manifest
index c6d75673af1a..35297f7153e8 100644
--- a/acct-group/wesnoth/Manifest
+++ b/acct-group/wesnoth/Manifest
@@ -1,2 +1,2 @@
-EBUILD wesnoth-0-r1.ebuild 151 BLAKE2B b74a6c0b84fcb0ee35b9f981a7f45cd30590101f287a93320617006b57e1cbf87b2f9c0965b8e62b0f9f1f2e1a16618db0e9439c91f1a46ecc1571e7feeb0ec4 SHA512 660f65c0abff8147dfd8d641d7e4f978fc38df473fe9ed70506b8b1d445da71931f95c25f3a74abef3269ac78e0e877988e025e4aa0502fbf2ff00cc215b1632
+EBUILD wesnoth-0-r2.ebuild 151 BLAKE2B 6b4930d92187d8371551aa565659df41487ca6fa292a0ea56511bca7ceee4147c6e5097559927ddc9233e47744d68331843552fb7c29bd36edc2bc03ad1e3ffd SHA512 be2a7e02f2b9ebb5d95e3ed1cb1428cc3e8baf7e389cd246f7c2a129380bd5dd441bfa44e33793adb498de7d697038a9fcbb2542116682be66b4ec6b9e98547f
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-group/wheel/Manifest
index 45d24ebf7bc5..33f131062524 100644
--- a/acct-group/wheel/Manifest
+++ b/acct-group/wheel/Manifest
@@ -1,2 +1,2 @@
-EBUILD wheel-0-r1.ebuild 150 BLAKE2B 50ab84c5ab7a6e7d4e55b343e79a976a6d0a6c244195d5fd72602184fcdf69b61fc64588ac20c1c0160065aee4c7cecb6b8c2c9af5d75e2062ae6e153e65290e SHA512 6c80c6291689cd671307f3ec07b36019668197b5b739f40a35230a3386ac0f3dfc9ff9631b2cc81bcd7847845432178db93140daea86a2be15ab13fcd594cfad
+EBUILD wheel-0-r2.ebuild 150 BLAKE2B e37344d28cec22235dabd50c52fbe54478cc14f35715b2bc138c3a19259bc3c2ddb9ea4a486f03d1eb95aa0954437a41f27115eed0b73e0322b89e39972882b8 SHA512 868f1e1442cd9dabb74f4ad1a25d56b07eba7ef954daebc52bfa3f14577f7cfc0bf4f6596c4d216e367c55111bcf918c1bb1688c85538755c2ae23ea885f4775
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-group/wwwoffle/Manifest
index 18fedba18be4..2af1231be790 100644
--- a/acct-group/wwwoffle/Manifest
+++ b/acct-group/wwwoffle/Manifest
@@ -1,2 +1,2 @@
-EBUILD wwwoffle-0.ebuild 197 BLAKE2B 215dff4c0217e70de4392824eca8e1a44768e085a3063988bd260e60df0c7aa2b3ff5a6dd62d968c67314ccd00742dc43aaf0270a07a2f9cc8f0ea4894ab1dfa SHA512 8862fddbbeb164d21004585ae84997748fb4d092bb0c3f930685771850e8426a81fff2342ae36e9baf51ae310ff536fe72b64027b60e5a188a0237be2c8769b7
+EBUILD wwwoffle-0-r1.ebuild 197 BLAKE2B 48561f60bc2b23145c105b82933842d495b85e4bd0b0c3b7c491c8d2a6a7c95da13464d65b44ba850247569d20632302b9a3b24fc84f119a44bb3ec7316d7d6d SHA512 77685f0059a401d5093427494ca219d7f4594ca35d3d5d54d964c261e25b87dde1d9ed5d0337a75b461751ad00f6574c4e76741c58fcdc53655896df71c1fbd3
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/x2goprint/Manifest
index fdb1540ebeb4..d74aeb7b491c 100644
--- a/acct-group/x2goprint/Manifest
+++ b/acct-group/x2goprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2goprint-0-r1.ebuild 195 BLAKE2B eb89af7ead842785ec65956fa4bbe93e22b5445e74e50b227140d2d57e579de0893f5344f163ed6c3d5598885b4e63893a6a3d4071b2bd364f8a10d62395adf9 SHA512 bd6a238a1b70ac205d7b486279324b619842c2803bcaf4b8368908399c3471b354569d6fe6c524e881014adbefe612840cd2af50c6e868b984b52ca0bae5ae47
+EBUILD x2goprint-0-r2.ebuild 195 BLAKE2B b21efe9c46f49ee2fd8f3079b3cae493b0d3c5e5450c26c3549e401b4c83c9f6dfb0e7b16dcbba9800f70dbdae59dbb801ea749c20c7a49afcc91fb45f95f5fb SHA512 71ea1ece28193deef03f30875c321ee779eced0d531c9cfd6a561b8c1fd6d44e4f16506432784a2349ef161e606692e711018ccfdf694e696a22761b48c347a1
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
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/Manifest b/acct-group/x2gouser/Manifest
index eaac52d795a4..675f48a9398f 100644
--- a/acct-group/x2gouser/Manifest
+++ b/acct-group/x2gouser/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2gouser-0-r1.ebuild 195 BLAKE2B 9fddaaee53f6406e7f99247f58eb4b0ac773681979b5567438d2886a37ad6b06ef183da45babfd75c625baf6147d1beca46dc7502e3d6450b9921b6890ba2dd6 SHA512 2bbdc10327c27c73047bfed62e47bfc688b6a4787d28f9e89dc36bcbb743251587e811fee770de7fe28b06466a868f26b8f7819ed4e50ab13f4d494c0b230589
+EBUILD x2gouser-0-r2.ebuild 195 BLAKE2B 5dcc59ca83ac2c17e3262edf0f47b9d88b650dc7a87535905b961156f0f5b8f36d36b5d8a60a70dba3d36992039817e9c8bf80a2e1a326c16da0ea4562749a9a SHA512 ffc86c567c9fa68c2b0210aa564b4e6149fe985b7ae73dbcfdea127465c9e7f3e10658a08bf6823eba38aa92d72356b48a9efdd3255348bfb5ce6d3bc133e605
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
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/Manifest b/acct-group/xpra/Manifest
index 14f84233e7af..4c50e68876c1 100644
--- a/acct-group/xpra/Manifest
+++ b/acct-group/xpra/Manifest
@@ -1,2 +1,2 @@
-EBUILD xpra-0.ebuild 187 BLAKE2B 94c5219981840a108943dea842656d6807a9914558b529ee8875953f34ebe48f63b7808cf6b9f1aec5952cb2df15d5e33c2ade172e8cf3ddcccd9783b834e94d SHA512 8b7342a1df54ebe54d41742de7782e0d5da308aaea6e8464a94f7af0f162bfcd041631268c49c7b6df811452b7fb76bdb2def7cb8779331f22e24d6d4762008e
+EBUILD xpra-0-r1.ebuild 187 BLAKE2B a10e3487a7099c7c5b763a0d39ebde79f59c49f4aab5b57b273e1795a0fdbddbd0413851bb41eb9a7e9ecdce90779c3b705bfb81f081c1186e64000607f4192f SHA512 41216fe41818c41e39dfc245c5233da6364aa46fcd1736a2a1ce59ef94ce8d04977f0edb5191625655358ca149e068e5e90a164172bb7b67584d0aa46a39fe3d
MISC metadata.xml 497 BLAKE2B 3160546ef489170b7625293a23d168cd6ad1a3539f63b70a740dbca26059fa1a391c4c39e59e50d2e60ff3d84a3e2664ee59f24db5cc87190acfa7b0a729b8b8 SHA512 66a88d31c810a2e4c7571d0ba924a23de871b4e1defba2245573a2273fdf5152902083d91b16974367b75f0beaeedb8e9f290676a5481532e4e80f65bab44ed5
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/Manifest b/acct-group/xrootd/Manifest
index 3dcfc499e1b9..a2d2f27c9179 100644
--- a/acct-group/xrootd/Manifest
+++ b/acct-group/xrootd/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrootd-0-r1.ebuild 193 BLAKE2B a23be42c1d56170259b4ded27d4e080cf047c609d247a57f3829af79db26efcfdf1b658d83c6b9b343fcbccb6d5772784e2fb69fbe57736baf3f45ac221d074d SHA512 52e5f5617be7ab5c61887178b93bc6247ff0a5d80342d91a646c0d61e791c6fdc3208e603a65778a464b0ef3ea6361265d0d86b45acd040f976feb47ade312b8
+EBUILD xrootd-0-r2.ebuild 193 BLAKE2B 6f30133d56fa41a5d59bb667f0921900899c4b9b107627e888750b055e22c73574c0d15a4b60f6f0a6c994953d2077f5ab7d6df15eeb1672f04878df77d8b9b3 SHA512 75f1ef96f384626328e8e5177dc4cad12a6ae8331c17f897ed6292bddaf913fd4f78efd314f63335bc343fac8fbd71820dcf0bc5108d6d829263eb60a54c1742
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
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/Manifest b/acct-group/xwax/Manifest
index 377d1115a509..29d6537374cc 100644
--- a/acct-group/xwax/Manifest
+++ b/acct-group/xwax/Manifest
@@ -1,2 +1,2 @@
-EBUILD xwax-0.ebuild 197 BLAKE2B 7c8e274d1cb9b1c055600e4e08c891e90860cad19d0b6427ca75d0f8372ac04b84c8ead0fa37d736949eaad439041b79266f08e966b8f6f9c4925d411d881029 SHA512 867331da7ae6accbcc81e2b6def0999822f18297c1bd7895cfd172b7ec8046bd8454c11f61524e917153ce64e06880671c80f6046d99619816e7e308dba7229c
+EBUILD xwax-0-r1.ebuild 197 BLAKE2B ffb900c27e12a38895bda02e6647f73570a2d18f230cf1d632e848ccc1f749945e907bafdc751ec39bd91b394630f33c78059f80e01fb3be80c3081484624eb0 SHA512 5aa88923d7461f329723c1f0987b62ded7ef2367bbc9eb4d01cf15ce02759eb35ea8d7c99a1d312e624b2eaadf0499d07fe2ecc2bca0549fd0fc75557dedee49
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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/Manifest b/acct-group/yubihsm-connector/Manifest
index 3cf3f82d18f6..351f3dc20330 100644
--- a/acct-group/yubihsm-connector/Manifest
+++ b/acct-group/yubihsm-connector/Manifest
@@ -1,2 +1,2 @@
-EBUILD yubihsm-connector-0.ebuild 146 BLAKE2B 4368844bd47a59fe1a52a3ecdaabd0f72572fb690aa5ec27c52bc0d3cc04ba6f94623c667050a1e6bed586285f59d2293d626890843e6c520dc9f8e144b2ec42 SHA512 de76c06a3970805c4ac4b3c4f9669061e571dc0bae10ebd61b9cdc668cac9e843fbf81a0464ed303d439d8799dec645200ae209deb89588663910f35f2dd251a
+EBUILD yubihsm-connector-0-r1.ebuild 146 BLAKE2B 4368844bd47a59fe1a52a3ecdaabd0f72572fb690aa5ec27c52bc0d3cc04ba6f94623c667050a1e6bed586285f59d2293d626890843e6c520dc9f8e144b2ec42 SHA512 de76c06a3970805c4ac4b3c4f9669061e571dc0bae10ebd61b9cdc668cac9e843fbf81a0464ed303d439d8799dec645200ae209deb89588663910f35f2dd251a
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-group/yubihsm-connector/yubihsm-connector-0.ebuild b/acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
index 8f606cd32c80..8f606cd32c80 100644
--- a/acct-group/yubihsm-connector/yubihsm-connector-0.ebuild
+++ b/acct-group/yubihsm-connector/yubihsm-connector-0-r1.ebuild
diff --git a/acct-group/zabbix/Manifest b/acct-group/zabbix/Manifest
index 29797c1eac01..80b902dffab5 100644
--- a/acct-group/zabbix/Manifest
+++ b/acct-group/zabbix/Manifest
@@ -1,2 +1,2 @@
-EBUILD zabbix-0.ebuild 182 BLAKE2B 419b09c8812ced7f2b33ee9eb600bfb32ca92d3064ffec7578dea7f17f54ca1694b744b8f14d6a150f1cfba2b003dfbd2ac4d62faaa3f92d5bcbac853011363c SHA512 43e0f645a1f1218a51155072fb4e82c825b3884a9a0772acf6881fa79a9202b8938128ed44fb3225c8bc52c4b800c0c0e40b77ebee8dc0efce2b98556d0aa901
+EBUILD zabbix-0-r1.ebuild 182 BLAKE2B d374b5320d1e2a73bcbb02aa2bfb56824c8e51e5c27a70de55705344797eac17e0048ed623228595264409f18de9256b3140ab6cf0b7be1c823861032a562a4d SHA512 2c6adc9769f6ce456acfa4e0ad3cd01056607f7867134dc6017ceced991b517c012e52b78658173321e179fb3c72d3973460e22c2599838a2d39faf616c2013f
MISC metadata.xml 250 BLAKE2B 2bd2a200020745da1f097ec123623682c370bf39f88991aed60c1682b0c18f56a698812a65e2f63699cf61fb6f433bcfc91de65b77290fe6053ac122a3ee21cd SHA512 bda67aad1f4c4e8949671e4a7a0e757359b53050f6873aca15fdaeea73064e1523143a8e5132e2f665770489442f0f6aca1d061577f6a5befbc59f2bb52ce62c
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/Manifest b/acct-group/zeppelin/Manifest
index b2f409c5f3c0..708b6ab9decf 100644
--- a/acct-group/zeppelin/Manifest
+++ b/acct-group/zeppelin/Manifest
@@ -1,2 +1,2 @@
-EBUILD zeppelin-0-r1.ebuild 209 BLAKE2B 7617b1d57d5e9b6d735e575906fd90e503991ea1d0f5eed0404144d1fd6fe7f93d999c90a55362aa1284000445c7582f10fa4561c2642c1b311502f6393fd526 SHA512 76ec83cfb99b0e632a6eb5523a4a0a3df7d637294c296f2548073311c605c225063ec3abce4acc7283b3eed94763c889adaa7100ea688ee8fac3a95da585d506
+EBUILD zeppelin-0-r2.ebuild 209 BLAKE2B 4806febd9d884ebdb29d961de2a920ee34ef5d48b32d3c0aa9305af168baabaeb487dd7f316b1d2c45b593fb45e76e624fb74e420e644cd285ad19365ba1d6ee SHA512 861dd34473d13f99f3ed85167e744ac80d5dd02f0e09eb9cf9d03fe1f34c09afe8c57e1c221498a49b834230906ece72d93628de0e9e7cbdce7727f3b99fd272
MISC metadata.xml 342 BLAKE2B 1684316dabed0d0d2468052855244c3bb2504173b417c5b6f9ff9d2263ed3adf90d406201e19ca132d46ef7a5f072e571e8f16f9f5dc0a95ef0e0723c229ec5e SHA512 cb9dd8f18c328d49b61d1de97b20bebbd1261e944f7a56949e1ce72e7b62413716d83d77f72bce4387fa245d3414fe1b379f0d283487f7be55f2e2c256718a68
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/Manifest b/acct-group/zetcd/Manifest
index 7b9ef55afca3..97a10667296f 100644
--- a/acct-group/zetcd/Manifest
+++ b/acct-group/zetcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD zetcd-0.ebuild 196 BLAKE2B 882a1c20e19dede45d563c1e5892335eed0f0195af0490b83cf072d83e4251c293e82fc730f5ddd2d6954df7f323a809200080a74c34389ee28845b52611a738 SHA512 f600c9e57df59561f21c41fbdd266548d85781b05dc1335e25db149c274fad176dba45c2848dca9a0f5bd134f23669e793dd2bba10551743d2ae69bd3acac3e4
+EBUILD zetcd-0-r1.ebuild 196 BLAKE2B a616092d4c23965db6fb37fd35d8f8153b495cef36c52630cfa45aaa3f9d2ca91957265042c1933ab430ace6d0da367719be21fb13b6b6de37023b0a4e6d95f2 SHA512 646694ca46c575900785b00b54e7303ece5a398be737681e489709c8bba16b3ffd6fdbd3a32920d1435e689e492749c4b2bb40644f3272d7fd69b756eb64ce35
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/ziproxy/Manifest
index 8f5b2c7a7887..ca54945cfdbc 100644
--- a/acct-group/ziproxy/Manifest
+++ b/acct-group/ziproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ziproxy-0.ebuild 151 BLAKE2B 567688f6e05f9c5d396fa8cb2e885a9ac033a4d274518c0aef852dae9b6d5ecbbbea4cdebcac7df13ba31c7796cd0444dbec40127059591bfef65d0209e30d1c SHA512 107adfd461a983162bc95b23b9216587ac5e45caff893eb41cac913db1e82370bdf5c1315adee5f60e480d4e39487385204a5567e5f3eeefeb751004044b430e
+EBUILD ziproxy-0-r1.ebuild 151 BLAKE2B 9a1589cf0c76bda8f4d85b1a0654cd1a59d300def2c23f56fb983a2e29efc6104e67ac19856c292a2d8bb5e32a83dd36b08bc2d4c20088e639471bd4ce549904 SHA512 818a4131d4b7a89d484a49fdfc5ba1ea484bc6a8d750a9f4f56f301d8e28358f838aecaea6bb8a30b4e565007f0395f20fb50e3fa3c157b3c1a1b17cbd8c9878
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-group/znc/Manifest
index d9385474be4a..9aefebc8e5d6 100644
--- a/acct-group/znc/Manifest
+++ b/acct-group/znc/Manifest
@@ -1,2 +1,2 @@
-EBUILD znc-0-r1.ebuild 182 BLAKE2B b69171086e9a3d7282ffd1c917be1ddd046ef04dde299718a91a6dc69023942fc60b56d19ac56514f8f9289e0d9aacb9ae0ad30553d5123b62d3361c41ffd9e5 SHA512 be9d7421b716474345c7c4539b00c300bcf8b7dd82089876604c3021013690f03484f5f6f703e52d96f95ed7972bc326247a9de907c12d7c9dabb6f893755fed
+EBUILD znc-0-r2.ebuild 187 BLAKE2B f1e0a024421ae57821c627330e8376b982982b9b3986af25dc505d5fd3d95863bf61ad994cf40de3d2cd828d9eca9cbaa8861984542a268d4ea05cc43fb8c1a4 SHA512 d289c3333469c6bffafbf783bfb40ac82b4853bb92f53317768a912b5ffc744cd7b86ddd1be07611010ce47d927c6df82cf12296f29d2eb6c0cd54877b493c54
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
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/Manifest b/acct-group/zookeeper/Manifest
index 294bf037a2f6..5d93ef035662 100644
--- a/acct-group/zookeeper/Manifest
+++ b/acct-group/zookeeper/Manifest
@@ -1,2 +1,2 @@
-EBUILD zookeeper-0.ebuild 206 BLAKE2B f4a8c46360a9e9e30d13adee603aac09bb7b702975701ff0e6709df016c1c7594c2016d78e6c2dc5f1f84b65370e06f37640376f42b5eec7487e829208d21b5d SHA512 bce9e65d513043d165671a460c070363cb29c3b012e64895fa8865b5ec89b32476cd1aac50c1ab958bdf44848060e0154dcb931f2af2489e255368cdb0881a83
+EBUILD zookeeper-0-r1.ebuild 206 BLAKE2B 3cb11ed011df3b06a471b3bb8b22cc01aef534fcc40070be89653f5bfee0390b71f04af66a821d92f939055f4f38a886425a84f9f768d55302931eb991e7b02c SHA512 e62652d90b7dc750592bc19b870b04a28308caf8411582ddb96f5d09b96087e83928830c59815528402f4215206979c1636d868c82a64fab47efc7a950072ea2
MISC metadata.xml 366 BLAKE2B cade4c3fba00dbf1cb9357bf0fcb0347ed6f6162584250545c4c426a86c71cc82de6f7ae39571943d15e8ea32330e86b546c2135c265316ba5dd127472015451 SHA512 5fafae2b9877b5d46da31662ef3b76ed51604131f23548e945014c73431af0462f169b9dde330a2d3be1f079acdda204df351f3784bda51f14a089bdca2887d8
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
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
Binary files differ
diff --git a/acct-user/_cron-failure/Manifest b/acct-user/_cron-failure/Manifest
index 2203ae226109..0d16b605d16a 100644
--- a/acct-user/_cron-failure/Manifest
+++ b/acct-user/_cron-failure/Manifest
@@ -1,2 +1,2 @@
-EBUILD _cron-failure-0.ebuild 266 BLAKE2B 3f61b95a651927ba4b697d32235a082ee665ef54db582e52f8629896560fa425c3e6c4caeae0f485cba8f117c4aa815027da081d618bbd1f5ec9b98d0d8bd043 SHA512 136bf1ccb93a45957af54d9fe33d57eeddd785821ca3945a4f241cd2a4fad346f4c81a628e8916aab1b9fcbfcb07c7ef92adf65bfae24da8dd5d1f3d786c9248
+EBUILD _cron-failure-0-r1.ebuild 271 BLAKE2B fe850bfcb26b9671d2051268f9b77c276b77107c286f85f4fbcffb4c0a956e859de5a384c4be47914d9c2158777fc5879a80955bb5d1a4b078fe9a300293ac54 SHA512 9aa532759a5ec0d6a2a15613de86f17bb2e8dd2f9fbb9e0915d7fd60815b92480ad15e8fc1ecc0293958b4d8a2f60deb4f4e2328f0a8d2d2eeb57640c8a5ad63
MISC metadata.xml 248 BLAKE2B a5a7d9bcd542fe55d50fed508ef21f6a820aee11993d27e8ffb967f55cf3f8a02846c96499f1112e1b58f4a93b8b6fce596589e653fe161bb94c1b5868bd6dd5 SHA512 a45b735f6fec1b6bbce0a559869d9ac99c13b2dceb0d2b23f6fdd32fb7b6d44a2b199f47d89418784243fafafeea56094e0e0c7a90b67cad5cefcc94bf1423d4
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/Manifest b/acct-user/aerospike-amc/Manifest
index af38f17f0473..3358693b1d6a 100644
--- a/acct-user/aerospike-amc/Manifest
+++ b/acct-user/aerospike-amc/Manifest
@@ -1,2 +1,2 @@
-EBUILD aerospike-amc-0.ebuild 268 BLAKE2B ca0e788ebe36eda690049805b4d87a8105791bc6b6d87fabc882e764b5e8417eca41a296005e72a78a7c4a04daaf60a9a4f8bd9dcde94f35fc9bd3dbdd74f26e SHA512 e5a6ebddf697cfb22798adf58325bcfdeae6b952d54bff4811f390ce5517985e8e04ba62cf16dc2f066392cd102bc01a539457cd75655c92d82126ce126fb459
+EBUILD aerospike-amc-0-r1.ebuild 268 BLAKE2B 409c3a1f1bf640c28fac4b9a6c26cf375e2e48b57f52e1a7475d9034435164321d9394db51a497967c3a62cf84898741c8eb71925d20ff66dce50b270846d842 SHA512 3e6365e074e283cbcbf4eb4bba526aa9fa85377af371fd5ff22bba625d95daad7e388ac5d3404ebf637d1023b975c1aef06d3ce72ef715584b998009325c739d
MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
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/Manifest b/acct-user/airdcppd/Manifest
index f29177dd3a42..b4eee8c6a11c 100644
--- a/acct-user/airdcppd/Manifest
+++ b/acct-user/airdcppd/Manifest
@@ -1,2 +1,2 @@
-EBUILD airdcppd-0-r1.ebuild 373 BLAKE2B 3e8176c48fb5ef3b74044b042dafb0ac34c7dd1ef147211403bda0d51628e70d205b795f624e8bdaf790e016b61ae63adab218037476a91c21fb428c3f35a96f SHA512 b88627d827f7946be26e6ea002a94c89c82f8c559c04d5cd674277b6675a5620f01bbaac6f9505c48a3b9df4808043bcb639f48ae060f6a4d489137985eaea88
+EBUILD airdcppd-0-r2.ebuild 373 BLAKE2B 4c1fe97226c7600f3aa5540ac3888980b407968eb778eb0b7a0c1a3c4d3e23bb528357f10f40dee3261de9fc21c634092a1506324fe9210e1e6755e93dbd469e SHA512 35d5c5b8ea61a09c95188acfb471651be3f026b2cfef515bf25bcbd14dfed4ec69393ceaf5bad316dd48532523f6b2b038778f958ec32f6f7d1ac304101f3c71
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
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/Manifest b/acct-user/alertmanager/Manifest
index 3fcf52c1084d..5ea13e8240fe 100644
--- a/acct-user/alertmanager/Manifest
+++ b/acct-user/alertmanager/Manifest
@@ -1,2 +1,2 @@
-EBUILD alertmanager-0.ebuild 241 BLAKE2B 2d1c52ab94f8a6e8833e46c20196a577d74a5f7c6ad8b5b257173ce4bfeec192f99de02ad1a4dc6967be8eca08d902104d7f47fdf687a9468b2b07bc6547f3e2 SHA512 2b2db6ff72a9bb6970179e76eb90a2689148a85bf81caa74de37b4696d6c670718ab221e896b878da71b919679b32a93b3cf96b30f568ebfff5fa865bfb5576c
+EBUILD alertmanager-0-r1.ebuild 241 BLAKE2B a1e258d0e2115433c30fd5e27c8d6b210bdc7a7ed145c98acd13d342fe0c18efc32a92ace2ebbb877dde88fbc652666307264a1a5515424481011de37714ea10 SHA512 28ff636cb39ceb2d226d02ea4bb6d29b5f771a5b44197ec3ac339314fe3e7524012d2469e0ee36dfbb8e8e3142aba56a4cd280fcff53e9f7b0843dc4264a4bfe
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/alias/Manifest
index a1e43d0c90a2..14aa9c73fef5 100644
--- a/acct-user/alias/Manifest
+++ b/acct-user/alias/Manifest
@@ -1,2 +1,2 @@
-EBUILD alias-0-r1.ebuild 399 BLAKE2B 861b236e499e82e0cddb70529f22d622137a010fb6508b47b8094e636654748ed9b4770b1c43e7575c3b08d09eddd1e6fe030f75d22f3df88512a040122c7f34 SHA512 aff4a8a0eee73d2276277123aae6e0e0fe20366e777aa98f6a0caf13e591408deef1eb4c48a16ee30aa68ff51cec4a89c4eb1f2cd50a6e286a66b743f91b7dec
+EBUILD alias-0-r2.ebuild 399 BLAKE2B 5773219de629f8f1830666d1433effa0a7bc79103dde0b9dc189136fa6ae3474ec1ddceb76fea08bd552539c7851d9ee33289e3db6e0922e0e9920a6407cef7c SHA512 94ad82ca56891c3e64c4f8968f3c2282d11e028448251ca8ac61b0d6587a875d4ffb553c2c0bffa628915e2afc518015c87618e41dfc53f96a0982997f783db8
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/amanda/Manifest
index 4b89de58814f..5ec87100211e 100644
--- a/acct-user/amanda/Manifest
+++ b/acct-user/amanda/Manifest
@@ -1,2 +1,2 @@
-EBUILD amanda-0.ebuild 231 BLAKE2B b4c12a48da158fb0e2e739525d4e11bc7ee17d166a76c984231cbaf2fb1483fd19033c15f4e5b6da8bc7c9f261bd7a5c493a3894d41c694b72b6e2f606d77554 SHA512 a335b75236e6471d744e6d853bd4303217f81c24a1420058bfd289c51ae2b1d1824e69f60b91cad17f897b3f0bf2186d58c720c9cc07f0d1dc303adce52931ba
+EBUILD amanda-0-r1.ebuild 231 BLAKE2B bebf7a6053e2619e15f6d149ba6b8546b78da6d7bc6fbf8f58c0f579831495c65516f6ed9ef216d35bfbc512b351bd5ed18d3318c330c6a156344dc97e38210e SHA512 5aa86bc791980cf44b1c2b60519f118b2eae6b3bf1a5242f1d3cc5951f10d57fc80bbd923be6ebdddcc265ed0a1120c5fecb22260cc09c8261dba711e44666f9
MISC metadata.xml 568 BLAKE2B 27da958a42770d386d7204ee1a18b189210253e4ca7bbf150efc7f947d089bf273fa1536ef3fa7525a94c753cac43cc784f5989dc348d9a9363e38e508d495e8 SHA512 ec050ac6eafed72aff2323a015cc5a40011c7803650f26907b2787a3a53fd3943a126d7f70ac1f673dff89bbc088968fd7ae92105625abb7058d159bd9cdabc3
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/Manifest b/acct-user/amavis/Manifest
index 11d363857dc5..427dcc3f4582 100644
--- a/acct-user/amavis/Manifest
+++ b/acct-user/amavis/Manifest
@@ -1,2 +1,2 @@
-EBUILD amavis-0-r1.ebuild 274 BLAKE2B e119e1c483488368ffa0ec0f5166d0843242777767c186793cd0eb7e4d6df3057db8dfa5613e3e60c921cf45be2b917fec3c8eab83df58b8504ce9f683276978 SHA512 366133f008e1d270d35ed0437183b927798ac0e8c0c5f522546f350d3cf66b3dc2dd530390282a80db138520d3c8aebba512fff3f8db8995be055267890f6359
+EBUILD amavis-0-r2.ebuild 279 BLAKE2B 5db9c52f3fcbf2db90246c02e40cd3ffd93416c9162aea082bdf8233e2ede955c5e7fdd569d5fe8f75315468dcd660ddc3e098c88122135240061a26d8fdad60 SHA512 b34df0cc8fd7c5334cd030f67ea6a34a6cdb898ce4dba9c35bf30719c30019ccc5524968dad15f3dd99805d76d5af5e2cfa295a5d7734d0306ce831d3b364d65
MISC metadata.xml 262 BLAKE2B bdf88a65e34409c3f65204337925e14be06c13ab53571f864dc58309b72d50a9968dacf93110bd97acc5ae729f55207718d4ffd6ce321210e220bc6d57fc61a7 SHA512 9836f7da275ae8424e0494ee38313d62f90a180ed9fcbf7ff6391b3a5b4c3679f566668f0acd82ad0fe5f036e70a0e0a33b95df87475e4cbf8aafe1ae6974774
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/Manifest b/acct-user/amule/Manifest
index 5798d9af6fe2..e4890d70cead 100644
--- a/acct-user/amule/Manifest
+++ b/acct-user/amule/Manifest
@@ -1,2 +1,2 @@
-EBUILD amule-0-r2.ebuild 270 BLAKE2B 4478c146afce117ef961bea8f3c4edbfe3d5773cb4956e13544c2ed5dee6ed2ecfc238071a6b2a548e199d1682baafe57e472403ba4e0a4103119a502ce588f6 SHA512 8a1eecc151a395002c359c4b9f8279f73fac3a9780117c540937ea69f2ee0a97a2c412d9db23dde33026362560dfb13aed285d0b57064135240509647226a0d7
+EBUILD amule-0-r3.ebuild 270 BLAKE2B 8283d4a89059d53e62ed1f3e857ba23b4fd6219d80f5c1472f8ae7844f6f2f82030f119270c75616070d311fda1c38a0366fefd2403338a6fe70aadb8fb36b56 SHA512 3546bd1d55330e273775517666208d295ea7e4bae8599e5394c3f6b2ed7c40ba6da5876a8ff35a513220a3b80c1986c993a809bcbfe62873f4e3e22ca86e9591
MISC metadata.xml 395 BLAKE2B 676ceaef4b63cc5fd7c0ad8b28065738adf013fa4f85cb2fa70bd1cafa8ea6b76fc6ca81e36e91c839bcc55c55a8bf24b4a325e44b0830f653adc89ee09dbfc4 SHA512 30eec216eef39513374c06cc1b0be994f53deb7054f7241a55b1ccc73d58ab0b578b92096eb56daef0e7f8d1377480a00a6bbb6e0bcbffb19d53a48f081170f3
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/Manifest b/acct-user/anope/Manifest
index f92bb0cd900f..f905945b2716 100644
--- a/acct-user/anope/Manifest
+++ b/acct-user/anope/Manifest
@@ -1,2 +1,2 @@
-EBUILD anope-0-r1.ebuild 233 BLAKE2B d081f128df708df4c8da0474db4fb92c22c2fd5147a1a762f1dfa110fa3fcb18948659e08aba39514842569b7eb45853bfb466244566d2d0739b3465b91d64bf SHA512 0ef1d9eff725ae071c492c961df5ee5553d5bce9c8b5140224e96bed4d17b755865416ca0fddc2aca9a01b333f832f3b755cbc143daaf14f4b7662bb3261ca1c
+EBUILD anope-0-r2.ebuild 238 BLAKE2B 461b1665e3fd09772f90c2003c9303a0cb1a3ccd06b2d70189376b45055de48fba0c598aa7281af1171810a90a6158cabe3d8e7ddd5c3d50fd4ed11193fa0b43 SHA512 3e745767ff53fcbf57f0ee17bab3077a850d1991572b195925be8d576e916f792f3040e7195548a4b9ef78ba267ee38ad73593080ac2235c8c4e6dc319290012
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/apache/Manifest
index af41610e44e6..4ed6a1e7e5a1 100644
--- a/acct-user/apache/Manifest
+++ b/acct-user/apache/Manifest
@@ -1,2 +1,2 @@
-EBUILD apache-0-r2.ebuild 226 BLAKE2B e7b667c8344edb8c18026f4375254738d82f57c5ab577ba4ce9da5aeeeea1020a2664b1a27a440c23b0f8c06d1e67837685112695ce9dd794f329255752895fb SHA512 26b053d6fb3e6f1719625679c0ea6e4ca15f3af539278335cf0bca1356a9252a3a54141063c5dfe31703bdfe1059ff0087ab517096d62d5ca40245ca6a571672
+EBUILD apache-0-r3.ebuild 226 BLAKE2B 6ac2eab5f1cb2c83772d72c9feb4ba0a6894fa2c3a4e9198460e9a3fdbadac4fb8ab56c657ed0a7dd90232cd088316ab3c298142a1e9e0ef671941aa29dae376 SHA512 673894f8ca9dacabb7d6764a919e8c56279fabd9f19371b1f902a28addf708b06bca8039422f2c8feafb66dc9922bbaec0367eb452863dd9ee863cd2439a843b
MISC metadata.xml 254 BLAKE2B 309bda95de24ec4bc4d565251f6b87ce5adc08e96bcd062c6b0cb77daf48729a08b84bbd9cf20f17e917bec6636c47c51a780dff452e45946df34088a7b80da0 SHA512 4c6b588732cb314b2a0c82d476516cb1c226f737a74934831232be6b9828e8c4636589beb8872c3df0931f6dbf37e78a47309376d3480dce7683d3ead5a63e61
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/Manifest b/acct-user/apt-cacher-ng/Manifest
index 67dd97884eb4..f91853619c14 100644
--- a/acct-user/apt-cacher-ng/Manifest
+++ b/acct-user/apt-cacher-ng/Manifest
@@ -1,2 +1,2 @@
-EBUILD apt-cacher-ng-0.ebuild 236 BLAKE2B b0c8a73f67a8295bdc89b737ec6f4fcad30f0481cbda085f14383c05d7d0e5db12706ae65ccaf936f7ea2da7ee165c0df9ecf39f500ab6e03d63b590d6830195 SHA512 439f4be9a951698348f5b408234d57db45e2173062fd9a596c0daf06566fe420e8fcb1d16f82eec2142314556595bd2690a18acb5543a7c04857240ea09b9a46
+EBUILD apt-cacher-ng-0-r1.ebuild 241 BLAKE2B 33036cc27dc1d6b4bbae54bf66d47d5b41c46f0c98ea1814a63f3b22d2291e20ef66e5d39caf24c80f7799dd8fe06543b605ac34501b9b99a588568461fc4e2a SHA512 428e409cda8f2e7cad1c34540aa412a92c63ea66a9f2abc7ddbbf32e86b8c75c1e45a9cdcbf7a6dd7581644cb7a50b317298408ccfe2fcb042c480f365b022d8
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
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/Manifest b/acct-user/argus/Manifest
index 14d4ef1598a5..954c24135b24 100644
--- a/acct-user/argus/Manifest
+++ b/acct-user/argus/Manifest
@@ -1,2 +1,2 @@
-EBUILD argus-0.ebuild 262 BLAKE2B e80c6c0e86db15cec848abde2fb7e6d6c0330e17a460acc8c763d35df37bbea5dfe44e852615801930b3e6c2799d6201c0ae1bbb105f8bf5cafa7794da44a164 SHA512 87ca7579154d773545b1f8e1a6af1e17a4ae3cb411be2b641278d55e85dfef2e5dd77b65ffaa08ec1f4b8af44316551848e294017406bc7eef62b7b0cd39549e
+EBUILD argus-0-r1.ebuild 267 BLAKE2B 3435d446de84e1291a0cb967a9c9297fc0cab1066f152a6500c61f62815549c82b5b8fb732f660fb9e30450ae8324cd0d2f56865ab3f4de65255991000091bb1 SHA512 211bbb995e83ef8801acdc9ebe0d5d16578dbe9e07390e70a2c600196d7ca0e8727bc2feddf78d5d7f5211da611fbb5102c12271b215c7c3e29f7b53160fe5a7
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/arpwatch/Manifest
index 03a380df4cd6..5894e9960f64 100644
--- a/acct-user/arpwatch/Manifest
+++ b/acct-user/arpwatch/Manifest
@@ -1,2 +1,2 @@
-EBUILD arpwatch-0.ebuild 251 BLAKE2B e60481baae233c93b88306b2fa140f6f0a59dba30c8d8e2261d9badf36503da50becf803649d8f2d3f29e7b0494fdf926ef2544af7dddfb19e7a58f970d7eca1 SHA512 90a8826b5368bd7610c37cf9a15d4ffefb0c8a9d76681fd770ca938d245e3d0fc2efe6ec795c08108c8969486af1e3b474804fc611d7afe346a366c5995921e1
+EBUILD arpwatch-0-r1.ebuild 251 BLAKE2B e44d696a212216d809a12cde634b920e5ab43bda3ff77e113758cf0c3023e9a066d6e183eaa1809ef3b1e65e816afac26ca126d86b693d24c360f797bbcefd48 SHA512 4f5af4432e8eb647ecaaca81d44673fea2857eafe6a46f08a5ba0f7bc1c2afa6f2cf2e0b57a1f6742f5d0786d29dc69b2835a0c57aff6dc316950a3730d10821
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/artifactory/Manifest
index e5155b35d0bf..fe4f7aad74a0 100644
--- a/acct-user/artifactory/Manifest
+++ b/acct-user/artifactory/Manifest
@@ -1,2 +1,2 @@
-EBUILD artifactory-0.ebuild 281 BLAKE2B 6197cf8e725e7f66a3ebbfb605fef6f1d3aa6a99aa1a518b0477e1845ca735a6f4ab79e9592814569cb0e7a3c92a57063a0ad8b10d0b8758de298320ae5c1752 SHA512 156ba68140b5f4e2f2614862cbf38acdce78b373ffb356694806755f337a64c53c1bea67ad864b5bd75ec7c4b630d62ca6fd58ff288c114dbddfb13def47f231
+EBUILD artifactory-0-r1.ebuild 281 BLAKE2B dd722693923d9a748ce81cf7965df397ed6063dc24548575cf754e8f063fff41bdbc024ba0a1b3e326f5d8adc1c4efefd58de8dc7e5bc675c7049e383b528f94 SHA512 105adcd5966eea80004dbdad0906777be43bff45115f9c285e9147503f8bcc30a9811f400fd0db39dc17c54ab05f37750730912fb6c79b3f0d40529001fb9521
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/aspnet/Manifest
index bf169ff4350c..904c3100a671 100644
--- a/acct-user/aspnet/Manifest
+++ b/acct-user/aspnet/Manifest
@@ -1,2 +1,2 @@
-EBUILD aspnet-0.ebuild 255 BLAKE2B 37a8e5c9240a597557b6426c5d1604faa7878f5d86ea818b56e0650430056d79a8b8fd5011ff369ff3588ae7514ee62e99a20d12e1a2dcce33d763bf088380e9 SHA512 4c136039726e9498c26658de4ac2a51eaf4649a054bd1a1a89a585ee86c94ab97a267af6b1601d3f4aaf3dc21f1b487eb16111395e54a901287fb772293f637a
+EBUILD aspnet-0-r1.ebuild 255 BLAKE2B b7b58dc7693a4ce0e18bf48efdf5de54ba1fc6bb458b910fde45aa7ab5f98d093f77437efdd1f73ab49cc448104b528c303ca3a222882c0924e05902fa868317 SHA512 10d25b8a83108ccc80cfed85cb513514218b27e24fd1291ea4c4e8b6ac983ef07cbedd4789d93420191e9221a614382c78fd7e0739212323d492e84cc28acecf
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/asterisk/Manifest
index 16981268c3b8..970e83fdf0c0 100644
--- a/acct-user/asterisk/Manifest
+++ b/acct-user/asterisk/Manifest
@@ -1,2 +1,2 @@
-EBUILD asterisk-0-r1.ebuild 239 BLAKE2B d1f0cf845ac2dbbf5b3ee41c62548ea64ad7aad68b4bac28a1dcc558271ac3effab50537d90fe596a90401b1e1117aa5b0eabc60a72d18c57663eec2a88a9ff7 SHA512 3f29d21c7a9d0506de137eef91de34dce3e85ca790dd1fdf495ac340aa8ef4fe471b0e44b1a864a9020038520632bc2e2caeec32f877582897355460c7099358
+EBUILD asterisk-0-r2.ebuild 239 BLAKE2B 16ff6ce6438b72cff3fdceb2af9982a2c47bb2f3bbcb3b008282a4b37d9ec2bfc568412c5404fb6014e329dabfc3c5a34ed23e92a1e9535461a7922bcefa32e2 SHA512 6cf9100cf7358f77761fb9acecbcf6d2d645eb5b6f65b07680406431a0c99220bfad447e1b572f0112d33a841918c3d291aa33e5201170cd01c8a78204044a11
MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
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/Manifest b/acct-user/at/Manifest
index c821a5207f0c..2e68213afe10 100644
--- a/acct-user/at/Manifest
+++ b/acct-user/at/Manifest
@@ -1,2 +1,2 @@
-EBUILD at-0.ebuild 226 BLAKE2B cc1802cefcbe11fc06c31add5c59c444f15af0686349abee3c2090ceca86be24f273116c643a883877c7864fb80e014666b78acf5dfccf83fdba1e247fc2c3cc SHA512 a3dcd58b18451df5bf5b2c6fd0fd632711c196d471c83922d7eaee58a973ff3760682642ed398e9143097cd0af16f94b404f37f05b143ffe0e8c44cf22553dec
+EBUILD at-0-r1.ebuild 226 BLAKE2B e6f3f561bb4d5de906428f31679f2706fabb9484e8e530ca2c87eb3e1806ba5fb2a9a3b57ca5b6275186e217241fc964090a41eb7f665a658e8464e5d9d9bdcc SHA512 173fb4251a80ca206010b2d2e466818df05eaad6645ed350de8678dc1175cc50e0594a4318bff2ce44bf257c0d20147d6d7204fa78e4d3cda74ce00db55642fc
MISC metadata.xml 398 BLAKE2B 037f58ef9b9d372a1137066db288badda6f884013296b4ea879816f539a91b5f484148ecd3c874561d24a9a3b4e336f6a73b332b30fc666f19f213b6bb37245d SHA512 c4d6086c77a47321b33e8ecfc827b51dad5f79558f1cb8845d495326d1f002e7fc5289165735fb26d1a1020e55d85f22358d313be11f5ddfb05b6580db027833
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/Manifest b/acct-user/atheme-services/Manifest
index 84a6acb75812..56abcb3cdc70 100644
--- a/acct-user/atheme-services/Manifest
+++ b/acct-user/atheme-services/Manifest
@@ -1,2 +1,2 @@
-EBUILD atheme-services-0-r1.ebuild 234 BLAKE2B 42fa49814fa5af6f6b03de5d0779321b38527f2c46ca55ea87657b855ead19c841f384f9d375cfd7473daca49a448bb3e5e0f0dc343558504e8703bef0f8295a SHA512 9cc19f82a9c6303174065d4784c993a10562e593c10b186f6319ee995ddb8c719fa02d0d36385944bce8b79d2bf79c19ed86d4774bb07b0dfdbb5f0b875647a1
+EBUILD atheme-services-0-r2.ebuild 239 BLAKE2B 3f45cfd09f6b26edca4ca1dec69ff6bc6fb7589e20041e985e4c61bff31345c2fb9d67199cb926f5fd2540ae2d0c08508054dcf14bec7bd6bcd4fd20c99573a9 SHA512 851d80df563f9a323b6ab3860148a68f18bed8cb1521ccbde0ea52ada0c0c853ff875cf5726a4889ddde35527cf9b5940713bc7dd6cce48dad3abee32538554b
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
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/Manifest b/acct-user/automatic/Manifest
index 7ee23618e379..7be4ecb6d4df 100644
--- a/acct-user/automatic/Manifest
+++ b/acct-user/automatic/Manifest
@@ -1,2 +1,2 @@
-EBUILD automatic-0.ebuild 236 BLAKE2B 05c81c7d98b6063259cc40fdf5dd209acbb26be1b0f912f45fc2fa73f0b7cd844e1675d20ad225d06df1762ee4f63e0943ec8be80d5f04cfd4ef1a6bc634bc4d SHA512 6c6ef4c25b039bdb145fc51e2d4fc3b990a196b594abe0cf63070afe346a7d36b6c6552cc64592a2fd8014d8815491cf40161e6ce3c477ecfa3b1b5a8e7a31b0
+EBUILD automatic-0-r1.ebuild 236 BLAKE2B 05c81c7d98b6063259cc40fdf5dd209acbb26be1b0f912f45fc2fa73f0b7cd844e1675d20ad225d06df1762ee4f63e0943ec8be80d5f04cfd4ef1a6bc634bc4d SHA512 6c6ef4c25b039bdb145fc51e2d4fc3b990a196b594abe0cf63070afe346a7d36b6c6552cc64592a2fd8014d8815491cf40161e6ce3c477ecfa3b1b5a8e7a31b0
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-user/automatic/automatic-0.ebuild b/acct-user/automatic/automatic-0-r1.ebuild
index 8972c4583c61..8972c4583c61 100644
--- a/acct-user/automatic/automatic-0.ebuild
+++ b/acct-user/automatic/automatic-0-r1.ebuild
diff --git a/acct-user/automx2/Manifest b/acct-user/automx2/Manifest
index f928fea3ecf4..224ad50cc204 100644
--- a/acct-user/automx2/Manifest
+++ b/acct-user/automx2/Manifest
@@ -1,2 +1,2 @@
-EBUILD automx2-0-r1.ebuild 273 BLAKE2B 75c1bae39d36caf84265fb5d5ffb3f8cb9f5a9987aeca75308880b4ee1353bef4c9c2e00d718031459d91a806e6f4f4bcb6b689770f8cb405e97a2bd398f378a SHA512 c2ad681ce1e57e1f8fd3cb2cf659c98028cb5289707c3843eab3e3a54e095b6aef72dc2c63b13c57d9985e1ea48f47b05cb74d74471cfb297ea9bc3fd203e481
+EBUILD automx2-0-r2.ebuild 273 BLAKE2B bbb370903703717ad9bc6009f338586748d58cd235b06ac560e02b1307bb12e9f9fbe5a808a72e0108d3bfa2a0d696f90ce0534380055400ebb0730dfcc205ff SHA512 9237bf2926a3f5137c980a449f9f8ac7a591fd7ef2280021ee51fe69693673c56b2591923e77acf2d29b6a1ccc47fb56d591fe51b3d8cbcd3a8506928aba1769
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/avahi-autoipd/Manifest
index 42262fea0ea7..cea354550c91 100644
--- a/acct-user/avahi-autoipd/Manifest
+++ b/acct-user/avahi-autoipd/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-autoipd-0-r1.ebuild 240 BLAKE2B 2ec18a7716dc10bcbb7551654ec55e1eb428f41cbbd271583cce0413b2c41632b7ac257368717bdd930f435a4a749543eafb4763778a9df45e1dd097e48e7998 SHA512 4c322c7c3633f605b87ccabcda2728168e65a6ec44899629d537575df0300ca117ba775af9da3a2f0d26916baf49a4892a39d2ec584819a0454807d221cc9ee4
+EBUILD avahi-autoipd-0-r2.ebuild 240 BLAKE2B 6d4eefce8642b4d4b66a2c2fa9b8628259f8bd312ba12d3a59a21f86563db697edbcc15e120a1c89714ac37e25fcaaee56be014b472a9337ac74502177bc1e04 SHA512 59462015e8cb9d103ef2f1282c19bc3cea90cb583916ba70190aafcc4d4d83dbaf146565358addfb67bd6f07bbb8f3fa107d928f603bab2904a602c9f1f76271
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/avahi/Manifest
index dcd50adadf67..3eb6007d9ebb 100644
--- a/acct-user/avahi/Manifest
+++ b/acct-user/avahi/Manifest
@@ -1,2 +1,2 @@
-EBUILD avahi-0-r1.ebuild 224 BLAKE2B c96e6780e6c2b7fa40b5777820d7a21dc1e210beb7dd136ea40672481fd00acd553a0c2cf064bbdaf1142415ba4675b775af508a36a9f1b07bd5c72cc99d4081 SHA512 91d489d5a7c531252489776d19ae44b753a394ed719b96b29e22ee430253f35f78aa3428fe0bed3dbc740c4f5c988b92175c6a78eeab26e13c719a28d4912790
+EBUILD avahi-0-r2.ebuild 224 BLAKE2B ff2162870498a62c79ad9c42643829850069d23b0fce842226ba5fb085f3d75b60dcbcd70a3a299ddca080911f701401e54c7ca24e174bb1874f99a619a83e1a SHA512 0972c2e0e957eda3bbc9d1d97f74021bc4875fd0d0764b1f13b3911c05284fc8ecf8a238d69c956811bb73cb30a8cc31c3346f0ce607d2498bbfe933c2ec4efa
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/axtls/Manifest
index f1888a1838a9..37976ab2c8dc 100644
--- a/acct-user/axtls/Manifest
+++ b/acct-user/axtls/Manifest
@@ -1,2 +1,2 @@
-EBUILD axtls-0.ebuild 241 BLAKE2B e47fdd0d85f9cbe95dac87da2c96b763d30c7fdf2ff688cbbf0b6926fe2345af5aaa515ec13b369ad3719aa7457ff438f81f08192daded8b811f2b45fef1cb3a SHA512 071889146eaf37f3f369e51beac236f17c25691f9be6b2382b12e940b070d1d18c7691cc8b19af34e1de3a7ce95c56c25b519a011118aa7570abac204a24ed30
+EBUILD axtls-0-r1.ebuild 241 BLAKE2B e77b2483b4e25fca65e4bd05a3711862c4c0504e1e012f0fed0c85910886caae911d50fdbcdf71cb7115cc6bb0ac604be26792dbb89dab45c3ecfab74bedbfbe SHA512 d259a8f22e8d0ddf106e63a9fc92a4f9abb886fd8fbc70f80d15e470ef06d3c16a45a8a261ed05ba08abb93dd57dbad071235ad82b31c984cc68ccc482f75bba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/backuppc/Manifest
index e66dc0034813..4155eb47d044 100644
--- a/acct-user/backuppc/Manifest
+++ b/acct-user/backuppc/Manifest
@@ -1,2 +1,2 @@
-EBUILD backuppc-0.ebuild 310 BLAKE2B 3a32fb20f92c07aced3981e95a39b4d0910fde970511d50bf313144269777f98c51a7003d78e38a65141ba2df70031253a24eb7ac760a9b167a0794a05573801 SHA512 9cfc3ab4bd227600d06842e0fda8e119fc0fa5e35dedad04605bb65e8ab1797aef127f5a049baa5a09e04dd2f9daa573f7bab3dae411eb4235177eb1399b12a6
+EBUILD backuppc-0-r1.ebuild 310 BLAKE2B cc2520f496781482bfe988e6e1fa9efaa919727ee2fcd8119466fc4e5ed9ac1665506ba63453370af29bb461c324983df47a322f97719ba0f2ae374af98af48d SHA512 178ff63d1fc06010ebc6976c8267e2ea4e493e149a3b55e6aa039b1be201f2f311de87a3224e8b2fc2888d25c9dee86901c134d9f36de6b17e2568883cc2fea3
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/bacula/Manifest
index 8edb5c6cf92a..7e8e544b53ac 100644
--- a/acct-user/bacula/Manifest
+++ b/acct-user/bacula/Manifest
@@ -1,2 +1,2 @@
-EBUILD bacula-0-r1.ebuild 295 BLAKE2B e59a6c41008a1708ca23b69e94534ba4698e67e6901b93bad05ae839df4619aa4b2dc298e384e6f4e1bfbd36e6012c1846479132606f5959de3637f0fad29d16 SHA512 226dd4e8dc809880d1ff6055223be6f188bb753fb7bfb785486be0fe776121c53f48f3ceaf9bb80854ce75923b0937843d5b08042daf5c4487da1636dd74392a
+EBUILD bacula-0-r2.ebuild 295 BLAKE2B 901d056a5afb0c2c7f13cce381b9de0f98a9dcd059080cc0689761fcfb73944ef071ae3b170559525b903cb33d9ce97fc4f3b1e088a60b9c2b26da76bf8c8e6d SHA512 63ef67688f3328efdff6b51e6d11a6077e8bd8a474ebfe7003a0f3dd0d1d615b5b08975c652907636e5e550641b3f4c2d8df14b4bbd6ef19212ba222c3cbd663
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
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/Manifest b/acct-user/bareos/Manifest
index a7713a8cf4b2..e49433193a9c 100644
--- a/acct-user/bareos/Manifest
+++ b/acct-user/bareos/Manifest
@@ -1,2 +1,2 @@
-EBUILD bareos-0-r1.ebuild 292 BLAKE2B db77a8caca84348f69918c1bcbb3d9c69a1b2906cddfbaf95286dc7f44659b89afac163abc5964b5899556c4a06adcce2132346090146137f1b0afcc695b58a7 SHA512 0db636442dc7f7e6d5b6137347ed5bda43a01502e563e4ed332ad03a7e983e3cfac3bfe522d0c0d70afbd095b6fd1288bea5a04039c72e5af37aa743b3b4ce5c
+EBUILD bareos-0-r2.ebuild 297 BLAKE2B d59bace020c8c76e2b7d76cd3783c3f282b8ad356764913c2f06a8a0e90f13501ce84098720f0d20794fc15ebce19eafb1ce8fc0fb2914ff6c672ffa63a767f4 SHA512 d68be10638c368765c1b0b67da06d37dd3dcef54dece234b6b7c29d36cda1c49ec5675ef1cb23d66dc46f6356e1232eaae1ffb95b0838d30ee9dc45c5b0eac16
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-user/beanstalk/Manifest
index 03f99f59ee40..ba12db4663aa 100644
--- a/acct-user/beanstalk/Manifest
+++ b/acct-user/beanstalk/Manifest
@@ -1,2 +1,2 @@
-EBUILD beanstalk-0.ebuild 287 BLAKE2B eaea570b667375d0042bca642de7cd9332e37c2ad9a53709101b23de080f321f5ee13924c174622a741d55d98a7e245e2d9c66b43787b3562d92704c0f61cc19 SHA512 3c54a024500abe620f3e388be9e8ca4ad49af888fcba2e7278da187eefa9619321ed5c514e8f24f50606cbb921f4b8e3c54390644f798f069b1821ba1f7177af
+EBUILD beanstalk-0-r1.ebuild 287 BLAKE2B a0d428189c5eb30b704db646d48d5cf68ad0732139e2cf4d3c2e4bc86d9173758b0b66c3b133e77fb6dc170b5a19e81952a0de6e5b0dacbbca9268bb3d117e99 SHA512 d31b24fd8f2f8e3b63adf32ca7a8bd869f328a0d9b029258a0c48e3a2188468625f2dbc78e590f0eefe456d4e5f34d2560c51b946252cabf9b698b85e32f3189
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/bedrock/Manifest
index dbc8e755af94..c21db147a54b 100644
--- a/acct-user/bedrock/Manifest
+++ b/acct-user/bedrock/Manifest
@@ -1,2 +1,2 @@
-EBUILD bedrock-0-r1.ebuild 257 BLAKE2B 87d763ae11de52de85c42ce6c8706d3a87509074d533859c39336657f70489035690dfbc5b9de8ecb5d7dcab369e952a59d2f2ff45a9932240b444094031bdb8 SHA512 4873ba63ca18f2e41a118df9ca083b51e136e55630d7b0652c60f20ca8f46c911b75d175799bf43293f1ad834da88403b9e0229ca522ff950ca60979b23a3d76
+EBUILD bedrock-0-r2.ebuild 257 BLAKE2B 73fccb05968b0b40cae7a171b646bec253c47a61afa884b23f53d8f8069592587784428eeeefdbdf8e4aa5b36d51f9aa4cd9a0a9dc8fa887a37c6a51fb0e1355 SHA512 2470f6767380a250912eda1e96baba67cee09d1b1f7eb6a1084e689e14ba336ea17ae3e289685d6277327c602b37ae368fde823f6847732bf6bda0bcf6ecb680
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/biboumi/Manifest
index a8a79a5ee4d8..662f8ed71f10 100644
--- a/acct-user/biboumi/Manifest
+++ b/acct-user/biboumi/Manifest
@@ -1,2 +1,2 @@
-EBUILD biboumi-0.ebuild 236 BLAKE2B 458acccd702c6fb762a779433f18399bb572d17b6194b85f28bf545e2cc558662ac2d56ac8de2797ed64519498e7a08f128cf6c2702226d5998a038eca8f04f0 SHA512 51124a78e9fd83ba3df510a74b14a6055ac15c61a40b71e8e52fa2a5cd56f7d08fff08e4268609256d294c17f22f2167bb41bc5b7adb47cfdc212628b320f972
+EBUILD biboumi-0-r1.ebuild 236 BLAKE2B d61722177af8368197c9ea1b42d9ac2c88df029d365b79731a624a3d4f04658cbd43a944521b3fa6e340dd6cc31ad6e3627373217886c7afebe12936f5f2f934 SHA512 df0f7cc9f816447b1af70cf71ed3d2fcf6de344e4f9ba80135d92aabc0dfd64cfbcaabb6809beaa7a8b18288741386ef6d610b95deaa2aca3e5be6fe106fc301
MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
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/Manifest b/acct-user/bind_exporter/Manifest
index 6254ba8ba98a..c99c3e6f0de0 100644
--- a/acct-user/bind_exporter/Manifest
+++ b/acct-user/bind_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD bind_exporter-0-r1.ebuild 236 BLAKE2B ab443d4d3a77b0b6855728b881c17eb0e054e384c8920c5a98d93835405e40df7cd3ee04406041a80bcd0aab1a99d9d51807c90b2f70ca17ce2162b4d15de32b SHA512 f1dd3c91a1e0163c05c1fc30a2fdf7f573767c67f8b1ab60b828474f5dd4169d0507859663503423e3038f9e47b53d66a0f7aa3f1e640d07d18df6c456e5d077
+EBUILD bind_exporter-0-r2.ebuild 241 BLAKE2B 3b3a129b4ea853bed61d935fe6fee2f5e4e4080124b17bf45eac2e1ceef5d9743e93f2f5cb6e18c0140b794673dc3b8b8e3cb8102939ea8d908738953220cc6c SHA512 4dfb630c67997b68cf51efd21040f2a88c745a33cf2421c95b591e72ff3313a556008ce9fd4cd6cc729a82325c43ca5e6853668863a083a364899125074e499d
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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/Manifest b/acct-user/bird/Manifest
index 4dd83af3cbd5..55eae8d659f4 100644
--- a/acct-user/bird/Manifest
+++ b/acct-user/bird/Manifest
@@ -1,2 +1,2 @@
-EBUILD bird-0.ebuild 283 BLAKE2B 6a03848a72077eec7e107fa08cae235666e301d69f73ad8844ab3b4a662904dc04f7be3747fd929c5bcc795bd671c05501ce7e13d1801a0f523447d864d3ee99 SHA512 8ac4298d849a19280a7d294460fbdb2c702566847df82668c37c7c84c76b4f22bf933d503d6e0145e7c632583715fe1eacd0588971fc0ee73bee5b0b25381cc3
+EBUILD bird-0-r1.ebuild 283 BLAKE2B 0af4f2467cf792292f423cda9b11923f78a09cc794770278a3589a0afd0e7ab2310d66e00d72a6d5816a35005e0d966e0d4ad3bbe8f5109c5d71c465e6d60be4 SHA512 a6baaba913725d87a3a25ff3e03ef9d4db4377a206214bdc21a1f9a9eedf1bfe7cb662a2bd6666a23d1ebfc713ec5c2a7347f812bdc42419981c932f9e8a7af4
MISC metadata.xml 383 BLAKE2B 080fdb7b781289c93a68e25e99430c9abe12915f7567be25c3d37a7c7d8903efa0eba320b1655e77ae8d06bb22aa86ea64cef3d85190729f21bc9018cbf3b1da SHA512 52461aeddda68ed1585802d7d831c95574cce5c9ddefd16ca28c71eb50a2ed3abb5b36e5e018392f184f07ad133aa2dd6b7054f7845b27ee1cc97b3bf80ab836
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/Manifest b/acct-user/bitcoin/Manifest
index b9ac6c92c143..f60c6d6ab02d 100644
--- a/acct-user/bitcoin/Manifest
+++ b/acct-user/bitcoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-0-r1.ebuild 246 BLAKE2B 6b573c1424e6043130cb9d8feda9f27be052de6507fa150242813d56ed535322fb1852fd7fbf9983907257d796a05b751316c7f2188388b855a6e34e81db3686 SHA512 1a38f8c22929f6d43abfbf58a855359c906c9566653f728e92425a75edb7ab021820b6f5ceb30fac565bd4188186c130360934a8a8e047e323bb27aad57eab1e
+EBUILD bitcoin-0-r2.ebuild 246 BLAKE2B a72e59e340b154f1612c6959827d6c565e4e5593ad28951438a4e052b6b84d1f1d03bc6ef1d10b0f8d4f1aa5c1381aeb14491fd6356399d3979635a28709feef SHA512 564b8ecbd26f0cb370f7955454580aaab7c5cf6710609426f4a2fe9312af4663d5217dae12749308be9505a7e17671d43d29338b1ab1973a3a0cb65c3fcc750b
MISC metadata.xml 405 BLAKE2B 3eb2845f129f9c7ece1f374a0bef8eeba29614c94e714afa75d9193c5238539d48de1c761de7568eb7a1e3497fc8afc0e876be8339292e7e020d14531b963a59 SHA512 2ef8d9eb38092901821728d198e438c169f57cb38772267e62dc352ec7e35586a578802492682705fcd1d387ef9987344ef7d501d254d2743a35c9f0692d3f75
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/Manifest b/acct-user/bitflu/Manifest
index 0e83322f1c71..51f3cbb94146 100644
--- a/acct-user/bitflu/Manifest
+++ b/acct-user/bitflu/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitflu-0.ebuild 275 BLAKE2B 45daee39f14de027bacee36ce1f5ab92616a45d650cfeab10fae52edae276759886d19dceaf8921041f330bd4da5303ba14960ae7c3352a7ef8ef06631c809b7 SHA512 23bec2ee900585a68e08b357f0aba2555fc6e9e23a21f88ece12b0741589f6e8a36e47bc5a2cc1385949aa547b663fa5870491c5d43c398524e6ad278c75622f
+EBUILD bitflu-0-r1.ebuild 275 BLAKE2B fe459f0f4b60c81cf2adf3bae2998b70907c907c6d27a5d479c8afa539196f795c8e8ae6579e4d520069b700c68dfa5392f7a83c874370f0397b0a518193a7d7 SHA512 98372ebce121fb91f5bd0957fa9677d99be013961186e457a2acaa914d927aebbdbc59325bb2a8eddd98c13c778750acc2212bdc179d74f259f30b2429c76228
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/bitlbee/Manifest
index 286116676ee7..574913834cb3 100644
--- a/acct-user/bitlbee/Manifest
+++ b/acct-user/bitlbee/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitlbee-0-r1.ebuild 224 BLAKE2B 944019bdf450429d1bf5b9dd6a59e254f2052405ca9e2edbf2c775c65c539987dfa305212c57af57c67093f9ab97199e305ffa9180bf49c43103197f68009d16 SHA512 b79c708a7f517ff96dfda5624c5059acc64fb0fe5e5e2283d451110cf16772702b77d7e39c1bfbc3ab7d5ff0aedcedda4421999943c0a3dda13cdecd6bdbfb8d
+EBUILD bitlbee-0-r2.ebuild 229 BLAKE2B 72b159be9a00e774fea8350d608710571836c4474f214cd17028a1e6c7311dcd7c7a66dfb95a51c0715a5c0abc01592eab3c67ff0b794804dd7517bef29564c7 SHA512 4165e0296eef6d2345d8bcd159a7dcaa95036d956db3564abb37f5c91d0165a717a2c2c4ed7136d27cf8f92e6d3c3dcc1c8badd5eb20bdf26717a0f4db6808fe
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
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/Manifest b/acct-user/blackbox_exporter/Manifest
index 52b8230132ce..dbd21e96747f 100644
--- a/acct-user/blackbox_exporter/Manifest
+++ b/acct-user/blackbox_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD blackbox_exporter-0.ebuild 251 BLAKE2B 29c4a423cafffd56c67d0d28bcb740380d595e4e5cf64afc1954d7c20fe70d7b59e39611e708e53eda8c43719beea54ce65524d63eae46c3a1d1d4e9e010776d SHA512 4469af136978c081e5a33bc3a7175c16291598792dd11dfe18ed44f3b9f9ab8c2b7d78ad5ce297ec99c250ea37f35cfe5822d451213bd8f0d2ece4984017e196
+EBUILD blackbox_exporter-0-r1.ebuild 251 BLAKE2B 5b515ca8425aea745e83bf20929fa5280d8f2a675d39be197b46087d78d5194a9eeef76d2b26a048efab31c0edea9155cf550a13e114a3792f042509bd071bbb SHA512 c7099232d5cfedfbdd4539d0e9b802d46c14ea7488eb8659ae748a072929d6a8d5e30255c6cca1a1d719d133892bb8b73fb826533dcb15f17dfac93738da92dc
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/boinc/Manifest
index 823490e7ef80..6b33eb34a11c 100644
--- a/acct-user/boinc/Manifest
+++ b/acct-user/boinc/Manifest
@@ -1,2 +1,2 @@
-EBUILD boinc-0.ebuild 291 BLAKE2B 982e184dd3be58e2fc5045e05e574223e23e5445a938c32d1329d38234124b098f0cbcfc6279aececf56c9fc4f65711f3535f2f212f24a48ef6e7fa6e9f9faab SHA512 cc736e27a523776653d1e3080ad500c796be422becb242fd6a66ddac494b855b0135cffe07f78310e2db5e21cf18c8181ebc2dff8df610d3ac8aef938891a305
+EBUILD boinc-0-r1.ebuild 296 BLAKE2B e9c0dcee6b89f8a607e12385d89f18316757a8c32337efad1475a2684aaf85e0511179aed57ebf9c47586dbf8fc3c1d7376886f524af3e9ed94c3b5b02dafbc3 SHA512 61d690938af6bb9081cac559b72fb2447f84d2e87dd8ffdb09a77c804ccab89358ea9a46914d2a7a25e8d948e0f2331af16a261e9697d9a8365c220db0940dad
MISC metadata.xml 510 BLAKE2B 80b772647185a13d46c2e56c90a473ce0752d55a9bd1aacb0847383ff73e4e4d56c5eb48554c86eabce217191ed36fa411c05fbe27edadee551808cc97aefe6a SHA512 d5d44bd410fe44f111a327b50b9f583589b749b7ff0a8ee66ec5fe54e70d6c18734e53803e2f3cfb761bb48a6d1082ee9c108d64d230a02fdaf5ffb737b7037e
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/Manifest b/acct-user/brltty/Manifest
index 7fa08afe953f..a15f42a43213 100644
--- a/acct-user/brltty/Manifest
+++ b/acct-user/brltty/Manifest
@@ -1,2 +1,2 @@
-EBUILD brltty-0.ebuild 307 BLAKE2B 761db8d612620961344e691b5775edd9519420da3e6c1860151fba1f2f91c6f27f4b7b1c060a9d40e1880d2e5ee6abd85c365b1e153d5c1205224bc40b946076 SHA512 ee7bda650a9162aead512b7791ab58dd43d40bf5fa54ea60b09ca6a1a90e98a0fdf6b539207549410e458ca7a2b2f8d015b2db6094af96a173ce8948ebc3f080
+EBUILD brltty-0-r1.ebuild 307 BLAKE2B 1a7b98d1e8a4cd6295ac977c7f4a06a74b0f5d05ff705b642f9818a007ed6aedc8aa38bf4945facf08de7d7d5f0fbf5624a9489b13262fddaa060f7d7f31872f SHA512 eec326ac476c0e420c9afd0b3d03e6c6df7567c89f1a0434ea119678439e03bc130c09c9260765f6e9311736511690c35dc5801876e5db057ae76a6384c441c5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/buildbot/Manifest
index 27f33762996b..6fc83d1d48fa 100644
--- a/acct-user/buildbot/Manifest
+++ b/acct-user/buildbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD buildbot-0-r1.ebuild 243 BLAKE2B af2fc2da53d9cbf85ae6c9d4decb576a98e47a909c09b318e7d8be9ea71ed6264513856a028c143a291888af8c526948ab72e1ad05e474986137a7559836564f SHA512 71255b9ca60ad95bcee4f3cb5e4ffd16ccb36b3b2cfb9b8ab70642a7fe416ba3960e50505edf7601b604db1b4b60c775a5b0e719f3b5e9e51cfa6add8694cf8c
+EBUILD buildbot-0-r2.ebuild 243 BLAKE2B d472f563118354a2dfd412730b242010691e56da5ca103ce08ea2e9a2ab377f5a0bdde7a0892cae0ab5a8b103a4b8685cb98132564e5d639601693ca506a742c SHA512 a08863d678c3eceace1bc8df737ca9eefa36d163d7d770fac7198e5571d710bc20bdeb4b24b91c19de4a65e14335cbcbcecf2b9b2c9096a762c5fe8002ced1e4
MISC metadata.xml 252 BLAKE2B a7ff81694559e4649beaf5821bf5c155420d0170fec450c215147b27928cf668494a61f850c49c5b5fc2f2185eb5c33b283766bd3824969c6e84e8327c340c94 SHA512 dc07337dc5c47477164914f740f97763d2dfbed7a82c3b69f34ca12c5e0d290d26e4e15d126ded66d525e98567e86814cf4ec7ae42a3ebbcfca0bf723a23d31a
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/Manifest b/acct-user/burp/Manifest
index 1d8d6d032f2d..6b2f129ece12 100644
--- a/acct-user/burp/Manifest
+++ b/acct-user/burp/Manifest
@@ -1,2 +1,2 @@
-EBUILD burp-0-r1.ebuild 245 BLAKE2B 4259b1106a7eacc08715bc16ec2ad9bea0ab78e4e0cad8f4bb3998aa595a35c2c3c7f8cc065412a5cfa642d636544d47e40e14510c37c196f31b254410e5cac6 SHA512 ac8c0f887ad5ca4303d3fbd89690c39c3b3f21dd0c48a325597742e69a829ed02e4b23ef938af2d15fd995d2e6677e043310c76fd6d4666f5d8ae02ef7ddb9a4
+EBUILD burp-0-r2.ebuild 245 BLAKE2B e07331e4975a684a86700dddc2997326c7e6c895c56b06340332a37ab08b191055c00647f81b431dbd056c15d5b3717941f37c1668b99fbfb8094c617cef6f4b SHA512 5e09a914d8705a3bada323b4d9b957797f419c3acec310285a2d28d6760eaa51171ff8ac1e7ab2d70d036aa32af14b908511a5221026f352b1672a82d560d02d
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/burrow_exporter/Manifest
index 612e4d91b892..ee0a648c6c05 100644
--- a/acct-user/burrow_exporter/Manifest
+++ b/acct-user/burrow_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD burrow_exporter-0-r1.ebuild 259 BLAKE2B b611011d872d850103034ce7f824c53bfa81661d42be10078b69822d08beabcc5f02ac1b677dadcf9b98e3ea644ba33553812889e19098d1fce1f273182ebf12 SHA512 7de120189ab70673f6badaee19852d9794b87d4394c6222fbf753e12ee17ea67498d3bad744461609b9de543cf436607ff24e770ccc332036ce9b68ca1b7d892
+EBUILD burrow_exporter-0-r2.ebuild 259 BLAKE2B aa7e14b0bd0ab64d8488bd52e41d804e7a3e3beea7feefbfa607fe0bb6ea15fe05eb1902ac20f5c327649e1e40da0a725c60db23a318e80c5c5b07f3fbf49bba SHA512 278fa1eb0be53f6232b61884bc0b556cef41d57f3127e9caf5b79a08ba065a8f0a4cbb5d495fed3ddcd8a1d046e65f942169aa531b37d6740623fb0547a70b96
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/cadvisor/Manifest
index 5d9d81d1b553..1839ed8464cf 100644
--- a/acct-user/cadvisor/Manifest
+++ b/acct-user/cadvisor/Manifest
@@ -1,2 +1,2 @@
-EBUILD cadvisor-0-r1.ebuild 226 BLAKE2B 0e96d76620c940ce3c1a66e5ba75301118d050e6ecf4817cfc3e29925efccf4965d764dd47ef307322a92f4277605ca38cb1e528d5a3608207ae282735b0b4f9 SHA512 1a7ce77d73ffba22c8321989a83993dac30335e617c08047178c8ee56de00750e5c7e9392b19d5a230b9181183cfc3bc8debad703958554826b95ec8f5d03e25
+EBUILD cadvisor-0-r2.ebuild 231 BLAKE2B 909213ea3500ec2adeec3bccaec0de0f358bef7af5c4f15fb2fec187c78404ed29f63aa4bdefc005e49b487f0e72704b50a269a1e79d8f9465daaf8951de7ebf SHA512 a4962b54fb574b05f446fea733e525947dbb474f8cfe4f55d73db9ef0381d76be7597ec2fe0d94c32a63e3cfe50158e9883dd88108e90ac214ee95cb8c1069e8
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/cancd/Manifest
index dde7ad189c52..b0d212d33413 100644
--- a/acct-user/cancd/Manifest
+++ b/acct-user/cancd/Manifest
@@ -1,2 +1,2 @@
-EBUILD cancd-0-r1.ebuild 251 BLAKE2B 22761b4b976f15b32a2ee10a7ae4d62c0a9c16878094a5d9ee634c50a5e481eba3880b4a9ea54018510d79027a53cea8681db4b09d0503df9609f7ffb58c5995 SHA512 653a83a106ee76b6c2ca5c711978d5c3694569497e35327af0872942a6c8063880b5ba100efe31395dec55c04cba2c18185e861754c021df0b65d10b2ad0d05d
+EBUILD cancd-0-r2.ebuild 251 BLAKE2B e103122428a0aabb79292bf54604319adc59921e084c4ea53ed051e9ae9e2479e71841e7ba0419b294d0674648fa56134f74309dba3b451bc01ae136f6e5330e SHA512 988778d5b60a607b878aac3452fea2321e63a15df853f3c6beba9e2b825b1f6a46f359fe5015c3e0bd74946a4ab652cd3275f116f205538fe786c53d2962b4e6
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-user/carbon/Manifest
index b02d6fcf47dd..29e1bf6bcbe5 100644
--- a/acct-user/carbon/Manifest
+++ b/acct-user/carbon/Manifest
@@ -1,2 +1,2 @@
-EBUILD carbon-0-r1.ebuild 237 BLAKE2B 9ebde2ea0048a790036acd2ad536b841853fcbd6f30f22079d235ced492519e705aa9da5377377058ef3387f21c5ad200b71f3107c37f91cf0130dc943555eb7 SHA512 b3808040be051dbec0e37d4a23f78f0938fc5bebb5b43206ca29fec120db454a579011545dde888e5275e51ee962b0de463a713236cc10d5b0bc79829afbdb65
+EBUILD carbon-0-r2.ebuild 242 BLAKE2B 06d9d88bc1c90a67c53119d317f94d94225322865358e482cc24609a98116b6f641412438db874ffa412536d5b2032bb15808a6a330f2d1847d7e0e19cf72645 SHA512 687d5ed988728e662f8a78fa1651412a2ec91f552c9ceea3f72644a0dc86bda1f8ebaaf81449bb639a712157619157bbb95372a71047cc2f85c7c5bf4d635169
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
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/Manifest b/acct-user/ceph/Manifest
index 71cb5768a685..567638d14874 100644
--- a/acct-user/ceph/Manifest
+++ b/acct-user/ceph/Manifest
@@ -1,2 +1,2 @@
-EBUILD ceph-0-r1.ebuild 253 BLAKE2B ff583dc61d2da7c33b829ea708680f88c867f216af7e5ad243538a6a2dde8cbd78c7f5dbe895cb2f5eab5f41b4e22e0e52d0f91c766820ddc046e7d7620647f6 SHA512 e54c83fe130736888c4a24ab3b31045ffe2c5c5e7fd04f3d9df359e9c04cfc0b936c1b3330ded3949e60c21b974e030a0b58bde9603a31613e0b92441ec87e73
+EBUILD ceph-0-r2.ebuild 253 BLAKE2B ff583dc61d2da7c33b829ea708680f88c867f216af7e5ad243538a6a2dde8cbd78c7f5dbe895cb2f5eab5f41b4e22e0e52d0f91c766820ddc046e7d7620647f6 SHA512 e54c83fe130736888c4a24ab3b31045ffe2c5c5e7fd04f3d9df359e9c04cfc0b936c1b3330ded3949e60c21b974e030a0b58bde9603a31613e0b92441ec87e73
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/ceph/ceph-0-r1.ebuild b/acct-user/ceph/ceph-0-r2.ebuild
index 56098366e894..56098366e894 100644
--- a/acct-user/ceph/ceph-0-r1.ebuild
+++ b/acct-user/ceph/ceph-0-r2.ebuild
diff --git a/acct-user/cgit/Manifest b/acct-user/cgit/Manifest
index edac28d85ca0..e9e57b6fd462 100644
--- a/acct-user/cgit/Manifest
+++ b/acct-user/cgit/Manifest
@@ -1,2 +1,2 @@
-EBUILD cgit-0.ebuild 247 BLAKE2B e18c6bec79054cd8a436a14a5b0fbdf83547a493e6beb26de8c730288aeb7d8c038b727bd947506fbc7ce66a835379a767bcaea64767d7d26a338080cc0894b0 SHA512 b2178e09ff70af379ef4cf4ec02f4e26e823630e35d81875506df3a408234217a4c4bae309fb61da0e3c71214d1175fa38b0e331b8b85cb81bc9bbdcd9c522c2
+EBUILD cgit-0-r1.ebuild 252 BLAKE2B 063656fc6110180fb3f1c7cf3b734c5c16859cf2b6aa3f760a5f48553e8d01d9080056991817f95d44e40dd966edcb370eceb92a2b21f988ad951249d1b63899 SHA512 43449043a699d441e4ef448e3888242c02f2cae7e411e784c06764ff158bbf4077d3cd9db01cb3a914685b9cf463d4842cf84bd076a31afc5c16582afb14b96e
MISC metadata.xml 251 BLAKE2B f41d5969712506f1083eeb23748860a267a5cb5a66dd8b6e765f057c4ef6549bd8e314aad6f6081eacd3f11274963a46093d37a4beb95ae442fba32fe6fe5b2d SHA512 3d0c951bc2e14c38f4b3e8cf2da3fcc69e7077d4bcca59a3a48e9c69b2de759a7aca10ab736ed3d2fa96fe8254a6519f62f3f584418f0b8073281f4bdf874e3d
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/Manifest b/acct-user/chronograf/Manifest
index 95a73169f035..00a56e4b1876 100644
--- a/acct-user/chronograf/Manifest
+++ b/acct-user/chronograf/Manifest
@@ -1,2 +1,2 @@
-EBUILD chronograf-0-r1.ebuild 265 BLAKE2B ba6f2da9041990f248a609e86cb6dc34ee914ae07b2d959e8320614ed6b7ebd62a68abcc794b8f17491a936a006d771d22acced7c8c73cd99831d8e30ef0fa06 SHA512 7f8ab5e95c06ff24a53d7e684696f33dfd21a57489e81ebd845cb14caa3000b53b2f9f69e84b14f86be4adb4830d5e8fb2bb5af6b3c97393f630a8a50cad82f1
+EBUILD chronograf-0-r2.ebuild 270 BLAKE2B 5ac9d2bc3a77534bfa271b9171a2d7e2c2c571c40ff129cad3d86394cc6c33c3d2259f841ba51cfb630a251afceec9e47d0c288f9443a04f66a771654d72a61d SHA512 3a6617833da974722167872627436a6a076ea50b369f2aecc254b05ec88af43a3e5d24d1603d07c56dd8a82550002a43e3d7f8e1597302e17e0f6b34f4b30528
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/cinder/Manifest
index 4d86712810e8..a38d873b083a 100644
--- a/acct-user/cinder/Manifest
+++ b/acct-user/cinder/Manifest
@@ -1,2 +1,2 @@
-EBUILD cinder-0-r1.ebuild 301 BLAKE2B cfd982181a84fc3e453a269a0551b7a5f0406c1547fa2b8b5339ecd409cd0087d9721e18b8c9a35bafe22caa3f4e6d37bfc5bba20f0e45103b435a1c76896cdf SHA512 1875c4a0f26a0d820ac802da3741e64984e8e31d9542b93252d41d7aba510cdc515f7b7742081aca03a2ba41f646fe2dff0442490aac0253d2bab02ab5f425f7
+EBUILD cinder-0-r2.ebuild 306 BLAKE2B 80c8a17d3a3eab209a6595bfbdd8762ead2ace66fb13a33a278900e17622c250ec2df3aa8c0d4b3c0868ba62764d9ecc629f257558eff33a2a6ea26877bb566c SHA512 7ea1ffce1b3d6d46474d63ffb53eb03c636627d740979cbc17828885b7c6c40044369b25ef95bc219f03942ca64607479acdcbc79dc5c100d9a61d565268e10a
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/clair/Manifest
index 6a678771d0aa..605b5209cc51 100644
--- a/acct-user/clair/Manifest
+++ b/acct-user/clair/Manifest
@@ -1,2 +1,2 @@
-EBUILD clair-0-r1.ebuild 220 BLAKE2B 782100f976c7d33fa44dfd4dcacdfcb46eb635d445a815cfb6733f196f2c2dd3a2613cdb02f9e42d473c193af3095c6d6acd318e59dad55e09d0bbba10d04a3a SHA512 63b2b39259a1eaee7899f778707bf6ac98ad96003335734bd1cbe08218ee8fc3687ab162159009b5297cd3385781aa480d5583161d1f0e86a42b806b5b0b0513
+EBUILD clair-0-r2.ebuild 225 BLAKE2B b56a855acfaae1e1f08d0ff9b55aa9676c0dfd7d47dc32d2cfad356fd8fe9e083d30c1e840a3314e84a7d57d993b94e9ea37323123584bc96c636ba1f106c095 SHA512 744a29d5b10adf2fb18d3eff5a7133c8636515dd74b53e42971087bd930c04f76e0f902e10eecc67c1091d219ce360b30cffd4663d3e47b1e845441cc19bb68a
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/clamav/Manifest
index 42ad75cd32f1..22b32ea9da61 100644
--- a/acct-user/clamav/Manifest
+++ b/acct-user/clamav/Manifest
@@ -1,2 +1,2 @@
-EBUILD clamav-0-r1.ebuild 198 BLAKE2B 33ff963e08ea8eaaf8dc8c77a41ab5e65dfb82f1057125ffbda51c524b26cf50d66f3f88b6a0ff2829cd27ddd24b7fae51ae22c7aba6b2c072f04f5c9dfce5db SHA512 e5046e36a74e609b22c29a9a366185f7bf8cb4714ff064e8abcc70153840f438a86ab01f4e20185cfabe376863689e55be70b3c34c38f4dfca7774a32385b04b
+EBUILD clamav-0-r2.ebuild 198 BLAKE2B f81b80438f73f4fc07338b83a7aae9d14af8406c971de57fa782a2f0097cbb6fa12abd01e55585df54ed2bc86596bf76036419089f884ee403b1fc8ca0e81139 SHA512 a887c59940534dffa3101adf5d792a721888ae7ae85269fbff305b97e3d7bebeec50a124e27e77c2fdcf373d074c04929aeda400b5bc68a7948a7af3bd105c7f
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/cntlm/Manifest
index e72053c7caa6..35d7d0fd0353 100644
--- a/acct-user/cntlm/Manifest
+++ b/acct-user/cntlm/Manifest
@@ -1,2 +1,2 @@
-EBUILD cntlm-0.ebuild 240 BLAKE2B 86501257402b0beb79b26233c1515541c33b9e1a8c331b0df659491d9643eebb299254ded545e491b27f0a3ea8a304344e7ea3a908408fa62e75565437451fa5 SHA512 e9b1e7021186dcdcba4e31f2f9ee2f11dfa9c152051aa7680333ac2a84646b7870cbcaccedeec9a42c139549f119c2a1ff561a78decd67d1ecba3e59b71a37ff
+EBUILD cntlm-0-r1.ebuild 240 BLAKE2B 28185570eb694987477cf4de3368b8da00b5f7e4d53275bbd80063f1d237cacffab69d3fab76be30b3a498df0796f836ebff8489576aba16911dfcdc7cdec74f SHA512 c1f2a7a57b5edcf8d4759d4d7b7a56943164cff0b71fa438d56926a7c3370200f61908a2bded868c296520c656cef50520cf65c41a466a973081a804727d51ce
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/cockroach/Manifest
index d9591e72e827..b63ce4f5823e 100644
--- a/acct-user/cockroach/Manifest
+++ b/acct-user/cockroach/Manifest
@@ -1,2 +1,2 @@
-EBUILD cockroach-0.ebuild 301 BLAKE2B 00ab9807fb374aaf6399a6c4fa5a6ec676e1d92377be5ab10801fe80043ad37db8f9e61a1ff78f67811bf67392b09a60513c575d7a05de3bdde39fd0d8293b8d SHA512 db25c3844dfc33549c411da2cb1c5a222e51a9eb613d6e96ad3ee9d3fb66c93498fef01f96301b72fe6a2c52892208d5e002be84f78424c8942cda926da3e351
+EBUILD cockroach-0-r1.ebuild 301 BLAKE2B 2a6e272be31089d0c33792b94181f77e27b0cefd840d938ca95f9add840e0cd8c6c30ef6c94b8852402baa2f0faf1627a18a223347f555e694b6e9b95dbe68ea SHA512 318c09aafba47ec575426ef1808b87dad29b27a866b0d2527a9f35424ade18db4c89bc7f9d46f53973f765f0fac83c30673cf479dc1151f47ae8c3cc8c4835e1
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/collectd/Manifest
index 9c16c3afc6a1..f6b84e7ec747 100644
--- a/acct-user/collectd/Manifest
+++ b/acct-user/collectd/Manifest
@@ -1,2 +1,2 @@
-EBUILD collectd-0.ebuild 260 BLAKE2B 84d607a18913303061ddaf9e52170d5c2d1e135c08074309a5491a4a0447e320362889b9a1f8bdd59f12b60ba5917655bbd88517e6533062e0ea569917026fd6 SHA512 382350949b6e3cf36c1d1f278b39238391fb2d13afdc940fbd277007e433f17d0ab41c0b759c4b8c134533534347c20ce530deefc62002935f415f9b97ee7ea1
+EBUILD collectd-0-r1.ebuild 265 BLAKE2B 6de2810a3158297b89751f773c55217ec1b1b22209b2c19b53e4cca1f03933b21c71d0a113e525ac4652a7a05405e4f6b55cfc0e46da4c7d5b83967650650351 SHA512 86d7d8bfa73326987766b3382bced8888da8ae9941dbce5488e178eddcc8d6b907be02b67da26dc6a1188b93ed58cfe559493c25654f441f866a3361018965fe
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/colord/Manifest
index 166f94677d6c..8a2695a15028 100644
--- a/acct-user/colord/Manifest
+++ b/acct-user/colord/Manifest
@@ -1,2 +1,2 @@
-EBUILD colord-0.ebuild 278 BLAKE2B 88b28dabb9fc7cfe116154e3a44ab4a19dcb59f1ff7b7d483dc2e30d27773ee10c3a82053dc7ade2b9bcf5d59f6fce418696541974e6fbaa7de3c0cab8c16348 SHA512 17ab09869356fa1aae526e25e7eb7524ee4fda867ea61d349ebea6f8f70b99abd56fa2b8bcc9bd2016b5269c6eae056043a71035c5f78e51c5585f4a72d0a981
+EBUILD colord-0-r1.ebuild 278 BLAKE2B 4c9b8f90585e05b72f3fa08c382fb37ef9817ce8cb999719a7fb2c512a07d6af83944d6d996b4743b6b9959ab504e61e34408d331addc82492624476c6748e17 SHA512 0db9fabb714a91ab60cc0c54e36aef9836e28f347f53f35e35992dee5d9c30279e68dd2612a79d74282673ea4b77fbd4fc817b489b551152379079bf9a9a0d29
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-user/consul-template/Manifest
index 93794927a456..13f5cdbe3191 100644
--- a/acct-user/consul-template/Manifest
+++ b/acct-user/consul-template/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-template-0-r1.ebuild 240 BLAKE2B a39b614efde513f1aedcc62038c03275c18650760f85403517717eb57e315860c2431cbf7886fd3befb1a62263a451ab0b3387e05bfd11cf1e2edfe415ad9321 SHA512 d5ab081a6db79c27f81022502450098aa4a41d82362d6f0bb65ba09fbac07f8986fcdf8ec5d7ad2eb65a499ebff296412cee0fbe5809645779881806f9f79dec
+EBUILD consul-template-0-r2.ebuild 245 BLAKE2B adb54afa76d7c4e2313579b3ee3049fd3bbbfe7c4b0c541ed3b59b7f5512cb74178c99f07dcf4f2fec62f28e2c1e2a3d4481147c788e611d421ba2ba2a1a0efe SHA512 ba681d663dfc207ffde2a1080ac9f997aef42470a6104e0ddc414f8b71311bb23c237525b04e60e40d179141edb966e4a24260ebfcb89b14f68836f6efe53f4f
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-user/consul/Manifest
index 1f16aa715a54..1e4ac3f55b35 100644
--- a/acct-user/consul/Manifest
+++ b/acct-user/consul/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul-0-r1.ebuild 253 BLAKE2B b4cc7bd07ff34e1ceb7a1b48c57b2cb23b042d84fb30049e3c501412a3cd946e80b4596cfb8d5dc208edd56e0e47d02ba39e4cad024a7c0e5ae2631e28e58b57 SHA512 a3a3be5138c0baf1aa87e216ec458fa8ca9f05cd1f1a3e1ce366e56a3ca33e4c637d762348a4a9a6fbaf8e52dfe745ef8addbad49c990a0b663c1221cf25b701
+EBUILD consul-0-r2.ebuild 258 BLAKE2B 2ad6b4c7ba6d192593276f22c74367fbd5eda43c1e30fd8446fd42702e9c9c5ed9ff6611d44285360bad916c4864144b90716c7ec8f1d335d608add2fce5f123 SHA512 c3b6d910f25ae255cb926e818dca3bc4c9122eda2a047fe28fd8afbf4b19684cf0e945e711b677cb58be6aa8164ff59b5558cc8b08800ca67153c3b6e1bd1312
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-user/consul_exporter/Manifest
index 2892a505156d..4e51a05bbd38 100644
--- a/acct-user/consul_exporter/Manifest
+++ b/acct-user/consul_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD consul_exporter-0.ebuild 240 BLAKE2B a965f0595740eea6b35a93f9b43c5a526000a1c7fcbbc0e096847353ff537918a089c55ec1b23efd62939c497f39f6a1da75c2f54c9e87a9f41e23ca6c451eb2 SHA512 8999088068e7bf014b7fe9bd5a9d699b71f9ee79ead1bf35318a345a803ec0e7facd032aad43f99c79fc4305f6823a7b26a64477ea5285bbe2d0ebdb9ddafae4
+EBUILD consul_exporter-0-r1.ebuild 245 BLAKE2B e68e0fab260c0692211afc1f57db7b110d6781f5a9cf8f9c740dcf81b1688eb5adc236b29bfd6ce5f1e38c959357829047c36148da924555b61d19f788ff6baf SHA512 3a93c94c5361714507a41e51a75b38dcfe4bb7bd57b563807b646f0f91c1167abead1815ed79d7d9141d7edb33f1fc85486a5183ef194dbe3e0d37c942b9a741
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/coredns/Manifest
index 2167518752a6..0d4020f68c94 100644
--- a/acct-user/coredns/Manifest
+++ b/acct-user/coredns/Manifest
@@ -1,2 +1,2 @@
-EBUILD coredns-0.ebuild 271 BLAKE2B f8d2fc76c8b70e965fa23e9b29cd7c619313f1af38cf413e18ca7f22481e2fcbbc47fd80ce552c592179ec4def5f592690b9750ca27233c0a0fcb60fbe01d19c SHA512 85b1d22c426bc448d9330c8bedb26d50c03d90411e64fcf848180c0a7d1d39c507644bead17d4b8136f2e8b875a06d4062efc4ff09251e86093dfb8cd2b13011
+EBUILD coredns-0-r1.ebuild 276 BLAKE2B 48f3c5e4145e34ea0b01585375d87a5802202bc306dcbafd8e662d0a85c486347182f985661094ccca9e8e71024b16df222ab0b1f0004728c858adf7923f4ab0 SHA512 7168782643aa9f427bb5f27fdd37843159fbd672759a65135641cc5aa0790010bd54d45c4714fae9d776b82d99fa598187b3faabdb9f2f9feb52e1b8f48dd24c
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-user/croc/Manifest
index 94d92ce161e3..5fa1edf95341 100644
--- a/acct-user/croc/Manifest
+++ b/acct-user/croc/Manifest
@@ -1,2 +1,2 @@
-EBUILD croc-0.ebuild 233 BLAKE2B ce05cca9ab4804b667229e5b244fe33737a4a3225bf90d50cb42a7178e12d4c8bc20679e8b2fe8a6b23fde063234f52ac949522152dab7471d631ae27fe5812b SHA512 a7b939944d26c64cd04121602504a11d04787d9ad1cfe0830f2747fa923ea91141277bdc59ee5bd88eda2de8cee7e1fdc747a25780020e8d0816a079f90816ae
+EBUILD croc-0-r1.ebuild 233 BLAKE2B 19f8700f38cca4206630aa269a93c638571e6215aa864c2057e7b5e73366d1927f4d7944bae72408b2ccff19533dc3a243b81ddf810064cf1eba025396e97ddf SHA512 f5016f1a1c4b2b56048bde40062ebab3a5167614d5f8c973647da810b0d39806acd698cb23114af3c09f6a00197c8537503909b9966be3e507934b4eab9e6283
MISC metadata.xml 250 BLAKE2B e1b3331ad38b6a21cc4a5b15c11669fab651b37d69c6259fda26509a6c52422d87965ef5e60207db0f42b6e2b52e2f98e87c289f57f758eb886faa271606b67f SHA512 d7cd0a9d76d9b5d2f3c9a73da396e760fffea65055ae5b083b8f4616cb6f0620443f387a2f726c841f2d7982516dc2d87c60bd1e5cfa9625800015ad85b97c26
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/Manifest b/acct-user/cron/Manifest
index 17c28d6c7683..18c9d49ad39e 100644
--- a/acct-user/cron/Manifest
+++ b/acct-user/cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD cron-0.ebuild 278 BLAKE2B bd0a67bf0888b6496cf504d77631bd326da673cbc42ddd1f317e32f873682bb95a5eb49eaf4becbfd23208ef4a7a3db01b929bff42dbb0d3043c9c881d666f71 SHA512 d34b4c070a53484b36f1fe73060a1779c1ab981c54b223de75d5226abba14ae1ad608a077c7457f1d1e3dbd22cb54b4cd461a5db82182d7bb3d6c2f078937edb
+EBUILD cron-0-r1.ebuild 278 BLAKE2B feaee0177cea9f5f71cca9248629c90842961408a46d7f7e8728b39e2981793ff208e94b9a0b0a917215a8febac25c872eaeddfa7f3c5817d3f94e1f52041aee SHA512 d63cffc6a3ff5efcbca3ce5ae547460beafc8eb38f6fb33b3faaffee529c67fb1ee7eb1118acdea68e7915005974f79b17eec0d8449f0371cb00170a64371b86
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/cvmfs/Manifest
index 7457e64909ce..632f71dcb8e6 100644
--- a/acct-user/cvmfs/Manifest
+++ b/acct-user/cvmfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD cvmfs-0-r1.ebuild 250 BLAKE2B ba841c70e8dd9122f1fdab67947ce63bf57d88664ea651bf129e0cec10e76e388a858cde426f53bed31a9bff1c42db7834a61e32eab82878d1751c2c15ffe9aa SHA512 e0f74313654fc958ecac2da409e39cc098d4caa863a043d169fe7749143ab1f041a55f4a8448770b96b5ad767f84957c24a072b4be99ecc127c51f00613ff0f8
+EBUILD cvmfs-0-r2.ebuild 255 BLAKE2B 2c8ddab9cbe3cd353031e1fa2c61831aee2646d2ded1e4a913c0b3ac075cea1b5a46a73d65f6316670acd18048849b1d5ac8cb5b44062530a3fd2dd7ffcb91a1 SHA512 48f7d5a14f57ec02cc3fae749869193d41dd33f75dba0bfbbf9bd7348e98f7409141693b8c8dc7744bfb261f1c1ffeb89ac44478efbecad532fbb4ed52dd3049
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
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/Manifest b/acct-user/cyrus/Manifest
index e6df9e25a0f0..e4093ce7a9a8 100644
--- a/acct-user/cyrus/Manifest
+++ b/acct-user/cyrus/Manifest
@@ -1,2 +1,2 @@
-EBUILD cyrus-0-r2.ebuild 232 BLAKE2B eb3653f5f4c0c8151808e73e91b2fc417e4bce8cf81e75602f141b68c686bf9f9207653eaa26a5e8b47f9faf13c76c51a9abaf973e29bf32d0111e7262f7eebb SHA512 453e047266d27abe0fea196aa789799008b97a72b7bb41ecbd33e06bb927c7bd3b610fb478c84913ba6c8b9d7734b4d8f0b29ebdee3db2bc86b4e325f56c6e56
+EBUILD cyrus-0-r3.ebuild 237 BLAKE2B 3f24837dea38630c8053872e0f7a597133ee6ec3d101efe6e52d1164e5ed305d9ac22d01ce841a1f17a7e4d03b78fa5a20ad338cf30b98931da84b8c0d27b87e SHA512 5866d8110598ceac43df3fa902c2c31d1f769433c774eb0946830ebd5e0d413f99423695a13c8c083ad212dfc3ac4bcc8b45977d575974d0002a725ad6bc47d6
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/darkstat/Manifest
index 8923f5c7babb..fab949f40c5c 100644
--- a/acct-user/darkstat/Manifest
+++ b/acct-user/darkstat/Manifest
@@ -1,2 +1,2 @@
-EBUILD darkstat-0.ebuild 237 BLAKE2B 98d07d85a4477c72c1d279136e8e620ec6bec74bc296e66e3811d64bee36c24e9b8a9b058eec8e214fa1372b904e44e9bccd85a330d2cf469115708be35410d3 SHA512 a247a5565630fa3d0f27a708075fa0d5cc63489b77d8f85948e3ca0bbd0597f62d9a6bb686981e9b4815b0ed39b118c6f62ea4868e9060b6326acd5d0c87e5de
+EBUILD darkstat-0-r1.ebuild 242 BLAKE2B cd2686931e8f09808de74f5ac1fc54426c2eea254d112c3d84c621a3450365ce5ca8a045b91f5d36e3b14461a9bb88b5cdfa8b097da880121dde32150c0c0103 SHA512 fa447a2da3dc866783dcc51ed37c6ea36558db8beccc9e17624c30db6518734f0c825d5e73443d7f67425870638dd68b286fcc7160e8d4cbfb879b7f526984ba
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/davfs2/Manifest
index f4a8f1b385ad..4459f232aa73 100644
--- a/acct-user/davfs2/Manifest
+++ b/acct-user/davfs2/Manifest
@@ -1,2 +1,2 @@
-EBUILD davfs2-0-r1.ebuild 192 BLAKE2B f54e375a7105b91849c52ce2299ed50da407c268a5068c5ebed567b0d25cfbef1af5e5d6d0ff5c6569c69a88fd6c6ce34378253ab3c5e29ca1b63e4bcc98cbbc SHA512 341f730e6e1b685cf37e47725063af79577beb64aaa09b3132bcf44d7621f1888928d76c5facdc347ccfc6aac998c4eb2d37b991ccfcdace675ca82391792960
+EBUILD davfs2-0-r2.ebuild 197 BLAKE2B 2ba3774305c3c36b5d801a0f84250df45e089000480d3ca3baa5b099764af4fec74a3e2f2f974a63305fa93b9ea3cf456bc8ab193b551b609574720a5718f78c SHA512 a4a778cc12a06539a1927cc242b04cd7b81739ff37a52c25b87605f636a98eddb80da687effcf90f7112afe9dee8176ddc734b38bc0695a93fc3f6bce45812b5
MISC metadata.xml 219 BLAKE2B c0192fc2c685f564929ff304a18b20facdcc8638726bfb8711803a633a109780747e98c42b14cd3e8dd674a92a7ed783a40d56e617e414b6cbc3d4fb18a63caa SHA512 f702a981fd2afe5f23c2814fdf91a540e6335e50e3cd85003e28ec2130739001ecfcfd824cfa91780c6b1d5999cdcfbb06857dada1c53b4f9580675a5491eb46
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/Manifest b/acct-user/dbmail/Manifest
index 005afc6c29c6..efd254b77ab8 100644
--- a/acct-user/dbmail/Manifest
+++ b/acct-user/dbmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbmail-0.ebuild 198 BLAKE2B cf2aae761a05449758e9bf1ed85adbbdd1892c780851f018a28713a92c0459b23e2d2a37cf75ed3fb7ca0baa3b00dafecda47672633a46ee1ad70578ca2ae71a SHA512 fce38395283685c0430ea83ad8f83991eed1ed116d77d44476f79dc211e0b2b1976d09cc7f510dbbef6e109ba3ec616969dadd00e68bc42342347c3400542f50
+EBUILD dbmail-0-r1.ebuild 198 BLAKE2B 83be3994f39a547cbc397750ccce419062207568a587ce47f759f8ae4f4c1a2ea8a41f00e163fdb023fed441a93a888fce777c4fe9b2aefbbd857c60f84f368f SHA512 dc868064e20a1701094379b82b24534cc554a42fff4dcec20b455507ea05821784c183c0a9bc5b8a11bcc04b43103fa03f45497adc22262871dac2a76b8cb28b
MISC metadata.xml 259 BLAKE2B 3d6e2c71a67eb6eec74e229e746e4ca8c32878d251276044aeacfc21afb48be29752d2257e41ab4ffefbd061fb05929b17237905dd4fd01c65c24e61e464a681 SHA512 ceb54d3784d2abce86137f25059dba4f90ebba03e31dae56d2b8acbc515d9c0d7ed909f46c569a73e929cbe9dac2caef440e9c52b0518d37c081e03be471fa4c
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/Manifest b/acct-user/dbskkd/Manifest
index 2632f583b852..e1fcadb3196b 100644
--- a/acct-user/dbskkd/Manifest
+++ b/acct-user/dbskkd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dbskkd-0.ebuild 247 BLAKE2B 380cb585f14520f3c37a00c85010e0f67ff6f0d7f02e0ebcb6f09f1ad4e2f3f35c9d8860a48516d364f1fd936c8d62701d9325c2d24766c9d2e9423ce570d65f SHA512 25899e2b8fdba85b33e7584e41d16605df724f6e8756ea1b4256e87920a2a6392fc02723f00bf62b66a5fdb2b720091d2b649080a99046e0ee41d71fa11202dd
+EBUILD dbskkd-0-r1.ebuild 247 BLAKE2B 148bcccd5b04f7388556db0cfe51e81d217773583913665ee0046cb53d22d7a2bbdccec3b9491a28673507b8446895c3ce365fbfcb87595e844f01dcccd75449 SHA512 480fac7b4ca01d36170e8fd9482139068d5850463f8cc5f889266de3e5874dac559c4f5870fbc9434f70e3c63eb3009c4330d0beb25dce16952e656c3a2729fe
MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
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/Manifest b/acct-user/ddclient/Manifest
index adeb86deea3d..54d2b514b36c 100644
--- a/acct-user/ddclient/Manifest
+++ b/acct-user/ddclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD ddclient-0-r1.ebuild 252 BLAKE2B 7cddab7b167c015be70b3dd2edc77a08e5ec5909995e3bf3c46459fabbd7b9666eebac7a398b750073de364fbcaa93aed4390b42b3f46d2d7a6890de8691a6c5 SHA512 1faee7f73e7c5fa4c5e7ece2b1586b03641ac49790aadc4184dc79e16ccde11137ff986710c1630c0e5ec5c5214e449b2724b7ea5bf8d0e8e7f89770421b72c9
+EBUILD ddclient-0-r2.ebuild 252 BLAKE2B f70b65d99fdc90f10cd1addeec14171c924e1dd3b4500e3196da5f62d3e89334c8d9ea664624c9b34693e0a4ecd03e1b806da737f05e14e7ead9e06572a031e8 SHA512 90d25a804be2173144e74f09c641ce2a075b263af1c99b3334658067926973fb3f1004363670715d1136814b8548ff0669c4f16d5a99bd030dfeadf87a6a7ea5
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/defang/Manifest
index 2efcbdfba098..35d46e526790 100644
--- a/acct-user/defang/Manifest
+++ b/acct-user/defang/Manifest
@@ -1,2 +1,2 @@
-EBUILD defang-0.ebuild 250 BLAKE2B d4545ba16e44f706bd9311122e26939c97639b5b216d41dd7d58641b3f269ce3edd4acdcf25044de3f47539081ff9fcdb79657058dd44bcf424f66fdd79500ca SHA512 e8a3519612417a30461bc399b73273e0503973dbb61b653aec192ad56a2074915dffa4e9d9b238c4113180bdf949962be92fd38157832cb0279a5d47396f2c66
+EBUILD defang-0-r1.ebuild 250 BLAKE2B ec111240eb6f5837eca4b2b7557a51a4d9ece7d5526db7fda8c82ebacd5101af9807638d7cdd5bc7d86360135af6df00ddac2ee57671edf68ae313e18310bfd8 SHA512 b762e43b12ce112b807fb8fefdad6cc64347e95189c704f99e8d8b26e9efc8b52b7f40ba7852e27a4385231567eb4b54ca848d671e274ba28175b99563bf6fb2
MISC metadata.xml 397 BLAKE2B ea8573a9aa18ceef29be88a477c5fdec0a5ce15904a80395a73eb9947df371f257b285249576d1ac69158c1d6bced11f16b742c52e63715ed275d43cf960b5b9 SHA512 0af40b5fc5e6d00c9be7afdb6d2d124aa13de899b035c7f61e98c82c37e74377b10ce09f909d5f52bba93cfae069cd17bb8cf8e705155a2d221ccda184ffd343
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/Manifest b/acct-user/dehydrated/Manifest
index 9d718f89573f..8bbe8e94d71d 100644
--- a/acct-user/dehydrated/Manifest
+++ b/acct-user/dehydrated/Manifest
@@ -1,2 +1,2 @@
-EBUILD dehydrated-0.ebuild 260 BLAKE2B c53c4c0dbe46d2b5f8770f8bf7bf09f58899c0e46dcca83e4ecdcca8bb7b55b8e346081262d7f4178880ccd36464d08d67f17c437767c73e10b4688d29ceff75 SHA512 30938b6c4957fb99e82727331755f8c3edbd05502e4eaf4f24359d26d589dce0bbcbe7e6f12761fb5ee3505d5c4365b4ff8acc62235136cb0e15a27ddc0d52cc
+EBUILD dehydrated-0-r1.ebuild 265 BLAKE2B 905819585e2b1139109d519387ba573ba701cedb1218b091d8b61d95d9dec532d1bba888cde3241c93181183484a3705d26089aab556ad0789960a431bdb66c8 SHA512 b21ea04d0b37faf4920e027d4557fa2bf6a3a99dd84abf7ff79e574f3efcb9eae2b81c7816c6f6cb0cc5fea725e7aa182a5160e673a5f44668c18870cde312a7
MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
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/Manifest b/acct-user/deluge/Manifest
index 8a284138f938..082b85a9e7bd 100644
--- a/acct-user/deluge/Manifest
+++ b/acct-user/deluge/Manifest
@@ -1,2 +1,2 @@
-EBUILD deluge-0-r1.ebuild 258 BLAKE2B 7822697aab1c4daad787e7c42d41263e5811668a5bad80a175bf0dd38d90a033fa4ef72dde639d70cd0199c4d816ca103d7508c4b9ca6154203f2ce0e34e2822 SHA512 a8e6f801efc0bc60180b5fc260f6b1ca1618ee37148cc47e424c51ca7870429aecd4576c15d081073fb35edd323da07bcea9119297bee529eca8d62931f54630
+EBUILD deluge-0-r2.ebuild 258 BLAKE2B 7822697aab1c4daad787e7c42d41263e5811668a5bad80a175bf0dd38d90a033fa4ef72dde639d70cd0199c4d816ca103d7508c4b9ca6154203f2ce0e34e2822 SHA512 a8e6f801efc0bc60180b5fc260f6b1ca1618ee37148cc47e424c51ca7870429aecd4576c15d081073fb35edd323da07bcea9119297bee529eca8d62931f54630
MISC metadata.xml 521 BLAKE2B e4adb92b824153ea2e9d79164c2111a1e49049286cbe9e1662ff0ee8300031092d65b3ca97c3cf449ca7a57bcdb78f86c9988154244686879194686f0bf3048c SHA512 d37d8f08b7b7d5a5a00d1c0ecbcf27d42610df9c4a1e68dbb2f17272cbc73fe000bba406f0f9ca40aba22f081ef2de097029886af6938d1b64e63a6d25fc8bba
diff --git a/acct-user/deluge/deluge-0-r1.ebuild b/acct-user/deluge/deluge-0-r2.ebuild
index 328da7731618..328da7731618 100644
--- a/acct-user/deluge/deluge-0-r1.ebuild
+++ b/acct-user/deluge/deluge-0-r2.ebuild
diff --git a/acct-user/dhcp/Manifest b/acct-user/dhcp/Manifest
index 508c38b8a7ff..e07b232be041 100644
--- a/acct-user/dhcp/Manifest
+++ b/acct-user/dhcp/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcp-0-r1.ebuild 230 BLAKE2B 1f192d8a05b241666e93bb6b9d0f0ea5e9ff2994f23e2930a89b818da122b2e75bd6a459e2a1be2f30794fbea4d03072dc7b1c0e2f9ec4330f285f1408f7ce15 SHA512 59e6e85fbcb0f99f5092dc65fd0ee3767e322225ae67bc17971f0ca4f9da263521f3e162f4eb955cb639f3092de14377661b1321fbcecdfa4440c38edc8bff5f
+EBUILD dhcp-0-r2.ebuild 230 BLAKE2B 5e16482a0c8cf27691e1cf6fb89aee054eac48833c1275788515b4f8a5da6d5dc7c9d64f42b18d6f3737f14cd3474251bca1a9d502228e106c452eb71fc80498 SHA512 1af187e33a649671d1fffca92169b0052c18ef26b8e2a98756f9a11ce6a0c5363fc599dba39fb12d5ade497ab98d813639d46d9a65263d84cee0a186cc835213
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-user/dhcpcd/Manifest
index 9127ad5ce7db..7926187bc3da 100644
--- a/acct-user/dhcpcd/Manifest
+++ b/acct-user/dhcpcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dhcpcd-0-r1.ebuild 270 BLAKE2B 12e28cb8ea4a65830b124f73add3ab07cad1a98e7551ab3657b24ecca2f750c973126b5d1671ac892daab20cfb4dfd8126a98f9d208949aac4a2fdb0376b108c SHA512 d8c2461213f1b8cecc48001b537384aa238bd3b3ee919e179f8c142db421b85a6f4b6587ce089dd2efd3392633011c57a726f02477a048b3c080409a48dc7163
+EBUILD dhcpcd-0-r2.ebuild 270 BLAKE2B 476ef4f27d2f176cd08dd08548a896f582578a9867e03b4dc1544660aa795449124f98166c1a5b97b72d09b40990bb1282f4eae75a41b4828121437767aedc02 SHA512 3c6693917cfad9041334122af0768fc3320f3429bbf76ac9e196511878fe153dba0f0f70f37d9736e31878a2b397d8521d011542362d537024ba9c5ea3b044f1
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-user/dictd/Manifest
index 0f882420f315..fbc3357a3d74 100644
--- a/acct-user/dictd/Manifest
+++ b/acct-user/dictd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dictd-0.ebuild 228 BLAKE2B 370fa42c192b87777292ee13a41e12d29ba3818ab5c270f49791f79a261e572804086271662fb111df7506834e20357f2d47168df8f8c67db30cf1cb00c332be SHA512 25421ee8909c997b4ed5cf624eb492c5a7ad36e60262adf8708a1d167552e16220dce9a2dc33aaca599535ec88f794879113a0d8a85cb6a8090bbe4d462edd3a
+EBUILD dictd-0-r1.ebuild 233 BLAKE2B 7daafda5d14821d45751a4fe0e68a599d2af8c963284f981b387e8486b5e8e8731dd1abcee9f7d7ef988c30a4822c2778522d80d9818c4f745bc452cdefffe62 SHA512 46e931f939111d3931c8477f0b2afec67cec40bfcce0300a0bf1fff2452a487672babdef83c358913229403d92657e96c61bee3b19e460decb8b29295096421c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/dirsrv/Manifest
index 51c6abe6e8b2..b70b69ffb454 100644
--- a/acct-user/dirsrv/Manifest
+++ b/acct-user/dirsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD dirsrv-0.ebuild 235 BLAKE2B 7a01da0560f3f958aa5a0f9d4d47a5eb3a8c97f22371322306f4c3192e7afca619cb7a81fc24b7219c0ed4c06a07238bf9c9d39b9e1fddef281d3b19555ee6fa SHA512 25e5666f13f0fce7209533aab077dc59e9d0f66d7a8e156407cd2b8a470360c5b343bdfe5ad8c84cfd6289a36782e2aa48f18bac20230df7153068c87e071d5e
+EBUILD dirsrv-0-r1.ebuild 240 BLAKE2B 82fa9c61d7f43009e600e2a835d41583ef0a7a1663932b94deb801f2c8b627c91484aac64421cc2bf80ac826577b5cc2f4f082093aa51c5dc35fd92414097d0b SHA512 36af0fd90f924e0e51a9af685cdfdb05408f96529bb1c266352294cc6fad1b901de62f8dc72d467c100345f0617a0f384e27d8dc46a46858948825d3dbeda076
MISC metadata.xml 531 BLAKE2B 9b3cdbe8aa6b5513b7b2fa5c16b4f3a3809e369420d156c9a84dbcef3b6630ab328732a81e0cd88d06004e208a3156346bc5bbadeb549ffa2adebdea758ac45c SHA512 0744c746cf418423c03e41753c82d3ff22cffcb26c763f16fd449d86ec22dd1a927ac38d8f8f062983c75962a62b1556181a8bfc1835fb7a11c60e8dffef8cc9
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/Manifest b/acct-user/distcc/Manifest
index f4523903473e..a584d184ebe5 100644
--- a/acct-user/distcc/Manifest
+++ b/acct-user/distcc/Manifest
@@ -1,2 +1,2 @@
-EBUILD distcc-1.ebuild 237 BLAKE2B 7b390eecec70767c3f778d2b2c55d0d6b7ab111acdc514ab4154103518d1c745f3759e5e7e4560462ee7b48ffec1dbda41ef8ab35ddc95d44b41c3f69d57ad6c SHA512 4b8fcf7c4570e3ae199615c61a8fedae39200834acaaa66259d24c424c70006fde4356cdde43a3bda2fa6b146677be6d812c806c4bc06ade9ea53d855a043990
+EBUILD distcc-1-r1.ebuild 242 BLAKE2B 210b907f4cc77b114e5454a564d7be59cbe0fedfec4b596cc5c9769764b9aad9b3fc9933bc0c89687a9838778567e79df64c28de6d65833bfeda47b143d46008 SHA512 68f38aec2d3f7707a92bcfcb35c897ffeb24f02703fa17c5ac21f27fb7eacdcacc38b5195f3e1cd6274a001459fe8542d1423b3f3b6ec87f47cb0bc7fe2ffd8e
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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/Manifest b/acct-user/dnrd/Manifest
index 678518f1df98..3f62a08f53ec 100644
--- a/acct-user/dnrd/Manifest
+++ b/acct-user/dnrd/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnrd-0.ebuild 236 BLAKE2B c0c265d904b6f1b01d3b713292989e96c189fbceffe820c6e2e62b7c33857b13f8d8abf7c85af7650a468f2169c27c5581f7612a5f12ef36e15a2cbe1118c8a0 SHA512 81162bc26bf6e3991af9c9a5a81773fd3300061a297e10c156519285255d032d732ddd36c1fa19e3a3a347ae84d2f79b9b2491a48eb6502e46042280e389faaf
+EBUILD dnrd-0-r1.ebuild 236 BLAKE2B 1ee697aa9eee2c0463c1f780bbc823d9a577d9c5b376f527bb515d28b6ae64e0d26df0235e23db343f528e3a203bbd1a1fe4d34d451cb224c57004b7b499e81c SHA512 08cba9860e63d34a5b020d26d9dc3b5e70a675a84a4a0d9f69e38bfd2dd6ab825f76aaf3639efcc3a1ee7af2a2690454c81ba5a54b062efdfbd2ee6b7d2386dd
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/dnscache/Manifest
index e152ec2672ba..67b3bd2fcba4 100644
--- a/acct-user/dnscache/Manifest
+++ b/acct-user/dnscache/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnscache-0.ebuild 198 BLAKE2B a687b9097a7e4137d489ea27d96a575f01e6608ae43f06d49501920fe6533780d0474aaa2e1043966d2739c9a92c8c746b8ecf7b84cfdc7d6d716fd7a3fc103b SHA512 dfe11955fa7c34b8b9e544a20a2919b0e44d166a66e9c43ecca4f5c2cf68e58cd60477d1aab689060c3e9a60340b4e764c9aeb744838e689266e6ecc73c5848c
+EBUILD dnscache-0-r1.ebuild 198 BLAKE2B bc68077935cb8e5449e427cc93b9cd12e8c2f0a0e5ff2d919ec7c7a04ed5e101f0b5bc9619d5256099cbab164d02bf6c71ba69fbd10652621c173859974bc053 SHA512 5161558a85c6bfc264c5c702070cd8ac454fbbce983315718fdcdbaf8d9169c285a8178d17a2c3ef5a8450065279d0b39d038a6726ead03726c366c629f5f534
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/dnscrypt-proxy/Manifest
index 68388655f0a6..8eb02271250c 100644
--- a/acct-user/dnscrypt-proxy/Manifest
+++ b/acct-user/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnscrypt-proxy-0-r1.ebuild 251 BLAKE2B f14fbe1638b29b2ae554e8064f11f231690c1831e905c34738a1953f2da09e51068eff11b05521f30f816d0274c0fcc2a8f66bb3e87166c4d1674990f93c95e0 SHA512 4002dcee748a549024e98f5d54f818163b3fa7f7122eb0525bed282a7ec421cf31f1db368300842b56cf7b110c2c7c2bb7eede79972ad56f38c36baf1567c008
+EBUILD dnscrypt-proxy-0-r2.ebuild 251 BLAKE2B f412b460a3de14c12dd647ed8699f04d41228b2b095b5ea7f91d25b9035c0332ac2ca935e6a3ba28ed2d75f8d47d4e587d031a1977ce9b8e0c05709d7c183221 SHA512 6151792c40af254988ccce39a948b859e980333568a0b7eabea92830d4157a72ddc6256bf2d3381ac47a77f4d360ea2e5c609f99faf08c9883627485b9bef554
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/dnsdist/Manifest
index 204cebfcffd5..ae6b3653acfe 100644
--- a/acct-user/dnsdist/Manifest
+++ b/acct-user/dnsdist/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsdist-0-r1.ebuild 239 BLAKE2B b99df7daa5cefe11370cb3205877a846494595dab8103929235379ea0e9c30201c87fa26beed8b057e9c0aaef63e30d2e5e0d589a7b5f4358a49ad97b4ec6365 SHA512 29cbc4e322f1e123720906f7bf27aaf53474eef0b69bda8ed97ff3716c1a283c95b004638aa7997035e690a4217245821acc8315acb639fea6cb67953885d29e
+EBUILD dnsdist-0-r2.ebuild 244 BLAKE2B 87844e2a6163549d52e2c0904951bc6ddb005a43f08f3894227a973c10061a0aee1469be5329839463e8ff21905e59ec28afa1599456a115e1a8f76105e3355e SHA512 266812df1ccedf343fb7081260df27cc7964637e82837073d6d4fec8e89e57bee0b8854f7506c854e118a8fb8c2daa39ac5abd391c4c783bc688e747711c6483
MISC metadata.xml 253 BLAKE2B 48176bf4d3261fa1fa73f54f89eb55371dae1f30f8b6fce3ca78b404418583f11c35e1978342d406e1918f737bb8e971778a780d4195f4a1936f866a23cd8423 SHA512 26103b425624e485d98f014bc88d2574fad61a638f750ff21507690509c78529885f72d410975d4f3586b11192d86d8b6457a86330e39d64312c24ce58aea7c9
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/Manifest b/acct-user/dnslog/Manifest
index bad347634b42..acbbdc48defe 100644
--- a/acct-user/dnslog/Manifest
+++ b/acct-user/dnslog/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnslog-0.ebuild 198 BLAKE2B 06642d5e526a1c74fddce8cffe02bf090527eb4f0b7e1059e30872384e01c5e76733616339877c92773eba3a888c81446d54552f4509dec40ecd5e428ab4f57b SHA512 2646ab941e25e77570ed2f3467044a8c2a0143d7bd228a514c8011d095d6b50b1bd6511e74d5251c3cd8bb98a50105df04f7e23741e35cb683e57d417e4810ef
+EBUILD dnslog-0-r1.ebuild 198 BLAKE2B 59a55ea3323e902d1fe99575e741d62e5168a972276026e6011e871dfdc060bf121c18297fac4ceb65de0d12ddb4886f9f0cb77cc64b27ea9203a9584db7623c SHA512 573fe6655a4a30c5503a0cef9e04b1a163a4d286775863548e72675a2d703e6880c867dc21eef1507371cc7abe2f0ea0c5c7ed8b8e0e78eeef029225b15e2fd1
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/dnsmasq/Manifest
index 1998b49a5c7c..9906488d1159 100644
--- a/acct-user/dnsmasq/Manifest
+++ b/acct-user/dnsmasq/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq-0-r1.ebuild 238 BLAKE2B 3d9dcf836df4c13d8d5ba90719f73fa1747efa004fcef1b9682c4516d10ba31f3285a3651b31b5c5e66534df32170537d366720eaa7ae32222e84b5e01b45f79 SHA512 7aa2f58e0037546b7cc3ca36fb62dce294914899aa231b6dc891d055ee4d05dd7a96938cb5983b65217bf42a72339c47fb365817b95341acb397d79753165bf6
+EBUILD dnsmasq-0-r2.ebuild 238 BLAKE2B 6ef5b6c7aa1390ccad84ceb9435037a016fd38932d0787fc15008223fd50d064a198876da014118a033ec797ad83d33ae87622861409619fb481155669054fe9 SHA512 f5595a3c079b141da96972b14a38240adcb585f1b98188b11bf9c8c4469ae3be14a2dcd15c1f7b7845dab76eaaebb8252aa3cc265aee03282728b65b37ae57a0
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/dnsmasq_exporter/Manifest
index 0436c050045a..5bf9f84a8af2 100644
--- a/acct-user/dnsmasq_exporter/Manifest
+++ b/acct-user/dnsmasq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD dnsmasq_exporter-0-r1.ebuild 247 BLAKE2B df6383e1b543cd477ea6b61e0c3451a8932c594e6f69379f4e0cdd35dddf3047fc44ed737393fa979e0814e840519b27cdebc32c88b0286cee6bafbecbb5a622 SHA512 6c116919c44986a4297a2890b5526db5ca7c219b56e61b5bb01baedd9c5f5f48b52b44c07d8b04dc6b2dc777c69d56930f152bd223855f23249f301570011ade
+EBUILD dnsmasq_exporter-0-r2.ebuild 247 BLAKE2B b24232206f28ad79a1f8cea7afb97e44ca8ad95f73f408d5b062bdc13f55ffb28869168c96dbd739c3ff35c8dcf7a7f9582adf4af4da4af147524ecdb459d8e8 SHA512 fc0c67a87a55d50acd7a7016f635e500c1fa127bad1128c4c6a7d44240399afc96b3f264c702f52e1a4d88ca48c7ab77d0df6a594d9d6b044352d243573dd014
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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/Manifest b/acct-user/docker_auth/Manifest
index 493085fe7c91..2ccda4ddbb21 100644
--- a/acct-user/docker_auth/Manifest
+++ b/acct-user/docker_auth/Manifest
@@ -1,2 +1,2 @@
-EBUILD docker_auth-0-r1.ebuild 232 BLAKE2B d37a5c3a253edc0f1574b22a4a28c99404b0219f052befc5dc04faf136f7fd72927e3ca3b94895dcdbc5b704086e37d521693ed98f2add9cbadd6e009f78fdcf SHA512 f6d4869aeda8b14f4f9dc536bdaf8844c4cfe99bb5223e09624acc48c4f315840495d2f37d1fe630827c2ebd2a6391edbb91b77176c6be2781c6567dedde6038
+EBUILD docker_auth-0-r2.ebuild 237 BLAKE2B 0730bf539e7704f54a321dddccd15d34dfcd9811d0ba2cae2d2ee0071611a67e7e758f77c80c8d97b3a4e5ce11f21561eefbad3125ee1e007332b8bb5a5f1905 SHA512 32ccb1e7ad9cdb5a1d76cb06c7e8dedbb1cbb571ff9b6bbc152368632125c9d0a936169109e776d5df397d0bce326d72f3efa13694f3bfba73b3241de67d79e3
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/dovecot/Manifest
index f204814b54aa..ff5e15d725cd 100644
--- a/acct-user/dovecot/Manifest
+++ b/acct-user/dovecot/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovecot-0-r1.ebuild 235 BLAKE2B 60ada3b644854e97e55095fdc6b87c95552f63a9aafc2a06f30b1bab5a820b6aa7a7ccfe17f87973363da1bb9a4e97d5e831833a6ad2cfa433c6f9c8ab498f4c SHA512 b678e57dfd87068b415c2caeb997fbec30cf29a5f358f86c3155b9c16ad1a4f67a4ca99c53d58b6492baf01dfb0fc8e3066c2725f38ac1f79b2686975c14b7d9
+EBUILD dovecot-0-r2.ebuild 235 BLAKE2B 6b21357401d5a2a18aa28563713b5c57cfbcbcd61db2fb12748bbc198e97a1b96e718c6456bedc0b163714bd9db11c0b2ff6a45316e5dc7edf6548e23b20b830 SHA512 2b1f355ca84e41e3475076f621c5a1b2afea59d8f06309445f772caffd1636035dc7b8b4030252f290e8c068a43ce627ec688d45bfc52e451a95c98fc00a174f
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/dovenull/Manifest
index c005ddad25f5..c153498b9865 100644
--- a/acct-user/dovenull/Manifest
+++ b/acct-user/dovenull/Manifest
@@ -1,2 +1,2 @@
-EBUILD dovenull-0-r1.ebuild 236 BLAKE2B a38fe9ab57129596996aac85e5dced70159b9a9d37970f89a8c0f80b8f9a9703fbdcee421caa243a8013f14e36348ae8cca3e0095e585b7891fab71857c7c4b7 SHA512 e546f8aa5a64a687e101bfa50dbdf6c977be81d3d0343b8201921290f0194491515c73aca2f5958f5c52cb4ce7067ccff80e093b017d3e210e8b718d63867889
+EBUILD dovenull-0-r2.ebuild 236 BLAKE2B 8707ce0bb796ef7759544f4e65d51365b3bf02b9a18955671c752335d513b6c0ab8cbd11ddee08587f0989886852efb74169669e13a7d3cf98e4aca7762d983a SHA512 2f54c879d9133ce8e3d3bc73f24c9e5fe8a72c876d2ca7e7e628956438354340be30637c1088729412b46bc79facd693107f4c66034557e8244b8be2bb18bcce
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/drone/Manifest
index ae22663e4fd4..f8ae5302921d 100644
--- a/acct-user/drone/Manifest
+++ b/acct-user/drone/Manifest
@@ -1,2 +1,2 @@
-EBUILD drone-0.ebuild 267 BLAKE2B f6502e1a43cf2216342f496ff2911458ae0d331b66ad0902fa608d556492a5441aa5e953ae534c95697019ec069831ace05e6ec85fc644cc79a7cb6c18823212 SHA512 46413482c49640d350f86929da0eb549cecd30ad39672704d84b49cb6d3c5ed8aa3a91d818040c46dae6fe1dd5a6e091c53ac72b34f44dab4607a65b3231bb5f
+EBUILD drone-0-r1.ebuild 267 BLAKE2B b857fbc2488d021a7cf8a155e60827c8ca584ca6af03a60def4d65859b97d9c4cbba067f4cec812b90bee73fed89d98e3608fe34a50140c856161a31f9c17102 SHA512 4ba2bb4bdc47a80b6880a7eb2601fa4b6ea31845e22efba187ee210d405c4838f4085a2aaf2bf55d176968014604838a719d0168af04bc2a704815edceb221dd
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/duende/Manifest
index 8f6f4b24cc5f..366e2b54c484 100644
--- a/acct-user/duende/Manifest
+++ b/acct-user/duende/Manifest
@@ -1,2 +1,2 @@
-EBUILD duende-0-r1.ebuild 263 BLAKE2B 4a3b9b4aeb7f2b3f9d4261ee3a42a78e2f566370ae45a7a419b74aaab4a648e66fd4d9e2c758c1998f35bcba4761f8f2e68466b2b518c102b0004f00f371d928 SHA512 d3f05b84bfe7a84bae17abea5bcdcce91d780c9442c94c00f3a7c08cb3f9d15daf40ad07e693193a65b67592d3e315b9940610ca42b2ddae8fb597fffa545788
+EBUILD duende-0-r2.ebuild 263 BLAKE2B ad79ed0ac020b629823d211ae748cf8873aafe97366627582f57d053751f1a28030b780883baf0ecb259ceacd9b687bac9d3b5005939b943538d883c8c4458b7 SHA512 468d2d47d3894979651a09be49423eab9773a63648d20011e44672ffc008ea39e85d5af2251776f718c9d00694a479bd22a6f188f21cd5a82a619157cb40206e
MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
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/Manifest b/acct-user/ejabberd/Manifest
index 5584b3b4e343..87961bd21d63 100644
--- a/acct-user/ejabberd/Manifest
+++ b/acct-user/ejabberd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ejabberd-2.ebuild 370 BLAKE2B d10747e8f6facd772e09246ed7ad1e3f78c276f947b8b530b575a600b85de0e6e7f06784a773f60a46bb2dc811cc2da72f15eeb8fcd214691f24d7ffeddfda42 SHA512 2679237b58c3bcc00a1ef19871b88f0656d522e3b8ee5141f291dcf6e24e5dddc2f5035d4f4baaf99845f85d799c4ccd576c5995073efd1d5ff4cf99cffb3b39
+EBUILD ejabberd-2-r1.ebuild 370 BLAKE2B da820d73597f60bb42147465e1acbf3cad31e2883a2666aaa4757acbf06f723be8e8db798b75b18278ed211e5cd4d5a552579bc9f43b36ef7011d885ee23b5cf SHA512 efd5fb729ad682d1935e6e6202357ad8fe6d47602ae0f4447065821cbafc32da4d2a1512f7db3ef4aa8f6d732d2998cd9cd212b24979d56c52ea0638054c44da
MISC metadata.xml 328 BLAKE2B f5091b52d611b1b5316381dc2a1bbdb6f4bfbbcd6bb92f6e0aeb9dff2e8cc080665eed36c14e0abbe593c8d7f4074cd19df1089915441a75f57f3317d2c8b5c7 SHA512 64e578aadb702803be2ad5d4bc629c91e72cb5d6446e9c77a46198cce513e4de1ab582d527c69da62e3f86749f2a1eaec9ba0e0764627562283c29c2ba223811
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/Manifest b/acct-user/elasticsearch/Manifest
index f6587a57d3c9..8bac0f13e2b2 100644
--- a/acct-user/elasticsearch/Manifest
+++ b/acct-user/elasticsearch/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch-0-r1.ebuild 310 BLAKE2B 0f96c0cb753183440ad7148b7c515d8f9ab6f183c486e54cb249747b1bf16e16911170d3f0e17ec2f2dcb92b9c623a9da36241ae7cd524d54da742ad641167d7 SHA512 54d4356742d329f1f3343601ee42c183c01fc9f6a7da84bd3fdb1460445aea04b355769892605f7775b8a25d2a70ed074eecc0e9ca98b2843f149eea796b5dcc
+EBUILD elasticsearch-0-r2.ebuild 310 BLAKE2B cd8ec5ce55bfb0aee467d9355049cb8472def58521ea670dc13964ad9707bc67cad791e4b7b5a1cb30cd34a5c83457648eff8acfbfc458b994c12222518bdd64 SHA512 f7666742a579a3bd3fea3df5bbc599f41ba2d85cfa985af856977e64d5c83872cc1ddb472e17e7fd261ac89447e29b329061c34b6eb3fdc18146571e66a4eaaf
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-user/elasticsearch_exporter/Manifest
index ccf3651da5dd..8cedd0239ae6 100644
--- a/acct-user/elasticsearch_exporter/Manifest
+++ b/acct-user/elasticsearch_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch_exporter-0-r1.ebuild 273 BLAKE2B 5bae90d0bb86304c796a2a28e0a4dc3592c506c1fc0d00622a8569c0031b141f7b87dfac83cf7319d071c93d98d49c353567fd6f4c0a8d88c55b247fae907cdc SHA512 6b4527d2fac7adb6e1991e0c9accf22169a52e25858f27b8a487c3f0ff349c173fe542fc044f5ca57e5b68a07505a406f3de8e5f673dee9f44e5581b7a2b8539
+EBUILD elasticsearch_exporter-0-r2.ebuild 273 BLAKE2B c3b9c17d2a93a3ac41e16a37d5ea749e657b3c79b63e418cb8e6f0f7577bbe9ae28c5568314c7bac727b15645ffb456664b9c8eac2cb9a52d66ba7d5e9f458e4 SHA512 d0603e09e0722b95f1240f4ec0fd198007cffb46b9cc81ba399b8035de4be2b3c46e6819d8c80cf8571b4abb11dd38c0b205aa72d9695a14f26eede1df08b720
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/energi3/Manifest
index d34854cbaecf..80b5a1806626 100644
--- a/acct-user/energi3/Manifest
+++ b/acct-user/energi3/Manifest
@@ -1,2 +1,2 @@
-EBUILD energi3-0.ebuild 237 BLAKE2B f5a77117c1db6c771bbd03108d0d5e2481133091f3ea53962349d728854fcf76168f57c0200448124a3fd443ab164a36bed511d49cc01133de58b42bab4f9235 SHA512 7fec6355e9f09b2a7ab8daa376991370ef826bd9b6a42ef8f61f32e370833a015ff1321a941c5e2df0707be5e7224f85c3bb340d36888e42f5a62140d9f2d284
+EBUILD energi3-0-r1.ebuild 237 BLAKE2B a7e50f3ca84a9dcf30ed94ded8aaba7d8bbb90a6e3c65bb5b219c1e7b618b0729858d9e64af889b47e6c99336c1fac8eac8220673601308f669cb83e3014572b SHA512 7cc39038c9a152a609e1aafd961804f7e839e3bf5fac34955e891e55b1c6cf095045d49fcd9406515296f7efcc646dc63ad303d5e30a4e3c7e854f54b56156fd
MISC metadata.xml 245 BLAKE2B f1fab6ac89edb8c7e0d5c3582eef178767c9e0a28ad1a59741d043cbc57c2cb9a14508be1e9ef31c9db4b74c8b265c38efca55d8b64cd30a128447862bc4550d SHA512 049bf946fa98e28b0e4b016ac2ccb4c10cb132b2b2103e1483ba0fc7351a0cbdaab6cbae460c6d9c2781a21cd1587449469516d5b23dea33418485ba5f4df8e0
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/Manifest b/acct-user/epmd/Manifest
index 53bf4a5cb460..125e142495ac 100644
--- a/acct-user/epmd/Manifest
+++ b/acct-user/epmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD epmd-0-r1.ebuild 243 BLAKE2B b3e3a9017c4f13270152e28d36e0cbee4ac8e23acd92db2f2d24b30d48de55674784e375989a24c512d945abaefb3a3c56cc90d5a9cf1b5c62c30e890029a9e8 SHA512 6b081a1414029a714eab8a4a09d109126ad57362a0e37992b31b75705c2a81018ed5c211b86fba9e5acd006b3609cb96a3218df2bc3cca7c8143b804772a4351
+EBUILD epmd-0-r2.ebuild 243 BLAKE2B ff1a954f6472fd9490ab0b6d0b75c69f10e57480085bb2d1097758fc5eec72a7f30e87b4744192dfdc4ae9e9e8d8c53ea966f0ea0c4f14496aa457898309bbfa SHA512 dc35bfe19233ecc5f7226e9a3631597756725079356c21bcfc072a22852b480a13e46d148ae2e5695a97734f5116fdb452d5bf2d70e37ecb9d3d9ffdca42fd70
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
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/Manifest b/acct-user/err/Manifest
index b545cd366c2b..3303c8594a12 100644
--- a/acct-user/err/Manifest
+++ b/acct-user/err/Manifest
@@ -1,2 +1,2 @@
-EBUILD err-0.ebuild 193 BLAKE2B 9b072cf84646b787072a12bfc5173638365bea3d72d37d18c957d8663fcff6358bedce5a04bae570630666a1b61f9066aa762116ef8d988f97508c1226c7c883 SHA512 09f76a677189b8c6005a51d59b0e1d7a226c19524c297ecb276f4a4ae3ec0d302b0fd6a4f65773ab91720b40da5277944faf47e56f20b0dd60fbae7709eef082
+EBUILD err-0-r1.ebuild 198 BLAKE2B cd7e4399f27cd3a5641fd60ac0f75642dd03bb09179fba744548faad10b5454dfcbdac4676e17219cd1e79533eaec2b53f73c5d69330a1174a065669650d36e5 SHA512 0d85c55be681249f9da06e95a9493627c460c6d429d232150ba558f33899c1ac5499e13ace3cfe6cff710325879047c313027a1e3dae728575a0443f14aa5176
MISC metadata.xml 387 BLAKE2B dc4c71051208fdba10dfbb38deb731492f03310bbe6a90d46ef696f7549a851f0933f51d158f598fea4211e55232c15f757d3b436bce0d1b8ff0516c85964118 SHA512 d9a689e19f684bb65ad0b38ad3050ac6aa247b45f7321deaf49111d4153a841bf2ae97b59a21472308c79668de3b96f60e8b50738d5998908c359cd1be0b1de7
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/Manifest b/acct-user/etcd/Manifest
index 62a512a75596..f0262a174b38 100644
--- a/acct-user/etcd/Manifest
+++ b/acct-user/etcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD etcd-0-r1.ebuild 272 BLAKE2B a8473818ec6fd4685aa6ed6f5cab05c2fd0af7285df4482bc458e5a80046988b6a3672b932b29eb56e39da9fdb7f995b27e7b712eef78f59fc00b2197ba01170 SHA512 22a9d9b239c3411823623e6cd73704d9f68270e03a24677e86713ec6e64cc3abdd46cd3177ef5c59ccf20855367a8c224d03fc1df75d2437112abda176c30c15
+EBUILD etcd-0-r2.ebuild 277 BLAKE2B eb14a0a73393f11fc52c4c7231e858356888fc8c51be93237a8b62f907d34882d288148ee0cb4c1016901475ccf38b35f73a3ea1733623f335df05a4b9b20389 SHA512 bb8997ad41e81cfad423db4af6bb81d35289a7a39e03cad33ab39966e7797ed7b7d7a3c8bc17ff9e3118cdb062f65d959b93ad5710a7bad4c703966d2eb6fa60
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/exabgp/Manifest
index 6abd4c0eafad..8dfbe9b5e7d0 100644
--- a/acct-user/exabgp/Manifest
+++ b/acct-user/exabgp/Manifest
@@ -1,2 +1,2 @@
-EBUILD exabgp-0-r1.ebuild 237 BLAKE2B 1f5a160bcdacf3ac911a7206952d6dedd7cc9f62da3aca570d9ef66c4d9ca8473fe9806549d3e24717df8c12b78634ba57be1a3124d7bc5586a6d6484032e528 SHA512 270d7e7e0bdcce2a1d739134fbf590ad748aa9ed3d8832eab32426465f3850ec052cb3b69331a7aa64b46dde36f253b60d8ea2fef2c01bb16cc230162bc17951
+EBUILD exabgp-0-r2.ebuild 237 BLAKE2B 7e0c06afad541f11b485215cd02ceddabe6a243df82942ba82d549fc3c1fe314d8c9fb67d69df09f9d56a267ace8e596375c611974b8e331df64d65b0fdda901 SHA512 b3ed485ed36dec4dc7b9c459738d56bdf40503f3e1c265a9a059f60b01c3562da00af21df6d1619d22aec36dba32535d4fc4dbbb30a5f634f79650c6349984c4
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/ez-ipupd/Manifest
index 928a52637e1b..cf68b96e4a60 100644
--- a/acct-user/ez-ipupd/Manifest
+++ b/acct-user/ez-ipupd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ez-ipupd-0.ebuild 287 BLAKE2B af7015b130423ecf84fefb4934ff7587dcfd34366cf3c979abfe13a54fa11f8b1d62cc10fc2629d6f8cd1fce54079a96824fdf7ea75909c98b4a34a7e34e22a3 SHA512 aecf8199a27599cb36c8cb5b65b1af30c0e8028f62dea2e4d9f42e04ca7c62295259049165614cd73f2a3d16d2e443a489d239aa18aaf94237d7e36597931bec
+EBUILD ez-ipupd-0-r1.ebuild 287 BLAKE2B 95910e63e3becdc1870c4665dc69cc92ec6d02100af7f46e76762803fd44fc4cacf6276a0d55601df501f8be6ccadd07deb5c4d225e3592fef8b3e82b6a42779 SHA512 ce5e2540e61a88ab6c642b90efbebde9a35388b818d22525c619ca5b2fdb5a5199f020f939d165019a165931dc79bc623f96d5c1e5aabdaf4d0a13850d328d37
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/fax/Manifest
index 18c304994cb0..a3342575c7e9 100644
--- a/acct-user/fax/Manifest
+++ b/acct-user/fax/Manifest
@@ -1,2 +1,2 @@
-EBUILD fax-0.ebuild 242 BLAKE2B 933110f0c0de4a6e2650b6efc8ce9d4c6906b419f6b3bdf80b7e9e863e0cdc77af8c10504d4ee65692ad289ceb9f1f824c824b0c0196d5f1df33f1df542b76f6 SHA512 38e3855f14d5a595e7955c03c225ea4ed322daa954d0b22dc775661db8cb5c3ace419119625c6f1216e30c51bdd65206e751c0389f831fce5b90e34a2c9bde43
+EBUILD fax-0-r1.ebuild 242 BLAKE2B 75827baf0ad342023b79bacad655c2748a17a6f59d83ab0db09c37d13f51b98f97225f49ea3466610fc771ecdd89b2eb02a94c838a94dbffea29a1575b549b03 SHA512 a9aa64c7e6794447e75e0af18176778ada37786e3571ac548dfb67e1ce67f552256d838a80aaa24635edfd8f3ef435985864bbdc18a2f40293663ce2f4875904
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/fcron/Manifest
index 580372f981fc..4371b6e05c36 100644
--- a/acct-user/fcron/Manifest
+++ b/acct-user/fcron/Manifest
@@ -1,2 +1,2 @@
-EBUILD fcron-0.ebuild 244 BLAKE2B e052d56cc913f14ea565234c61ba8802da78c3a3c1afd64399abd97e22a4ad9b6e525aea0bb85b63bf5f8dd056dcab7473f746408b05594f461722936974588b SHA512 4530971666a480beac9df22a759e50d76e7c82d586e083076ad010c6da5faf4ea863c4ce3e8907f8eed7583142872cec2b57780cafb1d28588c481ff91619dfb
+EBUILD fcron-0-r1.ebuild 244 BLAKE2B 7701edcedf9255e3331d5d71bee4d073a1f3fb0ca736ce276ed8fc7d7d8847bb1bea35870f96f8881b00af1b620450cacad8444d941c396085ee8a7a5fd39aa8 SHA512 ff834080ad8f10b88c6601eaf2942cd8c2a9b62b99ac16dbdf1adbf3f94c86d6d2e8f9aba0822ad83eaf14b62d2d50019ba4cdffa638e6661d847496cae0c345
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/fdm/Manifest
index 5f4e7a451d0d..9a9a4c1ea962 100644
--- a/acct-user/fdm/Manifest
+++ b/acct-user/fdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD fdm-0.ebuild 235 BLAKE2B 7d053279e941218eae6b57d8f1f1c6d5263f7c101181001f6eaed7d08e8203dff1b7460f3e1438760d713a9e6039c02cb5456da40a131dfb521d91d6ad7f9ee0 SHA512 c1301b62c4c73fa2e9fdf3f971333c79418fdba7241f3f9e55c26bf2b32a8935365dedec6de1914a916997ed8404aec45b047f927a56c0c3c3054888b3cb9360
+EBUILD fdm-0-r1.ebuild 235 BLAKE2B 55c3afdbe9526a8f25ad191d641b221040c2890c76acc54412aa617b43e8381c3c219a76076751711eca8c530948dcb921118a93502ac12722d3f451a127f1b8 SHA512 28595f193f3b05778eca8edd4bd8d12e2659dbb48e50fe839dcc69d06d09281761e95de7b96afbe415717e1dc0f97765db8ada5465422007a21afa57ec50ec09
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/fetchmail/Manifest
index f98597f4dd9b..418edddb55ae 100644
--- a/acct-user/fetchmail/Manifest
+++ b/acct-user/fetchmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD fetchmail-0-r1.ebuild 299 BLAKE2B 7dda94866ad9d62b4a4fe10dec063a7d9742aab57cdec43eb74d87614120d5be10da2e1ab108b5391089f3f80723e88db9cbd60c3a153912ac74fd40a04769d9 SHA512 bcf1e9f2a72db92848db54a203b01d2bcd641748c3ed5874a41e2d897a434eaaf38685bcbef7d3c6e67fa532d9bc4d27e9806e7d5a567e05e8263ae0b712e3b3
+EBUILD fetchmail-0-r2.ebuild 304 BLAKE2B dc6eefb048b6111d98c9363b9840c1eb7d5d0f45cc4f7150c41ce0cedfd53a57ef4707bad908f07f99416926cdb6ee62aee17419b2d00b810c6fd6e8bcecbbed SHA512 d3d8fccae985d60001b4223196e88d94b98ceb818dae2e30768953154e755c39703f645637940e58c591b7a58cea305f66ba1f790646f915b88a659510c39ee6
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
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/Manifest b/acct-user/fhem/Manifest
index 9e910f77c0f6..0a1efb4ec7ce 100644
--- a/acct-user/fhem/Manifest
+++ b/acct-user/fhem/Manifest
@@ -1,2 +1,2 @@
-EBUILD fhem-0-r1.ebuild 294 BLAKE2B ee501342b24f46c1f3436c27e5e24dcd074ab76d055ca5306994ce8d9790c7469c156b40c4b1f3378a43437f6723eb70c74bbbfe84721665820466a53e8a48cc SHA512 0098b902472436e49de5948d3eb591952ab7ad5559b94f65c1594e9749ce611c66763d5ef3e1b531462020fa792f3d21b7ed32ef0f86faf2e561fbdf37265f25
+EBUILD fhem-0-r2.ebuild 294 BLAKE2B 618bafd26638dd2078ba703334f34758648f74d3b60ab7b211d2cd06833f216e40c554a15ee21f375736097b6392c84155ae7a77c938ce004f0f1a0bb29e8ea9 SHA512 a7f9eb5e69dd44b6e61c55be87b7843d0de483482cf9c05730cba7d49e72fbbe99132340361c51580cda63835f11e337824ab7d141bf158b8c0f315d6dccab00
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/firebird/Manifest
index bb6240a30256..6bc95cf8de46 100644
--- a/acct-user/firebird/Manifest
+++ b/acct-user/firebird/Manifest
@@ -1,2 +1,2 @@
-EBUILD firebird-0-r2.ebuild 334 BLAKE2B 3fbae4d4fd057416bd2cdfc86188c89aa9f323385f643c265e541c02f61ab1a4e4049520732e81aa6ca857dbb180a77f7cf86fdbd7f2a9a8de3c64364cf70193 SHA512 38b2d474be130550cb220757400b41373010343bd104e237b464b590d668ed5843eede53d6f12305668faf4eb63b52315d2b9fcbe6e1bc1064377eec08506145
+EBUILD firebird-0-r3.ebuild 334 BLAKE2B f13d6f6beba52e30698306afa9af30c18f46de93cd463dc2f20915196edaf0358a024207a305e8267993be581ab55e7fabc301cc764a716c403a4e713ffc381e SHA512 959fdbc8f384f28a2b7946216372b35afd8847e4e4ce016aa3fba17ae5bb254ca576a623b6abe503ee67484ee35ab2e48ad5dab0d400feb3fca588531c43a89e
MISC metadata.xml 219 BLAKE2B 5b3c48d040de522ffbcb035a9704f5b71799a5a2e45172b39ea97049733842723503ff69869946c69808c965b7ef9eb40cbf1f2a5277815c4bb2e4b7ac978001 SHA512 176cc78690ba2800973fc6fa926e7bcbf3e18e8f45e925491f2349ff8619ef5df4b4a0f01b0a33f9fabbd2218c09581ff028f56379daa85494eaca9387a745e0
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/Manifest b/acct-user/flatpak/Manifest
index 6115dbac2da3..4541e9197bda 100644
--- a/acct-user/flatpak/Manifest
+++ b/acct-user/flatpak/Manifest
@@ -1,2 +1,2 @@
-EBUILD flatpak-0.ebuild 192 BLAKE2B 1b15f788552eec6a1a6c399b213dbf35fc0a129975b14f2d64266f2ab0c49189ce090c193a6478a2cd8dde1d660f827f0e4256ec12ecd46de56742cbb9cb78a2 SHA512 7840eb711528447e7b52df777dae91a0531dc9cfd222e0e68ca6fc68b92c07015e8107fec3da8fdd22af61ff710ffcb26747549e133fe1543f919197c16e655b
+EBUILD flatpak-0-r1.ebuild 197 BLAKE2B 4db4bdee6d5f58efa61c8959ee1be612dead8a0f9bb4154c3f61ecf5b540e4fbca06a39b032cc67a3999e8c3512e03792cb1b79b1715a6ee2be919fc926eda8a SHA512 70d5fc3c92c30ab0825327e86d3985357c0cb44fcd1cb8434ae518f94c249512533c0f1d7560b1acf70aa6c060afb6fa213329fec8e68c392f6790aa62675796
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-user/flows/Manifest
index f9bdba7c99b5..a31513598115 100644
--- a/acct-user/flows/Manifest
+++ b/acct-user/flows/Manifest
@@ -1,2 +1,2 @@
-EBUILD flows-0.ebuild 267 BLAKE2B ad4a975688786ee51afafe7134df57cc1b8f1f12f17748c8e1db4baf12c988fbc9d7fc648491bd089f6716fef241138be8d4a86fcada81c970a59bc3993a5270 SHA512 ffe20da7cf763d00863af891780296593850f118dc7111147f451de04838b19eaf2b4debb27408dbe128ca7f02c971bf0b4b14fbe3f1ac9fb8e64701b942b8bf
+EBUILD flows-0-r1.ebuild 272 BLAKE2B acb02ee35915e0b39222014445c41cd7ecde81836d41f5642e2b903eaef1f40cdd48ef4e62d59b896ceb62a205c4bebbedc29b9aeb3b73c6657abd1902555db5 SHA512 9db41c46dd1628b6e59a605fe5d7374af043216a222398c707924dfe229c25501490c90fb88923323d94a0e121d0e491e2ef032f1c71199c94e267f5a8867e71
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/fluentd/Manifest
index 4a742d2db658..c7d3eee15d58 100644
--- a/acct-user/fluentd/Manifest
+++ b/acct-user/fluentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD fluentd-0-r1.ebuild 241 BLAKE2B 26e8a0cb4bcda2bfabcc69fd6491bdfed7f70d6a111a2a6971f462345476e6d3834abd683fe83804213443bb0f6fa4cc2127f8ed55a9a08d0f85948b64f3759e SHA512 0bd3e02b535aedc96fa865a0cbc2a2d7a674d2547e6344c020e8f5e98633a60e271dffcde943484f988c428c4d9aedc91b939a2f1d989747fba5dc4dc69bea00
+EBUILD fluentd-0-r2.ebuild 241 BLAKE2B 64c5abc3407434ad0794f744afc7bafdae0aa0c47c300e621bb7470011e4817f50735427a7909713a3499b96a41bce5ff5ef6be5e9158cf95ff9b796060a4b58 SHA512 d3bc7e0f2402bf8c5b3d7712a26f817923969fa2fa98ea0c999e6b63a42901301d621660a80502dddee02d0cd53fb4aa52d66a9b30637cc2c6f5e1a7b48cda42
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/fnord/Manifest
index 905e13abf0d2..3951c596ff08 100644
--- a/acct-user/fnord/Manifest
+++ b/acct-user/fnord/Manifest
@@ -1,2 +1,2 @@
-EBUILD fnord-0.ebuild 272 BLAKE2B afa5789768275dbf59573e4ee9e070a78e0a9b851893f0f545495fed67da52b459000b1f53d8b5123ebfbe5588cfd401e6ac3dd563cc895dd089ff2b8997eb3f SHA512 8d58a13f6a3351e56603aca01262488d3cb9a5b3f83b48edec0aedbc9472ff7ed72c159949cf9fc6d343a623a4d01f994212de253c35c2273e69e1f84ec83330
+EBUILD fnord-0-r1.ebuild 272 BLAKE2B 8d8635a4a76be67613817666f51b17bedc6260dad3e827f49c90cf2a349a68d8ffc4160f6a78d69540fb31ef53e6f9e9e0d062e379b59ff6cbb654a87c5e8bab SHA512 1476ee402764162012eae0c42dfc335cd8d9d37b336560466a23fa74bea48138f53783ce533ca201e55f681707b219673713509a4745d40de59d8b4edbead720
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/fnordlog/Manifest
index ec2006e847cc..4ed65d890ac7 100644
--- a/acct-user/fnordlog/Manifest
+++ b/acct-user/fnordlog/Manifest
@@ -1,2 +1,2 @@
-EBUILD fnordlog-0.ebuild 272 BLAKE2B d40701a5d2ae2c054efd4d60e0d4ce0d865e3b283344dfea12334658a48fafafb95f675d8213635f426d4f21e22b442e71078830c47f0dfb6a251755292a938c SHA512 9491f3896a259be3c1f7d39393a9c92de5ede123da98d5c20f2badd1b4e28ac2558e3b4a92622628856380a2548146b432c8b131de1ad86b4e7e91cce406e153
+EBUILD fnordlog-0-r1.ebuild 272 BLAKE2B 5ed8504dbcde289594c65c7b30cb1e31d4658c18c3eb981afd44afcd3ce4e0b41ce111baa7d86089a02c666b6fede8adff936f88ee1de4da830cb8acdfc89741 SHA512 b58ecc34548f5bf7532e567b7a368a720527df8f091cc1fd084818a83f99f9c93f1d3346706442cf4e762b35553ca917b0b69d12ac01ac9f15c2b7588584d034
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/foldingathome/Manifest
index ac16b67badaa..9e3537997395 100644
--- a/acct-user/foldingathome/Manifest
+++ b/acct-user/foldingathome/Manifest
@@ -1,2 +1,2 @@
-EBUILD foldingathome-0.ebuild 304 BLAKE2B 277939ab7f0c4c702bf3d0e02d763e227bc30ca90fc21693a74c4df98a02085f4cf6f6659a0d9a9bcd1d86f37c3b7cd2c183628808d9edda4ac4d7ca98dacad6 SHA512 f42f202c2d9e04ca1c30278e65b3aac591632a25bf9697c182f6af0a1205aa291642410d2c93e8b83adbd95ae6b24a0b1df7926e9322fa02670b7008e71b9ab7
+EBUILD foldingathome-0-r1.ebuild 304 BLAKE2B 38d165e7431f516909d5fa1447834a53d22449c544a5dd0378bbe942bf8d81057c001f85abe94849247f3cf4e83a451a41d9bd0a63bdf4051b616c53622de3d6 SHA512 f51dc00042088355adb4df709d5435cec37cc6d024425e581d6f177c5922480f6083ae53fadbf999b2a3b125184567e74774727a75d744866f6dcae99b1c8956
MISC metadata.xml 262 BLAKE2B adaacf2ac22ce09f8b1b68f538773c1e2101156181ff302eca2ce1280ee5d45db4eb302a8eee1bbead5e55942443dd16ef924cfbfdc95a1658dc6a9f460468a2 SHA512 ac924b6b530d96645f173d40f7a2bf0e3abbf49048ebf7fadcea3dd553cd25504f0e68a103395de1fb59a2e5e11497dcead601be01cc6f0295ccbc4155f67e3f
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/Manifest b/acct-user/fp-multiuser/Manifest
index 2df2b11a167e..b3c662631c52 100644
--- a/acct-user/fp-multiuser/Manifest
+++ b/acct-user/fp-multiuser/Manifest
@@ -1,2 +1,2 @@
-EBUILD fp-multiuser-0.ebuild 286 BLAKE2B 62eb59f3eabeca42600a78930205e53b84693ba3b115713ff700215028ca521ba08015815079f8fa9b3f28bfb446bf5f53c2e12035d3cb53c6f2b11f5ecf0f42 SHA512 70e11cbfbf635a6e5f215430c8502303ee1c071c380840c4f8c68cfcd38b145e9a18fe96931e638a25ed1f59459b213fa22e4cb4e4fb1aea515de8f7f6879b27
+EBUILD fp-multiuser-0-r1.ebuild 291 BLAKE2B 77cbe28c47bf11e00a8baf4477ff589fa8aea6f74a08aa8dd6a3879b24cc3f8e0d68507540dce6b50b6e5e55cda9a4077fb7f466e8f691adf774169730ffe7c4 SHA512 3c4f4c281cc4575fd6c28bffb4b7ba68b7d58f4c167302aa8924f07aa3fc54479d17ffe873db981ef1e91a8a183d44874f7030e8a0ba8e0250b1d2f42e09e4a9
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-user/freenet/Manifest
index 2171ba6e475f..0324dd36f093 100644
--- a/acct-user/freenet/Manifest
+++ b/acct-user/freenet/Manifest
@@ -1,2 +1,2 @@
-EBUILD freenet-0.ebuild 289 BLAKE2B 2f436b33719460b5c8166dee021bafc502fb10638d22963e3b596947c27c47dd02441c5dbd907afcb7039639b9a689d1d0d766237f2b183ba98fb281ee2b048d SHA512 81db114bdf3f07952ec7742e01d010ace97334fc786d0435803592b0788194b83a5ea859abf89eaaa6fe800d75a49d4b1c438dd8b4c53801e839d31bdb27e31b
+EBUILD freenet-0-r1.ebuild 289 BLAKE2B 713cd8e27080a409e3a1f0b8e9f8dd0326970d9a40c89b559149c1f78c8afa794da6c05b35062e78a8959bd6eefb8acda7142e49102f9d965ed6424705f07810 SHA512 500eb41f676ac17ca23f7c292d2bf7326c3f01eb982d11c98469d3df7d50f50feaddc43418bad7a977d965372fcbc8b78ab8bbf653c82ee33d4599f44e5a6bba
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/fritzbox_smarthome_exporter/Manifest
index 05b19537db89..1109a74bbbf5 100644
--- a/acct-user/fritzbox_smarthome_exporter/Manifest
+++ b/acct-user/fritzbox_smarthome_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD fritzbox_smarthome_exporter-0.ebuild 241 BLAKE2B dc4de9c0025a4b95a16240e558891ddffa8fbc2d08bfe41ba2cea57eb371df3d5622ac904a5dc6830f90bc0c7ac2b18ebc439ee18b0023ed9da2157397a91283 SHA512 d913116ab0345b94d3cc6111e2dba066ba5e535c3ddb076060d4db384da537ad81bf2a494903cbf65483c773b917ced70abe8a4fd035dd74de35888ad51f850d
+EBUILD fritzbox_smarthome_exporter-0-r1.ebuild 246 BLAKE2B 6df6d768581d9d9ccaaa8dd72b99ef768b1b87ce478162a2cb432f75a9d53f3b7e8e4f8e33cc2e34ec6ec16640219068baee1ec76b60a08114bd3af9db7d9919 SHA512 f8aefa4857d5668f716190b05e54347e355ca579e8869dcc2a7fd22a2f3318c804e4d0207afda7e14def533a7146a02c01753cbd7bf5761f39bc642bd36c3358
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/frr/Manifest
index 68e0d37f85ea..3cd03440ea4f 100644
--- a/acct-user/frr/Manifest
+++ b/acct-user/frr/Manifest
@@ -1,2 +1,2 @@
-EBUILD frr-0.ebuild 189 BLAKE2B b8fe6ba343a800458a6fe2fcdbe2c9392abbfc71505a0103f1b99969a9317ea7f4a6f03e6a0ada98d43ac20b76fd51a7a4c97a7f34487835ea82b6da5ba949d8 SHA512 a126acd028c3b83081ab1a9f3e7f6ca65ee9bcba9eefefffa37a02d09e2be491681cbb0764e27b6beeec3af4e9ebdf7abbf26a2e33ffca57f32b602f9cd07a79
+EBUILD frr-0-r1.ebuild 194 BLAKE2B 5b78e17f9726254ccc8b474e7ebe8f24441e126bf9b053a7225804f32773be98a7bb58c1beacd13c604fe236ac011069d041ae476d0dcc560c110490a99713d6 SHA512 39dece8db644a270633251a4fddf6d6d27cfbb9d712447afac15ccb1f3f98a219a0839c5dc86d8964fbb70aebddd8583280d9e6b4547f17276798ede5c6302c9
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
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/Manifest b/acct-user/ftp/Manifest
index 7b579e100d16..d254eb81f615 100644
--- a/acct-user/ftp/Manifest
+++ b/acct-user/ftp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftp-0-r3.ebuild 315 BLAKE2B 5361237ad500b752cc8c71a772864e204de93267b5919c7077fa94bf32aa34311a72b0f4eca764febdb336d4c0228bba4a119bf44aeee97f9e3a7d5e90550658 SHA512 6f682d246f945b36449daaae8e04b7edf58f36e9b33ba181934bdc70ac5a8e027c3c5c8d147e4f947a7878e49790a101359725af088ede8e08b9dbccd6bf89df
+EBUILD ftp-0-r4.ebuild 315 BLAKE2B ad82d67af9687a340d4044167055a57c877c0fb1f1f33b9c0fc35d76ea0c9822ebe1b92217e78600ba79c12acf214b7529ee1f9afaa70079e16b0b43dc1e5a80 SHA512 db91412e294738fd4b1ff63d27625b46fa9d2ba7c9be66c0ef3f802f28df88078137d802b998d95cfd823a7fe274487748386af88093579e0d51079222a7dddf
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
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/Manifest b/acct-user/ftpproxy/Manifest
index 63c6531c7f24..3c95fd977769 100644
--- a/acct-user/ftpproxy/Manifest
+++ b/acct-user/ftpproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ftpproxy-0.ebuild 302 BLAKE2B eecdf448e319f6dd19ad56db601f9d273ca6ec4753347020d46b2217baaaae7657ad41f38b50bb44806cfcf2407272d01430c206d623f348dd5fc4732d5ea42d SHA512 108002fb6d5fb82f6ed42d08703e4a40219d0492c8f68513a0ab1306e717cb9b19ac830e7bcf929080eb6c6adbf78e3836e4eef893f2157513ef28b504d8d105
+EBUILD ftpproxy-0-r1.ebuild 302 BLAKE2B 1ff209461f587cce5987ede99268e2d8c80ecd953bf6323d660c45c5088251ee2901a83128959513cb27ac0584ffb779b5fc92b8179f2071b7bad4da5e7ba1e8 SHA512 dfc0b1afaff6ba07a84bb0a15a81c72e87a0093cf84c634205ef438d1c7d1f1cb6c6fe62e6e100a0740b3c5100b6159161988555d6e812e306480985d84a315d
MISC metadata.xml 392 BLAKE2B fc1f7d674fbe3dfea4c499c4595eaa01bf618ac2cf99dcc75e021d238fa9bcb09708645a67d2c65c4da7ada77e4f338345793455efbdc6ccd4601fd2e25e36b3 SHA512 02230e8e4aea057d502f6a2ffadc349514d6da1f1eb9346741767d1a893dc0fcd050691fb3294dce34fdd50cd8170a084482fa863fbab2da36ad7da441f74a21
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/Manifest b/acct-user/gatling/Manifest
index 4a5e56b8efa5..4ad7cb6f50e9 100644
--- a/acct-user/gatling/Manifest
+++ b/acct-user/gatling/Manifest
@@ -1,2 +1,2 @@
-EBUILD gatling-0-r1.ebuild 262 BLAKE2B 17fee8322babc572c3bc7175237b7397ad25922492b6814657c823ad8543fdea26c47408deb115ae522494f7a2c4c7ba410931018fe94e507f2c79f021c451bf SHA512 a68a764a03961c3b56398a9d8eef1e9c371b4534ac9274e57c5ae6aa8b64007335a7dafa875a907803446d57338da16eff590e26238a90e77488d2d585e97606
+EBUILD gatling-0-r2.ebuild 262 BLAKE2B 96c021408b29d1b462f664c9dd2ae8222238ef84e1d5805b78a15803537ad6858656aa7dc346fcd148a1d935e8ab912fb86970cc4abefa74cf9aa4335b0ee5c2 SHA512 65ed1a94fe49ed7d14f0d14b9d9162d6be2e553d550c7b17ea495c6a30a6d8728f99b750e5c8ba27d95bf3f71d0cced7f9fb6b6af4fa2577e0af5ec6126160d7
MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
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/Manifest b/acct-user/gauth/Manifest
index 6fddb12e9b6c..e9d6f438ede0 100644
--- a/acct-user/gauth/Manifest
+++ b/acct-user/gauth/Manifest
@@ -1,2 +1,2 @@
-EBUILD gauth-0.ebuild 265 BLAKE2B 31e996d6834ac1cde40a25cfd702d816d74385df3a5cbc1f3b5d819e342f0e456d60ea14357108d84f5bb2ffddb964d0c6cabd61bd70ef3b3a4df25f2d22ff5b SHA512 fb7856d8798e71462cf1157c1f621c26dffcaba73012b4986e2245d4a97a8823f23ce286437f8ff033cefb025bd7ada1de1aa7ad1deaae8b714bea07ace767f0
+EBUILD gauth-0-r1.ebuild 265 BLAKE2B 13f86fa4301cd432e8491841a030e173054569a274ba4dc1e03ef579087273b48122853aafe9657a5d451621dae372754032b42a8ea223ae43228d661dd1c78c SHA512 c85df099c2da8e81d6aa1d3ef2cd8af5e874e5d2960374382aab7e5815ab5d0950691bfc8295aba39789a6beff6477d5d2344ddf2dbdaeab609324755f9a4de4
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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/Manifest b/acct-user/gdm/Manifest
index 60df5e292cbe..2dbd217b9606 100644
--- a/acct-user/gdm/Manifest
+++ b/acct-user/gdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gdm-0.ebuild 262 BLAKE2B df60f339d858c37f7356d3ab6d3facb4616b0cca3ca418cee6a6cc4871ce0f3eda10cf309551d0a7c0a4ae8472c1e131c540da95401c7f99c6bb0e14876adc58 SHA512 44ec68d59ca508c849859f85a644dc2bc6e72a1e15c6a36f501ec4c10e2f9f3f47bc71b1eebdf35ad2bb36e436939218bf1f768dc3bcbb3ca4a59bf8d52411e5
+EBUILD gdm-0-r1.ebuild 262 BLAKE2B e0bf23660cfacd667d3e14006984d37f5d550adfea1b45bcd5a64cbf0737cab69f65c91f372b4cb55c34ff286fbbe1e04047d43e5fa7eb856e8b6bb757ac0b84 SHA512 3732fd204b5e6ad008426c90bbd1b544e9b7b35072eedb834dcd60c581dfa929161a557268b78d0f252d548aaad48f36a35c8298f158091b2d788c5024c1dd68
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-user/geneweb/Manifest
index e5e2237f0fb2..fc10b38dc3ca 100644
--- a/acct-user/geneweb/Manifest
+++ b/acct-user/geneweb/Manifest
@@ -1,2 +1,2 @@
-EBUILD geneweb-0-r1.ebuild 267 BLAKE2B 01e24219ac3493f34d706841939faf8dedb7850af6555f26e3cf1edb0b4f0bd04de3c4afa59bd3f004406843ad268bfb4ea5f777c7592d1d3a7711b9aef226bb SHA512 550c099fcca2d668b32a1eba252f6516eb363c511d9acb754a1bf087177368780c039b9d1465a5733f310c01096ff09d7bc841b5205f487f7d42a3ad49a4bcdf
+EBUILD geneweb-0-r2.ebuild 272 BLAKE2B 908f2bd98262d1e24d8e7c51dbb4c9cfa40c71fff5a9cd4e95a6c57ef98604af70f6a60d4bbbdeb1d89c07c23777cb702928d1bce9423c0858dccc745596fb7c SHA512 955613c775cdcf1dd05bd4c28217b16c628c89939a07c5a3a38fe854c6e3b5feb4690a90ca8de252bd1f1ee16e8787d511c2db0093b91b1325f97428ea39942e
MISC metadata.xml 254 BLAKE2B ff7f6eeb2a166b29a60b0a13ded8c4f0ab8bc5413b0fc42062bf6550b0fa637426c491a01ff118c9d7d58cc5f0566a6112ced6a24a2d0b2be28ab5c027829b7a SHA512 1d9910e0013ab41b3e5511242b90fa8fcf444bba4623074cd75fd09f8ac0be98635a1d38cfd96974fc830c17c73db9e7f23d105a811fe629032cf3762ce197bf
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/Manifest b/acct-user/geoclue/Manifest
index 5df8343458d9..d412fe68d049 100644
--- a/acct-user/geoclue/Manifest
+++ b/acct-user/geoclue/Manifest
@@ -1,2 +1,2 @@
-EBUILD geoclue-0.ebuild 294 BLAKE2B 11aa9f37c0df56956fef11715ecf7884ff0f5069f978e9df46ae48399c91ed16fdfca6208c17f35514d838678a415fbfba6341e09c9f167ed857cc2914a72315 SHA512 420cbeb863cb23f357f2e9f5f9c10240a34d73586989c25c60b3e3ab819de328ce79a99aa74a3329e92958f86df931bb3ca03f8f85297cb83d8a5d698b325931
+EBUILD geoclue-0-r1.ebuild 299 BLAKE2B fcb7793a069de4ea9528068b18fae8e003763856f6c3fc7de47070489f0e1f6dcec391e372f1a4d9de5cc2576d6cde089241ced5db87b220366f8d88992c3393 SHA512 14091c5be40cb17a2aa073e54b0eaf36b131c15a00e291490bd4a67ecdbfd1a6154147b6e81b6c53b37af70581d674533a276f2f23342db53f5d768e80bb90fe
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-user/gerbera/Manifest
index ffc2564a4d56..08d7d630c844 100644
--- a/acct-user/gerbera/Manifest
+++ b/acct-user/gerbera/Manifest
@@ -1,2 +1,2 @@
-EBUILD gerbera-0-r1.ebuild 276 BLAKE2B 5c613b2015ec89ec15facfdac4e541baf86f87b15c0d3f587d00bc0a4609cef952a9ff8ed7db4569ac63572ac7fd89cc98c3f86d8c2d13ec88b756aab55793bd SHA512 11f48b299593a11250ceeb1bc7a9a1bb6dc75606a5adf070d3e88f15d3fd5ef221b15236cbf14ef554c01bb6e23ba9dbfe51e7fe9b5da87a1bdd6c8be798e34c
+EBUILD gerbera-0-r2.ebuild 281 BLAKE2B 6ca1046e4a02d8a51a54a987bf6416d02dff81d9f02c41e39254ff9676a48e1d6ca7541d9241c017169d98de4ff251e743d80c8a4b2aa7c82deeca3748fcd91f SHA512 520c3192761f448f0d7c1d3e01db6aa468b8721a07c19b24d7d60b0c44a4bd2e922eec35f577ed56402e389028314ba533f9a4cf6eac4e3cdbb465a4767977ca
MISC metadata.xml 406 BLAKE2B 6be52a743657b969bb47047966f9220e0c095142868dbe3560aa2e55e16c6a078658a2c54b990f907e5fa0b24f15d3aab7901cfccd78b39aa00393f44e1ea841 SHA512 4a2559a1cae4a2779e48114bcb08ce6d2f1c2b5587d0296f20172a24c7bcffd54f93bcd67fbf0529ec01ff05384e26c194d25d333c63f5318ee0cadd06b7944c
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/Manifest b/acct-user/git/Manifest
index f64b94199813..c9b8ae02f9ed 100644
--- a/acct-user/git/Manifest
+++ b/acct-user/git/Manifest
@@ -1,2 +1,2 @@
-EBUILD git-0-r2.ebuild 582 BLAKE2B 3a8397ddbb3e204e0726f238f09a1b56cc12c7d9891c6cfa2988020896a14f90c05b8d02a6a942199950fd7ed4d24232130e2872b6b1c313fc0f521fdf49a6f8 SHA512 6ef944bfa5886a3a401ed47603e113ccaa43b6caf165580203366d3c7514d21fae39be9b71e18b637b2201490700bbde3c540c9e1c42d274abffd0e5fcc9560b
+EBUILD git-0-r3.ebuild 582 BLAKE2B 3a8397ddbb3e204e0726f238f09a1b56cc12c7d9891c6cfa2988020896a14f90c05b8d02a6a942199950fd7ed4d24232130e2872b6b1c313fc0f521fdf49a6f8 SHA512 6ef944bfa5886a3a401ed47603e113ccaa43b6caf165580203366d3c7514d21fae39be9b71e18b637b2201490700bbde3c540c9e1c42d274abffd0e5fcc9560b
MISC metadata.xml 503 BLAKE2B 14f108a60c2bc75a258da37336def1f1e76140c1027d8d544f51141dc59311e0073c63c8a15f1cfcffb36c1254a44ef19165d7a28888545d14a75330b5964b9e SHA512 6016d84743fd15b8592a79c6c67537e57108e1d4a419575acd1e90e7b50644385935dcc106871483b616d7fa88434f53bb40e1b5118187fe4b1d9d6284cb0e13
diff --git a/acct-user/git/git-0-r2.ebuild b/acct-user/git/git-0-r3.ebuild
index d6388db32836..d6388db32836 100644
--- a/acct-user/git/git-0-r2.ebuild
+++ b/acct-user/git/git-0-r3.ebuild
diff --git a/acct-user/github-exporter/Manifest b/acct-user/github-exporter/Manifest
index 9c85b27c0c75..705c889fa00b 100644
--- a/acct-user/github-exporter/Manifest
+++ b/acct-user/github-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD github-exporter-0.ebuild 240 BLAKE2B bcb82f35b470a13fe65c6092a7fbf7756056801da11b8c8ca483f8f138ebad6983ddddebd83ae17e33f62a74e3a34fd26c043b2502801e60764a4c64d35d45b7 SHA512 8dffc40a6f6ff52b2efdd1eca4ba7718b04f460be3f9f54efa4c654e67c3855fe9db1af3a7ec24e162947c5484ea627c154ae5245128eabebfa02da512c6bc85
+EBUILD github-exporter-0-r1.ebuild 245 BLAKE2B 68e69bbd3000bb6826232beef064756a0f52b3aa9b28e612b005001c8f55dc323a3674692e9c81940fb83e1c5f50259f152d24f1966a566360a002b30a89695d SHA512 a60a5efd84ddb032344697125bbf4aa15af72b7f478388f47631cc264f585b8697cf5e11ee7b7e850c9c9ff61c48c3d82effcc5e7d8c9d8fb8c7f03f3277b817
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/gitlab-runner/Manifest
index d1bd2e80b4ad..b229ee4500f3 100644
--- a/acct-user/gitlab-runner/Manifest
+++ b/acct-user/gitlab-runner/Manifest
@@ -1,2 +1,2 @@
-EBUILD gitlab-runner-1.ebuild 312 BLAKE2B 0b91df00506dd521e9a66472643ae56de19dcf1feb46bbc7f3ac9427b9eba3380a915fc9ed632da2b472e5c9c9e00b0af0b490720a8003c6231efd2831dc4560 SHA512 ac81a2750760c851d8b1405f3a4a83a3e9e55a08e397a2f402a79cfb255a8b8c26a1a5de62871824e91fa85f642319135aacbb009e9629dc90b096f8a35e93d4
+EBUILD gitlab-runner-1-r1.ebuild 317 BLAKE2B 55ea0596213160a5621b9c1d65a4b25b56119303b23fa7c36f10a6ffd3104f3ba3254194f73e1bb96cfbbaa07151df180e79115b34337dd4238f40aa3779dad0 SHA512 5027a6a4668c311e63b051da4439b51f6842fc0403e4aee25a9e9fdc7d4716ee14f6d49877d6850e66c4db1f1ab61b6b7101165528bce4c781acbfaeda826fbd
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/gkrellmd/Manifest
index 14deb120dfa1..7d452b8348e7 100644
--- a/acct-user/gkrellmd/Manifest
+++ b/acct-user/gkrellmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellmd-0-r1.ebuild 237 BLAKE2B 9d500334891a892f1938560f638900fab2ad167ed8f8153dc980a8ff5867ea683758c5e059c94521325bfdba44001dcbe6a77ef9ceb6cb563492a1510a5215fc SHA512 ef6e61d74dd7694935900f622d1a8f24ef3371e5c919c1e38d4a88495ff06671f2e55eef558c0bf633044ef20db02b0e61974df85564e3e1c95425d0d0db3b9c
+EBUILD gkrellmd-0-r2.ebuild 237 BLAKE2B 3be6ead806de42d4104f0ffbc686cdec3eba96acf6075e92bced1aeb2f77dc98cf4ef5d22f67f4d42ea65eed312e215efc6d8eec39cb790e32fb95501245f4f4 SHA512 df0c74d3705df0e84cb18ba9ce2fdfb4ba2735457ee80e4467a5d8e0cefa02a011ea491c3949c50d012203eba708b67d5402a1ca393f7f8b2a23616eaf0c317a
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/glance/Manifest
index 7e28a21b4a94..94e2e25d33a0 100644
--- a/acct-user/glance/Manifest
+++ b/acct-user/glance/Manifest
@@ -1,2 +1,2 @@
-EBUILD glance-0-r1.ebuild 301 BLAKE2B e308b883a7051cef24e45750150c3d348ace8ad666f79fc92787de2ca907b002e345f3f2c7f9ff09a9e41241ec9342843b9eb2bdacfecd9fa5939c16267a9cc9 SHA512 a625238857cbfe43e7551dcf926224c6a34d783021b407f0763618289cd438fd8f2cb9072e81ef6d6213d475b24fbc736705a5602e4a5d87d186c96aec08fd83
+EBUILD glance-0-r2.ebuild 306 BLAKE2B 4941c50467076ecb6530581c026008ef07ba4ab2c606dbcbe61ec4dbb59d08c8545d5cf6639e361cc837dfeb46431795ce0ac7d1bb9ffe062534148f2cfc9111 SHA512 9b61004651acd10a750658099e3be55765103410c4289b2a5bb35c9c1b06a62ee6798986081bdd1e2e60bbb398e575c0476b4b28bbcb5d10ebab10ffa29d0665
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/gluster/Manifest
index 3bea1ce7778e..23b4d74cd834 100644
--- a/acct-user/gluster/Manifest
+++ b/acct-user/gluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD gluster-0-r1.ebuild 310 BLAKE2B 1e45815549e57081bcf4bb184deb98f2800d29fc098e260c446bc037fcabc6871920ccaf12212fb2a9a99cf4d86e814a70100ae0140e29338a21c420378ff79c SHA512 81831e5e44382f253a9ed1d948308b4684024ecdf9d877fbfc0cafe62e2a44b6e156c4b93fac2dedbbc0d49eda76e3b68b7157929327bac3ece329c05e7373b4
+EBUILD gluster-0-r2.ebuild 310 BLAKE2B 5fb526131f206e11647ff4ee45d36be6f74291ca7ecd4eee00486bf47c2a8471c383a4c207da73863cf493adb080f224f1cbb101318875650b540339ba644d9d SHA512 1e73469fcdc7709b35464c2104e826e505b6131cd8642c4604a871afdea7efbb0035ecd3a8aed664128df8befda7e5d01ca660f9a31f81b1258352c7d92b18cd
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-user/gns3/Manifest
index 35908d4cdf5f..75ef68e942f7 100644
--- a/acct-user/gns3/Manifest
+++ b/acct-user/gns3/Manifest
@@ -1,2 +1,2 @@
-EBUILD gns3-0.ebuild 232 BLAKE2B 20ec0fa83b63d956e2bfaf4a803e775b9d10f927e56b764d2d4269b50e0b3b21a6252ce7932bfad37328b84604d7bfc396808efb7df81749c39d11166aacc795 SHA512 531eb5a96963a58305b1e1f6f8d73eb176e15269d66849f4dc4e31ecb40804cd2fabfa79a9ac3cffdcee4b330b594a169eb069f5278c0a1067e249036e299033
+EBUILD gns3-0-r1.ebuild 232 BLAKE2B 6d5666d87fbc8172fe52f27d3f2b2807dd068124b6906c193b1bdd94370abe8b4b70a14ed943009a98b875ff48d641c631f3139f6c0a552acc871ceed4055521 SHA512 bce774a6f868eb1ee726fba6ff299ca7da8e49efe118b525ae7e044f9d696b84e47058f67ed04febba0cee83b92daa15c96b6636d4c4d1fcfc1d56f0dda6d7a5
MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
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/Manifest b/acct-user/gnump3d/Manifest
index d56f9b32d969..8ac18483ded4 100644
--- a/acct-user/gnump3d/Manifest
+++ b/acct-user/gnump3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnump3d-0.ebuild 248 BLAKE2B 75238ff7e3b99f72a975759c0b4918b86c3c76718db502d2349df4c00c1057cffe2926a9dfba2d4a15f8dfd804fd622a8a7e688f2d68b8b3f8b9132285ec5bf8 SHA512 7c2c1cf691282d0af2d8fd912fcfe1b843b4fa8ad3bc53c9426765e442061db11a2623e3528fec25bc9daddfdb5fe0038c0517916a756f81708d4d3e15b7003e
+EBUILD gnump3d-0-r1.ebuild 248 BLAKE2B d6221bd60e314001cc6be01c7f031c2428d1b3a92eb2b475346238669329748e5739c8585a817644e01d7bee6ca4691a1510c14ee4b8d3e086aa88784b2fd06c SHA512 51548e6202576b4e871337d13c73a6f84fc0ac30cb6793dcb31659401fa3c4bc9e9cfd12b3e2f455b08512c34b108d21a84f89d3927a3c23120bb6f6373dd4a0
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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/Manifest b/acct-user/gnupg-pkcs11-scd-proxy/Manifest
index a512b9e9f631..1da6ba5a7c78 100644
--- a/acct-user/gnupg-pkcs11-scd-proxy/Manifest
+++ b/acct-user/gnupg-pkcs11-scd-proxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnupg-pkcs11-scd-proxy-0.ebuild 283 BLAKE2B 42ea5901fb893bc59524c8de52b32f9ceabd5081a83cae92b6ec4cd6075d06c11281d8baf3a653f7d0dff0a0fb51a1fd20055bdb5d8982a1c925c0f99422b7e5 SHA512 6b3187ad8be474ce2a15e0b70cbee0dbe79c0386bb0a667cae9e6c262d895be838c473a9181b2a0655ca353a10714f60ace447115136035dd38971fcca7e0767
+EBUILD gnupg-pkcs11-scd-proxy-0-r1.ebuild 283 BLAKE2B 9f07949f925ff4e0c6cf5c1624e0db36f536211d36fdf3b43410cf43b2894603f599b511a7bb7bcc3fd3aa0387c4ad2d823839e1d6b51c59d53656cb6ea07a29 SHA512 4210da65d43a8f27373939d2b164a412f0eb23f5310f1516a29fb452c3cf8620a03081a916f534994602ba2a669de3094476c30684853361ff1e67765ae3b68b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/goaccess/Manifest
index 3e4df5f3f69c..2821db54b048 100644
--- a/acct-user/goaccess/Manifest
+++ b/acct-user/goaccess/Manifest
@@ -1,2 +1,2 @@
-EBUILD goaccess-0.ebuild 260 BLAKE2B d5d0435007463691da21097639515ef0e3ca8ee1fd678cb8b81ede6a902f280233f67d42de8c05edcd0fcabea0c2a57d9c370c7363e9adafa0c80cfbf44d5ec7 SHA512 407e997aa80076cd69fb31b76cd9b4815b29f9e4588ee6aa38329b8b6c2c7cf86df7fb67aab636f30deb0f4049b01d6d3aabb0187bca63a03c388c20b2d5a155
+EBUILD goaccess-0-r1.ebuild 260 BLAKE2B d5d0435007463691da21097639515ef0e3ca8ee1fd678cb8b81ede6a902f280233f67d42de8c05edcd0fcabea0c2a57d9c370c7363e9adafa0c80cfbf44d5ec7 SHA512 407e997aa80076cd69fb31b76cd9b4815b29f9e4588ee6aa38329b8b6c2c7cf86df7fb67aab636f30deb0f4049b01d6d3aabb0187bca63a03c388c20b2d5a155
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
diff --git a/acct-user/goaccess/goaccess-0.ebuild b/acct-user/goaccess/goaccess-0-r1.ebuild
index bc260252062a..bc260252062a 100644
--- a/acct-user/goaccess/goaccess-0.ebuild
+++ b/acct-user/goaccess/goaccess-0-r1.ebuild
diff --git a/acct-user/gopher/Manifest b/acct-user/gopher/Manifest
index 9b5ae802fa83..7cb27d4ead13 100644
--- a/acct-user/gopher/Manifest
+++ b/acct-user/gopher/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopher-0.ebuild 227 BLAKE2B 64a69b84e41a22af7eb32a904c734223fcea3446a1b4099ea4da626c31b5e98b1b2670cb44723a574f19f13d5a370dbf22e64a404719c8826843ee562ba95615 SHA512 15d3b9dc6bacd693a1c24a1a556e5e9d5a65c84fe8571207a4484b2033f44e7ba3d9c158c94878da241027deaef61e9bc454ac3864bb9d73ae8fb2cbb0599b6b
+EBUILD gopher-0-r1.ebuild 227 BLAKE2B 9f16a9c8949369dc2c513dd8af9040cde37d5a73a4f5c0a64395dcb7904b852c3b6215e3f249295773398553a6fed5b66dda845446120372306f7b50d4e1cc7c SHA512 0c702b7a503107d042d54d9087959a0c0f7af63f0d3951e371463cfa7bd94f1cbb752c12a1923ce91a8d19057800e566ab77e7ffcfd2ceeb391a889ad38ab09d
MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
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/Manifest b/acct-user/gopherd/Manifest
index 1cdd07491277..99ff813e3f22 100644
--- a/acct-user/gopherd/Manifest
+++ b/acct-user/gopherd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gopherd-0.ebuild 276 BLAKE2B 6a223e50bc59ce6e9c804b3a9bdad43da7608e6ff127ee45b32304d5943de1d322bafb6664f804279780bbcf67de1591a4016504ab175b65a722fabb5bbfa148 SHA512 ba112e01d723978f42d1b408c4e75fd06e00af52f7cd32af74209c4d6efe98e7e1c488404c228d5c064da423684a6a1c5878ec2a98bc4ccd4e2d62a7dbe59c73
+EBUILD gopherd-0-r1.ebuild 276 BLAKE2B 948f40b6fccb2807b79f82e5a76c9d4cb5426f0886a0ffa027a18f27637942c5fa0336b9fec5c8dc93447fd5f3c166ce0a160dfc874779a3a18f927be66849db SHA512 9d3ad91b6429fedb289ef135c1aaa08f3e497c83dc8a7bb4f8b2596422230bea3e4a7eb9aac069caa13039eadb19480a2c1c3419f7eb48c1176c9e2fb1fc9521
MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
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/Manifest b/acct-user/gpsd/Manifest
index 5ac63e8fcced..4bda56d2a4fc 100644
--- a/acct-user/gpsd/Manifest
+++ b/acct-user/gpsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD gpsd-0-r2.ebuild 245 BLAKE2B 19ad403816f58a3c5337d74236576a2afb7ed275a16371a63e3a51d30e92d38272d58b1c538a9cecfaec5fb765b7711b00817386d047e64b8d8c1b4bcfcf0298 SHA512 f408a969cb5d2323f12383aa7ace687e8bd40015586ded3ce861441f55cf9afadbb95c787296a1adac1c254174fe89ab47715a59dbf1c118893be28b327e687e
+EBUILD gpsd-0-r3.ebuild 245 BLAKE2B baeca11f2c5eb7decbe326d582902dff30602ecb4ee967837e3bf2953ba014f0295e4e43e21c9f39675c15bf4ad53a71cb1850ce5b0b8bcc73dca7d26b4cc8a3 SHA512 889ab72d1d8d65a439218993bb753a2f783ce08c12e36bbc89466db05efe24ac2532dedfc616085eae411e28aee69fc393acf2f7a702d0a0f657dc07a6332cab
MISC metadata.xml 276 BLAKE2B 51ed91dbe57f48aa4af2c9fa6fc16fa70996a95e31096505ec3e9288f04182aaf09feb0cd3e2e1c45e37dcffc528c788995ee4c89ea73b3c736dd9ec6172788c SHA512 b0a243998a4962647e6e5bbf04f9d92837c969c5a2f44d1c752a032cf3f0308d0ad82dcab968781b8edb88aa49748e27da617e7c3587647d4637db0912a4cb95
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/Manifest b/acct-user/grafana/Manifest
index 526512f6a1f4..85ca34c8f43e 100644
--- a/acct-user/grafana/Manifest
+++ b/acct-user/grafana/Manifest
@@ -1,2 +1,2 @@
-EBUILD grafana-0-r1.ebuild 227 BLAKE2B 4cc93e0dd1ca0a19779890cf0aeda971b94f33cc31689a3b73ecfc94c4ead92b51a10ae3857637179f5ee66ae7c8c3cfb666e97e4bf19d4d4729e0998e4e1894 SHA512 898cdfe135ce35131b8554160494ebb53cf3c3f7cf1ca367751fa1cb4c7561c0cd3d3f6ed5b7a998c650243732edec70165fb261e8d6bac3bf9753da4e49ac66
+EBUILD grafana-0-r2.ebuild 232 BLAKE2B e1fd7a330a3ccc103e0544c649a28c7cc20b9e4916a975c8574c12ed45c7a41f234a3e80f588a1921c6e894f82ff75078200ab856a4d282dddedfc57db77b30d SHA512 fe42757173c135bde8d3d117eaae184f6c914013ed7542bde0d7ec0313a4d95edac51aa30f40f2e3727a63c15ac37a82f6b156e374f016300bcd426092eb8306
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
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/Manifest b/acct-user/graylog/Manifest
index 39515c913ea6..2e2f748133f6 100644
--- a/acct-user/graylog/Manifest
+++ b/acct-user/graylog/Manifest
@@ -1,2 +1,2 @@
-EBUILD graylog-0-r1.ebuild 232 BLAKE2B 9ab8206f7f5247a8736c6e5ed848648c4f965b88e77ed1991330447c783c8098bff5165a0df64d4e1b3ae279ae517104cd5cb5e598dec6538e84097b7b6a9df6 SHA512 1690e03bdd40cfad8e59bd92272964c040ba841776fc9ae35bf5bf92cff528363a12bc4ce508250cfe7c26a4ddf2125769d29902815bf98bd3c159f1f1cf98b5
+EBUILD graylog-0-r2.ebuild 232 BLAKE2B 209a0f58d773326cab999819ba5bc867f980e0e03c6f866fe8f6d45d75b95bbd026f55a81beacbb826ea023f12bd84531152278ce079b33b60a7b9a12cee8b88 SHA512 44d76c7c58eeae248a95cb65263ade93b809ba301edd2e4a821932d67c5d4a940cbcca520d5eb37d9c7829f98133898d60b725de90371275a5eb51c113cf299e
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
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/Manifest b/acct-user/greetd/Manifest
index 887b17f48071..5713b85ed5ce 100644
--- a/acct-user/greetd/Manifest
+++ b/acct-user/greetd/Manifest
@@ -1,2 +1,2 @@
-EBUILD greetd-0-r1.ebuild 237 BLAKE2B 2772ef9a59ffdee577ad2dac61aa0c4ba859143f803d2d1f51ce42c42999224b83e8c9ed22e884fd5485dfb73cd2d39af01d6cb4498322a4c2d165c00a256fa9 SHA512 43e09dfb2f6c5297c56ed19ab4c3ee0ba236f05fc81e4e9f3935288a6df7f363b975aff3bfce1614ad3b6f4fe7f1305f6af2ae9dc3c286e752455e941e8d7b24
+EBUILD greetd-0-r2.ebuild 242 BLAKE2B b32701199e49f2b69084e26baf48d643c55b9ebd8dacdbec62b5434b1b34b4b6ea6228af2617c036d6b24a06c38b7b2d20e2f475de0a90f37cdf6076c764d685 SHA512 ebcff12be5d323c1c08a63ea596c35deaa07a0df60757ccd587540ab0098cd20e7276cd667ecddbc655be460e62f13a02f25c52604c2ba388a21041da876f0de
MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
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/Manifest b/acct-user/grok_exporter/Manifest
index c246234d6229..b86ddeebdece 100644
--- a/acct-user/grok_exporter/Manifest
+++ b/acct-user/grok_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD grok_exporter-0.ebuild 255 BLAKE2B 31069c2ac77954eabd35cf8e33ddfcb6652cbcfccf8da5d592355ef296ff66958c97df5bd347986f476d8de36409149e3f8ea484c920015d7aa9b2a5dd9593fb SHA512 55937de55bd412846a4698c892403ecee1905921b6370fd7727b128ebe45b38af09c97962187f6d6050ab5142a5292a2479b1ddeca0a6fdd1c9d1bbace91505c
+EBUILD grok_exporter-0-r1.ebuild 255 BLAKE2B 5e464c5e40c650fd4e678dd7bec051c68273c6b28ec5a4fe31d9861622422896b2e2f4ebc66ab497a623ab6056d1b50c535ec5c5400edf174bd972ac354555ab SHA512 75907cef380ec3aae1f8193bae3f34b505d95ccc9f319169e0fb3f07fb1aa94f1e3177dc34cc5d5873fe67a1b4b1f0a05efb0b0067702fd82b9f10eff7c667b4
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/groonga/Manifest
index 24e890357dea..982cf7c1f549 100644
--- a/acct-user/groonga/Manifest
+++ b/acct-user/groonga/Manifest
@@ -1,2 +1,2 @@
-EBUILD groonga-0.ebuild 243 BLAKE2B 16297ee81bca4812b3c8490d2cf77835c04b2fa1f23aff3298dd27c9ddfb5e1276f4073fdea5e4301f5d229255ed5d769e86c527037504231a74b590178bb845 SHA512 b1313325d3118e89286d1cfa8becb04f1d968c79bb47801b0914bd595a628feaf19319fa97f43f17fe770e9baf821ec7bafa6e1b01c261abed1c2073e158c2dd
+EBUILD groonga-0-r1.ebuild 243 BLAKE2B 42be96b0b4a6cfb70a6e84e865c36f1255282f32d10f61e0ff783b5e412f3abd51250c667e0892d3203a942955188ae52a48c7adc6907bda6a73f66937f76aac SHA512 e125df0750783041ad297e9e1d6926beddde03c03be6560952c7559c10cd364e450b425c756b2db8c42f71bf98ee0635c1f77c2416d4c9f0058b0cd562d86a60
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/gvm/Manifest
index 47577465b401..bc21805086bf 100644
--- a/acct-user/gvm/Manifest
+++ b/acct-user/gvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gvm-0-r1.ebuild 284 BLAKE2B 2f31118a18a69e3717520bb9597e3b56b76bb2c35b9d577b132fffc63b31d75de83266c0b3f035f34fb7c64cbd4cf7cbdc5f4899228ca9267e7c55ed15975be7 SHA512 f46413c09d6857aa61b127f5c078ab20e299f1373ad8c0d6157fbf6cf4f24c35da16b0fa868ae67271dba8709485b559acea54be30559c83acda1d60f54fed49
+EBUILD gvm-0-r2.ebuild 284 BLAKE2B 7856856a55994f90efef0080dfc64bcc68c18b0ad11f31bce4875e7abb23d29319076a8b86c9c5cf5cb7be78ca41cac67cbd4e56ee15eb2c884d7cfb4deba6a6 SHA512 7c6d8820449075a854ea216aab76af47787416fd18165b63337d1ed8d605784f76a50cb94396a383fb93fc48db21068912a263ae020611232a661f437712dba3
MISC metadata.xml 480 BLAKE2B f044167fa448b019fb56009a38d0d1d84d7ec1df0281d65e4e5719458e154a7def87ac71decbf0cdc3843bcd8b56e44e89a896db2fc62d951ed102f7908897be SHA512 4ff3c81f201beff84473ebf82a9820b761bf30dad40e7702bf72d9053b64291300f98c0b45c50d5970ea1ab407e717dd6c1172df99cdb2636dd09100d630546d
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/Manifest b/acct-user/h2o/Manifest
index 9458d1b0fc6d..e88fc1d928c0 100644
--- a/acct-user/h2o/Manifest
+++ b/acct-user/h2o/Manifest
@@ -1,2 +1,2 @@
-EBUILD h2o-0.ebuild 240 BLAKE2B 1fec3cbc69c51a521455776426cd3e672eb84e43a2a1feae998702558425b2f85a5d5c8a3e7948a76298ff7da082fd838fbbd696970f5d55932ad64396f972de SHA512 9f9db91d65ff1707372dd5470a4d4a4b6ba9991d1567cf0c0e82f9886c0b8b87612c75839e6668ab5bff295afb7e7fc6427295ac80a8de61eeca2e7c322ab566
+EBUILD h2o-0-r1.ebuild 240 BLAKE2B 84a1fb19cd03aa52b363c92f9584689aaeb96917d4fc261ebabc59466c6f4137910a8030ae0c78a7c8d872c2ff3a0a456e6c115426c4c74ad8471ebada52ac36 SHA512 0b42ad953a294bed5ed34051faa0c6f5055dbb100cc2c2cc96839452289ac2f71d96303004bd2905dc6a58ef585005263013e2b9e8eaed2341285e947107a115
MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
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/Manifest b/acct-user/hacluster/Manifest
index e893c889774a..a52b33307dad 100644
--- a/acct-user/hacluster/Manifest
+++ b/acct-user/hacluster/Manifest
@@ -1,2 +1,2 @@
-EBUILD hacluster-0.ebuild 290 BLAKE2B f7a2214a320f111d7b47cee7796eb955961cf79fe86f65f2ccc36d85c6ed6d041f475712d5b16393a1e5be0a1f9b55264eac176119787ee6443a063ed3f1f6dd SHA512 9aa8700f061a9229c0e3179cf8403321d62aa8bb1bc02f076db2f21fb9cfec40cfc50a9b469d5762a0057da53717be306468bd5fd1a02a1da52eae5665d21284
+EBUILD hacluster-0-r1.ebuild 290 BLAKE2B f30238430a6f808a2e247ceda7637ce5e531dcd197ae04a1e2863d0a321f7eeab3b0b7609c8fea37ba278759c032d74fc6b71d765cf8088dd8d1ba2b0e632449 SHA512 0f4497b2a07b4f62af4a08fe4546a1c9ac0366a5ebdd4753cb158ba2c4be1ae6410b88188d44e10f05610098113f15dc6dacd174b888e477db1747909e151e3f
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-user/haproxy/Manifest
index d17ee65175e6..0400f76bc5c7 100644
--- a/acct-user/haproxy/Manifest
+++ b/acct-user/haproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD haproxy-0-r1.ebuild 198 BLAKE2B 6974ae3794190e1b954c59c41f5b63138fe972c91009f6383c5ba77d6ab0c8de4900cdb546dd82d1a2f04a9333a76c64e95e5ad3a239474def89ab39ce9a0b6b SHA512 fb9d667b2e516a8552702a00b744a475b4b0f530c432afe16c4e616afbbc818cb84f179afe96fa170b25c08dd6fac9dfce026e2a3768685d31c8f81ccb10c352
+EBUILD haproxy-0-r2.ebuild 198 BLAKE2B 461005f8d344ef6b9ea0c2225fd2bda39bf788791b9753715fc800bb394c8b111e2d74cf2725e2ff20a1dbbed3d9742eb98bcdf29a310ad1283d3607c782deac SHA512 5882f16e82fac763fb9af542388ff9e8e2cb60e7f1ce18d2da5a81e30bb492e118abdb95b15de3a0074a8bd5b9f891224f0b35feccaf47910d84cd4b9c9f5edd
MISC metadata.xml 250 BLAKE2B 127d3b63d96953a7263c1ecb0f0cd905cbba9006349ae20351476072eb08aa6e5d0da402e3a90fea218e2e05971096bbfd13d2bb6f57221d8772885075dc6523 SHA512 a8423fb0d09057a311f01b4fe8bc03d0535b701a96846a7617e9ea61d7aa3ccd7e8de31451488a7db435e8f8178a5dd70e5511080eccee8880d6959d9de4c0d5
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/Manifest b/acct-user/havp/Manifest
index aa601c86f5ef..ac394db67e25 100644
--- a/acct-user/havp/Manifest
+++ b/acct-user/havp/Manifest
@@ -1,2 +1,2 @@
-EBUILD havp-0-r1.ebuild 238 BLAKE2B acbd9dee458770fca1da0361f5484f3b4521e39bec163069d6cf791a3e800b058779fc0875107296f1fe69a7fda669552d7c085e566ad071974fd0a8594f50cd SHA512 7dc3392021f9f002c4e6fbc4135568b8ff3670e4410953c2cee120c10f489f3392fb0c760e1f6ce2b533ad97d9a0ef2348fa73d714540209b89277684ff740e9
+EBUILD havp-0-r2.ebuild 238 BLAKE2B acbd9dee458770fca1da0361f5484f3b4521e39bec163069d6cf791a3e800b058779fc0875107296f1fe69a7fda669552d7c085e566ad071974fd0a8594f50cd SHA512 7dc3392021f9f002c4e6fbc4135568b8ff3670e4410953c2cee120c10f489f3392fb0c760e1f6ce2b533ad97d9a0ef2348fa73d714540209b89277684ff740e9
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/acct-user/havp/havp-0-r1.ebuild b/acct-user/havp/havp-0-r2.ebuild
index 9b8f3542221f..9b8f3542221f 100644
--- a/acct-user/havp/havp-0-r1.ebuild
+++ b/acct-user/havp/havp-0-r2.ebuild
diff --git a/acct-user/headscale/Manifest b/acct-user/headscale/Manifest
index 5d6202557e85..34947f39a002 100644
--- a/acct-user/headscale/Manifest
+++ b/acct-user/headscale/Manifest
@@ -1,2 +1,2 @@
-EBUILD headscale-0.ebuild 304 BLAKE2B 8b1175d9b9791c2d369f463dad3fa103b68ec9528026c716459e1cd3c6b30bf57a24f90fbd7930a8b2b5a0db08da2f4d1b48b58a43bb682bcd4d9c90087f5723 SHA512 a0492bb398edbfad57caee21b9e2beaf8f9f58471cbbedcd74008ea1ec7fc2c147859e7e894a7b5ca292010751f12f409287550ac89323d3df223d73e629d97b
+EBUILD headscale-0-r1.ebuild 304 BLAKE2B 8b1175d9b9791c2d369f463dad3fa103b68ec9528026c716459e1cd3c6b30bf57a24f90fbd7930a8b2b5a0db08da2f4d1b48b58a43bb682bcd4d9c90087f5723 SHA512 a0492bb398edbfad57caee21b9e2beaf8f9f58471cbbedcd74008ea1ec7fc2c147859e7e894a7b5ca292010751f12f409287550ac89323d3df223d73e629d97b
MISC metadata.xml 500 BLAKE2B 7dc95b76985ac9cb40ac5f12de2739f6e8f9f4f4a68a0bb397968c7419900c52c6233df1ce7eefa369de0a66cfa07ce8ec71624a6111d72e8c91553012169228 SHA512 d5b77a9da9eba9bdf9ba2ce675f92ca058f145f5bebc3546ad7acbff8140c16915afdf153bba8aacd2ce5130d7427cdaedef64efcb368546da91cbac8b5495e1
diff --git a/acct-user/headscale/headscale-0.ebuild b/acct-user/headscale/headscale-0-r1.ebuild
index 23080db987f7..23080db987f7 100644
--- a/acct-user/headscale/headscale-0.ebuild
+++ b/acct-user/headscale/headscale-0-r1.ebuild
diff --git a/acct-user/heat/Manifest b/acct-user/heat/Manifest
index e68a45215a23..1cb348686fdc 100644
--- a/acct-user/heat/Manifest
+++ b/acct-user/heat/Manifest
@@ -1,2 +1,2 @@
-EBUILD heat-0-r1.ebuild 295 BLAKE2B 1e3561a469c98f002b4a6bd8359a8d4606678a5e1aaac25d3a37f453789d42601319dda36dc17a5c2a74d2b072cbbe5fd04b3f23ef40fa7dd2a3139314f96cbc SHA512 5662d13c11c13d990f0eff28902fd6ea2602ba9f68b6fea73d93f0d530ee9fd5c72fcbecbf88dbe17d937d9c5d3fb84eb217b4cfe5da5bba7df8433d6be1a3b2
+EBUILD heat-0-r2.ebuild 300 BLAKE2B 71eb6b89957cd31d25507b049fc1eafdb4fcfe369eaeed0b5b1d6f92edcc97717400a8ea55cca5656e187b9cff5bed8c5c02e99b64e4625087c0b248fa633c15 SHA512 584a020f9fb8f830707d56dc36ed653d95113d43620188dd59069865cb0462f208ac3c02d7d053ab480adbf373602672e5ef395d935acd7344b544129545d47e
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/hsqldb/Manifest
index f8366816d326..77c46d685002 100644
--- a/acct-user/hsqldb/Manifest
+++ b/acct-user/hsqldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD hsqldb-0.ebuild 222 BLAKE2B 67982e0f80c08fab1af2b12acd4f40abd1e034b634921660da0a9ba05f4de7cd31a0a3501567c14e0bcc172b91c5d2ff1e397b90ecabf70f3f268cc377426bcb SHA512 f95d9b0d79da5c68a89f6897b0e6944e7b784bf59b90273e13e86b212470b5498e990256c6e971136e165bc4a9399034f4a811e3aa265e072e9ff5558b3b150c
+EBUILD hsqldb-0-r1.ebuild 227 BLAKE2B af9bec82b5f401384086e38005ff91a6067c4c7e30508d08e496b64788f14672703238228ecd3f1107801da34e96d492c71ea284488efca4af5a30c6ead9f328 SHA512 b87302c714b5471a86366c1cbf99968b6acc548ed808b2083df886890a3f825f4c2bd5d9da685f3a5566b79aa06a3bff68ece1d4218003b9aa5e4dd51970770b
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
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/Manifest b/acct-user/http/Manifest
index 48c3a36e5f2f..c7777603fdd1 100644
--- a/acct-user/http/Manifest
+++ b/acct-user/http/Manifest
@@ -1,2 +1,2 @@
-EBUILD http-0.ebuild 267 BLAKE2B 5794d9ebd724dc92bbf64ba8f46e0599b11e3136d14cb01689e41f1fff86060e7a2f1ae6744abf4e700536e1da7285f466c55ce463012c0f1a6fda609a3eefa9 SHA512 739f658ae6304d566b2334de0750660bb5a61567c85ae1fa31ae10e02e03eaa57c744cb88d19ce017f27d700f6c6776332590fde3b91bb12afd0bc4d7dbe3709
+EBUILD http-0-r1.ebuild 272 BLAKE2B 19b22801fc209cd04116c20182a84bfe11cac0c186d0545cd9953e49a83febb73a5371ced5172e26e11600f38d7bc8c995eaf9ac545ec29acff7b11b88de9912 SHA512 05e7ce63753212abceae3faed2b49d2bc2edafe1173527d6196e5f6a51aab649ba2d0713df085f377e7e4adbbb8cce4d712f8891ed896f22eee8e6ce1a1bca0a
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-user/i2p/Manifest
index 940d6afeb578..2f5763560b5a 100644
--- a/acct-user/i2p/Manifest
+++ b/acct-user/i2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2p-0-r1.ebuild 269 BLAKE2B 8ce388f120bfb9cd45b13859c5830fd5821b82d6c899013e5ca4f78c01adb1cbdb07627e425d2ef9da7f89cbe78b3bf912c697b5aa378327efa85db44153f3fa SHA512 2deaddf7b77521c111a6d10ebfb87737957353c40dfd3e6d0e77e0b9e0735445f7a5eab327cb532be2f19c097d64add6b778ffbfa7fc2b37c96a224a99c95b0b
+EBUILD i2p-0-r2.ebuild 269 BLAKE2B 64ed9cb226f5aabb45661065f730b54a3ac6b76ac13f1596a7ebdee0797133e67a29f78ecdc0813744e8d4ebede566c42dc3a6c10cf20a40365940a12b613de3 SHA512 316ddbc8494aacb70e19f2cc7f4d6e8d52d7973ac7d6e5be83d0ab58dd67c13a27f847a76abe69ac1cf3d4860a37f0d73b42cdfc9871353fe953674fc1c99ee5
MISC metadata.xml 483 BLAKE2B 6e2651a8813c1dd7ac7feef36431a6e08809d57b66381ded08d142088ee4f71d3fd2fed3e441cca0d87b1c22075acac5576528b84997743ad2b2b05144d66b98 SHA512 354e27f466ce32837109c395204282426ff5ca47f7f5e6c50679add744daf3b6507ed9f6e1e954db4ddebb98b9c9e556d8a0de0f58b9a0882905f83b46f69aef
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/Manifest b/acct-user/i2pd/Manifest
index 36bdf612149f..7596d336bbfc 100644
--- a/acct-user/i2pd/Manifest
+++ b/acct-user/i2pd/Manifest
@@ -1,2 +1,2 @@
-EBUILD i2pd-0-r1.ebuild 309 BLAKE2B 37544474dd3890fd3583f41adcab24d3623b40ff8c0ba4a31b2a133e29bc90a15b2f3375fb968f0ed3e754b8683746ce8c834ecfc6029782ca533882c8189621 SHA512 417ea30122389c49b7c104d84068c0413040b6dc16b61e5f63f4227a22706f00f971d6b58c1aa76d45e50b35d54614892e0f9cc430ac2f870a396b1fcb3da5e1
+EBUILD i2pd-0-r2.ebuild 309 BLAKE2B 65ab685340e587acfbfe0e5c1b3fa03a9cb96170872b56461ae4ea078fb5973eff29afb46e610c6685789f47edd56bd2579c0c8b399763db17c62a08b98fdbee SHA512 138c84f14e0159807e8ad0b99897777f08f41869f1179eed2a45b6c023e40930da18d980fb1b09932a839e88cba078dd7af15108b3a89d0acb898d38e1f74084
MISC metadata.xml 399 BLAKE2B 85166ccc3c029d08bd993b4040ba89b287a14fe22bac1a96834686f074766a5545c64e6062766d0fe4162cf21e41772b8fedfac25c0d3f6f23bc38fc6feb1b6b SHA512 5add7dc4ce04ba1d51cc81d277ed0b7d50e16b678847aa00061fb7df1588f7080a911f54904ef36a3577dc199051189400cbcbb76b2c632cbbad72c2b8876da7
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/Manifest b/acct-user/icecast/Manifest
index cbf6aee68bd4..23c3c40769a7 100644
--- a/acct-user/icecast/Manifest
+++ b/acct-user/icecast/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecast-0.ebuild 245 BLAKE2B 8b430097e23b9528d17caa20148d04d8b084d1c07419c5f4c3a9dd845c11fb4b4fd2024fc639e0c0cc53430bf42d546c90fcf92a52dae44dab9ea254ab54afef SHA512 6e3b41e667d7b0b538ecd7a6ce77e8b696d7a87155f25c4c63e37470f54befc978d40f5dd4687d010f4d04da7b8541ad3a03e13528a0ae8321f7b23a26e119e3
+EBUILD icecast-0-r1.ebuild 245 BLAKE2B dcab43abc77f4943762b5da7754a4daf61d15734dd47487cd6128605c2d671759ac923a10cef776055fdd61c86d29cbf24d19ecb41512890a7974215e61cddf8 SHA512 801c18cf2e12144c2bdd2ac82b3f61bb0724d30beeb13447f8e553f37b4356a2aa800118aac463f67e5000756121ade2be86bab15d68085ceb9ed50399b35590
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/icecream/Manifest
index 910ba682cd57..b81e055a6b76 100644
--- a/acct-user/icecream/Manifest
+++ b/acct-user/icecream/Manifest
@@ -1,2 +1,2 @@
-EBUILD icecream-0.ebuild 285 BLAKE2B 19535fce6d34682586f64ec1998fbc85f7ae3b3eff8dced88a578a3da5120d9afc813415e65e1d06ed1965a0569bb0848c60345130a87bdaf0b4c23e023abecd SHA512 79a420440950c92c2c3e4f4a625c8f7ae899965dd513b21bc4678b9523990ff67226392efb75cde225c0b558d364252c9fdd3041055d675913ccbcfb187ef801
+EBUILD icecream-0-r1.ebuild 285 BLAKE2B 177a2df3049ae3a155a4bc1dcc4142ace9943225430a6f3f4e934dd6826a36bf2d4d0e1b9224e8d1fd779d580dd5f6a561fa599b69c11fe9c9950df75297c55a SHA512 a8c32e6750aeea9fe3158f7dbd63d324c43fa4cf0dd248b772ae513466dff68cf3c9abee5b29056f5a0934dbf3da97f472c1c741f807ed8dc71bc8b5bfd28a23
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-user/ices/Manifest
index c721484a0ae9..01f7dc9c2c32 100644
--- a/acct-user/ices/Manifest
+++ b/acct-user/ices/Manifest
@@ -1,2 +1,2 @@
-EBUILD ices-0.ebuild 239 BLAKE2B 6e86c9440965d6054a0becf5fe6f41561fc1de03a7beb6983496881f938692f42d0c6ec0f8cb9c7ee026acec1c55d486535ee0748698472e8ff4a576990204ac SHA512 f4fd5573968347da2b1ff2cbfc3f077a31f97419e16f94dc8b43dd83d6168d3750cb114ca9f8820880cb90282a0b635a5c3a81bd575d6925f6f38c7f213ad72c
+EBUILD ices-0-r1.ebuild 239 BLAKE2B a982b747f13a7ec66377cd1bf86956b8a38b4795ce759d5b723a9658b922cfe79ebcfc007f9c9c1996bda202d05ba061b82cb0dafc6ddd949303026634c7953e SHA512 1ff3b080963f74f70e0263a13478945d25ffb9f548415d17a7991683a02ef04d6f34fa1391e19388b69a968fe407f64391b069034ec03c3680c48653aad6adb4
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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/Manifest b/acct-user/icinga/Manifest
index e3987ee3adfa..44d82fc684cb 100644
--- a/acct-user/icinga/Manifest
+++ b/acct-user/icinga/Manifest
@@ -1,2 +1,2 @@
-EBUILD icinga-0-r1.ebuild 267 BLAKE2B eeaeb382a8f78b03c894f49ab8a3525a4643ca232a5d85064ee99b00323223bb36e1217fa225664a00d0577396a7de52acab5eb8d7d27c72076f45aab0a2f72d SHA512 b3f10417fdc4502b5f1af1306745112c1805115a6b73ac4b2bea2690ff0e48597573f799d8f8f9fc380b72cb11c5800b232f7013b2b9fad4e0f245e50e5b5a6f
+EBUILD icinga-0-r2.ebuild 272 BLAKE2B 349c36f74f7eb14f62567c50b9bfecef9bcd3e45fd52a0b69d6df5db0c6764d25d46f5396dc3551112ae9fe7e9c92a54d3d2383af2b65efd267b3b7b097ce643 SHA512 2b8efea203805e7cc972e6e8a80e9f0b4742daf42c06fc66d2478b852b7a9b941c4802b5f4b91174cfe42b9ba4783eefdab75a2c315d89e0361ffb9efce483db
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/icingadirector/Manifest
index ee71646ac6ae..ae35e38daf3c 100644
--- a/acct-user/icingadirector/Manifest
+++ b/acct-user/icingadirector/Manifest
@@ -1,2 +1,2 @@
-EBUILD icingadirector-0.ebuild 275 BLAKE2B 655e229d89382674373f8aed936f58ea887bc48d8e472f150b1c2d17884e12fad53d56609143644acf7b3e4435d5afa18d523bc7984fa1678c599acbe87950a5 SHA512 fdd449560d718d2d6454e1260c137da6d9e6b9eba8d3fa8e3b22169557e2232da247cf812a383302ba39f71bd06e3d5def4fb583aafcd8a9bc66930feadbf6fd
+EBUILD icingadirector-0-r1.ebuild 275 BLAKE2B 71231c936fb2e49a1f2fdd378782f374cb80aa722f8ce24c720c387af3575aa62de652154ca707c42af4ee66431dc32581027cf68d00be55b325eb710a2727e6 SHA512 b252e556f152314f4549af0ec6f56d8fdfbbe7625319402c014f1b49c4d22188148b2b0ea6174ed660a382c58d82f5b6d1bf59e7b5f67b9a249dfb21dc52af1d
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/inadyn/Manifest
index 0d026aa75e7e..9ca05c1cc56f 100644
--- a/acct-user/inadyn/Manifest
+++ b/acct-user/inadyn/Manifest
@@ -1,2 +1,2 @@
-EBUILD inadyn-0.ebuild 275 BLAKE2B ddba2e31ed71ead7a897686ae83c7e72a182c46ea50ec0b273ac61f9c822081af94bb98e426581e4589d2e057778112d3e13388a1f2eca7e96f98372a5bfe549 SHA512 b29be44ed238d4f0db793d07dca6c686207f03f3c3569dc482c92d45d43a47b37cfb5c3f27f61599563c25d6e7651db11c4d2a0e421a93d99df4505812981721
+EBUILD inadyn-0-r1.ebuild 275 BLAKE2B ddba2e31ed71ead7a897686ae83c7e72a182c46ea50ec0b273ac61f9c822081af94bb98e426581e4589d2e057778112d3e13388a1f2eca7e96f98372a5bfe549 SHA512 b29be44ed238d4f0db793d07dca6c686207f03f3c3569dc482c92d45d43a47b37cfb5c3f27f61599563c25d6e7651db11c4d2a0e421a93d99df4505812981721
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/inadyn/inadyn-0.ebuild b/acct-user/inadyn/inadyn-0-r1.ebuild
index 62fcbf9f94b0..62fcbf9f94b0 100644
--- a/acct-user/inadyn/inadyn-0.ebuild
+++ b/acct-user/inadyn/inadyn-0-r1.ebuild
diff --git a/acct-user/influxdb/Manifest b/acct-user/influxdb/Manifest
index c59bdd641b06..1fe12cc95345 100644
--- a/acct-user/influxdb/Manifest
+++ b/acct-user/influxdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD influxdb-0-r1.ebuild 259 BLAKE2B 7048ca310193851e4a4239a35264c2a3e37d5aa2c3a615e1440c997dec0322d35cfe80aabdd072cfdf1a44bc31dc163d31cc6a3ad6b189dc00481701da7c683a SHA512 2733657d9d6e714691809e09f8041a331609e187977913c6135d204cb5c0a79fc1555e7651d629d2f537bcbb424c1c7ee68b76e21a0de83b0b303790752dd4bc
+EBUILD influxdb-0-r2.ebuild 264 BLAKE2B 040c213b779762e4e479b4f17e6a6f7ce389014becf5ffcc42d55ebbe15bc87e530fd9c171b2b17b88ea35131ad908cd9f8a4bd05e1bfb52f46a1ed037653d7e SHA512 6903fae59e6482b75d2ad23de83b33858e5de3a727f82361f233c3e05f1a2bd582434793d357eeda0b8fa8801ea09833e89ac16e9c3b0c945d2702ac4ba0553c
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/inspircd/Manifest
index 4356050b54cf..b4ab3cdca209 100644
--- a/acct-user/inspircd/Manifest
+++ b/acct-user/inspircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD inspircd-0-r1.ebuild 245 BLAKE2B 6a4ab1cdfb63dcc976506b6911e162edcb948c55eaf2c02f96be92785d750335bd4174345cfa1e38fc0ff2c62d229dd9a707d7f10ad15421f87389e5a5509fdd SHA512 23c93b5172423dc98f935dfecd5c329f76d2d2c9bb64b4a321b64aa0b5f3c36f1803c1f1c86a6074e36bcb0c6cb22d256d60aa3836f6f2d46a1250feb650f15c
+EBUILD inspircd-0-r2.ebuild 245 BLAKE2B a59a620e629286b6cff4aa0d7bcc74be89c7cb4ba1808555c5f811355c2ca72d8b5e0ce328ac5c44777f114f4c68502e64b3f8e8f67b3bfba841c477a6d92a51 SHA512 694ad1474befa2d8ae628b71a570df7ae381aa3d4e3c201ecf911faad87ad207552c27585c1ebac94babed7661e65d146f82ff5ab6dd364f2d4a5d2870e9e1d8
MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
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/Manifest b/acct-user/ipfs/Manifest
index 798fbf7be073..34e6e656df33 100644
--- a/acct-user/ipfs/Manifest
+++ b/acct-user/ipfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipfs-0-r1.ebuild 316 BLAKE2B 475d1c2e5f10a3087ad209f518a656c0a6c639b17df907e734dcc4ca5b74f9a44e30da164ab60a93554469a536fa4e6ee2703d3a23bc9dcda1633a9e64dd1fed SHA512 911065cdbd6d6858bacb0767cdfba720e5f1646475dbf72bc72bf27c6929c466594246143bcc032fb8e115fc441512d1f55db3b38896ac4b3cadbdcff11c9c79
+EBUILD ipfs-0-r2.ebuild 316 BLAKE2B 782202662bc8266d6ffa7ad5c0d107e45385e1b76b55bcb59ffde6b886834c1d7a6fa2b9715c39d9b358154862262a126041d6c3f9c86083b7801783c51e27ad SHA512 d9cba7581a34e2703782f7c6cfbadb298f0ffadfbd243e604de6bcd1a2627883d3f48f1e6c1df3f3a92f21fe1565a6b0a1d3567fffc14509b77d676cccd16975
MISC metadata.xml 398 BLAKE2B 3f15e3a802595ea6a248b0d0881829913fa7165a519c1da5424595c0ca2bd95c0af09240d03ed36ae027d8cb0581a88ced73fee78ca67363e4b4252831ad1c0e SHA512 b1de318404cbf8feba1e8c19879104282519f517703039b9805616901c39f59c1e8d1db67c32e162f5c8d598d793c7e7ca9c9d34e876670717e935b50add05f9
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/Manifest b/acct-user/ippl/Manifest
index 638e928da086..c22cfa358af8 100644
--- a/acct-user/ippl/Manifest
+++ b/acct-user/ippl/Manifest
@@ -1,2 +1,2 @@
-EBUILD ippl-0-r1.ebuild 234 BLAKE2B af82622c0a2227f2ee21b57bbd067c02e5be2398e8c8a1317d15e0848f106b2c60ef7cc0a9148a0860c98126b3b396c7e64167065c9ef8cbb95e0494ca5fa422 SHA512 c7fc16e84c2529b0e09be81dd70eaa4ecbd349f2f63a1ec60568ed7f11c79c5a17839d4d22b0ff528cf716d414d8ab9b127ef9ca72467811e53eab78b56f4571
+EBUILD ippl-0-r2.ebuild 239 BLAKE2B b7f032f1538850a81129f812d074bec943ad39fb04c1ead5079131302147e2715788a7a8dfd2d1a539a9632d587fe8291a7f6e12c22949a2bd36476a5a8d1b26 SHA512 fd70091a981e52278864b2ad403d6684e7706490e765547631045bc3ba59f1a2e5162005dac344549af53ba87f2f87e1062c767cfaa9a11d13b941931fe6eded
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/ipsec/Manifest
index 9c724beef029..2f12b286edd5 100644
--- a/acct-user/ipsec/Manifest
+++ b/acct-user/ipsec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsec-0.ebuild 238 BLAKE2B 2ac85ca590cb258a1e85966205b09c3a7236fdffb646c83d6745f1369f6341e1429419e3226220ae46d3a50d8df880a1a8a8b950a42a90ba14c89bedbcdfe998 SHA512 c423b67d7fb20e999f503695b9e96034ad7b77a6ac73c0962362dc9ecfde7a984ca9329a924a01cfb9b64ab89d48cfacd17de00e79404736db1175098b4af5df
+EBUILD ipsec-0-r1.ebuild 243 BLAKE2B 6c3abe29e851a820a92f665527e38a053b0fcc2d86e576b610a7592c65a8d6ecbdaa82a1cb9953b0c08bce86e1271b3c23ef91d0195a48751a4984ddc546d1f2 SHA512 f2ef7d9e421ff8708e27df96d90a3ff7d37e8821164fe0b8832f9361e123b589970eb2d737fc2e7de79f6220352bf4a3fd8b3fa8a1f8bcb7bd0076ad943a5ccd
MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
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/Manifest b/acct-user/ipsentinel/Manifest
index 3c8eb9cfadda..09488ad19056 100644
--- a/acct-user/ipsentinel/Manifest
+++ b/acct-user/ipsentinel/Manifest
@@ -1,2 +1,2 @@
-EBUILD ipsentinel-0.ebuild 252 BLAKE2B c08fbd023b03aaf56f920408d10085e4287c1e3c296b27ac0e0d35ca76cac40e80707d3682c26b3e46668a11e0a67df4fd9235682cd32a8090d8ffad8ece347d SHA512 5f96ec48919d170a946273203eb10445fc7279a03c615572649f7139cd28f02992acc8474d73865ff5436b60c40351dc6cf0209f68eefcef7b8dddefdd697db9
+EBUILD ipsentinel-0-r1.ebuild 252 BLAKE2B b60265a87b07fd9959b9107dabd04e81570b6c71d2c369401fdb9d60e39f19ca2966b67839555d2c80f27c6d18611aa6ce0d770f60bf2d8874f4a441eeeafac2 SHA512 c22f5876dcf7a0029939fdf44349dae51ac3ce92549e1b199155512f6713f619d028fa2ca7db3584f3d9f11194f2a5734930da353e72d89645fa26d383902c78
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/iroffer/Manifest
index 794131905ffd..6b5f9f660014 100644
--- a/acct-user/iroffer/Manifest
+++ b/acct-user/iroffer/Manifest
@@ -1,2 +1,2 @@
-EBUILD iroffer-0.ebuild 193 BLAKE2B 1c86216a35e18b8abc44fdd070666909d7155edd4a16c471c20e4e7a7cc74b8749e9d4f81471a63c3218a8447bbc8e65d908c343c035f3228788b1b4f990e8f6 SHA512 7b43394e0d1b41d30b3ef33e3811ad87b2ea1e40f7118024ffa9ceb86a08274261a16f031786df547669141aa183d8c0f74984aef6015b169a8b5bf603e8c982
+EBUILD iroffer-0-r1.ebuild 198 BLAKE2B a2598dc6e89122c9c68cf3ea6c3f986a77d376201bdf96256fea30d04e260413b125a4e08b28e0a7ded8132fa9752f4a6532f1b801697a4948920dcd2667f871 SHA512 deaf723abf2f0262838f9b1e6da21f2ea2068e18736f7295fd598af0eaedb44d0f96fc575495c0ba6295ccf4ca793d13821752292b2177d0b4d8fca852922d3e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/jellyfin/Manifest
index 56a3dcc6091b..b997dd082d91 100644
--- a/acct-user/jellyfin/Manifest
+++ b/acct-user/jellyfin/Manifest
@@ -1,2 +1,2 @@
-EBUILD jellyfin-0-r1.ebuild 240 BLAKE2B 4bc54e0908950791e6bf884c952d56f1093d0805d5bca5eed567c27026e003224a6ac1ae03b8eed5f157ab7cb7c8cb4e98d1980485d1f99aac4970c16e48cc2e SHA512 c165d480418bf0f1d8cf4da190de7d8c06e0ff274a1495ecb207830802efbfa2743ec63bbb02caedf39ec96e7d71866ed1418263b5b5e5cd78b2afd340de25d4
+EBUILD jellyfin-0-r2.ebuild 245 BLAKE2B 23504290453021e01684f914fc1550feb380ebe0c76220abed42771ff98a3418f51f7f700fb8aefc9915251bbe5b2e48b2aac539f11c3e3c1f12dc131b757e91 SHA512 b725bfec0c318719dd429c476fff3333b3fb5ea8ca2f8518ed1cd7053288eea87af38a47f09a7e976482472665d9969d2bb89efe2491015e1f7964eeac577112
MISC metadata.xml 649 BLAKE2B 29ce34c89c1300d32c3ff30990ec92e49cfab21d74340d1cd6893650ffda87920348ac5feda5ee68feff3e8adbd8cd6e58548d73879025a206dc82756a99c383 SHA512 d8a36b27ee99f29cf9dfea5cc4a9735732bb11cc5931adb4bfe1d1942378d2477f63417b6a2a694e9691c217d20c5ce84bc8d46af5155c46b99b850c0f561315
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/Manifest b/acct-user/jenkins/Manifest
index 11c53bfd1472..a13d892dbe9c 100644
--- a/acct-user/jenkins/Manifest
+++ b/acct-user/jenkins/Manifest
@@ -1,2 +1,2 @@
-EBUILD jenkins-0.ebuild 259 BLAKE2B 5571a53bf546ef42ecfb3e4a70c759d83ec650e334be863bde8e2f6fe15c26a924f8672a89a5257156c1ba9e66ce82b1cb8a97ec59e32c00985a076977a0e1ab SHA512 b0079d52010269d53a2a05ea34f8d4b2c22b65e39477cd2315742d2e4dad0798146d18faf49410eade97197da80c0444d3eaece538587a548197fac4bd4666be
+EBUILD jenkins-0-r1.ebuild 264 BLAKE2B 86746d5ee458e47c03b7366c53589cfc616ffd9c5376325a02ae0d30830caec5b57865d063afba508e21f7008c69b4c187481e4edf4ae2c95b5280a3a5f24de9 SHA512 433cf3c0a1a3840b144206156020353c97d4e0ac37019bf28a5a219ec35d8fab0a68b0d49c214f8f5de9aad4f348daeb3cf9be34bb3e0af79551bcfbe859bdc1
MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
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/Manifest b/acct-user/kafka/Manifest
index 2dc716ab8e8c..0a9d70ea3eab 100644
--- a/acct-user/kafka/Manifest
+++ b/acct-user/kafka/Manifest
@@ -1,2 +1,2 @@
-EBUILD kafka-0-r1.ebuild 275 BLAKE2B deac647a85d94e46582bf8714416121e3943b07f5ae2d3649b980c1d4ab74beac7ffe1d8dbe853345226ae0f65e2e65694928d584d9ca14d69f4b278b3d56a39 SHA512 61056ac945705bd596af484ccc6ee2afd1eb5605b04e6a12fc6e328af6b883ccdc7b004d018400dfae9e4ee587118f8f1d49cc0a9c6d180d2cfe7269d989985c
+EBUILD kafka-0-r2.ebuild 280 BLAKE2B 4cab6d8ae48f2f761d588f59e569cc5f9105c64c484bc18fd8ed743459882ffd60b402ebe0426464e26a31f536a507c598892a41e98253ad47aef53d40ae257b SHA512 3d3f1b039032ae547af211da1326a8bc21b07bb0e4f85c27926fb30872e480857b0dcb99d67df3d1d4cd2072e0e6e7f27a5c62760052f260ea1ee2b51db38893
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/kapacitor/Manifest
index 5d94a33da831..6326195c7d33 100644
--- a/acct-user/kapacitor/Manifest
+++ b/acct-user/kapacitor/Manifest
@@ -1,2 +1,2 @@
-EBUILD kapacitor-0-r1.ebuild 262 BLAKE2B 99cb2449ba72cd838f0be8aef09304e7b005a64629abcfa3a7ea6be755a8a613078aa0f26f4987d4413d0deb0221dfb2b3e6b228d2630a3b836a464b183c66f6 SHA512 abfdfd125896fad56fe542ba48c1a7cc47bb2d063129dbea5bcd51988e069237a2dd2f4c3d7e692172ee4d16960916326281550ab31cd56223c2367478da7c06
+EBUILD kapacitor-0-r2.ebuild 267 BLAKE2B 213ef3b1dda302d3b6ac6a4bf9655edc3b06c8e333642c59f76c95d185de0deb211b8e4c8d37cb626a8f0ab70ef7d7de179c8d7532c4e1dd276d94fb70c513d0 SHA512 3695fde0017d1f89fbcee3faf1dfa505756ea9787fada53d2e100657720c673eb6c3261dda7996e66088c72f07066ff2607d1d039f16e47fce2ded52191429bf
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/karma/Manifest
index 8bdb281877e7..e605b5612408 100644
--- a/acct-user/karma/Manifest
+++ b/acct-user/karma/Manifest
@@ -1,2 +1,2 @@
-EBUILD karma-0.ebuild 241 BLAKE2B e9e584e0a67b45f038070b5a926edcbe8471f3e2635fd35e663a3b2da5e444b42840bafab15f592891c6ff1dafca36d9cc075d27f05a4fe81fb408e99af7e9f5 SHA512 9dac2ef74f844bfab49775c078efd4556b1bde9ca32bf7197119555efb3ea8147732adcd8b434c7bd163c9b99240585d7fbe15f048f7ec81d60e7413683bf842
+EBUILD karma-0-r1.ebuild 241 BLAKE2B 8bf7dfd7870d3b8d3128200c3e1d09ae92e87dc6903e11833936a8168c0b9397b847ddee014059d134f4ad55973c237a69a9a5fbf2edcc251a590248f1036e0d SHA512 470ef27e8901b3c228ccc615fe4fa46d33205859f37456eeaefacef775ae9bfdd8d99442600fb26879ffe97f9a401d3320a419741ed41e82428e8faa042fcbe5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/keystone/Manifest
index 62d61c210eb4..ab6f1ccbc352 100644
--- a/acct-user/keystone/Manifest
+++ b/acct-user/keystone/Manifest
@@ -1,2 +1,2 @@
-EBUILD keystone-0-r1.ebuild 307 BLAKE2B 224aebe94a3b55cac1407f4a02f940a8ace1432054bf681d3daf6d3c78d06764df4e2db93824e2293c4e5f497b0ddb9c758774b36d513d2dd9091b234ae849c1 SHA512 c855e2a15a39cc1f0b47c529ca0c556b1382d022634dd2d7f221e970b9594ef47f9704e3bb00e4821516055ce6beb3ccc45f96bd9e866fe8c074cf2c2770b3e0
+EBUILD keystone-0-r2.ebuild 312 BLAKE2B e0ec0ae979b33c369f9db0e3033b7a2f2bdfb549cf001aa27c08f2fb710ee70ad0c633c3b2531dfce7d104248c9ef5ebe7adadb02fdbc48657e54e2df4a24194 SHA512 643b84373b2894ec995026da1c455ca732e145c45a24508e854f7c735ddc47ea2171e07844813959df548e43cc6d432da91a00dc6307860ec782bb9d75ca9fd2
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/kibana/Manifest
index b90ab59335e3..d0676e764a03 100644
--- a/acct-user/kibana/Manifest
+++ b/acct-user/kibana/Manifest
@@ -1,2 +1,2 @@
-EBUILD kibana-0-r1.ebuild 287 BLAKE2B 344cccf7bca13602e7a7c782bce7ab8f5bacc7fe2d80d9d8bff694aea470cda8449c8b394f25eb281875bbf510dae6f5ea0b14ce17154d97ea2fd91ef147ca21 SHA512 9ca7754ad2b47570349bfcdbdd9209553d42782d5ea897f892dba0c3b49e4da62db825de4ba88ab78793993e64e7cb38f3a538ff7702708380344c2b3475b0a5
+EBUILD kibana-0-r2.ebuild 287 BLAKE2B a1dfda4ffd757f31f616066b870507e32976086abc63f41a3832e7fc2ef7409798c4446a680c7ff0a5a6a343582e0b1a2abed6feaef25bb4c975af0574844446 SHA512 b273d3dfaba39e8f1295529379adb4fa9b1056ba431dac275c7fadaae12b5afc8b1a617aacbffa3b39a3849186e87f7ada7e37e47041e6476dabb96dd733b30c
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-user/kismet/Manifest
index 24da32a30202..952a5d86b942 100644
--- a/acct-user/kismet/Manifest
+++ b/acct-user/kismet/Manifest
@@ -1,2 +1,2 @@
-EBUILD kismet-0-r1.ebuild 290 BLAKE2B 82cccbab7fa18f299f0f95549259422ab6c6100aabad1a40b0eced0874e3b2c8997527ca349ca8dfce030d4a8e92a1b263aad2aeb277765e5930f5f77ccc866f SHA512 3b7f78bfd4380f285e4bea20577bd748858213ca24f33d78c11ca0f106528c21dc2177aa16f4aeda95b56160e5101b840cab5fbdce91f9921b7f9aab5bbb6152
+EBUILD kismet-0-r2.ebuild 295 BLAKE2B 5a3c672e88359b47956d9f622a4a4160d3ada260bbc1a4a0d0671eb839d94c8668baaddef0bcf3d25e9cac680bb003c14a3d889569d55e89bda60c32b13cf629 SHA512 385470a9605534aced01016db503b9b27837110ccc39697c56d2ac30fbff1b111e92c3e22679606f9e37a74126b9966cd23b9fbdf8957bd7048f7200ce4be71a
MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
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/Manifest b/acct-user/knot-resolver/Manifest
index 899e39109af5..fb085dc88ca2 100644
--- a/acct-user/knot-resolver/Manifest
+++ b/acct-user/knot-resolver/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-resolver-0.ebuild 237 BLAKE2B e60a70d83a1828ad40175fff0a51b719d288dd9bac02df222fe541b60ee173cfc1cdad29b04354262a091298ec095bc752e97a1b99e5ee71f041a55598cf8477 SHA512 eecd7010f800f810ace5a2d6541863f0fdb9cbef3e6c4f25b1b31582232446fe66ed8a91b2750932a417ae703b17d5fd1727388bdcad5f4bdf1dec43fb730981
+EBUILD knot-resolver-0-r1.ebuild 242 BLAKE2B c42dd09afa275a4693e4637b55e5779efdc057f9f3cf0ae81beb796efecb5140f6441de71b264050c737ca7da8ba032d1f7113b051d579c533cdc4b486368e03 SHA512 2703668552a6dc1e2ae937551537d9de62cb6a02532436a1b4ca7ca59656487356b3788e23705304ca0ef5bf8d5605b9b0847a9bb6f2fce3397be72026d3e514
MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
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/Manifest b/acct-user/knot/Manifest
index 0f60417ae020..8175768976bb 100644
--- a/acct-user/knot/Manifest
+++ b/acct-user/knot/Manifest
@@ -1,2 +1,2 @@
-EBUILD knot-0-r1.ebuild 262 BLAKE2B ee66db55e0086ed6aebffc5aa160db5255bbb2a6dcc4b0dbb0cc8e8be31310d920b4fdef9da3c3f91d72713321b53a1f2947c47160c92a6a5fc7dfaf4b17f22b SHA512 5b78bb7d5b187964389db20269e25b14ebcb78913dedee7c642c031aa72b3965a44ef34bc5be886c5c00e436705588a65835bf62f6363741fb1fe2870a109885
+EBUILD knot-0-r2.ebuild 262 BLAKE2B 54638cee234e5c3373f485bd75eed56bbaf5c3a0fce9f1c25c987cb44ddc76fe64b0900f0b6a9c6216070a8baa4a57f4e61696b86c7ff0010e24b964d7f5593b SHA512 6d4641003e5dbd67939b5246b3269972e4f9e7e192c7b224f056de63bebffe43edf75206b211814fe20a6750abda47f01fe3b42c7ddc963bd32d4df5af3c12a7
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
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/Manifest b/acct-user/kube-apiserver/Manifest
index c01710cf96af..0715bf149bc6 100644
--- a/acct-user/kube-apiserver/Manifest
+++ b/acct-user/kube-apiserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-apiserver-0-r1.ebuild 243 BLAKE2B 5a876f94d5d4b4db4f315da69a494fbe998f91e3f4481e2e60a6d3b86cc83a240a9acb3f49315d663a4b325b04e834457f18064ef8b85bb9c4663b00840e3a60 SHA512 c91239aa8e8c9d70ffb0d97417175c9b6643ddd12d707e76d32782700b9bb8d222256c5684496b6c54756755c5a041fd5627ab6adebc043d04b4fe59f7369839
+EBUILD kube-apiserver-0-r2.ebuild 243 BLAKE2B 4471dbc459a725549ca311a5de9f89760b0b0322048be1e74881db8fc0671f470680d8ebec7f43f1df934011e04fb383184c1827dc0383b8f888fa99c7e82230 SHA512 17e04bc22ca54a1e5ad9041e65c31937571d723ee321df1c310a875c283b0d2138907849ac58d8d9e2a1638654002dcd5f365edf73852e84e5f2e0f3c2b156a5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/kube-controller-manager/Manifest
index 154cc69a5920..e473c61af6f0 100644
--- a/acct-user/kube-controller-manager/Manifest
+++ b/acct-user/kube-controller-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-controller-manager-0-r1.ebuild 261 BLAKE2B fbd37d8722a0930c225a7610b5b389ec17f5337c9239e09bb350ebd7bccec69dad1e554477b98ae2447005da36ce67d25252e76f2cc30d867d28b33709ad4ea9 SHA512 2ebfbcd6094163054e1ffcb2d5cb2c3f5f06d89bddf1947dc607456b75c345064db1236af0cf398eed56d667d58dbaf87c757bc2f0c15fa5107356fc1f84530d
+EBUILD kube-controller-manager-0-r2.ebuild 261 BLAKE2B 5c325219285889ac6f9b680fa8547fcdaddbdf059dcce2e128808bf1958fb5b13e90822a2fdabebb651d5e42430004cd225f03ed902e1433011afeacce1fa5f6 SHA512 5d8d502f15bea54bc34739a68164fe3a9bcb434d0caeeb24761d304f67f31692ec61c0bac1f5cea33ade73900536c5d897d88424ca260f46be90d2a56f3bd72f
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/kube-scheduler/Manifest
index 0e8054004668..4d5fa1e52a8b 100644
--- a/acct-user/kube-scheduler/Manifest
+++ b/acct-user/kube-scheduler/Manifest
@@ -1,2 +1,2 @@
-EBUILD kube-scheduler-0-r1.ebuild 243 BLAKE2B d230248748bec9252a71980f35a2089be0fa66b7c9bd05d0304864b41394a76507d29152bcae91327c64aa894456c0a91cfb90bbb94788440a1e9ca83cead275 SHA512 6b483c01289ca0ee22e8f5ecebd41a056729fe53ccf88088521e9b925fb2aea6f66597fc602fb600e88032ec71422d3eebdb99443f843a0a6294f0ccc5c5ceee
+EBUILD kube-scheduler-0-r2.ebuild 243 BLAKE2B 9ee1738b6a4a364f44c802a4ab719ea58810eea7475993fb8e7ea26304414e84ed16dff9f51f9eb9fdc0224d8bc726d1c57dcda7b6d7e4636b591e440beaa6ea SHA512 53269a79abb0a22717222fc1732995015ea7e974ec4fa55b933a85ca44fc88ea9bf75b5e7c935142b5b47d171a3974c6cfd2f1a494ce0128385a9ac575b8889e
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/ldap/Manifest
index 64a7ea8cab7a..c4b500ae00d3 100644
--- a/acct-user/ldap/Manifest
+++ b/acct-user/ldap/Manifest
@@ -1,2 +1,2 @@
-EBUILD ldap-0.ebuild 286 BLAKE2B ee98117dfca655fe09ab72326befb4a74f98e35d843251684653d788918de9db19e931aca9bdd2dcb28abc2a47f17e50d97eb86e86e7cd201e3ba65be9418261 SHA512 6d5e5587922488233d1b5fc6d47d966d66fef0a908a64de047f80f1fa6f5779ebaddcdcc28f3c042e4947364dec84718e8846a834ac53f7677c7284e210710f8
+EBUILD ldap-0-r1.ebuild 286 BLAKE2B a4891b3e24467f61415c0eec7261ac977909b02e92bc2b22c42b2c09346ab1264f37b799a0674ed63036c6a451cf4d3a99d41ddfc7ca5fa1d24f45785e13ad0c SHA512 98fdfa767a7ed9256ee629bffce944864dae89fa7ba71f1964f1eab2ce53e0aa8c672c66544f88e9b00c602880a96f60194485ad7808c3606a8980177e51210c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/libreoffice/Manifest
index 640316f8ecdf..ed39ed889dcb 100644
--- a/acct-user/libreoffice/Manifest
+++ b/acct-user/libreoffice/Manifest
@@ -1,2 +1,2 @@
-EBUILD libreoffice-0.ebuild 302 BLAKE2B f24d238069c476b97ee0fb2ad2a37b80ab3363352b5010b419248aff81157342ed3d862cdba6312c82165bc96315de5c8408400afda30e07f91f39b03a3270dc SHA512 273211d2b1d7c67324a2f182053e8375826a5185fdb2d3db66be11999fa7ea8bad20a57fdf64507787a8b189c7bb669685d99477b68fc91fa1b58fd2aef633a0
+EBUILD libreoffice-0-r1.ebuild 302 BLAKE2B 2c762dbac41623485c2f6f4010554f9e7cc6179ba4203b2c331497de86beb71e0d3ed8529b112d44538c8f2f38219c1561c5b8ce617599faedc03397dd4499b6 SHA512 3504c4d752c93f5d31c42103b3cbf7e3ada3e7e4df857f4a1756ef3b4c3a665179faf11c59649137fba279ac4c90158be5cabc5e43a99554f813aff902c88a15
MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
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/Manifest b/acct-user/lightdm/Manifest
index afcda54d5f83..8e8f373e2fe5 100644
--- a/acct-user/lightdm/Manifest
+++ b/acct-user/lightdm/Manifest
@@ -1,2 +1,2 @@
-EBUILD lightdm-0.ebuild 287 BLAKE2B d86903678eb08e941612f7bfc2f6c898ab32c88e9390f7c6db6e57a9eeb51b6c9d0c9bc5cead400def341b8de5bb90d492a44ca17795acf97a8c091fbfd6f908 SHA512 c46f6173ff085da3698cd19e318146cb43d07386971a1d82732f8b3b2c95eb04ede308970976596124b00d4b07808c8871db2eadec27aeb5b2a0f266b9536c40
+EBUILD lightdm-0-r1.ebuild 287 BLAKE2B 65ded64b98893b0021b693229f82c2c24934f90c1cba8d59d4173342ec623543c02e001b7a662da9850f71a288a8f8689be20d0663841e14b4833c26681efd78 SHA512 746c4a2fb6377736941e5de69e44796a7182acd69b3649b89e8cce944c27423ddc54b6919ae4b0fd749c265865dc9cacdccbbb64fa81dacd470b2b28684d1a19
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-user/lighttpd/Manifest
index d5b703456750..86d4a3f1af2b 100644
--- a/acct-user/lighttpd/Manifest
+++ b/acct-user/lighttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lighttpd-0-r1.ebuild 233 BLAKE2B 5b1eb6e62b0912ec0ab14a2b71812b5563e9c4ee97a1bb495d52e99606ab4011e094cf7cb3c9eb6e96c99b1624979c66dd7f9b6e2d8b0cb4822def3c6e43e61e SHA512 84d72a4ee397c4a29a1d36930ae470eefd69e5c3ce742418265c8207c95834459b1f45bc664b54b12b43eba7082379a2c588d9d01fe60b61d57c5ca773eb326b
+EBUILD lighttpd-0-r2.ebuild 233 BLAKE2B f62af6f5ac51738b7b4e499bf4795e1be4619a80519d6d9acb545201a912ce0d3db44c3e77a6e223478e74832f7a78e0f65833f18f3207a55c472bc408755201 SHA512 87fdddbfae5d49d7a362794b297bbb870e51919d64a51e25b11bb77a6491caa566be34083d9430e36e40523b5770fa28c085006e2d83672fc245459ef4f46268
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/litecoin/Manifest
index 0702c42e4744..ab5480eaf266 100644
--- a/acct-user/litecoin/Manifest
+++ b/acct-user/litecoin/Manifest
@@ -1,2 +1,2 @@
-EBUILD litecoin-0.ebuild 280 BLAKE2B afb8e8ffba9e93e820c9a0f72b20644966d60c277e0c58b51dfda5b1c5bb2cedc0ecd4c46d7d596b2d57510880c700a61929137d86e6a4bb709c4605c448cd43 SHA512 fe8361604261d9c530befc9a6687d1030002395858480cee2105b18666a462049ce3ae68376a83e95ecb89e2c1446ffc2bb03f82c6154a852643908de1918106
+EBUILD litecoin-0-r1.ebuild 280 BLAKE2B 6cc0ac450d981d4cae14b8632782bb735ed512de942b5edc79bb8587d6cb5a3a62368b1a182971dcd4f08fd80b46cf9106d21d0acd2b96302251f74e2a95174f SHA512 4c98bc63feccb773a056a4609d8dee8b27ac1b82e15e35c1e6adfa9a330e25f36d28cb95dd8d96d8337c4f94edbe24092cc5cd4999711016a759ba7bbf3ce0ae
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/lldpd/Manifest
index 8865ebe1c510..b5784f581181 100644
--- a/acct-user/lldpd/Manifest
+++ b/acct-user/lldpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD lldpd-0-r1.ebuild 235 BLAKE2B eafd1129a6602af56c58fdb7190305da56c704cff2816b2dac99fb1a805108bd11441b702ecc2a687a88f497ea0eac75394264e0df8fe346fe4d12cdeca3ef1a SHA512 64bc4309d729c2cd1d19e06f8f230e9e8b9c50cd7a66e877684cece7ae95b424c002ede86b6008055523454fd990c466b59df8b53283a79863b09c9c43212e98
+EBUILD lldpd-0-r2.ebuild 235 BLAKE2B 88be1fa5594479f70424210ed629f72c84092d5f3124b576eb38e7634ab634d8339c732d30169f442a97fb71b595f495aa0fc145ee2af3c4223bce9483b5fcd1 SHA512 2f8e188f5e9f97f74f42b53a4b7ed896c1af605c65e17d9e026174d76e97e984ea301462ec58854e4875979d65a2e9570832c398a17df703aa4fc4c1290f364b
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/logcheck/Manifest
index d30f6234347a..27d50c8f14d6 100644
--- a/acct-user/logcheck/Manifest
+++ b/acct-user/logcheck/Manifest
@@ -1,2 +1,2 @@
-EBUILD logcheck-0.ebuild 246 BLAKE2B 02bd84c095b8c90d937767d0a79127f960268ea1b19130d3af768d889b2470df72ef198c070e618562f83788dcc5afbb8258b282265386b04a2004f7272d701b SHA512 8a51dc29ec57bbd500cee6ab8846ddd2473e4e54022a531b3116e53191b2bb12f393b79f58bc971e65b8e83d989eb0120ae6ac5bca2d2f00d68fa6af9c21f289
+EBUILD logcheck-0-r1.ebuild 246 BLAKE2B c5558b50804374ca2de6befff985e05f6e94f2cb94b8384a36496aa19557779022ca3b122723f29ee15e6db574843b9fddd865d40040669f3a9fd13c48bf030c SHA512 4a92a64568f22e474e723c767069c60049f21316bef996897cfd7e91f41c7b47f94535db0626393c352652240ad733db9219d4f20018c6b5c285038bfb9047c8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/logstash/Manifest
index 6f3d012334f3..455b1683ecf7 100644
--- a/acct-user/logstash/Manifest
+++ b/acct-user/logstash/Manifest
@@ -1,2 +1,2 @@
-EBUILD logstash-0-r1.ebuild 293 BLAKE2B 09bbcf8c584c2b718581f7b8a5e6ee473dfc44af0cd1e62aa8530fb07d8099eeac21f569d6c9e6f43a1e5e8839dd8091002f18e4c33bc31e1f010127892b6c8f SHA512 dca82fd0a20d3dac218e9e662155ad55ea6cd63e32d79862e3af6b8659a60676992786db888aaa11df7590607214833d6962f61648f0c400431da7945045e79b
+EBUILD logstash-0-r2.ebuild 293 BLAKE2B d98b5240c549a808fc3e4bee7d8e67e056e6cbec0d38b23cfefb04bf886cacd1932690f27e50d60250512cad3ef24d3f730ba60e4dfbe6bb8ff9fefa9d0b14f2 SHA512 62b3b19461ad7d45b5f79be5793676670d74f8adc5f4920b6a86a85224c8506677b9f8e44aef4042324f2d12c394c7a459d1d5bf6720138e63b07f53deef0ed6
MISC metadata.xml 398 BLAKE2B c0e51fd139e20b21ce5c3eb70594d5a50189499af295f4caf4f1ba3d4d3af3e3ad33e9717330cfaed6db182ba45527416664c99c79411fcec369198cf2dabb20 SHA512 f189a42296460148d1c842bda2a91c97f7d9a9a51051361e364547173651b49377ce4c85c50c628f893fffda8c120680b078cce80e42523728eb5f32d3d9f927
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/Manifest b/acct-user/logsurfer/Manifest
index 60455d1591a2..eec98871be61 100644
--- a/acct-user/logsurfer/Manifest
+++ b/acct-user/logsurfer/Manifest
@@ -1,2 +1,2 @@
-EBUILD logsurfer-0.ebuild 248 BLAKE2B 5ad664de7e44e59446787cb5c25f6fdd252707d7be26e392409a9b71ab83afaac46786596ba2826cae33ea1fa4a7d54d651d395793d49db1e1d4c1492bebada8 SHA512 c9b41ec2cef9d24afd1389b21eaf0b7019da53c71b41e81d98c5bf0ead827d515eafdf4bf56abe5fb5da88d85e2a5e44d8e3ae97c68cbcb164eeba6ceb854afc
+EBUILD logsurfer-0-r1.ebuild 248 BLAKE2B 1fd5264778d20f13e41927655f7fb3df7da082edb9955bf29a29a2ad63f1b0303aa0559521d61c91130746007030901d412dbe2d18e970d0aa9ae17cacab640a SHA512 89590c55c98e6b2f86ec771374c587517ce42b2dadc5b4cb47384946b43d69376c27523e114f8d4bcb9cc77ac2cc11ca6ad8f6487b2524f1d9db9f535d69246c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/lxc/Manifest
index 9e82121c7aad..71d634514feb 100644
--- a/acct-user/lxc/Manifest
+++ b/acct-user/lxc/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxc-0.ebuild 231 BLAKE2B 28c282a5600e0cdb01ed2f9d801a70781af66d97773c15ffba9f4c5c00b826d8890433589e75df9ac118df079a556c681f1731ebb50369c9e9baa2c72de6dd40 SHA512 5002765f63eea0fb5cadb4d79ab498a8599da84c652f09c83c2b3a47457bf18574824b62828aa22945f13b7ddfecc832b79e8c655e40a5cc41f6bbea2d71464f
+EBUILD lxc-0-r1.ebuild 236 BLAKE2B a61f8a9ba72524fe5b2b6c3e50040053668d554e7ec5765eaad42def8a9ceec2dcaf40240e41accb698dce66d5d5b9edf804931e2dc5d2d4d0d6f3d248ee3a1b SHA512 5cfb4bf28f4a20bd0868234d87cec1769bfcdf2f811255a1d08b9f33ff392f8c0e87a6e360ad4ec8aa93495e8f90451555df4582680a681ec4ac4a7a591dc9d6
MISC metadata.xml 278 BLAKE2B eefaeacc4adbdf7808105113674a97a8aad48ba4b6ac35ab0db401ed86739e62b5cceb545ccb8185d74e660c6222bc21cff58ac8cdcd6443e1acb5be5122e3d2 SHA512 415abb61e906b24fd0acd5cdd10299585b7ff38d24ae4db63d93f715e4efc86c49d7db13488b1b6405608bd60a4b75e949fe75fe93debaaafa28a392407bfa37
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/Manifest b/acct-user/mail/Manifest
index 2b610791c92b..d10a7725bb86 100644
--- a/acct-user/mail/Manifest
+++ b/acct-user/mail/Manifest
@@ -1,2 +1,2 @@
-EBUILD mail-0-r1.ebuild 314 BLAKE2B c053f680b68219f88e137cbe4a7232589822bf2b93d761541991a7fad73d55bede7471b35022e3f51cc2ac9700221759f008e093f0ada132bf443b53ef0abd5f SHA512 d7a6df92a012278d4a324c92ceae2eb03c76c134c03a829f88b5b34ea36a07a4bd26e42b7d193f8b33f4d1cc9a3819038003da7044717ec0ec8bd817291024bc
+EBUILD mail-0-r2.ebuild 314 BLAKE2B 1d76d95ac1d8c4c9a0f46918c16a118c7504acb96fe9cef5c2caff7515995f8462e34288c0c426c5e953fead231d6670473b5dc63ac1c73a7df014a97ac18a78 SHA512 7d42a4ec0fec4ac9db1f4bed2030ce91daa79a485adb1d297f0c0a9a5f67ed63d55f4ed1e619835629f6894691a40c3dcc9f3f70e01ead3e1ccdbbcc161fe8e1
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/man/Manifest
index 71f7a51d9ba3..9b436ae5cd3f 100644
--- a/acct-user/man/Manifest
+++ b/acct-user/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-1-r1.ebuild 193 BLAKE2B cf86792ba5890257091605e7b8b558c923e5602c1998640878dc9d412790f1b9700db0afe5adcb9220746ae99b2ade1460b57805574bb936cf94da4a168e8e52 SHA512 584da8d06c3489d263c57eb14a63e6846ebf660c1fabbb7d36f1a844b0c837271bff554a2bf4f078d87333f39c27375dca84780705faca010c94e13e99b06359
+EBUILD man-1-r2.ebuild 193 BLAKE2B da384074752544f3a07c7a6d9400c7eb7dcceeb665a2d6513496ba08503aed519c4b520b622795be8fc46e924df33f66d429645f490ac8edba4f235f75a24743 SHA512 7a57c7134a1d2ab1f860118fa861523a0748fd94bddf02c3e13cbd25f4ccb0a287030fc357e007b37ba1a9eb5c9cb544bef644a6ace8e329a886fa2a2d7a384d
MISC metadata.xml 228 BLAKE2B f079847f571a8b1d3a795045c91b7c556e56a6c8ccbdb2104d4e0e5f976498fe3767a5b7d57edd46406b4e81861ad65b52de6b5d8d11d88409c91f158ceeccbf SHA512 982f1dd33d491d63e0a2f9bdf0fa9fe4778abbe7f38017387226101da3674eb242104ff57cbf5553923f35e6a8398b96b7cbd29da8033b7f70e128d67b366516
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/Manifest b/acct-user/maradns/Manifest
index 01f7c010c4a9..aed7db433bd1 100644
--- a/acct-user/maradns/Manifest
+++ b/acct-user/maradns/Manifest
@@ -1,2 +1,2 @@
-EBUILD maradns-0-r1.ebuild 197 BLAKE2B 13a500f10f5173c37759fbdc8011541a0b8df362cb16b1ff3d4539f6a17fad7f4f8de927c1e62efb24c88035cc9a0ae8b66cb8aa71bcbaea311f8e33b50aeb16 SHA512 1bf584d582cdcdab800f1b68c2b6c83f25e0291ed8ae76b76556b7ee1010b3eac670280bc93bef37f68df2e727c500b2399218cef1b7fb6a402566fa068675c1
+EBUILD maradns-0-r2.ebuild 197 BLAKE2B a9064f31cf4f036a8bbbff35968b6aee6e7e968ddf5538f818e336fc3bf548163107cbd7caa6f715fe847dd48e8d38137464a24149470becf38d96aa0e945795 SHA512 943afdd7a55e0b435eaa3bc0b76b6c115a5d91d9a98ee2aac518cc1c4304293f18e1c25fd7c4a7948467805212410af7406410baf3d728f0055acbe478d7498e
MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
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/Manifest b/acct-user/memcached/Manifest
index 803e33af5322..54ea868b929d 100644
--- a/acct-user/memcached/Manifest
+++ b/acct-user/memcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached-0-r1.ebuild 240 BLAKE2B 54ff736f16e4fb9a9cfaeb6bd6371581b70362886969474d30e5b538b92fc0c92731dfe002b2c1e33e73d94af4414500baea44773946a6a8a6f151df64410f73 SHA512 6c093998424f1bbb1ff4f05447cb61769b5ec7128d00bac5152aab476ecab47aae4f59b67273612ebc20df46c500794e60ab2df5641c68f0a40b760b132abca3
+EBUILD memcached-0-r2.ebuild 245 BLAKE2B 3272490f1470d9330df301adb0267eef0064f551c24ee5d7faa55b4e6a9d940cb8294b8b9739bceec8ab4676b5c3802d3aafe14c4a5da59959bfbb4af1319526 SHA512 67ce619fd252394c43dfb4ddd5d5c854a45d32dbceaed153b1d2bb91042d4ad8116420e17fce9019287b9066168b9f2aea1a1a400f8a03a5403d6f67b986f0a3
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/memcached_exporter/Manifest
index 4d46d43af1ad..d2ed6a6b1397 100644
--- a/acct-user/memcached_exporter/Manifest
+++ b/acct-user/memcached_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD memcached_exporter-0.ebuild 246 BLAKE2B 36b6a2b4ce6b41d06fdbc4cca5dcadff7cb516483f10a9557032c2e28055d5aa086111941df40937e5ce5c5c81bf482aaa056f7caf1a566e9da53744a3c3276f SHA512 d59a3f899eeac7afe04cbe00a9e3ef86407cf97df54bff2fdf1b999664f216b598ad933ca60cacf90b87aaf27cd04a3951276b375576dc62e195e54c70d45a30
+EBUILD memcached_exporter-0-r1.ebuild 251 BLAKE2B 2337a209c4d6f1f44064b917dade5f2d2b511041e3e2a86a2c4f257ee7c6588d644e545a1ec99bbf975cec95c78f03c5fe49d9c15ba08d773c253b73a2c4b6b3 SHA512 97d67933ddcfbe41cf15fc7278e961d4cd388e51a65aabf79d7ee28c4d1a05dad689ce250fdd3d0e43d0f352b8450d92893989064f5a0c83e4aee0566d44c1bb
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/messagebus/Manifest
index cc96545abe4d..10be1f6ef3cc 100644
--- a/acct-user/messagebus/Manifest
+++ b/acct-user/messagebus/Manifest
@@ -1,2 +1,2 @@
-EBUILD messagebus-0-r1.ebuild 201 BLAKE2B 90acf8bb1a7bd2ebed17dccdc899a02e2ed9b5eac334f79bdba027d7d14faf2137f54f29dd23f27f25b0382a948ce9015300710dae9f5809bfd61792e8acac3a SHA512 d7db48c87a624d9850081e647d5a2a2f3b5e7d6717fe10d3d0b39740b22ce711a0e1bcd8cb786a93cd256930eaf97ace8b72378da27965324911e7c1b9bee4ec
+EBUILD messagebus-0-r2.ebuild 201 BLAKE2B e7fc8f178823a771166c5a613906e521a383c51e67ab52cc457d2a1a6e73812ada52f653082f03dbd2f901eccf1bdaa7adb352f48d9a16f12ecf1d03a4ea4a52 SHA512 a96a4062c83f9b3f33add68bc0acc07793edf1042de13af0c33520e2c76d9817cfa1431285e740dfa9b1bf0737147fcc00995378425d559183aeae512f52c775
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
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/Manifest b/acct-user/mgraph/Manifest
index 87b10df13346..3e8d05aa715a 100644
--- a/acct-user/mgraph/Manifest
+++ b/acct-user/mgraph/Manifest
@@ -1,2 +1,2 @@
-EBUILD mgraph-0.ebuild 304 BLAKE2B 726678467e20dc66c655c3a5e0538bdd2bb8642cf45858673e9ae73ecfa683848311fc16b343901571629f18998c27f35717431068571b8838670194e8188ee5 SHA512 ccd63bf8331592483f1912cf919eaffc241a50afaadd87ae67bcebc7e2e2594b2d21c482334fcea80965d71adf78280a295e887b1c052d9874d2f84fd3b4e1bc
+EBUILD mgraph-0-r1.ebuild 304 BLAKE2B b9380b35e78be0a2b6fbb45389d13893e22b532f1426fc6ce55433ead51d87c2e820dde589788023a6111a876cc74fcebcbfd695b8846f3b5ae5a18b5dfe6d98 SHA512 5b964bc862dc65584a6acd6845072e89f30ed5165dec362499ece114dffe57e72342af8c298122b3b79187ac5b4adcb046465a279db07556a1cf913a806f330e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/milter-regex/Manifest
index cfed5cc98ecf..ccd161d0415c 100644
--- a/acct-user/milter-regex/Manifest
+++ b/acct-user/milter-regex/Manifest
@@ -1,2 +1,2 @@
-EBUILD milter-regex-0-r1.ebuild 252 BLAKE2B 7274e10222867b7f77e28c222d87d0041a3196783dc39ee04c4137e619697c386be910a735e343b2682265a0e5805a89ac0132186118a1014ad2898d7132cb4b SHA512 1960fc8a23f4f3a577421eef45f0ccaef697f576e157e96a3ad8331fe54cbde25268a038e72ee5f9b386bad24babcd7baefdf7580e3d110929a93aa727b674cd
+EBUILD milter-regex-0-r2.ebuild 252 BLAKE2B 33d0740883b3d1ba3cb50f8a9e562e64a81a575113c918013e79b656c72cdd980aa816441d26f9cfd7863ec69c4b6eeb657642a4fb5a83274810e928701d99cb SHA512 559ddad479360fa8d97c86da5956e9c75e1b98d859ddd634c2050451f12e7cc6b5d4a2df6ab90b4db1d2af1c9e6d24e0b40a491ee016a13cefafe66aca9b9d9e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/minbif/Manifest
index f6ebdae809a6..a41b7bf5706d 100644
--- a/acct-user/minbif/Manifest
+++ b/acct-user/minbif/Manifest
@@ -1,2 +1,2 @@
-EBUILD minbif-0.ebuild 272 BLAKE2B 29cd12588f212a078d7c0c197e13a123f1a68106e91d29f76b4428e5910ac47120d45117620f0cd61bdc9c4c97776c86f3df90302b22a22577dd9574c5fdf47b SHA512 f418f468163b2c86c2aba24ba7b4f5159fced08f2312d1a97c21328755a7405b98dfacc357bb3dd1831674d2b0f72fe095ffa81dbf3edc72488761f203d601a9
+EBUILD minbif-0-r1.ebuild 272 BLAKE2B 98598d5c84a6ab2866587ebb41617866977643a51f89432e7fe3eb80504379f7d13b5a33d2a392fad8a61105c0befc86296ccd2509869d130c94268857d43614 SHA512 62b9cc77bb476c240787e56d69ca6030f7dab024f54066e20c24a75e6a5b5bc082f9a6a3226f33730b1efb39f74d24fc4154752012ca6a8a21ec57cabe948f7e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/minecraft/Manifest
index f8039e962eea..809b4b8bee71 100644
--- a/acct-user/minecraft/Manifest
+++ b/acct-user/minecraft/Manifest
@@ -1,2 +1,2 @@
-EBUILD minecraft-0-r1.ebuild 294 BLAKE2B 0f4c2b2327c625f1a07e7e10575f688d6accbeaf40a3b43f1f0eef4ed353828dafbeffbf86cd52801727807bca8885c5eb926ff8e92e9f9775856e47600cfd4e SHA512 5412c9006fd6737120bdd0bfb564a94ab315f892be845f39950dd08f0daacb096614802279eb2b65e80d5f878aeff52a46367bb548a144479c4f6a5dcf1cf579
+EBUILD minecraft-0-r2.ebuild 294 BLAKE2B 465b067d8885082466d839b30f63ac518e7d8dcba9c6b9b5e90f0267a7ee0abb83fec931b588abe27fd5007bbf6f6a15e42e23d4dfd1b2a7025b85449031e34b SHA512 850f0dd8dd92eefe229e6dcb24a74fa73a352339233d342bb3fd9f365f72dd2f8460fff8dbddc5e1792db12be716d23a9f9fe298d3c472d2718acda3f1de6eec
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/minetest/Manifest
index 3488b5272782..daad2ef5b77d 100644
--- a/acct-user/minetest/Manifest
+++ b/acct-user/minetest/Manifest
@@ -1,2 +1,2 @@
-EBUILD minetest-1-r1.ebuild 279 BLAKE2B 28b1814d4644e4c2eab068b1d1e59471c290981531a7d7ac4bc6e4bc25a3a900e502904f6b3f8b86809a7a63b523f011f53a0656a41ed9eb6896267378d94c6c SHA512 974c3eb1106438f42301d11289243995a4ae3cca1661e5fcb1267fbcd1b6725f98e6f5760588e1f5e6f1054542242aebbf91ec03a516a14631db5a2928e6ad58
+EBUILD minetest-1-r2.ebuild 284 BLAKE2B dce3bb1396d8c41cdcbf6acd866b53940ae8518b2f5c8db0c903112aefc808f882dd061ce8a442741416c1775e7c9aea8da2a8a3feba92e002140041cb4e5b64 SHA512 d7f7ee3cf4f7bec27a32cc9c6c5d12d2766eea13e1d2116c11c80b085b42ec4fdbc44bb73d5646d7cbdce827319be459b54cceb9bc6346b75a2a58519524995c
MISC metadata.xml 360 BLAKE2B 4867d8ae1f68605b01a06a446474bf19088f0cc57c5b381dd3af707e32bb7727c348b2c59b4ff654551be2ab78ac7ded05a0e258d0601740d27c058bbc08e863 SHA512 db7554cc1f206ef22ee9748d3102d40cb5b1085f5acf3f2cbd732ea11e122da26d20d2065d7184ea4a6b94105b4e53794af339c869f5432cc005e46b4b506545
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/Manifest b/acct-user/minidlna/Manifest
index 5933b16fa4c3..eeffb7354151 100644
--- a/acct-user/minidlna/Manifest
+++ b/acct-user/minidlna/Manifest
@@ -1,2 +1,2 @@
-EBUILD minidlna-0.ebuild 198 BLAKE2B 9dfa79b694cd9b23e2cb50b4eea091bbc533ea42d053208fc49bec8aff43acbc5b184a183a1014c37861249573ce4874a43c0921d03adc9c19b05840373b4604 SHA512 4c75e147c1a6b2cdd4be6f9558144f0e9902ebb5daa77b3b50e30cbb75bd3ed4f628e63adc8090c305f30becce068db60c99e4278bf6eda310a37226829e7298
+EBUILD minidlna-0-r1.ebuild 198 BLAKE2B f5bd83f3df77a07050d4a3c2bd4ea00914b1a712a677bdc0a44050141c05332167f67c3ce9cfd73c76b117d8968a6b7e4993d14bceb7e88d41d6c861bc0e0981 SHA512 7b8b7f545fe20dfd8ff26a7c83a0088e97e7e88751ecd8170659bb4f00071e9c8e7628c6241916c0eb25a8d9aca7111dbe5a21f758424543d4eba24badefe0c9
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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/Manifest b/acct-user/miniflux/Manifest
index 05d4a862a29d..551746a81364 100644
--- a/acct-user/miniflux/Manifest
+++ b/acct-user/miniflux/Manifest
@@ -1,2 +1,2 @@
-EBUILD miniflux-0.ebuild 238 BLAKE2B 01e2fe4fd3a95de3cb13234d89427968255e40372b2193d6a357ee6a587d5b8cc8bba968826e61a6c325c2da1ddc002adf0dc07c40353f3fdf14129541380b69 SHA512 02599dd8d9bf95f29087aec2c77b989654391b0d6fb68366b2d6c1e2f31f280758852aea2fae61ea601bd20b7949f22c2dfea77b0935a5aeb5b00103cbf1706e
+EBUILD miniflux-0-r1.ebuild 238 BLAKE2B 66f61c4f70fb9fd604c9e5bd2781b46fe043b4763d25273be13b7416fb16b8b07e92cb430829d634de58038b4736bb808445fd5925bc874d2ee2b8b5e23d5c8f SHA512 0560065e4708e2cd55b2f506dc127ae6d5773de433fd7204112819564deaff320dc0064fdf72f45203a864fa01988a406e11e2b6f26a0108c4aac05165a37898
MISC metadata.xml 253 BLAKE2B 894a7b03d1a84d9f92bf6ee4d3f48a672a8cc36c505763b02c63280a8b6655aebce347245da9505078457167c207380cd8d5a8dd4ce31a48cac2c1b7a1d31d8d SHA512 0ac515844f89835ebb3acc9b771e502be5cf81e9eee85f00da8a20d51ec2b92d6874ca1412421b46b11ce2387abccae3520a0ba0f56ce044b487e6c3d8eab4d9
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/Manifest b/acct-user/minio/Manifest
index 941d46771b7e..dce2a9bc7613 100644
--- a/acct-user/minio/Manifest
+++ b/acct-user/minio/Manifest
@@ -1,2 +1,2 @@
-EBUILD minio-0.ebuild 257 BLAKE2B 930d70f38781e2ebf6feab216d4b5913ea615e77bcae1702dcd9d23bdb81b7ee6ec4b2e3d63687c89f2ec9e93515566678dd0017ef3dd20e9eb7f564d99b5b9b SHA512 2c4b6a1f2c94a2d3a9575529ff66223c9c29aee5cfdfcb1af55648df25dc8b45d8b61a171d3bbc1c5861dd8f587be622799b194dc190b3e4021d52761e509476
+EBUILD minio-0-r1.ebuild 257 BLAKE2B a1af238c427ced933f7b70304c4a4fd63a4ac863579e1d5bdd44c3268c2738157c5e77d0b7d8e6d21c373e0ff1d2f8fc15e5616534021f5d503f501496df6562 SHA512 672ed14aa3a00c45c6e2b8b5809b3d58a8dbaff91489e879dabc17149f0c92ea662c181812f9064ea3566b08cf0374c1f954af2b2c85d1bf39481811c57b0b1f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/mogile/Manifest
index c1c9f575bd2c..50b223d8ad11 100644
--- a/acct-user/mogile/Manifest
+++ b/acct-user/mogile/Manifest
@@ -1,2 +1,2 @@
-EBUILD mogile-0.ebuild 248 BLAKE2B 005e3c1ba7f949fe13237176655bb5f7a9a39cae5e9d5f28ce6c905eb59af0ca0e02e3f8c628df7e035166b06771d0dfe3020df5c042d2e2829643c82c06c90c SHA512 f5847b5e4527d3288e7c59760eebab26927f85fd2668e6b8a6438170f5752bfc0a4fd8a83edbca1d7cb0cede2a307322e22bc6a2fb0ae7c0a77ecd3e0f85ff57
+EBUILD mogile-0-r1.ebuild 248 BLAKE2B 10e86681e5c8ebdaf49d0a9db8b8a520e7abf6d4895d5d7a86a652ca0e89bcb8b6808f704180ac0c70be974f15382e0b6b890eaf7717f735f0df93a53741c762 SHA512 5b59ab186b31245c6305018c9ab3436bce4f646d7c1e2b7b793098f50af8408f31cc6eaee391841d56e3fc82d6ce22992e381a154a035728eeb469eb461bf7a0
MISC metadata.xml 296 BLAKE2B afccbded98b241e31d1d4810d0213d05e04f65e55d77540618e3508976acd9cb381c5ff54ffe36d0d88da75c22d66b0df4b785c33fc5b3f5a8c6695f1ce207ed SHA512 9ee502a57c0e4eb85ae2a1e8b0d6d2a3ba2d8e96d22610728441201d1ff4050b447a194f0da401e33c7e4ce91b5abf04b85f08e70c286e2c739edda5aa4dbec0
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/Manifest b/acct-user/mongodb/Manifest
index d24d2e838684..3ad98659a15a 100644
--- a/acct-user/mongodb/Manifest
+++ b/acct-user/mongodb/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb-0-r1.ebuild 290 BLAKE2B cf28a1b81945753e527b376fb8e548269160ddce9e09d4f79644dfbf2d6ae61a904414ad4c80b2b817262f96f82efb3cab2807940443bfe3197989d1105ffe4d SHA512 8a9135c178eab42341fcd88e71a7965c1916e90ff37f5f8849bbe14cacf13bee322dff99efa7ec900982fecef7b7cd8acf85885ec5f72e4e3d905f8d76970998
+EBUILD mongodb-0-r2.ebuild 290 BLAKE2B abf5cf954ef476302a3d84d9fb41336180c7ecaa6f30c31ed95323df76cfbed3684dec957670e85732cbef5a9c82202fc1b1b33f76d512111d1adee0a4d88a89 SHA512 520905f907942f0723118bd5796f4d27cecd67c9366e9b30996322173b2fbad6398f60547a910867c8f38aabeee3c3e9b18b629247f1d35ade6751d78bfe2d93
MISC metadata.xml 506 BLAKE2B 914c508b2299ec351b57287f94ab25b016f8f6459a5de86da19b40850a9a90c364218a867589963d471becd19c93b73adb668787aa0134ffd2005b4d39fca7ee SHA512 d94bdd1e741af6d113f86aa60e837c3249ec74f11c6878a6932ecdf8c420968e2236a04bcca8e33ae77d7fd3029e7dbc78054167ef6feebfcab998ca527a677f
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/Manifest b/acct-user/mongodb_exporter/Manifest
index 00c9ecdd8d97..42bdb626f6b1 100644
--- a/acct-user/mongodb_exporter/Manifest
+++ b/acct-user/mongodb_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mongodb_exporter-0.ebuild 242 BLAKE2B 7f44a0e6ee259bc39eb51b0d81ca6cb706c0c0b0d6902f25e09ab0645784ba29c48e1659efeec37281fc38f859664e71d80b6d2a49210d8a01500082203fd903 SHA512 df236caacf0c6c2cd867b9ab2fa4cfdaeaa10b921c83bb7923a5b8bae347fa022fc7310a084f55f5c56f9fa84dff3e630310e8eb300e3440bd5db3d478c74efe
+EBUILD mongodb_exporter-0-r1.ebuild 247 BLAKE2B 59e643c72d904de72a745c2a858512ce2365b40ae262e5d4a750e481488e1a28cdd0523b1cf1c4aed5fc8296cdc489d6634f01caa100474e01f83e7bc7cbb7f5 SHA512 d80bcbe9a96f524a89bbfc82ba0a777cf1669f81bbd294a277e2216bbcb59eaa0da93096940fb820b29ab8bc95b6488211d816ecf9b9563c966ebaeac7e51784
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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/Manifest b/acct-user/monitorix/Manifest
index 88b6855fbfaf..4f9e29842eb0 100644
--- a/acct-user/monitorix/Manifest
+++ b/acct-user/monitorix/Manifest
@@ -1,2 +1,2 @@
-EBUILD monitorix-0-r1.ebuild 236 BLAKE2B 28a4e45994bdb4eeb08078aa6adc9b3eb9beb3051fce870ee5c47fefaf33d90cbc1c60ac047b7687d405e79cf821daf50a4fd45c857ae96b3bb26116202115bd SHA512 634e23889b5eaf9edb79285401a7ac2274a1524f882ce1c7bef21f83327d45dc8beccfc4f7184aaf6595a229d99a136d87064ca09322c8653549abc35da2805e
+EBUILD monitorix-0-r2.ebuild 241 BLAKE2B 42561489bee2492e1dbd40f773805737c01d60281393887d18dcc495f051b3e4afbd8602eba18f507da000f754d02cbdd6895cccd581342e985b29ea7e806dac SHA512 503b8dd6a4411f14b0589dabffd07b612a006c959087c9fb2cef537c52f511187bcb673efbf62a558d870f700b9c5c9051d5bbc1385b31aa6c0439868a30a95c
MISC metadata.xml 391 BLAKE2B 9ead41308785d3c5c7733cf997c688ae1ee8584c5eb379d8a03f14921a7597aa28951510c0bff8d5a0ec80df5b13864f34dd2b2ed962ddd870b3777187b0e09c SHA512 af160187c0209c791cfd8d497da9a9ff4b6fc3762300e309d5d75df2571fec2b52bdba990b2d13667d3fed5cf50e6d3938b70683e53d0937adb15e4897ca49d8
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/Manifest b/acct-user/monkeyd/Manifest
index 5389643697d7..3e55c99e0190 100644
--- a/acct-user/monkeyd/Manifest
+++ b/acct-user/monkeyd/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeyd-0.ebuild 310 BLAKE2B 3408231a1f46ad33dfae79549ba592efbd84044edd817d14d59f9d4b0f235dba36da046ff5e88c3b0676ca42decb0eb59f815c32f4ef30330300e7ec7dd89a65 SHA512 14493c8b57edf791d541d9ba854a9963b7df7c573b4b04c2668c55b4dc16ccb3f330494010bb6950caebf268aec29ed6d12487203507acd6b61ed843a6b86a7c
+EBUILD monkeyd-0-r1.ebuild 310 BLAKE2B 35942e5b491f5c2c15fd8bedf967a3d98c1acc362bed5086f42b735f655b8b4f4d82bfc23ad6bcc015cb807cc9e7452a2ba73634e64039a1bec28310cefb793a SHA512 8a6c5b1024ffeecbabbc27d5b5e8c8783970d02166d4eddeadc26997359c3f987c364278b5169741ab5633da112dedd7cc6288e12872a4c1e19bcf9aee054df1
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/monkeysphere/Manifest
index 1f121c5aec31..f6fb0a361be2 100644
--- a/acct-user/monkeysphere/Manifest
+++ b/acct-user/monkeysphere/Manifest
@@ -1,2 +1,2 @@
-EBUILD monkeysphere-0-r1.ebuild 324 BLAKE2B 6b77633672fbaeac3db76cefe36698cea9918f8e8a50a3c9cb69d1ce16482963421d962ce8d5db22f6ec107024342d9a4cad6874fdcd99126598a4bfd8c191fc SHA512 64a521fd9a4067827e479194b9fe8238749bc0f084dd7650b7123631a6b1b6137575e8da05396bd3c6bc75deac7d2257a5770670d2f7fc64773ac23663a71e1c
+EBUILD monkeysphere-0-r2.ebuild 329 BLAKE2B c3fb30a691bb0d2640cb1b066e87a0a820c37ec046dbca5c5322f244cbc929be422339afe1660204d81bd7ecfcd482387eac9f6cf1358b1a5f91929c57efc4c8 SHA512 ed34d58c9f6a852e06da1df991d164935546388dfb4fa683ca49c938576cb088c8cfa09d4f9497c4039f09babc67ce63ba43b4bcafca71c83b7d7b4d571c7499
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/mosquitto/Manifest
index bdc234550619..b865e9b74e24 100644
--- a/acct-user/mosquitto/Manifest
+++ b/acct-user/mosquitto/Manifest
@@ -1,2 +1,2 @@
-EBUILD mosquitto-0-r1.ebuild 251 BLAKE2B 0da801820587e7252c41e0e1880eed442e1a483e854790c12fac4e66999a68fc71923721bbc58630357f04e13ccbeedc797df26c39972dba8629adc22f5dcfda SHA512 c5f611058e18d9ed366156e19258e02eb9c46af2187f1430242e002da7420a0c1d9b82252f882c9f25de0f89315db95a27af5ee1c232496428ccde60d0bbf0a9
+EBUILD mosquitto-0-r2.ebuild 251 BLAKE2B a892230256421020d539c235a221b54033f0b5464d112596f5a6c801cb89b7067b365528fde2079cad3a9474424805de37cb22789e3022738e9efc82950d1858 SHA512 62fca076f93f8bf149ebe2a097e8c188e78cb1a75dae22ab0f8f1efccbbfb227fff9e9761c241904c9b95c5b4b170241ec8f9709ee59b5d2933d85063aaff537
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
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/Manifest b/acct-user/motion/Manifest
index c4e9d353d49c..83e24af9c2ca 100644
--- a/acct-user/motion/Manifest
+++ b/acct-user/motion/Manifest
@@ -1,2 +1,2 @@
-EBUILD motion-0-r1.ebuild 268 BLAKE2B 8f46b51f52ff016e8c91862eb708e05ae4697c88e60b71b3f32da32538ae1dc7d581a593c6203aec764a52e0e6e36e9c1d3d1ca47e78b288189cfecfc15ae33c SHA512 3db269c8739f01541a6b78124f45bb020ff77372f9f99d496fff22e99723955193d6f43e75fb0abcad41e831ea7d693ce7ee2fc227cbba537a6e57860a58e4d1
+EBUILD motion-0-r2.ebuild 273 BLAKE2B c73b67352db3b848d9544fbf8054a3799ef8ffd23eca291dbccf4ab7613afca4f9b10e6f0fea80999bed5b01dfdda56b18d471e720974061fe0c4f8b89a1ed3a SHA512 ed5aa548cc7c541dd9fc70b98290a0740aea74da718dffa38fcb35d02d3aa3e0e164b01eba0d73afd914e8fb7b114af59b5952003c5124bd15b52576dbad1ffa
MISC metadata.xml 396 BLAKE2B c23e0428f6d197596409734471aebdc88231ccdc6abf3b132414ac1c4a2aa933017b5d6368b018e8e91ca1c01f38c49933af23888f2a6eb3b9e333eee0677d81 SHA512 c5fbc86f53d46fda14e9268883cad59049f01e2f356185af9a0d0ab8d5e76de69923768027bfd0d3fe02af6af2c008adcfeed20f3d312a8bf458fa655376d19e
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/Manifest b/acct-user/mpd/Manifest
index 4897522f7629..5f5c92317697 100644
--- a/acct-user/mpd/Manifest
+++ b/acct-user/mpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD mpd-0-r1.ebuild 274 BLAKE2B ce5f2a0b9b442b3749bc8c25a213d58813ad809cc3853268358333f9efecc39f037beac7fe3709521e91f951538eb9c7b06a749ac7dccf5065f045858bb71e5b SHA512 2397cff726b2c9e173e30399efa6cd4160222fc403135052943204b4462e594a067c1f291281f69e757950706a160b6dc9e07e2a0e53c417aebeb8ab4724ceff
+EBUILD mpd-0-r2.ebuild 274 BLAKE2B 0482e6f5c1b4cc634ae18e54695af58052500e91fc5957f3e9360c635e820f12002084a3d10e01dea3b2fa0783f282479baed28e84c7ca41ef370f85b1a39f9f SHA512 77beb3f6b29d316cb66f82dc17fa8ad6acce79a155a980b7a408c45ff6c2f3701ac43a154191e5f4a3660ce67f65ed30cb287fc12cb9180ae32f5541c17f8595
MISC metadata.xml 371 BLAKE2B 1dc95f39908a3eaa277959b6434e6167edde97094d80c15895328586207abed46ab15e2aaf48751945f62888442279c9832fae1f5276c276522239afbee1c68f SHA512 79dba2ab8e6a18dbd7c10d95bdbb7a0b2bd8b639c98982e1cd325a5709b9984d713cb81c639165b4055a39d4993f44a746dba9db87f0f66acbc3b34d6f210103
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/Manifest b/acct-user/msmtpd/Manifest
index b7e1a12f927b..02b7db6e69a7 100644
--- a/acct-user/msmtpd/Manifest
+++ b/acct-user/msmtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD msmtpd-0-r1.ebuild 233 BLAKE2B 73058a412dcbc565df094705059329c3a37776909b5b1f9e0883283b71be17da92c9bbe8efb729f4e71a60ceca28474e55d0f4cda8ec6e6ffa5cd1a970996be0 SHA512 6372ffa6d1f65d3ce23d088a694569fa831001d56ba9095d28bf85ff0ecadfa72335ac5c0e87532642c1cf98e581524f1006d4d0fff023d06520914e107d3066
+EBUILD msmtpd-0-r2.ebuild 233 BLAKE2B 7004b36415ccf8c982104a4dbc66e27e6cf198d9e9dee662f134ff4405977aceae7f59739948fe14d19dca9e5158d30a287aad1e39a8049ee477565f0cc2f890 SHA512 e6e12ab2894b7baef6362b752419fa2e77ec728f9384927f98b1d84a4cc15991f7a2a41a4282d3f6959781e494d705c74d30ba50bf9aff78f53d5686edd530a5
MISC metadata.xml 228 BLAKE2B f079847f571a8b1d3a795045c91b7c556e56a6c8ccbdb2104d4e0e5f976498fe3767a5b7d57edd46406b4e81861ad65b52de6b5d8d11d88409c91f158ceeccbf SHA512 982f1dd33d491d63e0a2f9bdf0fa9fe4778abbe7f38017387226101da3674eb242104ff57cbf5553923f35e6a8398b96b7cbd29da8033b7f70e128d67b366516
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/Manifest b/acct-user/munge/Manifest
index de869fde4564..c291391c927a 100644
--- a/acct-user/munge/Manifest
+++ b/acct-user/munge/Manifest
@@ -1,2 +1,2 @@
-EBUILD munge-0.ebuild 273 BLAKE2B a0ef6e47b41a87865bcf3480c9543b84d0cabe79ce444e02e1cbabebe555db2fcf4a2854074f0f34b2d56e3055e009c812ee3342df4a531915a7ea6ac62b0cd6 SHA512 f69b6f4a45d2d851a04defa6191675a3eba9b1b088f08cd8b60af5cf1b9baa0a72c87448b523be6c5b5fe43d6792304ebbe2cd51058670d6db00b79aeb307e2a
+EBUILD munge-0-r1.ebuild 273 BLAKE2B 1ad56e71b145cf784e52d8fb7ffd00cf99d05083a871b1e9f69b51912137a71b1b245b6949763f04aac1f0c67e6d0996bb328bb976f8953dd1903b819f671b24 SHA512 9ca1d68ea3922e826b6a5e594d0fc7f7ab8fad6e8f907448c074f2f14bf62566222d9b9b30cf7b18aa6044ed7eae3ac45d416fb82258c679071f275d4d74cf3e
MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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/Manifest b/acct-user/munin-async/Manifest
index 1c4bf9f3f460..57e7d6ed6fcf 100644
--- a/acct-user/munin-async/Manifest
+++ b/acct-user/munin-async/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-async-0-r1.ebuild 307 BLAKE2B 9c9b46307d17ce85f68d63c95723bc408be957c8d060430cd54894eab474ca043ad181ab3200bb4536c49d9b8ff3e3a7d821d56119484b69804cad58f86a8129 SHA512 a7f4eefb2a2f298abae6c6920f7632c5fe44849b0d69bde38f51ea55eab4aee31e72a2b79e817f13fe6f2bcfd1607f2ca0c960e04d581a5db0dcb087cb0eea64
+EBUILD munin-async-0-r2.ebuild 307 BLAKE2B 9c9b46307d17ce85f68d63c95723bc408be957c8d060430cd54894eab474ca043ad181ab3200bb4536c49d9b8ff3e3a7d821d56119484b69804cad58f86a8129 SHA512 a7f4eefb2a2f298abae6c6920f7632c5fe44849b0d69bde38f51ea55eab4aee31e72a2b79e817f13fe6f2bcfd1607f2ca0c960e04d581a5db0dcb087cb0eea64
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
diff --git a/acct-user/munin-async/munin-async-0-r1.ebuild b/acct-user/munin-async/munin-async-0-r2.ebuild
index a11cabd62269..a11cabd62269 100644
--- a/acct-user/munin-async/munin-async-0-r1.ebuild
+++ b/acct-user/munin-async/munin-async-0-r2.ebuild
diff --git a/acct-user/munin/Manifest b/acct-user/munin/Manifest
index df56e6cd61d3..26ee85c9209a 100644
--- a/acct-user/munin/Manifest
+++ b/acct-user/munin/Manifest
@@ -1,2 +1,2 @@
-EBUILD munin-0-r1.ebuild 258 BLAKE2B 1f3c980f0e5d2f817473bcabcc6c094b6defe24f14106ee487e0de1b6694be547a1d89f67f575f24b1b9f45a9f9555763778327a6709147a59c99cd38a5b51a1 SHA512 50e2f8d063058834842d70a06851e5c04416d5affd9497d6e72db3c2b9be3162d06620fcb630dc7061d4bfc656974ed86d2a7ddbcf2e19e4e62e3a86781e4245
+EBUILD munin-0-r2.ebuild 258 BLAKE2B 1f3c980f0e5d2f817473bcabcc6c094b6defe24f14106ee487e0de1b6694be547a1d89f67f575f24b1b9f45a9f9555763778327a6709147a59c99cd38a5b51a1 SHA512 50e2f8d063058834842d70a06851e5c04416d5affd9497d6e72db3c2b9be3162d06620fcb630dc7061d4bfc656974ed86d2a7ddbcf2e19e4e62e3a86781e4245
MISC metadata.xml 380 BLAKE2B 8c995d84a878c8753675f84e20c80169539330a6caad7f64a083b65d14a8e86debe7e46e28246bf12b3e0b076d2cb166bae826f7c8382567a1428e1129c8824a SHA512 a6cf99f2a69c4ee66c84271e4dd5cab03e3e5351f166ad3971a1f76c9d189d0d9f12752497baf6f6964e4fddda0408bbde0b71ee74631111f85f8b5fdd66ce7b
diff --git a/acct-user/munin/munin-0-r1.ebuild b/acct-user/munin/munin-0-r2.ebuild
index 08f9f00552be..08f9f00552be 100644
--- a/acct-user/munin/munin-0-r1.ebuild
+++ b/acct-user/munin/munin-0-r2.ebuild
diff --git a/acct-user/murmur/Manifest b/acct-user/murmur/Manifest
index 481df5863389..852181fee6cc 100644
--- a/acct-user/murmur/Manifest
+++ b/acct-user/murmur/Manifest
@@ -1,2 +1,2 @@
-EBUILD murmur-0-r1.ebuild 322 BLAKE2B 68ff555c46ac47dbd3b2062efc2328f095338f79dc9b4fd788b16c52b7040af98c44648450991ca6426d975f91ad533698b024b0d117bd5a66b538312b60bfa7 SHA512 bbff61b4c9fc49e57e16f252e8fb59926f37c57ae0237a7295c44cef20ec85ba68080d8ac74b675d0e762ab3b01b1b1d7ce07180e50b2a2d0860bda40831bb9d
+EBUILD murmur-0-r2.ebuild 322 BLAKE2B 82014234f093bd1b5ee878daa113a23e2df6b5251b1f6fd4ccde10b31b01c6c37ad44c79e0120b7d574ee80ff0e9b71a0cf681253b7eca60ae542dea083e7eb7 SHA512 8aa909aab348b573d146ebce6fbc3e5e5a5642e1316c0995c92996e4aaeefa23698a90fd0efef6b48c625f867c61efe5c7d19a3ce33060b5f9589a469c52e4e2
MISC metadata.xml 259 BLAKE2B d393fe53508d06da051d73863657c1cf9f63ba80d8217c3c17ed754a7e652bc90be692dbb619d2a5e3e1d0dd258a6019c7b9a7aec0597bcc0f63e2f16c60774a SHA512 3292858f61d9b06b284b4cae18383cbd9cacbee726291402e1b3cd104f9498dfeb4074c6550ff64b5ef374f40d3d329b04f2f3010be782ff06e896d4c666c925
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/Manifest b/acct-user/mysql/Manifest
index a85e126b2b67..3fc3ebbb9760 100644
--- a/acct-user/mysql/Manifest
+++ b/acct-user/mysql/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysql-0-r1.ebuild 236 BLAKE2B 9068d4a86571ea5369d11eab6dcf8afdf9ccbf4a6cf2be31fb04564962e8ac6832f35b50a0b3821fc35da9c7e3588f833cf762b12d20677239817a88ef1f4bf7 SHA512 0be5ea55777d17fb5452260a0a7725e34f595fe39b98c5c683227d208fce80293c7fcaeb09e0a582e2bdf701e4234f12d3dc5469b5055c18c8b0d1a1b1c30e29
+EBUILD mysql-0-r2.ebuild 236 BLAKE2B 227a164350eb7c610faf4ed206620fe105da0ecf4a7b08d7d80d10eb57e9d4e17230931d2b53c2dc7aed86a7634dfc4466a8a631b76727b4a522a24fde25073a SHA512 7022cb81c69f1c2bc83ff8866634b692e70898c45a4efbe11d65d8049b97aaf5cce003e91acb64932d23e55b32c05a18f20b30c2e7ca3a21338b11b890f7fd16
MISC metadata.xml 258 BLAKE2B d72173be6096a07ac4d2cb3e8cc161e6d817e7bf3f3b87c82c8c490403d67487ad3f4d65edb951b3a9ddfbe38a5c2a28b335436fd14f7af773d630a61d34f2e8 SHA512 25f8d8e566c979bffdcba13749feacf7d50ed10ec9099018bb18984d97dafbadb4787b4e49e618658390afa31c86531d08d27e13ff8119a39195d6dde26d9b6c
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/Manifest b/acct-user/mysqld_exporter/Manifest
index eb27dd9ec399..b44a16d6f792 100644
--- a/acct-user/mysqld_exporter/Manifest
+++ b/acct-user/mysqld_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD mysqld_exporter-0-r1.ebuild 302 BLAKE2B 55a765e3055710d4e661bda33977238aaaf5cffa32af93c3d4714b10b83a3f7aba0d90c5ba68875f32476ca9736be2a9ac0652b88265a674d681e8fd7916597d SHA512 a27598a1e27403a17d709b48c4e7a212a954e60dfa85058fea2bfdded3fd77cbbc47f815df6e02711eb766b9ed7354fe7190412604b94aa191794271664157dd
+EBUILD mysqld_exporter-0-r2.ebuild 307 BLAKE2B e02791a1e387f58c5498ee8b68b505d311c10a3b6c403b2db80916171bc8221f06db715d227091f554a0dfb8d3a83d42b90583af8b6edd74e50a38b9c33c93f9 SHA512 20e68014a5b43a3e7c2048f0634b56a2845647c032f17d5db1f4701306062efcb49fdf18aa58e460995a09bc0aa2c7466442ab95277ca465daf253e9f6788fe4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/mythtv/Manifest
index 56550e9e7952..22a0e18681fa 100644
--- a/acct-user/mythtv/Manifest
+++ b/acct-user/mythtv/Manifest
@@ -1,2 +1,2 @@
-EBUILD mythtv-0-r1.ebuild 328 BLAKE2B d643663b87de960ddf934c0c3d8364b9ac63f3103425ef066c7c6536c4f026463383beecb53599c539cac266f8ff67d515eca5723f96d7f97f05c3b7d9a9bdf9 SHA512 4946f8af3e14eee96942486dc8e48da04d11bd6852688b6cfd5ce2fe91c5fb34a3a2d7a09fd242ecc0c40912a3118f96f1b8c97ee27efd17342af0c4f3ae2885
+EBUILD mythtv-0-r2.ebuild 328 BLAKE2B ae33da77409fa8b334fd736e20a1f8cfc5bfd12e54945cbb70c3c9347c6648148ab8bb1ad088fa213b231f9989cd14d0e6338387667f6410a654d2e5e3fda118 SHA512 34749afcfa6a3833530aa030fa8f2bf304b64c546f4523887dea56a98a25bdf88032b4d6087df2344f4a7f2ed7a157eea8403ce1dbb3a76e2f376cd81e2d8540
MISC metadata.xml 412 BLAKE2B 269dbfe3205f3520151a0d18ab4d2b8a1854a85020e0246471c4ed78dc7f57d7dab5dee7fe0fe12de2505410da9221183267ef9f09c6f903b5b1e4feaf98b4aa SHA512 093a35b0ee0dfbb9c841467bdb78c52699c712e94e8965c076a98be872f9a7cf545b75ccb8d44048488c6ec6d169c8c3ecf198c7e551f427bb9e0940102c054e
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/Manifest b/acct-user/nagios/Manifest
index fe64f3f2609c..2758da056917 100644
--- a/acct-user/nagios/Manifest
+++ b/acct-user/nagios/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-0-r1.ebuild 198 BLAKE2B 00dd014fd07d522c9c507a2e14b25068c7ded68f6627df9529eda4741cb5bd586ad575595d6fd3cf587b91751edf58a0b4e150ea400f8c4307f2a9df21b3284f SHA512 36cc74b548b4ce0b0df80d8c895ad77edc768bf7fd2369bf8eea984f5813aeaba939ab28cc87d65c731dbd19c5943b43c885bdf1f106e2b69818738fd6f61a67
+EBUILD nagios-0-r2.ebuild 198 BLAKE2B 695ac63b4a5be5ba88fe12d8d2f88adeef658341367c55d788a5fba43976fc7755b30402ba7a36568d4059b34f332a954b3207cfc85004b68b531efd29635cd9 SHA512 00261d93d998d70784c7648fc08cb5aba514be22626dabba8c37a3b5e1627eca04458a71e5bcef52845c40644ac399cf972ed8e1925ffbccd3f52dcdc47b7298
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/named/Manifest
index 0eee47bbc2a0..46ebc6a4dd69 100644
--- a/acct-user/named/Manifest
+++ b/acct-user/named/Manifest
@@ -1,2 +1,2 @@
-EBUILD named-0-r1.ebuild 257 BLAKE2B dba42a909f8cffee6cefe3c7857b4dd51fee0edcad28ed45471795ae0336583f03087c8e22b04c9909577a01154eb19bc3d0587ef763aafdacd8764e9d2f088d SHA512 7fde4359acfdbfd1dfff4d823ba198c127421d2e6bfe2d8b6ef14115d750d568c247e2bb874e4edaff91288da59d30411888056f46fcbf6116c362a296c35643
+EBUILD named-0-r2.ebuild 257 BLAKE2B dba42a909f8cffee6cefe3c7857b4dd51fee0edcad28ed45471795ae0336583f03087c8e22b04c9909577a01154eb19bc3d0587ef763aafdacd8764e9d2f088d SHA512 7fde4359acfdbfd1dfff4d823ba198c127421d2e6bfe2d8b6ef14115d750d568c247e2bb874e4edaff91288da59d30411888056f46fcbf6116c362a296c35643
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/acct-user/named/named-0-r1.ebuild b/acct-user/named/named-0-r2.ebuild
index 4ca236119be0..4ca236119be0 100644
--- a/acct-user/named/named-0-r1.ebuild
+++ b/acct-user/named/named-0-r2.ebuild
diff --git a/acct-user/netbox/Manifest b/acct-user/netbox/Manifest
index 09efcfd7b867..775a5a2bdf0c 100644
--- a/acct-user/netbox/Manifest
+++ b/acct-user/netbox/Manifest
@@ -1,2 +1,2 @@
-EBUILD netbox-0-r1.ebuild 253 BLAKE2B 4d2ff7e46f1dfe8c716fd4c20cdd4079ef221a72d3d8cae992b3442e7a73c398807015077d149183a0b19c1d905a4d06de31be7bc766dab74f54e99fc2bb44ba SHA512 05eea396ec881818c31ee5a421f3882fc4e24e2c50518b997e951671523fe9d4638081517dd4616b8aafa8f3a6808f8de66c35b9d2cd53c89cd77321ed4660fd
+EBUILD netbox-0-r2.ebuild 258 BLAKE2B d4638b5021a134eacf9ab2e11d9a6ef0dc28127f00341d87d65c2005cad1c6a69c900c425e2459d060e707d00b8a0591d0b5f17c054104718b320c21c155de4f SHA512 58ba3083ee3507da2f23de53563517ffd02919caff31b9ce6ec82fa7164c7ae66ea472d29d9a568d845d19b9b7ea77a451a135520706de6754d0fe137faf57de
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/netdata/Manifest
index 8b267921befe..b8d3c155fe95 100644
--- a/acct-user/netdata/Manifest
+++ b/acct-user/netdata/Manifest
@@ -1,2 +1,2 @@
-EBUILD netdata-1.ebuild 255 BLAKE2B dc6f008152244bcface104af37fe191c781e461d6739c40f00434dcd92b74543a1f45a9c20bce45af1fdc40ad0d55afee95e2c109f7780c02b2011b88c3ff97e SHA512 761644d4a0acef85d47b2785b4ca8829c2eaef27675c786c80491826f923ea86af0074fa249031b117ef8b8d8e7df1f0645b75abca5b426b2e08c6c7eeb992e4
+EBUILD netdata-1-r1.ebuild 255 BLAKE2B 4a07c13d959c8d7a9c03492967c3cf733330fe7f31a28573674c2d4461e470b4b6f1ab691089380ac1a2e78edcc6ac5cfc96a87fe0a2dcd7ee010177c27ca4d7 SHA512 5415d1a83fd00265afa78d545c3603813192f410f977b5edc00d63c23edea0b9c75b094f8c16b1ca298ca6036e5afcb3b4f616466957c292e47dd6d7fb33298f
MISC metadata.xml 255 BLAKE2B 5c405696da1838a5ef8da4bb3a32993157261b449cd28da0cbfb24fa2f33ea1a15ec1415fdeee87c2c051b023c58208065b0cdfdd5de15d648ab675420d9a2b6 SHA512 df4870842bef82cb206492fb14b03f0195dab3fd6aa1eed1c6aeb9c57978bfa68fb37a523ee3d8591937e750dbb52579e24b245e0213be6805b5ee461392cc12
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/Manifest b/acct-user/netperf/Manifest
index e70d29048324..5468da3043aa 100644
--- a/acct-user/netperf/Manifest
+++ b/acct-user/netperf/Manifest
@@ -1,2 +1,2 @@
-EBUILD netperf-0.ebuild 249 BLAKE2B 0a861f33f2ded71d79e8ac917ed1f92c04b7f8caf1d11618a2a12c437ccdf27be63c7e4d562f6a84e9e57b1d7fe336946b4cc1a9f9411eee5691483b5cfe6d54 SHA512 e47c542031adcf69166926e3f3cb6f047ac6c6dfe29b585827571a240d0be8aca57876b525c49d72554bab931b25115748456d99d35efdcd0ee9819168f6e5aa
+EBUILD netperf-0-r1.ebuild 249 BLAKE2B 1d85d8990e96688d01d993d75339921f6fac129cd58db136c76612b734bdf62b4daf706504b2ff57190381c874b2707e07adf3941f5b346a1054717e69e213d7 SHA512 11632e4abae8008080b1fbeb5a24f3b20e00f96e86fcbaba5a722244eba20a11a778adcf8dbe403b17494d707966c4314af60e7234c58c0d37fdf7f9808024d6
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/neutron/Manifest
index 368a5f668419..9c8783e3019f 100644
--- a/acct-user/neutron/Manifest
+++ b/acct-user/neutron/Manifest
@@ -1,2 +1,2 @@
-EBUILD neutron-0-r1.ebuild 304 BLAKE2B 3e25d884c30f4912e39f75bb3cce38c11368d04773cad7d1eb3d1e1df8ea70fee29b5154e98ad30ceed2f55f02c0eaa87f6fdb72e744103ed746acae54750b5d SHA512 90a449c4ea7d7436f421245c08e70e849293a99073e5fd49f8908f5f08695901fc3cea20d71b55aca9720bc581ed564cf24ea55bf31e5d9425d4583c587742fe
+EBUILD neutron-0-r2.ebuild 309 BLAKE2B 79f5366e01a3ac2015fa4e48c8a68c80a39c96c64b6ea517d64e5d3cd12fc3489bf4cfba063d27c2223bd0d0822ff236ae26eed2dc0c8cc144ada95a9b136f0e SHA512 ca26c30d3dc59263d9e4fcaae469b181aa3378dc3f6bdbcc41847ba0a6ffb3a592b5904d8578411b2db0b17b7f8ea3cd720c8c3f9dd3e5c685150feece85a3a6
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/nginx-unit/Manifest
index 9b92894dea3c..a4d4845bd128 100644
--- a/acct-user/nginx-unit/Manifest
+++ b/acct-user/nginx-unit/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-unit-0.ebuild 242 BLAKE2B ccc5855e43b1c3a396ea15a5e89e668ad3b833089f21509528e9e082bccdfc7343a414cf555f94ee95e3195db62561414dadb7a9ea398e5e38104405c46f540e SHA512 00f653c6453919020fa18f900d58abd6dca78fc82a3d49bc35ccd74cfd15147d1f6dfd2b30860073bb308054112ade0b8cfc5772d04c691cb4d7289678346a23
+EBUILD nginx-unit-0-r1.ebuild 242 BLAKE2B ccc5855e43b1c3a396ea15a5e89e668ad3b833089f21509528e9e082bccdfc7343a414cf555f94ee95e3195db62561414dadb7a9ea398e5e38104405c46f540e SHA512 00f653c6453919020fa18f900d58abd6dca78fc82a3d49bc35ccd74cfd15147d1f6dfd2b30860073bb308054112ade0b8cfc5772d04c691cb4d7289678346a23
MISC metadata.xml 223 BLAKE2B 095cbe9aa757b7e872656ee3f17c562e1628cbcc794c9776c46c6edb22e30ee62d077a5ec6a59f26fc453bea96c643cf710e773a399651bedebe8a5178f56344 SHA512 33143373e4f170a675d3f9edd8439432444e03242e1e9cae2166e5e2b189ba1401ecbf93a7496999faae23851c4de60b705b9598a59b97894dc89d6aabc4bd6b
diff --git a/acct-user/nginx-unit/nginx-unit-0.ebuild b/acct-user/nginx-unit/nginx-unit-0-r1.ebuild
index 25bc84af7397..25bc84af7397 100644
--- a/acct-user/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-user/nginx-unit/nginx-unit-0-r1.ebuild
diff --git a/acct-user/nginx-vts-exporter/Manifest b/acct-user/nginx-vts-exporter/Manifest
index bbbe0a6e7f26..b9e1f44a5dbb 100644
--- a/acct-user/nginx-vts-exporter/Manifest
+++ b/acct-user/nginx-vts-exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-vts-exporter-0-r1.ebuild 251 BLAKE2B f828f346148dbeb9e73fcf11ceff4ec8b839c9ba3ac4b1816883bc871bcfb1e042071301c2e4031bfe33f6a2a78b64aa7804dca99de81d1eb48a37dd4b2f9675 SHA512 fff5e9a275befc5c68d328f60ced2ea46960fba8b6b4ca3daed7ceae721ecdd67ae0ce506d5c90923c051ae8ac7d1ec0dbb840171702c22f72c59fc335280336
+EBUILD nginx-vts-exporter-0-r2.ebuild 251 BLAKE2B ccc58f6173787595784353794d055c3e241c454863d21f1bc368bd74a3c17dfffc51bd2868da897788ff31ea36abc9e825fa254c2978c952d499decb2250e047 SHA512 1f16dc75844e7f4505c1921e31a7835b4dd93b3afb507c0a8afe80d6babdf71ec9e3d16fa47a71f6c6852e8effcac1c8ff42746f02128690e2b72aabc12e7d34
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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/Manifest b/acct-user/nginx/Manifest
index 1b4f6b296043..981ee40150eb 100644
--- a/acct-user/nginx/Manifest
+++ b/acct-user/nginx/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-0.ebuild 231 BLAKE2B c79c318d31bb9bbf7a65e5dd9b6f0e7b517c28efbf317f3c7d9a88994c91ed8f7390aa8144e001195a78ae2200236c3ddc04494989b24386f44a018a310bc9a4 SHA512 8e6e6b411a7b0fb680415a45271151d5070a49616d4306e3530f8be0d176e5b12801b8d91fa98f6a0704100737f83aeb9c28311875f1899eb2c2820221d381ea
+EBUILD nginx-0-r1.ebuild 231 BLAKE2B e38623ffb92d14144b168c77e408c828aae94d6b5468d38355732b495af793f687abc0da9ed1897508fdc13b573d9284581edee7b60549d51c9f8121ae5acb9c SHA512 31dddcfa5700dc59fed75c4cc4b2f5e629ff46610d06eb946548769d839add22f2da9536e4a65fc72b80981be7cd77b1e91f99c96e7d27eccfc2d993b19aaa64
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ngircd/Manifest
index 5bd2569d0513..7803beaedf87 100644
--- a/acct-user/ngircd/Manifest
+++ b/acct-user/ngircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngircd-0-r1.ebuild 235 BLAKE2B 13f36394d8e20146a44adce5e3c16be2ec02a2791472cb6ded2cdef17c345778273eaa00de15977c7f2dc9ebc2a52bf3755526b52b0d62dcd32c7e50d8b37972 SHA512 3d89f6042d3eecc39b4f7fc054cc6ea06011dc28142f6bfb7b2888101f9cf64f704a4eaa529acb9684bef1b46e463179db421374045f09094fa1c2af55d64648
+EBUILD ngircd-0-r2.ebuild 240 BLAKE2B d3225b5c628c004908e7324c0a585e0025a8aff88bb703fd8c11ed0ff140bf75980e1093d7b60c949ecf1332fa34c579ff1f43ce4f379bb231aed0e8f1edd4bf SHA512 0acb58088898872cf6db6e9d177e850597321333a43ab19fb402c1623d06007a0ec74722d7f2f3228c9563e9e315c02cb4a054341903f601750024260f2f1997
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/ngrep/Manifest
index 51a5bec481c4..4582dc7237f8 100644
--- a/acct-user/ngrep/Manifest
+++ b/acct-user/ngrep/Manifest
@@ -1,2 +1,2 @@
-EBUILD ngrep-0-r1.ebuild 245 BLAKE2B d3f29f165009a42f8802285ba094410cc1739a6355a9fc16ab4ae3c45ff91cee325c46e803138e2bb0ba58eebf228c0398eef68d2010476b4799e304e1044628 SHA512 1b1ea5e82218b74d3a2d0a3df0bf8f6e6b1973149e44ee887f3c0c533f2135b864a5cb7e6310f6783a6f52af0c9be973b87f4fdc599cec60a5e5833622f0cd7f
+EBUILD ngrep-0-r2.ebuild 245 BLAKE2B 6f62e551d7d7e2b8bde63f2e39914cfab40cb5d8f80d0d50fe1462ed069b63aa44b785d63392aac5d534b771be440fe82244abf940c117e8745b6723e25cf8a6 SHA512 34f15c43da49de9ecb24e41d67bb5e5bc6ddbda5a8fcec99c479ada812ce87e103cbc8c1a48828e4e447f193ba908c4e56c5bb34a7e4c546c7dbbe2c8eefad85
MISC metadata.xml 625 BLAKE2B dccaf7134c266c36cbb22380e96e5dba09a7b9ce70285cc21c10168b236c7b17e7dd52e3c84dfe4a311ab600263159f7acf04243edefdfa00937bc43d54b71dd SHA512 3f7d9d8ee4647bded5bf3b73b7fe5489b19b82e27a8e0150f08a6f3cb1a2dfe9292591ab4d378f897e09d98d77b276960aa756d22af7affb4ef2e40b90737003
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/Manifest b/acct-user/nm-openconnect/Manifest
index 692f84ee7e87..6176ab15ec80 100644
--- a/acct-user/nm-openconnect/Manifest
+++ b/acct-user/nm-openconnect/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openconnect-0.ebuild 270 BLAKE2B 6468b44cb44f674c7f06d568eec9d992b90eff7033495524dffac2078672accb76745637219cbfd85c1f417a3c233308f03c2af2af75b8ff4324acd989c6174d SHA512 410388cafd2571b943435a9f63546934db760e8919067566b7b5799cce29c5ace24e935dcc58019a3d390ed7f15603f11c5fd0cd6bba0f7fca526befaa1df971
+EBUILD nm-openconnect-0-r1.ebuild 270 BLAKE2B d10812aa8def630db0f0d95244e494978877913080b7c88f8360feed76166f98c38e48e262ec298fb9c67c0ab298d6ea66931fd6574b2914b6ad50e9991b28f3 SHA512 4e97bf7f6fe4b91503775a01749879033336dec7d7d40e2494928fcbb4c663f82e0c96b0bc882759f8447a3e3a560351a96283f99abddce0b31a73c18b8943aa
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-user/nm-openvpn/Manifest
index 9edc8da7b085..dbc1b92f5dd0 100644
--- a/acct-user/nm-openvpn/Manifest
+++ b/acct-user/nm-openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD nm-openvpn-0.ebuild 262 BLAKE2B 841d3e5ae6d16a47463d3e7d1d7b946aeccc379daaa1a905e2ef4ce80218d27be320311254b56d1f0b2b407e89fc9402381354ccd8f690fb2c60cc463a1a0828 SHA512 3af825a6e17f5b840c5291152464747e55d7c1f0e436b8dc1002b868b42e1b9f1ad56d3de486db34d2fc8ded11a0d047de80f01018331aadb00b05332dd94d55
+EBUILD nm-openvpn-0-r1.ebuild 262 BLAKE2B f03e570cc10f73244f7d05c152c7e9c279641c2ab1be37752b3a7fa0e7c35f12202245f6c814bc2bacf4ecd19dbd44efa2401af41450bee9454643228fe906ad SHA512 d8de94f64d20b9120fd107280a47abd56d60900febfe8688d4dbd8e0fa70575c600fd8bd45a9a6fa70069fd30a501dd7d3535eb88a8156209326498f79302cfb
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-user/nobody/Manifest
index 82e0e763ab34..7f43518e4958 100644
--- a/acct-user/nobody/Manifest
+++ b/acct-user/nobody/Manifest
@@ -1,2 +1,2 @@
-EBUILD nobody-0.ebuild 334 BLAKE2B 6a7ff630d53303039a124119521f6051d59aa7eb5c1f3a90f3a022b809b2af18fbdd4c8443789ca372c2324ac5a5a835e1561deae67504ec69f6dad6716958f2 SHA512 dad68f1111c2371b9367846527043837c7eb9cb594557c6956ed9b074ea59030b6d114903eced4c1409d25719a11d76d5efc3584dad96fd7c4f67d21bb11ac22
+EBUILD nobody-0-r1.ebuild 339 BLAKE2B 310baf04ae6cae681a79ec57cfdde5d3071e2b02ca6e72a323f2eba9516f8331e16a52b70319b163d8cf66d9acecb40336d39a9a82472a86c9d358e77d3bd74e SHA512 68edaf3b19a2e9fb77f95eeea1d7324ee72c5b0de163081384e615fd7b862fd1374997d16a76bb0b6a96665ee72ddbc2b97579418664d1aba956967482fb19cc
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-user/node_exporter/Manifest
index 8076f3b42b33..b177d678da3c 100644
--- a/acct-user/node_exporter/Manifest
+++ b/acct-user/node_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD node_exporter-0-r1.ebuild 232 BLAKE2B 2ee0779cad879d941d1ddfa12a1dd23c4ed3a53c7f789621437276356f6a72d991405bf90350377569b3be9365d1d7ebc30b98288ad52d883cb07b0a76ca8067 SHA512 bdb22f269d086fdc421574b2ea21f68072fe6444c38c7f965d2a1b5b2a0dd343a74d4206d3fa8c13a1273cc52c24b4645caeae043a1e6f8c409c4a791e8a91e0
+EBUILD node_exporter-0-r2.ebuild 237 BLAKE2B 5b671846cc179a98c877164d765c3c7b487f71520af4c5d3fb30090fdc2ae2c6c657cbe97e20f93e70b1ea48617748e40daf01e49615acdd67f8e53321770f35 SHA512 5241b39d01465b91b8d15764f237e905ad3d37c2cbfa4e9b922fb5f68cf6a58e48d464233902caa572def7c315e1e06940005402c8bdd942bb5780b979816586
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/notary/Manifest
index 75285cc26a8b..f67959fcaddb 100644
--- a/acct-user/notary/Manifest
+++ b/acct-user/notary/Manifest
@@ -1,2 +1,2 @@
-EBUILD notary-0.ebuild 241 BLAKE2B 19d7c44b05e111b98ff42f6a1986219dffb1b4eb1c0f298630203df8560865720094c1fd9d8466fc93e9635ecac3429d29a1756e3e7035f54be6ecb2e2639fb0 SHA512 faf1e148c8e1b76690b1fbb961a4b06eceb994069fcdd29a07d046abd251314ee93855ce6374141bda3ae9fd661e38f658a19ba47281f55f33f006cee61c7d68
+EBUILD notary-0-r1.ebuild 241 BLAKE2B 373cb77b6d6a847b26233377b7361e83606f1f5df737dce22bd8659925f168f176166f3497dee6e4a303ea9f17d9bf10227a7c202226c4517d719bb75773896d SHA512 785b1643de19ebb204d99164e56b4a29666762e0f7a56a1268b193a1b90ae0cb2dd0a827ddf4f05f6a9759ccf8548ac84e74457140181daa51f815b384cea5d8
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/nova/Manifest
index e02355c96a54..03cdc9d7a38e 100644
--- a/acct-user/nova/Manifest
+++ b/acct-user/nova/Manifest
@@ -1,2 +1,2 @@
-EBUILD nova-0-r1.ebuild 295 BLAKE2B e134136c36a27792585511f1ac80755af05e5d0a8395899860703e2da9d3104af98f65284fc9f8d60234495f70a5502c41a13e48532286a809777e640933ebe3 SHA512 72c51363c9ef365217e7b302fc2fd94717bdf93a95e0379b0a2f8c303226c24f82bdc349696e1f243d1909fb54daa8b66eccd40d8018b411bf96719fc04df4fc
+EBUILD nova-0-r2.ebuild 300 BLAKE2B 94d9547c75c42d2d1051fadece14d314809da68f53b6fc561c79b89059c60f4d7e217e440bb7a54192b2deb8de394989ccebde411eec05a27d978b3496637c2d SHA512 017896cd4840f810c0f5470511dfc1e6e90da833f701978b7f5de13e9fcd963dbd7318816c80ff7cad985ecd54833aaee28a5afe9d8fc0c7cc7da33a94c453ce
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/nsd/Manifest
index 17f37a9a357a..ee63e493aab5 100644
--- a/acct-user/nsd/Manifest
+++ b/acct-user/nsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nsd-0-r1.ebuild 228 BLAKE2B 9111df8f2584fcbe988f38b164cc0406a077c4962052774555b2c7db8c28f8b730e69c6a2e775ec8906c02195f65c0fbd43f43980e49084ab3808a7cf0f6bc67 SHA512 467da74dc8081ad5259c25eb00eb87c9bed792d8e70b42f09fb1903f14b3d4f7ee91fed6ecf14fba5425c5e990482a065aa4677295b63db4188414c9de6cfd35
+EBUILD nsd-0-r2.ebuild 228 BLAKE2B edbbe76ae3743c60407d7cbfb081d19ca70b83e777811106b1e4e8189be7d11622a83936eac9f36ac8123fa6f3f423a63d51c1174dfc7335c62576d6b9f474ff SHA512 432590e0e9a1a319ec687ba1ea504d31b6345818641867e6a2ab2ffe05053bd020ec7117fd6927655d99c15b11eb512e6bcd2d4a759fe2b539c56a4ea4c85b59
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/nslcd/Manifest
index dffa2f1854c7..e18d32915ac4 100644
--- a/acct-user/nslcd/Manifest
+++ b/acct-user/nslcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nslcd-0-r1.ebuild 234 BLAKE2B 9d9702fa458c59fcbb6bcdd6caab3c6cfa3e006f0390f4f7d55620ad04c1a8f543733c55cfeb9de00c715903f2f4df132b12f40eeaa2e356a05a88dc8fefbc37 SHA512 a5c04515673e2f98b5668ecd0b049e8777a19c34c384cd627b747353e40399201ef084038957f0f71473aff7e19bbe07dbd210eee12bf3542b52e3169c1f7b62
+EBUILD nslcd-0-r2.ebuild 234 BLAKE2B 698561d921a594a6201c4ecec2b9700a84654cee2377374a6c0eb4c9a34beb727dc35ce48ebc89391eac5e45ecb8c045a1ac070cfd95bc775d089d85e570d787 SHA512 651ddfc9f722d1c5dbb69218b8d119e85983cda5c5eae45c6e60495fc1bf8610658342a1f93f3ba5f5ec2bcd5bbf52f577308dc63bf3b03185a99d6640fb7e37
MISC metadata.xml 377 BLAKE2B de37a4550f576438d2d9e50c63d53758876cb174ec6a40846b0c70f377cc1d0928d24951fe803bbb28dcbffa5a30dacf89c05a814ae7304b61ead2c115cc9b25 SHA512 29c89211671ec281f5aa38644ba64d43c90dc32251074e6c0a399b8087e3d5085f0277b1f7899ea278389b406270c0b35e18cbf30cec9fa52cbfa5e7ceb9038d
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/Manifest b/acct-user/ntopng/Manifest
index 2c3f62f9deac..eb5bf70944c2 100644
--- a/acct-user/ntopng/Manifest
+++ b/acct-user/ntopng/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntopng-0.ebuild 227 BLAKE2B a39b80a7a9b382b1304cf5ed081da07652027ba8d899bfedecde86d7ca9df2dcfe6bf1c4c9a17fb261ffc668ecb63ef0282b79b7afa683825846f18ba94ff006 SHA512 02b44adadb502ad0de9738426741fc4a724513c59404f805ef3e120cbc296c1a1563514cc78c51ce64a18bb1cf2b5c1b774a2a62deb896003f580003a738b5c0
+EBUILD ntopng-0-r1.ebuild 227 BLAKE2B 985a938b1721efa798225f203a35352cc77e2f8026e9e220007daa12f2e2e2efd4b037602dff04858fcc524cccbb555eb2cf96bbd621672253495af818d55b73 SHA512 5dec558dfa72eb8f845ca1eb136fdb57f9c4fb5aa9b2a33d275f68eb951ed52ab2b9e432e8eae595f07ae554ac28b607b5c7657b7a3fe5afada929e46468e4a8
MISC metadata.xml 219 BLAKE2B 5a19926bd602ddf2021d79fb07de89ce03868320d23f61ec16b122f9ba23e04bd24a71be898b22d9518d5792fac5d5860a181f3813a1b78727117a6a3bc93e6f SHA512 e55af6d159cb39bae94cf8b8c9adfc62ef53d56aa11c024e8c4001aae58d9b9256b059f1a4918f55bba17b231ff7725a002f67a5642f92f3118835f3036c2fa0
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/Manifest b/acct-user/ntp/Manifest
index 7a1e6d4f69c9..e2a73c4f0ca5 100644
--- a/acct-user/ntp/Manifest
+++ b/acct-user/ntp/Manifest
@@ -1,2 +1,2 @@
-EBUILD ntp-0-r1.ebuild 228 BLAKE2B 41a90eeab279c7045f2b201a878c57c4c65381670ecbb336d6bb1115ed2120289b0f0f9fdd6a5520c362e959abaef5c1241fbdc98cecee02408d54e57f550768 SHA512 6e52b85aca1318e2268124402d6e534f1a2e1818edcb613b313c887796faa864fa533fff104a3dc3792f2fe1ae8d00d73df8cb44da8530c99a57e014f3611196
+EBUILD ntp-0-r2.ebuild 228 BLAKE2B 65a18c31686864449b009ba6a38a22ea853185bc82e0e62ec339f5c712d57de19798a08172a3bf145a8a3433231b3cc8f8b90b1828ff11eb017f274995a76747 SHA512 6cddbc1a107f68fa8e5b307e77b950d4986a6294e8de7050e41edb2243cd39a472733684b95fee8e1f68cd8bf00b31189958ac8e6e3a33f42807f7ffa2a3b87a
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
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/Manifest b/acct-user/nullmail/Manifest
index f5580ad2ce65..723150100687 100644
--- a/acct-user/nullmail/Manifest
+++ b/acct-user/nullmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD nullmail-0.ebuild 282 BLAKE2B 6dd6884992839b4a3f2ca7c3e74eec54368e087a8ff2eea08b86edc9b2c70c28161ad193b40b9694511faf987a3a6eadb90739dfbb5afd6b1940218113aa0327 SHA512 249989acf0074589218451ecf1dcd3f839bc72e7aa4a591560f89b17d88c2cc9745927cb8c897d6399ee43e9ad8ce3649d294f4cae43a7574a1be750dfd3c492
+EBUILD nullmail-0-r1.ebuild 282 BLAKE2B a575607b061a0a15d118761ced2ec68da6453beda15c82f0c625666c5edeea9cdfcc4842f7f7570b0bd2ae4e5af0d608e1ea54aa7c0e0627e18490542292eca3 SHA512 a6f002715cf0debc5b42087069e8388e46dcd210de7094f83e20ad9a6e9b6f3713822d3526356e9e347799e2eda6bfbfbfcfdc887f1b3af7f488bc7b1d2c776a
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-user/nut/Manifest
index bcbf9643ced8..bc40889e1454 100644
--- a/acct-user/nut/Manifest
+++ b/acct-user/nut/Manifest
@@ -1,2 +1,2 @@
-EBUILD nut-0-r1.ebuild 282 BLAKE2B 47c635eca5726044e1857c152c0327f87bef38309a2b8089778d03e526e0231671fc92743b0c33d37fd62d240b51be34fef9e7a2a849288f6bd9f0de253e26d2 SHA512 e3565624f4ab5b65f315140b0fab9090e48f7bfb1100436b96ebbb6c88f896c36d584abec8b269566bd56ebef07ec26bdb86616d23bbc8156df9b10c77be1885
+EBUILD nut-0-r2.ebuild 282 BLAKE2B f4c1cd162165ba443d6189c79e6708739837213e1ffebdd950c028a4223d9d0c150e02e20d0e8e799487b5e56297092df6087e4f76bd57114129f007d73a2c7c SHA512 0aac22fd504dbde4db3e01f62a243c01c8a222a63c2235c6901c0b050a88d09e613b69de4b913e32f053c7d65d23038d9186acb8337afcf254f762c6642a2205
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-user/nvpd/Manifest
index 7b2478c5ecb0..c359d0b269aa 100644
--- a/acct-user/nvpd/Manifest
+++ b/acct-user/nvpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD nvpd-0.ebuild 239 BLAKE2B 5ecc9f22848828aad5f3e87a6a14e597172367b601235212140ad547351d7a42c980e741730ddae13f7a9b6f7346f1dc60aa800fb15c14b3655162a1199bcd01 SHA512 e439e19ac0526f08367b6ff255cb757cfa720836e89d80563014733599fc2a360b5054b3e601a3858e41658be5f82101001c015d833a07d3e15839ea9cfe352b
+EBUILD nvpd-0-r1.ebuild 239 BLAKE2B 8169b5afa1415d450a0c806aeb0f6d5e1c752051af21d4ac21f81dcfdb44ff8469d2b34aeee48b9df834a31102c2cc61644f8576e5bec70416cff68a61153b11 SHA512 a47f8ff2b039874e1610833ee4a6e38f22f58949c9582553852535ea9aaf4d43356722632b654bf5f136f36c996f0357cc7430465c33be6dbf1324c2ec9b19be
MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
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/Manifest b/acct-user/nzbget/Manifest
index 2547b72651db..34ae7c911c80 100644
--- a/acct-user/nzbget/Manifest
+++ b/acct-user/nzbget/Manifest
@@ -1,2 +1,2 @@
-EBUILD nzbget-0.ebuild 359 BLAKE2B be626efa15641f56263e2ac2721a399e30141d565bca1bdd240d4f0aee1b9d1c94fe6e510b02d14732a39e5179e5cd645a8726df80bef29e293d6952be9703c2 SHA512 571f60cd710556568201d716e879dcf5a86a9d4d0646bb2c33974fa469f966d7dd7f33227fe9cf079e7b2397f4213b201c31bbfa9d2cb884ede71a77f9ca9a69
+EBUILD nzbget-0-r1.ebuild 359 BLAKE2B 975eb0b03c81cf1f31d8a5afa86bae17a1d9052cc52b4f7038ecfc338212bfb97a791c96a93ebddef581fb42e2d13b053482efc2c2380f1df8b0465683156d6d SHA512 06fdbdcec151c3432977ef833b05ecc2ef9c64a8a0907772d0d26e79f8591d6dceb7121bea5fe314fe9f443ed33de6287227531ebec586b081d8f20bbe69c093
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
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/Manifest b/acct-user/oidentd/Manifest
index 4ab32fee45fe..806f25cfa6f0 100644
--- a/acct-user/oidentd/Manifest
+++ b/acct-user/oidentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD oidentd-0-r1.ebuild 198 BLAKE2B 34eb82955a942fd447d028cf6b85363db45d940072847b25d62893c75352cd0c667a77f9f8e16390c85856e30efbc294f283c43415ff5c11b5f8b185671e6028 SHA512 4c8b8057009972ce5aaa10bb12711ca98112b7c50f0650d97f4f1b4c1e455bed54ff8ef8d808215ab46a3f4fea48b7393a985d1ec802d91e323b341601781060
+EBUILD oidentd-0-r2.ebuild 198 BLAKE2B 80e7a6e29b56064d228eaf195697adb50e239947e7c017ff8d7eb45eaff32e18d9f1f8a3bcedc237ecf4ebaefc9d8435daec7f965821cc64e44c5b4150a1fd41 SHA512 883232784588fa1ccc7159a6b62e1ea63ee8267309b56751c68bbb72759ead9ae13dc87cc1a78ccc2d92c36c7562a00a97804a770e82ec07d655771c666d354b
MISC metadata.xml 393 BLAKE2B cece790dd0310b08c71dfc107e0cf9d28a86714a8d14361140f30820be5987008fbb1f0954db16c6686a8c087bc54f0935960d4ce718e2f61240d2e83e67823f SHA512 4b60a9a9e648418f7d7eb82dd3f5d4ab28caf622f9f84cd8db5a782cd5db5e6bf1b20a4dae54b65f27998db671aa1ddd64ddd3e9ef26ffb1d786bcae82760cb7
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/Manifest b/acct-user/openctd/Manifest
index 4ae554eb4807..39f2896f7810 100644
--- a/acct-user/openctd/Manifest
+++ b/acct-user/openctd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openctd-0.ebuild 240 BLAKE2B 3fe0dfb2a61307048ff8bfba1ab4bef023e5c5b763f878a0a5149b235242d736efc8c39d91486fc4fedb53ab9aef23f89173aa15f00c28682e6873254f84c315 SHA512 14643efa3850757463a8c63a909d3b459300cab75e87f9f3a9d28176f10ace7ecb90c4b1be0896a189b50f388ad13c03319e1ad64a4cc8d9f515c421ac904445
+EBUILD openctd-0-r1.ebuild 240 BLAKE2B 5cb5b5d6fd61a760931309987d88d50f3d14f004eea5d831d7293f102b204396f249992c871c77fbc1a25fcfa9a97878e5a6992cf3595724abc4b7be48845730 SHA512 1394b54aa22142f0aead250e72adc493c618acf19d86ae6adaa0b3897b4a154a150aa17d4f5a989ce00860058b08470d551ed53ed336ee050d727710255437ce
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/opendkim/Manifest
index 1afddb0944aa..32e483797d47 100644
--- a/acct-user/opendkim/Manifest
+++ b/acct-user/opendkim/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendkim-0-r1.ebuild 232 BLAKE2B 56d87519a4242e428d61466b9b5699054c10c58ee41251b31dd09187b1f629f841c5032724be59b2117561dc8b2d55823f1e659dfe7d7df4240a915f970c9569 SHA512 804499e34a9a1e2e8f19b5102f45eea69bc738d6514b5f5198266ea06f49a4ef15aa18851546c1258b36c9ed4b11d041c0cc82173d501dd3e15cf243e9a35b02
+EBUILD opendkim-0-r2.ebuild 232 BLAKE2B 44cd2629fdc7a53bffb3cfc9a351fbc3aab63c6bc9563e118e78e10a9a576068a18b13c4b8a35912ec851c0a8f78d8c92ad4a1dda098972cdc8a292cb33d07a9 SHA512 bbf39b9461b96f5e8daf83e283c2027ab001d8460c0c8809eb4af4d8e3010c847182d31454c65fd2c13159313126eed9a17541bf4f5a0f694f80efa306fad427
MISC metadata.xml 247 BLAKE2B 4846dc5414f3478596a37af6a99c490ce9ac8dc341903d8fff794c05354b7a73309f70aac92faa801fff9f8a6aed87860af87e5d227fb2c6425b907038bf0052 SHA512 7a189fd4e7c0f67664c0788b4769a1c038374eb224c259fc206dd1d2448eaa1deab71c612186cff31cd380fb445fa4ba066a0cf881028191e8adb0aae9d862c9
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/Manifest b/acct-user/opendmarc/Manifest
index 820fa351aa5d..a6d87389ded8 100644
--- a/acct-user/opendmarc/Manifest
+++ b/acct-user/opendmarc/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendmarc-0.ebuild 309 BLAKE2B 23344727f00fc145d2cffc3f643506c5046df64734043e47a3dde52ab454d9fd4a4a936d3f945e71f747966d313887bb9268af395b5067ebe83c2634bd8d0bae SHA512 39a1928977cde0d6114088469e1dec904d36cb8ef03677ab0b70a95ab7f45ab19d1c39ce6a6ab6301dc8910e2b22371c74874f317b5ba4cc5999c1809a04948a
+EBUILD opendmarc-0-r1.ebuild 309 BLAKE2B 78ace2c37405320a08e2e7a463463d7fe06d80de2d25c014fecd07e51b067028e4799465c3fef5a9d94fa0e8642a04ad9bd7a7faafe90d5f609feeea1a1e59a7 SHA512 c5baa0cbb57ee8bb7406b50db08027192d9d0afd7cc10023b030f7c3e9345357c1564652f4681de98f11f56d58d642d0593ef787595d78dae297c4279aacb549
MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
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/Manifest b/acct-user/opendnssec/Manifest
index f80beef17846..be085c69b9e7 100644
--- a/acct-user/opendnssec/Manifest
+++ b/acct-user/opendnssec/Manifest
@@ -1,2 +1,2 @@
-EBUILD opendnssec-0.ebuild 250 BLAKE2B 9f59fef05559a90467941d0cd5b8a199fe8091a4bd8d018ff51842d4b6d0cfbf2fe00fa543ec920c9b7cb23d6aefe6414466804f3f136e1aa0825bcbf433c288 SHA512 81411499e8bdd721a8d376c8398b4cd97392fab5067ddcfffdbe105dbf23190a795440fbd7ab3478f13158133541e0b3f2170cb754c877926bc4abe7d575764a
+EBUILD opendnssec-0-r1.ebuild 250 BLAKE2B e6d4cf60bb9c4dac75243cc93b6f6894e4c5f7bbd40b9206330c99f86065914b52553d53b93b77f520f2f643c63faef742be87ed34384ce1e55f5d358222ddb7 SHA512 9d6bec5e712dd0e6cc3c852570a42fd6db630e06e9f8a087f406a6e482360b3b129730e52824368fef278fb4517d43f332c1de327cbe28bd866c1a3eb55e340f
MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
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/Manifest b/acct-user/openntpd/Manifest
index ed2611e94666..7952eee1d318 100644
--- a/acct-user/openntpd/Manifest
+++ b/acct-user/openntpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openntpd-0-r1.ebuild 309 BLAKE2B 858a999dd04a60e9520b448ddb3797f5a527064abdab0cac4e54eb88869bd79a95a0114bc7660d6803678f0f30cd32467838baf9590eadd736808a60f42f420a SHA512 49137194f13147070ac8432bc610cc45befc6feca90368a1d0fdd685a05a93b1e0d2bc05cbde823d2d55b088f0d7839cc005c34c0af9c3b07ec49d4fe5c872ff
+EBUILD openntpd-0-r2.ebuild 309 BLAKE2B 35853c3f18ffa365ec666a8403ffa05ec3d991ce95ed1f4641c653770a4d230ed4cf8d877fee96d16a193b6092e83431fe672010ae9079f5f742ab2d650cbb5d SHA512 6fc356308b8503692a4d0acbdd4d04fde7c12d94a4f13bde5a5f4c7c3f28a1d3f52c7989678addc0d0a8be662302f2c2a6ef220048bcf19f6be10169fbe8bbec
MISC metadata.xml 392 BLAKE2B a875ac61061b518231ca2dc61e92dec80b9a647942ba08b241bd897a2232a6b3ab804f875de8a64a1d323f4b289193571998d867279ca135dda95ab1f056abad SHA512 4418af84fefa90044cb549d2195537df74dcfe7a8c02011b8e0a975f660e0226c942da080b20529fc5752fe0e87928479ac433de3d7ae2947182672e3508a030
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/Manifest b/acct-user/openrct2/Manifest
index 6e934a055289..c4547584ce25 100644
--- a/acct-user/openrct2/Manifest
+++ b/acct-user/openrct2/Manifest
@@ -1,2 +1,2 @@
-EBUILD openrct2-0-r1.ebuild 259 BLAKE2B da686a31c48f2da816ecc5e1fbc10355e65fc1c7a545246e35da903d4de4fd01734703935127f725254d79968f48bc6a5bf714c31085a65f588fe3d10cc92fa5 SHA512 7a776f80babf0eb0ba7bb8107cf8cbf12b965258c70a52489ca2a2a7f98154e31e2015daa4d7bfad1e34cdad2a46483bd9246275cfc317bf2bfc83da7a505a91
+EBUILD openrct2-0-r2.ebuild 259 BLAKE2B 6f9902a1571200bd2031f74709f3776146f9fbb5e66c7c7d61ee279c2c0cebc274d9eaf5a6f1afe3422cd26836e70934dc8b9d033e92ee699f1ebf10f79ebff6 SHA512 2c3d2669661009c84f125593240a95e5daea9a4abc980271d0536be77117ab3576ecff7c49488ff2593435463e99d876010a79bb126d8b22fdb11c2f9d52dc91
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/openttd/Manifest
index 4eda90661c89..3441eb33fdf0 100644
--- a/acct-user/openttd/Manifest
+++ b/acct-user/openttd/Manifest
@@ -1,2 +1,2 @@
-EBUILD openttd-0.ebuild 287 BLAKE2B 79e2897e6bf5fc6b17133d1a71869d0b771892815234d81a79c859297a797e73bc41d77bbde3c0c4a816513045738b7427f27f679837c76468a062737f85dcb5 SHA512 71125af5bbf55645156b4198ec429a6569dfc82679fafacde6e2e28e5658d722b4695649453ba8941da47ab665000eee7825498bc1e7e89900b3dbb0f45076f8
+EBUILD openttd-0-r1.ebuild 287 BLAKE2B 1847d1caff5dacde096b32c7275fac6b1e9f39cfd261d8c4b51b7978bb7ce4d19657a2e5a55e7b8d281966cc601d2983f0ff5265683d6675ab0f5b01980238d7 SHA512 5066821da839233804ef328cc22de025092090f76b60d5e8ced30a5479fc266c2ff127b43eb9e200e9cfd7aea9ddfd04b74d2f4f7426acb26632eaa397a00344
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-user/openvpn/Manifest
index 10f3c508a417..21b0baee1f5b 100644
--- a/acct-user/openvpn/Manifest
+++ b/acct-user/openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn-0-r1.ebuild 238 BLAKE2B 8b8d289fa313ccf9d5dd83ecd41ab28f2449c0c3a846e3e4d598e1b252fed6a08f75d7c8513c892e3540b675b9a6963c8f4926830ca29157f517f7a6b8161026 SHA512 aa92a087ebc304e072bfcfd0b04582e9831d90b9006b88364848196a17abc6889951780ad1e5a9d8f914ddf19c94ab543fcac0531d6b0706a074c8c6951f88fa
+EBUILD openvpn-0-r2.ebuild 238 BLAKE2B 28d82b0d6005b6845e3b052d2cf20997aa5406be682b95627859a2044a71a06c35fb6553bfab336e473dd1945685c25b6513ac46b467bf363bbcb4953bfd9146 SHA512 059a90ceb27930e2200b15167a6d9a719d525f87213b1b87e5a39f42416c903f034a646f818af6c9f085bffd50ead4c8854120496d5cc6855f0c6e2553e6a98f
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/openvpn_exporter/Manifest
index 3b68a9e90e81..b049ea758ad9 100644
--- a/acct-user/openvpn_exporter/Manifest
+++ b/acct-user/openvpn_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvpn_exporter-0-r1.ebuild 283 BLAKE2B 6fbefee1ad6e9c8ecd2bfa19e63341b5d4a8163357d70a292c3f7c64b9860b64c051d33db7e06e08bfe377af84438315247260249ac43b2ff9ff16387c216d59 SHA512 3d7b6762cd39547dbfd4f0d2682721541bc939034d64f1d23f0bcdc146c2a4ab703c1b3cfb9110be84d54f072b51ae9825061de02e6d0b79b4c73e37a04b86a0
+EBUILD openvpn_exporter-0-r2.ebuild 288 BLAKE2B f730246a6e21ac1dd18aa28ba33df6ca3b2b3cb27f9a66e2166356e3fca9052e96bb05e6c9726db2ebb993570b6ba78203c5a9c7decbd7786d2c6bbc4bbf0ee4 SHA512 c310e282d44b7f07fdc530205b7e4580cb255609606f68922feafc3c5b73d98feaade4b0841ffb20ba6cd4cc862d20bd6eaa61a7561441c2b2e442152c44fb92
MISC metadata.xml 250 BLAKE2B 24647b7269305eaebefbb6426c3543e9ecab2b478004d4353af64dd2281fd139059d4ff4450ea7545d357c3f14583e8f9acf6485abc570ef4a8ed053cd76df67 SHA512 5b3a845086e7023834b58c81bfc93f332349e17898f3bec944fa9430e419a5cbf064de5e71cdbaf570e68dbba1d69a8313c99021f8b68a94ef07f53cd52c34fd
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/Manifest b/acct-user/opm/Manifest
index 6b4b6b5d99fa..3fde56261111 100644
--- a/acct-user/opm/Manifest
+++ b/acct-user/opm/Manifest
@@ -1,2 +1,2 @@
-EBUILD opm-0-r1.ebuild 234 BLAKE2B 2daab98a3eaa01d77f8d3b79b9df1b879ddd455122329020b83d199e954543fb9c41498a2b55fc0b8deee898360971529d6fc9c5890c58c3eed9842592fd2c56 SHA512 ef134ec8d47b2675558f41701d57c724395cd8f75ec6ae3a0e07d8f878f02fb3108e9eaceed6d0ce7816f7d627c09542ecb837e7846fe06dd04775005c7159f8
+EBUILD opm-0-r2.ebuild 239 BLAKE2B e4baa011679cdebe03eedd416bd8b09e492d222fe1722de0a94960b7b3e4308476fc31e9066221cbe05b2f376a582dee0e3a7d0c313644acfd4797fc0e9527d5 SHA512 83f69de949b82d90ff27792162eab9afbe8ec51619ab34bd05436e6a54143ae6f2c038c84db89a7aa1f57c5b027a7a4d5876d4dee3b8011042ab0bf58c3c91f0
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/oprofile/Manifest
index a88ce078a894..f6a7e8236270 100644
--- a/acct-user/oprofile/Manifest
+++ b/acct-user/oprofile/Manifest
@@ -1,2 +1,2 @@
-EBUILD oprofile-0-r1.ebuild 254 BLAKE2B 7466e42780d328dc9f97499b6065a66879f2ee771e602a3541d108db7405242ea562363729707d7d45fcb8c2f42660136ce03f86c3cf26bcd5df351e76741bb0 SHA512 cc86ec38f94cc9011e4f0aab84ac749043e67d81ace47e62ec690ebfce312c020acc3c7224c362fda39da9ac7f7ea86ae276d08042c87133af314056774b350c
+EBUILD oprofile-0-r2.ebuild 259 BLAKE2B 20644b4935259e90c9469f1b37d3a8ff323a3103b8fcc666e344b8a84f0e92e7c3539fa36bb7d6e4583218a400084c55e40c20bf9b7796fb81d9075d690ac358 SHA512 69d2833ec5541264eef14bf614e9dceff32b1e73bfe28f139d0832cc58fa95174e54df508594830f170fbe3efc3ac65644ac4bef5177869e0b615831d5e5a208
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
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/Manifest b/acct-user/oragono/Manifest
index 5f5737b4704d..d8ff44f595a9 100644
--- a/acct-user/oragono/Manifest
+++ b/acct-user/oragono/Manifest
@@ -1,2 +1,2 @@
-EBUILD oragono-0.ebuild 239 BLAKE2B e8f82c548e12a5b7bd08fbbb9ef4289335611a3629cdbdf9c47a36e602de8c531706b68e967c7a8824610fbc221fa7cf2e4124f92dba106df24b6b6fdd9e9bcb SHA512 b7cb950f561c4c0b25aaf18082f00e715ce68c6fdea9d7cb68a6c584763a7b6bc24f24d6322e05aac60088c90f85dc5b4d52f3a24bbc2f74c273b53c850d55f0
+EBUILD oragono-0-r1.ebuild 244 BLAKE2B 2a384c949f84fe38d3b28c57edc90af230709ab23c11e9bc74550089beb87b06a5cb24193f38e667056cc4534c74b5e56940c98ba8fe0d44e7f33f4ee2bbd7a1 SHA512 bdf7d2df71cd8b648252aae59f7ae11a6bee3de8ce4576dbc91e0e4145ee7bb7111e8c1a52f5679f353870ed2f6364844aa65d3e41b8c8d55806cdef3deb27c9
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/ossec/Manifest
index 9b523bafb9a2..f4a869cb4210 100644
--- a/acct-user/ossec/Manifest
+++ b/acct-user/ossec/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossec-0-r1.ebuild 289 BLAKE2B 5820ea90a2ed2f8e100f8afa0e40b2bef5b80f4af88addeafe3bfb4f88b04c301457fba4a41c8a0b1a9ce5ce98136a2ed1f2d1990f4b5784ffe7679c696f09d9 SHA512 f1ca67bc0db90aeae7259039cc2e6a30a3190c054cd11c3b15b8793feff101d8961471ee488484bc4950b885c3d21934ef1554cd2b2d16fcaa5c3c40bbdb1240
+EBUILD ossec-0-r2.ebuild 294 BLAKE2B 47f6a90b9df53a66697a048c0757be29e3ecc5063791253304cd99fed7f2903397af5b63e850305f36111c0e6a09688eb532cf6a951fc531e436b3b797da5be1 SHA512 1846071fbfeaa68c19693c403b29a934767e1b8f6293289568fa79e1fb82faaea2e28459c77103ebdc669becdd7594da9ff232d7ea7516a3f73c576a0112de2e
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ossecm/Manifest
index 26bfd5b4417b..f87e6fe4c0b8 100644
--- a/acct-user/ossecm/Manifest
+++ b/acct-user/ossecm/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossecm-0-r1.ebuild 247 BLAKE2B 288296ef31b602e1dac853b031fab1a5b3277259de84110ff223c3bd1e6f4ae5446c9404347f1b66c980cd0d5fdaf864212d1f0a36c1ab53b017e3bb1d321053 SHA512 cbb873005ab2ac5e17c2c2b2d8640a66d69fb9eede52bbb7ff27961509bf50c81f02cf47d1e850a9067980b4f820c499a8392f122506cdec1b7f05deda538465
+EBUILD ossecm-0-r2.ebuild 252 BLAKE2B 11c4b18a16b318787d7d37944360f9ee971ad5f60698225b630b58890a9ceec6abdf09a6d7779a5b3e6df372ca203ffa011e797cadfe5f983d944a51eb851f50 SHA512 c5621c45e783c44c5f4e9c76fd14b235efdc4efa76ab172525964550bfed57548ead1d7b31bec50d4c57513444d5c8c874ab8c3e6952243a7cb58759a4ae9b94
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ossecr/Manifest
index 6741e22f1289..62557ec1f2ac 100644
--- a/acct-user/ossecr/Manifest
+++ b/acct-user/ossecr/Manifest
@@ -1,2 +1,2 @@
-EBUILD ossecr-0-r1.ebuild 239 BLAKE2B a3d0b70d0e176b6fd1bbfa834cb45807dde16139ae9e53646bd87e847b61bcec310f45b6a14b1d3617649b4335adcb55537f8556b8996813ea1bacac86b337fc SHA512 5d633783b8a8f680495fd116270b7b5dcaf2e3faff80bc3048fba5ca5c26f683a46e8864f91c85c6937fc4d2b2e9077e90b4ef4447d8fa66903d2d411d799201
+EBUILD ossecr-0-r2.ebuild 244 BLAKE2B e4f29f47c1d406d3c96d5dd0a5d6cdd103c66d2ca3221294e3a3007700dcbba87e30c8bbe6da5b43628b0ae28123a978159dda55e4535fe866a809f126006dc5 SHA512 bea423590213b2125e7b6469878a72732247d6a61c174f7cb549171916ac5491040db57421fd81189933013d0fcb0c86ace9b1b31b7da7fc8be8d282237e6b7b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/owntracks/Manifest
index 1b0260c8e6bf..51c5dabbad13 100644
--- a/acct-user/owntracks/Manifest
+++ b/acct-user/owntracks/Manifest
@@ -1,2 +1,2 @@
-EBUILD owntracks-0.ebuild 253 BLAKE2B 0d199f04e9aede45055e16d80e0bab3894a36a78fb85b56fff5b0980723893d1ed66fe35a5438f25af45cb4e6d1c846e480dce0bfc2aaf178c897de4f33703de SHA512 526ccc94032b748ab8a9ced584416bdf7f1c7dde5a76da529b29f60af33f1277ab1b807f83b0cf6ab75c62340f31779e08c3918023f243b48bd52c667e8299a7
+EBUILD owntracks-0-r1.ebuild 258 BLAKE2B 61cebc47b13366093ff08481594265bd5bffbe037d41314d72af01cdb7a9650d6a25d494142abd2e8ca3ba17797db877d2c95d8b02e665b9a48a3b90ca402613 SHA512 37a7052596a666f550ed05483ecf56ba16f2039b793dc129fcd47f44d91cfbbbc3caafe13d212f32985596bcc52f3de7e38d4dbecb5b6269b390b366cace74cc
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
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/Manifest b/acct-user/p2p/Manifest
index 68866b9601ae..5e23d868ba56 100644
--- a/acct-user/p2p/Manifest
+++ b/acct-user/p2p/Manifest
@@ -1,2 +1,2 @@
-EBUILD p2p-0.ebuild 226 BLAKE2B c2fd54a7797a7b21642a49667bbf388e3feab159b5a7fa004fc58a1bfdfe3b5fc8a7db3bc157c49c871a25e9a2642737d82a2d143028b5722a2ccdecce3ed95d SHA512 32ac4a65866519ae80f285b1d5bc9142e192f0f2c41a462c55090d2513869d82535d0cf78c072a82d550379d09782965043265bac8032a4723d101ead1c4f64c
+EBUILD p2p-0-r1.ebuild 226 BLAKE2B bdb6503646ec6af5f7a455aac48962a6f1a0ad1330a39e44d5aea21252116b767e65974e3f2f1941ef3299ffff84d67d7d4bcf053efe5f3d9001b8e55966d792 SHA512 802bb19adbe81ed4dd7e5b33634e2a9839b21bb8d8d6db89f1940eac2625baa34b6ddaf2dd4349ce80c72c2a542319ba7911793fa3f9813c3b9c7da2161b27d9
MISC metadata.xml 407 BLAKE2B 6cd79e7645acb510b97a94008e57434ff0e0c1a6e01f0b26a7f1d1f9904b3eea8cc1039f621ecec6512c6bd463fbed7a6472b7fb9a61f7d94b9e6643fa443bca SHA512 d701b4402b608096a4b6aa7b89c6e789bb86d8c84cf07ebb0525d67a8f32b9db650da91ae01c7051d53e09137eb5a2c4734008eab43f029c06cfe47f9761272c
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/Manifest b/acct-user/partimag/Manifest
index 3ff6689acea8..f792709098d4 100644
--- a/acct-user/partimag/Manifest
+++ b/acct-user/partimag/Manifest
@@ -1,2 +1,2 @@
-EBUILD partimag-0.ebuild 283 BLAKE2B cd3918d1a87ccb5e67f3505ed573a49a85b9dcfb8a8942146ccb0441d566926f1220aa24966530e1dd421b0561adcd8affa1d57865d13639df7d1aba459d167a SHA512 b901f7307ae3971b71e560dc8e1e7ac90f669e959e035e0a7ff88cde149012eafec840dcd3565125ad512845f103dbb90a2eb2488b400ffbad6336f404ac4d4c
+EBUILD partimag-0-r1.ebuild 283 BLAKE2B 96c9f4d87049ec9be5b3348118672c4c237a858f3b95d6e285040b542ea31278cb3019f645aef7d8fa5ffc06554fd1d057dcf6297bc7348489d91f7a48e6bfde SHA512 76dcfb8539fd9f9759615ecb9e5db35762437dce7597dad2626537aa7067935e5ebd1951b714c517d3aefc333492f85aa89a3baf8df06b49e5212dc21e909182
MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
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/Manifest b/acct-user/pcap/Manifest
index 5a68d5c37ca3..a514f9cb59b0 100644
--- a/acct-user/pcap/Manifest
+++ b/acct-user/pcap/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcap-0.ebuild 244 BLAKE2B 70f2386fda254c7477dc251e110e04ae5066c1cba5920fe338ed77478a173f096fd980b65fcfcb9163068270b50a33275f9c79f6f9f4d204d41a74117894e69c SHA512 611abd9f86111ed64a74de1d3fe78c8e58dd3d0676c1fc0eb1e6f4e2d3d2102a3ab6cdc5340ce8236369e884636edb6e127589cfd7279b14c0442b114f4f6eb6
+EBUILD pcap-0-r1.ebuild 244 BLAKE2B acb4cb1d81a91eedd86cf5405b814573cd530e509b8dc1c8cc1699149f4609ed7eb1451d4ed276eaaae00f1194bf57ac7cea2370165ca19f4c2d4900986c8e6a SHA512 1c127e2dbffa71b6574013995013cc1cdb30c252d594daac3a55271c69ea3b286852a3912df5909876e80cb65e6115612c7b47c733efeb4b9faa2b17f83b17ac
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/pcscd/Manifest
index aa252155c788..575e2c5b4f32 100644
--- a/acct-user/pcscd/Manifest
+++ b/acct-user/pcscd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pcscd-0-r1.ebuild 236 BLAKE2B 1a54f403670b5c562972b331dc773458321b4e12566a82654d5be443cf9532928d39ee09dd778eaddcc3bfb03eb0fe68b16b8b7aa52f5586d080f7da483505cd SHA512 ab6e0cda6b608801bdaa109ca2b119619df9a7d4e91727fcc39b9507927f6d987a5f7e0466f228e297901597046caec4e54bc8846adcf5a60590a50370f9281c
+EBUILD pcscd-0-r2.ebuild 241 BLAKE2B d56175a6d8da3a2161ae67fbd0662c156b14b76d91d5e171201495241d4b9aa9b3828ac4b444563441c26cd835f33234b2f70810dbd90c9304bb217c9f76b2ff SHA512 263629a43a1b877c9dbf692c74b7948374455be9c13f18966c65c1b5840693350172a1c97d07b3a02e1c58fed728a8b5955f855bfe12ab12f2c6e827c4e0471b
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/pdns/Manifest
index 9981f0f22662..2f9093c1ec50 100644
--- a/acct-user/pdns/Manifest
+++ b/acct-user/pdns/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdns-0-r1.ebuild 190 BLAKE2B 9c698917dd9043b4b265d9f2eb78382836b95972b0623057ee8bb5b56ffd4580f062fc2b7cdeb629ed6ddb0c219fc0dfc2cdcce14ca7891ca7f5fdb2bd56e102 SHA512 a02ccf0b9d44c8bea550b730d54632f1b098ddcd7c7186de1b96cc0b44ccc8b9b89b6a82c10472530dc7c1d201b2adfba49ef1d8dd38d216159bd0c65da79354
+EBUILD pdns-0-r2.ebuild 195 BLAKE2B 1a772053909946e436386e466852584291381addd2b3ec2fc44dba128f0a703cd5e4de836b5ed7bd4f3a4b3ac3df1ee6dc77a23bf950d6d548e89adb1f29dbad SHA512 aaac826ad14fde1c8d9ef677bd2f8532fb8b7ca5303ea2bc036d1fbb77586983d06279e582c473f265c0be92b1d6b68cfa558a0d3cdce1482fc2b3fd8eb08f82
MISC metadata.xml 248 BLAKE2B f38cd0a21b3da6993df506679c7da8996160f97f57e74db7fc5f4bbcd75f096392cf3d14be9884c9451caecf81c39ca42b1f478105b8175d5ade2d16e9b26e74 SHA512 27f2c2b1e481b510d781bb2a553ac5ed76bea02e40db22a0007b1e377d25d3e9065b71821ca325bfdad92bfec7d32d15cf86cd530ad6f85509127380de51636c
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/Manifest b/acct-user/pdnsd/Manifest
index a28a2d29b75f..e82f12dbb516 100644
--- a/acct-user/pdnsd/Manifest
+++ b/acct-user/pdnsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD pdnsd-0-r1.ebuild 293 BLAKE2B 4019cb8509d1ed0769c926414defb9fbfc5233380b62e2eea837d62eaa166208d91763d21ab9f9038b7828540e865a9703ea9e2b40e3fc074bdba40653840396 SHA512 4ffc19a1cb1bbaa9ea9d30ca27853c94d0a3ab8b11a9779e956359139ed4d3430aafcdcedfa71be0d8435100d313d69a46461e96d7ed6db5ee01745b7d897410
+EBUILD pdnsd-0-r2.ebuild 293 BLAKE2B 66fada3ae2ad904b97b784fc59010a8a659b19c1a9dc3dc8a2e8193fe104a9fd0296c99d2ec3bc46892fede092bef68f494edc193124bd360b5994da0c38dc07 SHA512 71b0f2047608e4244533134f092b0baffba80b2a7553c328d43cc43c68001ea30df451d70012fbc0d8190e874cde194784cc9d5806e543800534757ca076e61d
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/pgagent/Manifest
index 35b86609bb9b..5b7c3fbe2b0c 100644
--- a/acct-user/pgagent/Manifest
+++ b/acct-user/pgagent/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgagent-0.ebuild 501 BLAKE2B 5067a4fea54efda0074414c02de861218b255dcdec20beeb0926f7e109ab115c17ddaae2456ed2fd4005641dfa29b87243622947d01f81be1c2a4efd615e796b SHA512 96f03e816d5b6952488a39ebd389b99fe9438ff5390b94ea42ebaee5a4a8fcbd36573a4edef0fd9f43d0a571c4056136f9acdab37fa538b3ca507d2932d59670
+EBUILD pgagent-0-r1.ebuild 501 BLAKE2B acf0eedcc45f5d1e0a7c4d3a8c09c8c0513a9042bf00f2c127e1daa620475a5978eab6660a1aa2fea40103be27d18be34875218ec298d6bafa1ac7216a37ea1f SHA512 105d3e43cda210272c0db2b651ee812ad9d79eea75e3687e84fc9cf52977031ee03c797ec94646c7ca203ca706debf14e5bea7b71e3b1499cfd4604f2358b5bc
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
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/Manifest b/acct-user/pgbouncer/Manifest
index 12b35e37bb35..6ab9eb8697b9 100644
--- a/acct-user/pgbouncer/Manifest
+++ b/acct-user/pgbouncer/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgbouncer-0.ebuild 239 BLAKE2B b7a009e430019b0137f5bd8634fc3031cdc7dd12882f49dda4ebf2648215ff6ddf23fbfe46f39aa833ab248f90bfa11e7ca079a0c38a91e1074a1e7e939fb8b2 SHA512 48fcfd49622f1007bb9553d123d303a4181c8352dbf054d287ce8d47b9df7ae08ecea46a7f63788f301c2b0613fe2825b9f891a1266f6daeac9bdaec6a63c102
+EBUILD pgbouncer-0-r1.ebuild 244 BLAKE2B 2699bb182f62ce9136412fb6bb2b795dee05c5ccdee60e571eeb5eb3fa9e91bbc93af56a54a709d29cd0baa0ca4ef8d381677119a0615246a76ebf0439098cc5 SHA512 0b1d775c990e6072b4a92603951021ee189a6c9c6f1630f777e76fbca9f1b5521ebf93b7b4b540430071de867b7a857c00b1b2b4f54400e342a1b524ecef59b0
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
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/Manifest b/acct-user/pgpool/Manifest
index 0152425bf4b4..62c885c1205b 100644
--- a/acct-user/pgpool/Manifest
+++ b/acct-user/pgpool/Manifest
@@ -1,2 +1,2 @@
-EBUILD pgpool-0.ebuild 244 BLAKE2B 3e9aa7a172d0db3e6d5b728082be6d459111a3db382b7f1868c1f55962dda8ed43551be21c46d6dbea0917efb69eb03f80de91e0c1285f66b93ac13baed00007 SHA512 707534634703e0429220dcf7bfa1831f38b537fc5434b4451e53c0128a59b9a8a7e0c3c7286cd9f4f679c6622127dc83f315d03b28788d6cbc948e6106fc602e
+EBUILD pgpool-0-r1.ebuild 244 BLAKE2B 3de568ecd74719e9b35a39f81c5ca91af7dc26858ec27c8047e425957a0d4490b416b8a45ad00117bca3fac6b8ba88704682483c10faab788d9c0455554805ad SHA512 dc9678f47e3359b05eefc99efb9c59f5d61358e457eb58bde1fbb912eaa559670014fc107bf948725b3b3e7e2ffc6bb61f8361ca51758bad8173ba0ddb56e88e
MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
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/Manifest b/acct-user/pipewire/Manifest
index 2b974f3d6912..a50e3f93750b 100644
--- a/acct-user/pipewire/Manifest
+++ b/acct-user/pipewire/Manifest
@@ -1,3 +1,3 @@
-EBUILD pipewire-0.ebuild 304 BLAKE2B 8e05fa9d67ce8934b9900f5c8a01bc52e8b9c2c4769d5f1996a626c586b510e858dd1ce62d4f53d3f4e1e831425270abd539754624225b3f6988911da74f732a SHA512 d85678788914f8ba66ef2d03702442fa0576223e5d30c9d712dd821ac7862e4876fb2aaac642b42b68cf1e6d1b2669dd19e2518e1d5522d3f22d08d1f7b05956
-EBUILD pipewire-1.ebuild 296 BLAKE2B e1d875f4ef1e567f006fef2c1d62892024a7861f83ed205bba7cdf40cf0fe1e248cf2531a0677dac4a4af1c29ef45bf461451b6819db2eceaceab1795a829bc3 SHA512 6bfb6cea55816f5cd03f4d6d9e422fa2aaea53c0102266f5009a76ab815ef8f3144b03f6fcb6c635253e5f69f278781d75fde68c39853e042dea20840be751ac
+EBUILD pipewire-0-r1.ebuild 304 BLAKE2B 521e82b7a4dbd6b5e4d87504ee3cd60ee3e4b7db786fc2deb8fc1a586019eccde801d5b849739a8176d46fd79b5ef4482682c8ba1bd7ef4cd662126cb12b4cb3 SHA512 09aad60a9899b8069b864b26dcd4d0b8b11f6a5e111d4a5750da3a5b0d1312743e7b4b9518bc9ed3982a96ddec55567d95a35374049f14477630977916103c76
+EBUILD pipewire-1-r1.ebuild 296 BLAKE2B e1d875f4ef1e567f006fef2c1d62892024a7861f83ed205bba7cdf40cf0fe1e248cf2531a0677dac4a4af1c29ef45bf461451b6819db2eceaceab1795a829bc3 SHA512 6bfb6cea55816f5cd03f4d6d9e422fa2aaea53c0102266f5009a76ab815ef8f3144b03f6fcb6c635253e5f69f278781d75fde68c39853e042dea20840be751ac
MISC metadata.xml 345 BLAKE2B f519f452866108391c70c15f93d9c861d4d2abc2d7e8abad79bee5e5e2649119643c9563e2c256c5fa194df4b2bb8b641ff62136215ea3d79564edffc849e9f8 SHA512 1fe7551246560d5f17056ed4d8ef3b88f080d7beb1285054cdc691e392686b62107695fc35afaa4bee308bcdd850ae69d1302bb7127fec149854de58b226f469
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
index 0492f9ffcc2e..0492f9ffcc2e 100644
--- a/acct-user/pipewire/pipewire-1.ebuild
+++ b/acct-user/pipewire/pipewire-1-r1.ebuild
diff --git a/acct-user/placement/Manifest b/acct-user/placement/Manifest
index 04d9c9ec47f3..3b9173dd5d8d 100644
--- a/acct-user/placement/Manifest
+++ b/acct-user/placement/Manifest
@@ -1,2 +1,2 @@
-EBUILD placement-0-r1.ebuild 310 BLAKE2B 60fe6a26541f56b1fac7c64e2319069e0173cd018c6ffce2ed94d787273c79081ca211733c47a08f67ee3edd9f981b1f7d5f816a66472557c4e3bbb6d234d7bd SHA512 25e6b743aa49d03db305eef5b2a76d3adf59cfffefe90cbdd291455ecbfd2497268402bc7a0b0c50273e93db4a87df9144fc72dead6a6266f4a7d30a25dc761f
+EBUILD placement-0-r2.ebuild 315 BLAKE2B 1baa698922244e945852b118e7978a458faed39fee4165ea1841cfae71db29e2e4b544fc0a55a3176da166cb84c88d17888150c62bf68624d87dcdcb0ef47b72 SHA512 e31e31743a99151b6e58e4be51250592bd53a903dec14595c75ae970904ab62553c911f4d99422006bd1d4a378ec48933218fb949bd2385ed6a9a9ab2ef05b31
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/plex/Manifest
index c1be736bf88c..dc16101d289c 100644
--- a/acct-user/plex/Manifest
+++ b/acct-user/plex/Manifest
@@ -1,2 +1,2 @@
-EBUILD plex-0-r1.ebuild 278 BLAKE2B 7659458e6d7821b41ef978163542273b0d83558c672514f1d120b907d6850e9f702c9d7f4f7a0e15d527ab113da7f3a8a7289d0d59f90caf03d1ead150fda750 SHA512 e50691af58a4e0e32917353797ebbb7093ce3bd0f6ee6074ad04de5db0dfff6d16bcb632f83c87460e9a9ed1d23aa84c5ededb8a5148d668734480c93484081c
+EBUILD plex-0-r2.ebuild 278 BLAKE2B 8b02274ba5bf22ad416e785d36aefdc526b338df04f6068c2d660fbcbd54f23d50dec1a0ed07caa49f7fd2ceeb45342f6ef0c433cdefe65e98746270d252e5cf SHA512 aaed3b187eb78550c6ce909e1dcfb68744cf13a3205266e315e66c26abe71f794b1dcb3d22850fa604cabb7035999cfe3e504af390e7bf6896240e323b72f5ce
MISC metadata.xml 398 BLAKE2B b0364533e5e51af3ff46cce6e364786496e4a93a365d7566da1fad2f1a7a262cb18a2afb43d3e3f02d9a7e6a6f76148ae49c40653b63b3d11f242c99f113cd90 SHA512 c05d31ba64239181f746b0d3c66dbca84895f310378b754431ff3b8e27127a02ae3372c538fb21c23f94d4ad7331c9a9aa90b001a1fe581aeab2ccd913495a8a
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/Manifest b/acct-user/polkitd/Manifest
index afa286bbd89e..d2169a8b912e 100644
--- a/acct-user/polkitd/Manifest
+++ b/acct-user/polkitd/Manifest
@@ -1,2 +1,2 @@
-EBUILD polkitd-0-r1.ebuild 231 BLAKE2B e903a09bc1ed3ba8038e5ccf722f64debab81709a586d3ec2456a9fd918910fc778010293e5eda39a6caef643f042c069cce8fd3d0e7b65d915345452df027a2 SHA512 88fb1f885a9df9d42b5480d1e01f7fd364586126d34e89bb358940debfacd2d7f0bf980da0e8697fc05ecad0742751b80ec4a64e3268acd4e129861a380a9587
+EBUILD polkitd-0-r2.ebuild 231 BLAKE2B b01b4c3c5040b23f25568b0e3055685272ddfe17aa86f08d1ba9db32fa031cd288e1dc4aab7e74cc2a7c6b3278f2497e4e5ca18f6b9de55a58fc95ce78bdbaab SHA512 62fadcafb059b3b91da695c8b8a1fa14855dd2742389c9f37650d81699a0781028d36514b279a83b36cf7da717672dbd9980244ab9a9bc694ec0e600ebf11392
MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
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/Manifest b/acct-user/polw/Manifest
index 70bef8312853..ab25d542a764 100644
--- a/acct-user/polw/Manifest
+++ b/acct-user/polw/Manifest
@@ -1,2 +1,2 @@
-EBUILD polw-0.ebuild 250 BLAKE2B e1cda9c9252b4c7fcf3968ffded6247ca9955b1c2716958faaec825312025131c4919bc406d69ab4fb64ce4448757d942ece299e327bfac22954c480a491048e SHA512 3963b0247f161b0df957aecb82dc61f146354a615157cba01d6e5dc6cff3fb20ff7519e034e72d603548c9605ec74a06c8cf231091321417f0c89ff59035dad9
+EBUILD polw-0-r1.ebuild 250 BLAKE2B 668f88d1f360a470e81b5e9af6cd6e77addb064dea00aa2ddaf8a1cd0a09016bcee8a3a6e37e4da3b3e4c04d56063eb397e0c795474e87adaf16f2d5b7b56b05 SHA512 23dd32ea9e8d391f3fefc0fafd89fb01523b397a18e4837224f115e51e0d6f7e346ed517a50798932e1d9d7a8960d050cf5eb723c51b99557285ea65c8e54b33
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/popa3d/Manifest
index 0a5e1b961a6d..779be76a3152 100644
--- a/acct-user/popa3d/Manifest
+++ b/acct-user/popa3d/Manifest
@@ -1,2 +1,2 @@
-EBUILD popa3d-0.ebuild 236 BLAKE2B c0c3bd0b3ccf4bc8e9c2c639d422e24a95bfc02b752cc4eedaf68c2854b22794d3eb499373cfe5ef1194a5c3e5ed3cf303ac3290856374818dc0f3a069c58e60 SHA512 03fffcc4713b2bf11fd7be1fc148b4e220c13624606aef1adcbd696c73255f22a6e8b351383df9414d800ef1f1d08d1dd2e2b58b5916ef4c4169c01faead5d95
+EBUILD popa3d-0-r1.ebuild 236 BLAKE2B f1826a104a205a1c622f6dc939f48617dc13a4f9b3bfd9b2c0205a0dbd17410442fb100091380ff54401656d868e91e558392d7b51359a424c763a2a068e4569 SHA512 522de732511dd13a45a434095a7dda0600723f0216ff775bba186e8f8d8cc537c8a4611a233aebe18c7bd60c0f7399a6c6353b52e2b3bdf9abb7b3200fb3af16
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/portage/Manifest
index 583d8f93d88a..5ba99c356be0 100644
--- a/acct-user/portage/Manifest
+++ b/acct-user/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-0-r1.ebuild 237 BLAKE2B 50da337688798807174d65cdcbba8c5a19ec25ee9eee41a5a23127e48005a281d41a54281575d7afd7cf943fab6b258ddbc58c4fede601739a1d8d96e53f6ad8 SHA512 eababbb04a4d3887accc2aa003f5e099cd37f7580535e481829a36ce10dbed887d95b78d9fdba651daac10f19bb4e71866853bc1e60601eccb0126585df348f2
+EBUILD portage-0-r2.ebuild 237 BLAKE2B 50da337688798807174d65cdcbba8c5a19ec25ee9eee41a5a23127e48005a281d41a54281575d7afd7cf943fab6b258ddbc58c4fede601739a1d8d96e53f6ad8 SHA512 eababbb04a4d3887accc2aa003f5e099cd37f7580535e481829a36ce10dbed887d95b78d9fdba651daac10f19bb4e71866853bc1e60601eccb0126585df348f2
MISC metadata.xml 224 BLAKE2B b8b01962c2bc1d5abaad41f5f9c1af011244a3a3c73ca8544a532a151b5afd90cd1a423ff4d796bd9dc76ac7504a385a850c5f6ceb4c8a5d76e44aa52452d24e SHA512 fa9628394e8600bac8ce6f6f75926875f02d5469f9f5e33f4ab3180504d1a4f614a72973fffb21513b73bf93e22e97d03a4b3fa5360c52e322a0d2919e1f47ae
diff --git a/acct-user/portage/portage-0-r1.ebuild b/acct-user/portage/portage-0-r2.ebuild
index 5d8cc4b82ab3..5d8cc4b82ab3 100644
--- a/acct-user/portage/portage-0-r1.ebuild
+++ b/acct-user/portage/portage-0-r2.ebuild
diff --git a/acct-user/postfix/Manifest b/acct-user/postfix/Manifest
index 5e55381526a0..154b908a358a 100644
--- a/acct-user/postfix/Manifest
+++ b/acct-user/postfix/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix-0-r1.ebuild 241 BLAKE2B e3459163277555cf4d8331c07a197d43f2c84bc65dd3bf53999e4984c985e125c5131c02b62f6318cb3673e7f0e54699fe4ffa337060d610c4d24c410f0e27e7 SHA512 2024fee13494f2a013954c6e7f7e35c18aac13456313518b40883a68081a7b1265b6cf0ecafd90da5fb279cdd197d442fa1413e0509a70838e49bff6d10936ba
+EBUILD postfix-0-r2.ebuild 241 BLAKE2B 0fb050f06980890ac98f64002a5903473ca13b7b56849136e89c9101bcd1caded942e2b21486819afabbb819c762df53674e5557143f0ad125973b4e83049900 SHA512 f590f8dcfe05db3e360cd9cc40c5a0bc089453061c5407d75122751e6f0e65956a73ee5e88841f57dbc5f7309f24580dd1d1e7c4e0f91152c6ae34bd8d9eb1d8
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/postfix_exporter/Manifest
index 783e77870bfc..048ee2e91d11 100644
--- a/acct-user/postfix_exporter/Manifest
+++ b/acct-user/postfix_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfix_exporter-0-r1.ebuild 283 BLAKE2B b7bab64d7864d313f35304b21b4a58abf55517be2c2aa9ea2ca29a96c591e03cd549cb8faf53544752cec7e38ec39a3d7451cbe8352566bd4b8aab9a471ef78f SHA512 284da6b5b3f7205b9601feb657f441ae167f8fbdadd42ab9b58b6e5b17c1b9e560684b7620492df96e11761a3943907429d7f50329a5749869fe524c24e6442a
+EBUILD postfix_exporter-0-r2.ebuild 288 BLAKE2B cfd3f7559f4ad3e0883211d751539992141f1e3f7f1faa324f5dc6bff8edfe8798d29ae7f1377ef1ff854c6c93922e63e7864f7ac0e5b334769d67a686e0583b SHA512 7f56e61084701490ff700462916c09a8c54b536e0c4da3e07c9181773bfd84c51b10d75c7b83db79501c2930dbb7fd6a806530be492598e1eb75efec7c74c00a
MISC metadata.xml 250 BLAKE2B 24647b7269305eaebefbb6426c3543e9ecab2b478004d4353af64dd2281fd139059d4ff4450ea7545d357c3f14583e8f9acf6485abc570ef4a8ed053cd76df67 SHA512 5b3a845086e7023834b58c81bfc93f332349e17898f3bec944fa9430e419a5cbf064de5e71cdbaf570e68dbba1d69a8313c99021f8b68a94ef07f53cd52c34fd
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/Manifest b/acct-user/postfwd/Manifest
index 92745a99001c..746bf607ef28 100644
--- a/acct-user/postfwd/Manifest
+++ b/acct-user/postfwd/Manifest
@@ -1,2 +1,2 @@
-EBUILD postfwd-0.ebuild 248 BLAKE2B f84198c5e9e4255af1b81ae85fb3f8d72c6c1d15e0c820d3ab8c2c9c9867392a88b6148f64b8d8b32dad7a092d1428dc010db8378eedca1ce7cbd999ddfcc1b2 SHA512 142f32020bcd43806aeaf141577c864943b787b5ee2f25b1ee4d4cb3eed19d71f25660e98354cafffcabc2077e61cefd8ee45e9437f5395eee6dc24d28d3a4e6
+EBUILD postfwd-0-r1.ebuild 248 BLAKE2B 0b769d0ca58ac82bed9a87763fea720d59feb78f6f11c6ff0ade529bdf0730e654bf77f454f8ad7f953fdbe14780ce057aa39aeb3aa672f4b500dcc9bf51ad54 SHA512 f644cc754ac46225f0aabaa7a27f650b90bef7f580fce4b991ec1f64a415763aeb1b4ea53798faeba18a528fdecf34883900d89491369a203b6019a0b3835455
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-user/postgres/Manifest
index b10caf469832..52c3f3ed4b3a 100644
--- a/acct-user/postgres/Manifest
+++ b/acct-user/postgres/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres-0-r1.ebuild 324 BLAKE2B f8ac6ebd72a8de33f6881b20c023b172969e4622b6c86411957f4166bc570fec32b7758e222466ea55872f8b82e854cd7f726a0d16fa16d705ca76d4e7ab0b9c SHA512 c6801fe0a4f054b98545c3b9708266878577bd2fd1df542794ff812c43aa55ce8c82febf3f1e4ce7b342c2e931a97454d0d96000a7fe88ba38e00e8b3cd5b7dd
+EBUILD postgres-0-r2.ebuild 329 BLAKE2B b0f8eebff1de8f254d23effda8f6b5e6638937ca71e740b87137ddf48ec86b5ece1b4d0cee0e5d9db2b673054319cb1acd2964af44c01962080b5db2f5d79cd4 SHA512 71231f9291e6275af67b193f2178af90463c7b9a2542fbdbc77b827f6bac78c085d6761ecb8f66a24eb02edb140ae8c936656794c42eff6f6fe69ca817dd85fa
MISC metadata.xml 287 BLAKE2B 86ad1b083915fd3a1729fe9ace5eee420c95138ec3d27bff6c8d57bf39f3e06595fa0711369238294f4ed5045616f9cf5bbc8f3650b125641960fc36dd83fedc SHA512 365668680d866efbac01f9a47e8078ac241ad2330995f8cf6bf965bc5c24c8a555e904df644a035d370e3af347e9a1dcc1e8e90a06fad5eeb4fdddbcfa36c2a4
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/Manifest b/acct-user/postgres_exporter/Manifest
index 85b2ba951c41..dfc9b4a1b604 100644
--- a/acct-user/postgres_exporter/Manifest
+++ b/acct-user/postgres_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgres_exporter-0.ebuild 244 BLAKE2B 25c75a69d0f124f5164fe25115125bc5d7168196c93648f0e9a1835490c51e9601ae97711cd0b87908e1856317ddb812916f158139fd9efe16a45e77b52b16b2 SHA512 89a0092040304028be681b4cc62334c9bc313188b9c2acd19d4c80b3e1146ad5a6cbb00b507549afeb990a6765828f87589e8bb5e36858bb50abcbae75df21e4
+EBUILD postgres_exporter-0-r1.ebuild 249 BLAKE2B 70d77b3c155a7e39cfb448488a6262d8f12de029576f55e6710c0faa99df006ac99c978ae39c6abf623da9269016f11e705ae705cfc4670c66549cb468ab7ed6 SHA512 ce7969910c53c6d9a369f6d4bea4bf5e8e9f34ec6c25556a5d053151b548ccb72ceb63a9f318ee21b0296e3c03fe09850ecdb1c81af2e00c3f05d081a1b29996
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/postgrey/Manifest
index 69ec34a99bf8..207c02b046a4 100644
--- a/acct-user/postgrey/Manifest
+++ b/acct-user/postgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD postgrey-0.ebuild 242 BLAKE2B 140048e65fe7acd33e4874f955991bab40fcbd298cf3aae359247afe374e81d3d30f47e90a6322f5991afd4808a09f326bdb0ab5b8ffc372dce2c9904167f0fd SHA512 c9753e811af95ea04de11487ecbfc42098865971cdc63edd50687a2855be19aa88406bbb41a3318c978c4a8199b44d1920d5fc64cae523bb53be070be015c1a3
+EBUILD postgrey-0-r1.ebuild 247 BLAKE2B 0eec250a67c031b3c3c3cf2d71ca6639117d5183b5d8eb0711bd4cd8c12e47a47cc5165c0be84f8ceb96f02b1716cdeb1c9ad1fadc223d4e81d4f9582a0ef3ab SHA512 9b9dcd550437da9fcc71d76c3cdd0fff08c4f21ea327838ffc46b5490ce36b0bf6ca5da15aee411bc66bd1806b7ad2911d91c042018a5cbf16d23ce12ee761c3
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/postmaster/Manifest
index 98ec37706b3f..9effd5143c36 100644
--- a/acct-user/postmaster/Manifest
+++ b/acct-user/postmaster/Manifest
@@ -1,2 +1,2 @@
-EBUILD postmaster-0-r1.ebuild 313 BLAKE2B cb00981e854cc20a55b7646eb72722fd91a7ae49925f866ce6ea743a08a8a8eafffb4443df2dee1550e4811381705081a48b385aa497089dd244ab13123f19ae SHA512 64ec90dfbb63bafb63e42375e45a8a8cb55c007cd9286db862b5d0ca97486a0b9e9689b99e73e1bffdb287a55dcedc1b8a557c5508a9ecea11cf88bd1eca7837
+EBUILD postmaster-0-r2.ebuild 313 BLAKE2B 6d32e82a9a63166f740f00bf0eba03f5496b3ede61e03059aa68ea1eb8f8c8cf89cedc6b2718d77e73c5df95cdef572b649f49b3fa9d0e7a29bbc5f2082526e2 SHA512 6bb9c9523b48d9a3cc3c77a40c6fd7911167b47cc476d1640532b7472bc5dbb8836b12e244ddd5477ddaff74c8a04dd61a534fdcd7205c78da091ad495567eb1
MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
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/Manifest b/acct-user/privoxy/Manifest
index ae3686907f4a..0dc796cbde52 100644
--- a/acct-user/privoxy/Manifest
+++ b/acct-user/privoxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD privoxy-0-r1.ebuild 248 BLAKE2B 0a8b6cabf92c93d74154614617658340a89726af5e693573ff466af664c0e6d8fa5ebdc47281539a72c038593dd39503cf30c5f49fa35cd9c141be30a9d9f1d7 SHA512 de640e59c77b6a1336a9caedacd016ce42314b48fb99c2a35d7aebfd0a6a6af75d5fb62cd5f5c6ce49d16c9e9e224160eb0bcea4b153c89b7adbe17177f01622
+EBUILD privoxy-0-r2.ebuild 253 BLAKE2B f7f6b1a3345b22d385f03374a8a715e20f1b4a5b86cffa8de8144e0efbac0638aca73e8719eb4555019443058b31bf299b15fe070cf37a8203ea0abf00fa502b SHA512 0fd1908bb7e003d171688cc71364ced53543b1a183199dd481c5f3fd0ed9e26265aa24ab2564cbb6f324b1c10a91c94b81adf3ea51b5f58e62a0cb8c3999e5da
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
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/Manifest b/acct-user/prometheus/Manifest
index 77a7d7d6f422..886a03c638df 100644
--- a/acct-user/prometheus/Manifest
+++ b/acct-user/prometheus/Manifest
@@ -1,2 +1,2 @@
-EBUILD prometheus-0-r1.ebuild 265 BLAKE2B b1b95d382fef5bf12dca99d2453872ab5c79e5c1a375c6b31a3e1bfef6c17d2445362d722692ec567eaae6ea7a044e48b52d1664f060b7f2a39a30bc0ef71b6d SHA512 964f3eabe995ecd6c388f2db50f0188725572202387baf76bcbbaf1f21685bf605ea0fc3778f009d171e0fc1325eedd27a9d40c3f31a663e4f4ab30a2092d93e
+EBUILD prometheus-0-r2.ebuild 270 BLAKE2B 0c92917e66542262229d538744457d41118ba0be91fac441c48b265e81a23541cf14f1274cfb2d8f212407df8d91fcc157817823325a8574304f06961316fce0 SHA512 9a0a4af3d1e4f909fc22fbdaa85f296834d038d8b665024b75ad597ba1ebe96242f94115bf590091039052027ef98a425871c14b31ab5f34eef8b4f4f79355ad
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/prosody/Manifest
index 1720956ea140..51ed9e6619ca 100644
--- a/acct-user/prosody/Manifest
+++ b/acct-user/prosody/Manifest
@@ -1,2 +1,2 @@
-EBUILD prosody-0.ebuild 243 BLAKE2B fba7d09fd545e83ff9eb1631eef52c6f5ad88d0fa7a8aeda6a98baf4e6f197b9dab7efb95c9fb680e23a7cf66f6a8f0b3e437167c15f6a2e80ee2dacf0ffedc7 SHA512 eb7c1932673ec18db3bbf1effa26ef90040f8a73d1d8584d1e15acf7b0ca4f465b4ffd1e9a345f1255d52e796c33d0fd7874c2d82f7d7abbe8c8db33dba6509a
+EBUILD prosody-0-r1.ebuild 243 BLAKE2B dcfb6ded4e66b99a6029722efa6f64400a5393ad7169dd212bd1b1e96c2c449a151c6531a2f46356be267fef8021be95d6ed792396d4fd7deee7f6dee2a75d75 SHA512 fdf0dcfeae41082d400822c46619d85135e11120583294ec98fe85fe959198e95c25f5efc0eeba3a1e9340750464e3d22fe1cf2f38e7d848f286e02c514680c6
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/prowlarr/Manifest
index b62ada6bb5ff..1de0b1646023 100644
--- a/acct-user/prowlarr/Manifest
+++ b/acct-user/prowlarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD prowlarr-0.ebuild 264 BLAKE2B a60850fdfd08d5e148767b893f6b18b37201eedb6b9e08a8761ddb4df5061ca725d88ef3a4a2bec42ea3b9aff7b94cd88a9ff1d97a22737d245211cb9e9f7a15 SHA512 d66335cdf8c0fe28611f95fc0dcf9f5ba262d03cc00bc2496b1971b94bf47352f33c21742047726b09488b0d51ad2de2782a55ba0ce786da297cd1cd8ef85b16
+EBUILD prowlarr-0-r1.ebuild 264 BLAKE2B 1f1afb6d64fd7ea61540b95d38ab362ccc4bc6060251426770b956f9b50f0d1f7d9901cfe377f16f5907d55f744b1312863031815fbeca9448251317ecefeae2 SHA512 a0b463d83d75e38e3a80ff9b19309dba8372c2cf741d7bf608887e5a93d6215fb785e97d94bd5d5262d54659f8231744c952dfce2f169c7ae0036d74103d0e24
MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
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/Manifest b/acct-user/psybnc/Manifest
index b8015180af1c..405b46a515ad 100644
--- a/acct-user/psybnc/Manifest
+++ b/acct-user/psybnc/Manifest
@@ -1,2 +1,2 @@
-EBUILD psybnc-0.ebuild 273 BLAKE2B e5d99c05c387092ba0e42a49f92eb606db34848fcd10b3ae7e23fe5ec17474c31d3e531045e2fff7ab454f4857ced4d5358972b000cef544ff0dbf0955a31a7d SHA512 6ec8ce95075ce391d43aaaa5376de47618dde9e99ae4e81e70b0f15a69393d8d0cef26332ccf327a6a4fc47508e9845563ef7c730459616e7b3b789c20794e8c
+EBUILD psybnc-0-r1.ebuild 273 BLAKE2B 86e8cba3538b2f74b9ea552ee1a952bcd7c4be3ee55854970e967ab64097e52d7956dedbe04d4ff59337bb2eaddc9ac3f42274946798ee83c610e948d0e5af20 SHA512 f7365659d85db38ca7f42d96bdfb5a4bc352afdd220f5387aaae080c5c22bb7e2d9f3abc4f23470a334cde4ac50a14b6640bad4991060329a5cc3d58e5992b4c
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/pulse/Manifest
index 49188aa8c9af..582ce611cd9a 100644
--- a/acct-user/pulse/Manifest
+++ b/acct-user/pulse/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulse-0.ebuild 311 BLAKE2B 9ef945e674872b39940ea9a245996d3bd55c6c7870ea15e10df39921a6b9a4cc4604c213ef5bb0f70499890ae5bbc8d198a2908ae44e6cef2590b52bb32efd7d SHA512 c1ed685899ce34a6703e026534eeea17c70420f176da06b81497c9b09a96096377c334f1605558f0b24f725b00e32b04065122f2ce506563075d1caabe8bbfed
+EBUILD pulse-0-r1.ebuild 311 BLAKE2B 1253db627e39ca574b2d430db04093f861a73e6fd44c8d17f95469b0d19bcf4c62c10eb203ce7a5dc999ce380f29898b379a9d308de60c35ce3979c492159abd SHA512 8d24118920f8992ca31cb3309ccc1fe0a4648b7bd2a6a0f797f4f9e824e80b38031cad5c26e739859fef4fbd7c7947842b46551dc7310d2ebf1b7aacc22a0361
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
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/Manifest b/acct-user/puppet/Manifest
index 714f5490abf6..f0f4f6fae401 100644
--- a/acct-user/puppet/Manifest
+++ b/acct-user/puppet/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppet-0-r1.ebuild 288 BLAKE2B d4389ff4fa1df370cc54534f3309d35130d237c9ef64b5efe6a4594375a87616ba92a26b13ec49e9abfa682fcf7460b4ffac61a88364954e0fc21c6246e3701c SHA512 2c177faf68c5a71b9d2156b655ffdecebfa06507fbe807cfa67254635df54e299520acf3c985ddd6c5c49b12f3a72a6a119b3da553112b00849b774cfffbed1f
+EBUILD puppet-0-r2.ebuild 293 BLAKE2B 399d924d4a31aa70fce85d37407b1f4d946bff4db37cdc1e166d82672afda20c263cc649033fbfc0440af43d8b42627f5dfce2071b3d61be7d730f5f22a67a40 SHA512 1c0f83ea36dde9009661d656278f3a6cdc86ace870469f95b23ba367a8b91b32971f05e9657dfaa0c6e4ecf3eb3f637c9be433af5a1017a33957f237a5eb254b
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/puppetdb/Manifest
index 07722db1cbe2..e066c861033b 100644
--- a/acct-user/puppetdb/Manifest
+++ b/acct-user/puppetdb/Manifest
@@ -1,2 +1,2 @@
-EBUILD puppetdb-0-r1.ebuild 320 BLAKE2B e23ace284f713be4ec1f12638d361c31d956ffbdd01ef4fa751d8c10555a026c7c8d959dee5c04d47fb49bd339768a0ab299d349d95871c0f0879ce9ec4ae01d SHA512 040f9ecdb9f0b415857240ddd676917d340ef4793a350efd090c9436461902c609c17e73442ce2273d7ad020e3f2a88f9c60c95c67788368c32ad5adebb6a5ee
+EBUILD puppetdb-0-r2.ebuild 325 BLAKE2B f0417caaffa8899df8ecc55c25379ed274f8261e97bf24d12c81dd698431559ae3d7b31f5f3429f96ad1e45c61c7ca6e0f48bfb3660f0d1f5925818f6e8fb2df SHA512 c504c82f423afa444c80052f44a95b7851b5f33ce4e9974fe8201d1d7b2acc3b362e8352724ed9cfb780029006708a775836e54921a318b7c2fe5df69ca64ef3
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/pushgateway/Manifest
index 249df42d9926..527ce12b9aa1 100644
--- a/acct-user/pushgateway/Manifest
+++ b/acct-user/pushgateway/Manifest
@@ -1,2 +1,2 @@
-EBUILD pushgateway-0.ebuild 256 BLAKE2B a49fb3d243d4c603afd7880665dbaf61c2f1c6663a5df00c07f339b31688629b87bec0ec7c2fd4a9991700293870776fe135c3e1f7eb9efd465cb5ba32d94df2 SHA512 16c349b3300a241657fd314c24fe5207145299e48893afe36a4059f5c15dd31965a9ff2dbc1ce873ac33c6d5629c61efff42d9e39c4d561519ef95609d98bfc7
+EBUILD pushgateway-0-r1.ebuild 256 BLAKE2B d2b66b812a9678f4234622631b6d85ef661916d37dd766c385a56e1dcbea8bf22b7acd01b445f97ebe6e7bcc73f4db0c4c3daf6cc182e0ca22c927ce542bb278 SHA512 af60d89b59a530b9ee6910cf7b30f4752a13089606e4207fef374ef03e04b9dcf4c46ec569da12a2aafc67f8f91fd7c40d18804cfc8abe2eae4664880bfb55e0
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-user/pvpgn/Manifest
index d737ab99ac81..cafb1775b300 100644
--- a/acct-user/pvpgn/Manifest
+++ b/acct-user/pvpgn/Manifest
@@ -1,2 +1,2 @@
-EBUILD pvpgn-0.ebuild 270 BLAKE2B 027e999f93f4b2e56ee37b353fb4d2e0d64938eb99b4d5abbc5e80f741caa3a8fbe24d1544a2dcc27ea6b1bc4b0e9fba096d23654cf33edecb19800879f530b9 SHA512 b15d7ea7cddc4cbe228b4428f55925499b6021f65817420886ca79d3721b5b601d0c1a61b93d1f4924d668dc1f53188f05615c514fb95fbccde404e40e9a4e32
+EBUILD pvpgn-0-r1.ebuild 275 BLAKE2B c9191b4b984c2108cfbe7bbbaa93cf9d822740e6d4f0ad00a9de62f0512630590ed952ed04fa0a8dadb3f6b0516558f992162b76cee0ba140e822703b85a6739 SHA512 5992576fe68e3360ad67ef7f834893198291db2950b9067b0d1cbc4f4e9c9af6fe6cfbfbcf21c83c86553b3a1ffda5901951123377de9a939f46f3332211b784
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-user/qemu/Manifest
index 9ec800e0131c..55f4e2a36a82 100644
--- a/acct-user/qemu/Manifest
+++ b/acct-user/qemu/Manifest
@@ -1,2 +1,2 @@
-EBUILD qemu-0-r1.ebuild 198 BLAKE2B 5cc71095367861855afcff1cf2ef4121b0b9e875689f27e6bb7c54c00f8bb04a5f22caffba7df37bf5a927cb1fb87ffb239cc9e9d47033271d274be7a1c67b3c SHA512 26d2056d1676e62adb65e575ad6428ef629dcca56866c1f42ebfb3de2dbac349168a98acb73e5b8f0218a79c4d06b44f45e87e23980728610f53f669c4c765b8
+EBUILD qemu-0-r2.ebuild 198 BLAKE2B 01e2e45a3a86887f0c1809c4f5b9c5cee3226afe81c4ac4637b049fd37086cdd69d56c87db755d70c25e18acd500cdf8dc5715f9467c1c148efb7bb969ea946d SHA512 015f383b96f744b4fc5ee4ddbe2cc77570d4881161e4ed13b6a0d00369443fdb454baa35432cb703e54246a840b11f0d1798dff0a97fff9a131a25b5598f2e09
MISC metadata.xml 227 BLAKE2B 2355c732c316f08d180bfaa60bb45afdcd3f67b9ca719603dca82410f450477b3a806ad419eaa50021acba7188ab9ed9e3ed0022240ac6e5acac14db4881ec6a SHA512 0cbb3134c00cab9733bf5404b7bacf2c591826a3e69c39f67f5394b380c8ea04519303eab502a6540731a9c56d1f84b07f1f846d236c02e276a783ed2df34aa5
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/Manifest b/acct-user/qmaild/Manifest
index dcecbc299914..2970c4031747 100644
--- a/acct-user/qmaild/Manifest
+++ b/acct-user/qmaild/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmaild-0-r1.ebuild 233 BLAKE2B 27038cc9fb9fc419e3cc2ce623789364ab1835913c5b506df16bea08c2f8e656bdd4e42e08dc7fce631858c0f5fb8b4c83caeb20343d287ee29044fc306b4049 SHA512 98968b7a8ddfd1ef1384de372b3f1f9bf8a2f6652e0ed069f68dbd7e217485766be1193bc709b19dc05319350b5a41e78df60872afd594d8be86582a60ea5ae8
+EBUILD qmaild-0-r2.ebuild 233 BLAKE2B f2f0e4cd7ebc1d4463e4c2d3893be4f69bf9f65d96906315117ed24a1eef790aa84dd189e084a4859a5c4de29dfcd8546ec84a22f94088a8a0b82e5ba4f32213 SHA512 d151fdaee174785902b9d237c7d03dd578732a04b51bb729f6c1e71c2db21b37b414a5b887bfdcc29d381b3d887f692810c47f91f8e5fb3570e21daa0f433597
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmaill/Manifest
index 8061516e338c..c622fee3e346 100644
--- a/acct-user/qmaill/Manifest
+++ b/acct-user/qmaill/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmaill-0-r1.ebuild 235 BLAKE2B dd2ad59231375414f51add32940742362a518a71f9b4f0abdceed14097355071e0f0e872c787442bd6f4ebc57f75f899ac2497489eea2890db20e8a93563e4dc SHA512 bdd80e0bed5689577f7b11b2a5619de755407914531a7bc7dc9678f8df466fcb9ce58def346a6fa87926b27e50e0789328aa6e71acf802e47a1a95daff41750c
+EBUILD qmaill-0-r2.ebuild 235 BLAKE2B b81459112c64532791f1dc5328fb70eaa5ad9f8e913385f073f02c148d939cada9dfabbc0a70f889b654253cff18dc47f6001dd10b2172fe5c34edbc88812d4e SHA512 6444dc7203ebe0e728584b5d1998eb9756b806669e1812cb17caa558d7934d6d04f11e8072a5c889ba0a63f65d2b43e3f90051dce1224f593f3f01a51db02c94
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmailp/Manifest
index 0b7ff8c5d8ca..58e7f0f1f6e5 100644
--- a/acct-user/qmailp/Manifest
+++ b/acct-user/qmailp/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailp-0-r1.ebuild 233 BLAKE2B 2d96e7ee8b958bfc6418f6c4d83aaa591c13392c2a6f0d44f0172b824430866b5d894d80797dabd0f3ffa162a4f81d91bfe5b49a392596b05e6f753b633a127a SHA512 7505cee64d4ff5c4e26c9dbcea71983ac49a3e83b7ff7f977a99c61ae41f31524cfd56e4fdb8d87373db10b145a01d330098c7a4d9c16f837f6b571d76511dc8
+EBUILD qmailp-0-r2.ebuild 233 BLAKE2B 1400c916c64891b6cdc217fb3edb91691f3ad774eebed5056ea3795e4c78c66c1b8b74d46d6917355a0c44ab4ff1e7c583f69920d8b2861ece0810e2b808580d SHA512 352348f3f13bdc75fb91cfb864cd8948791ee43ea427ecbfdbe728b5de2eff62f436639a2602b5bb61bd74e74cf44e74dbc409805c9a5bb886c697ae501062fd
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmailq/Manifest
index 9209ca579cb0..6fb15b0ae415 100644
--- a/acct-user/qmailq/Manifest
+++ b/acct-user/qmailq/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailq-0-r1.ebuild 231 BLAKE2B 3039f2b284ba5830496778f6cc6008da94bf852f043f0e84918d3be1e168373780c454f1171352ca53a4a9b4fa44fe9c93a4b85feab156c875c27d9c12430eb9 SHA512 6262cbe3d3973692e57e90085c405f74c59a6adcd693d73904553e919eb317572384e0d0dd569af9978a4fd649d444a5f9a97a061a72ddf84a5faaa77e80d72c
+EBUILD qmailq-0-r2.ebuild 231 BLAKE2B 5d5d333c0b28f5b8acd3c4e753642052d16a35521415fd6ff95d8f1e0e5aa5d655775cbb5d7099f4ea4f2b157141410750a828932de2e8628260e4ea7b4bdf20 SHA512 c6dea88197fb89fdfc16435d4b867e492c19f6176244b1bc57c97bf5eb31eb5648ec56405e1947ab74b74096bd59d67b47702cdcca7b41d1cf98f92ee2517cc1
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmailr/Manifest
index a6fbcccc83ac..20df193e8c6f 100644
--- a/acct-user/qmailr/Manifest
+++ b/acct-user/qmailr/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmailr-0-r1.ebuild 249 BLAKE2B a3fad32aa421e2905ab9673d569f400985ea539115e327d087304d418b941ae79837f48df93a075dc2584d42d47ea3c71429dbbc16a51d0802ead9fe683aaaa3 SHA512 f6f699adc85a3f671f1b4edf59c3720f59182d16edf866a9ab4c32806d87be22fa7e132c2cf17d5b7cc07bbd5e6b9fad3e07bec89321c573a185512eb30fa081
+EBUILD qmailr-0-r2.ebuild 249 BLAKE2B 337cc1df1911592bf54e4d0c4cb329d554884b355a16d8fa8c6e8065426caf5c48780425a32d67979be1c0135ed904cf58e8216a152ffd615e675ca0cdbb573e SHA512 1bc49f3540759f26836ae97a6b30b6e57b1db562b9eb76196164f7ca71627cd1d68c0a0fd3cf118089628c80e84f92c07f766b8887f7b6dba7b10f21a8af1fd2
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/qmails/Manifest
index c1eb320ced0d..674db3adf86e 100644
--- a/acct-user/qmails/Manifest
+++ b/acct-user/qmails/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmails-0-r1.ebuild 231 BLAKE2B bda6b7098137baa45a7820073bb045530647fc99941ee4e40ffd99f904e526bdd0fff9121af124c7129e7fc227030ebf6ceb2893748aebfeac950dcba0bcc1c7 SHA512 1746363a9170dc894cc258936afd4766081ffb64ec4e43ce993d99f477ba699f87d9d80945c3fc8fa5666d56699c4fdcac123efbe3f2ab93d4ed4f24fee5b134
+EBUILD qmails-0-r2.ebuild 231 BLAKE2B bfc936515840995a2c4643fe3eb584f0cd76309cc89dce8c5a3871473c43709cefdbc60cc04086bcf5b69784ec48c28b518d3fc196f74d3a18a696524c672a56 SHA512 102c66e127215835fb18aae3d83326d0381f1ff3005460eb964581ce12942a66f5f035cad85c752cdb0952aca4883bcf0e139260bb08553486dcbcd01655807e
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/quagga/Manifest
index 15b9442087ff..36b485fc6974 100644
--- a/acct-user/quagga/Manifest
+++ b/acct-user/quagga/Manifest
@@ -1,2 +1,2 @@
-EBUILD quagga-0-r1.ebuild 197 BLAKE2B 66b6c1993a236ce6f91fe66d99dc04cc07b733b12c060fec82b49e1c1eec732447e7f94e495b389407c82d7644917a521ba143e797665a142ed2cb6607d91d08 SHA512 8d7475f057fa8bdf94aeb91d3495815f5994f026215b1cf7a2ee5b8434216d0f849e63d59f30b548c007b463fcb9a4f719b27d6fd095629c083d450c7e872a3a
+EBUILD quagga-0-r2.ebuild 197 BLAKE2B 2cf6f93ce72da76d5d414d43416da56dad1013370f0e6450752157fd6efbf6876d2bbbf83331cad059e8592c42a20c9de92633cac2b2f3afe826fea570bc410a SHA512 d7f33a3a290ca6b6324e3bee7fcb8978095d0fb015b348a6885593a6f2d7200f6b955abb6b76098abb68c8da2cb8e79fab0f73adbd3b50459db952f4a5a1acdb
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/quassel/Manifest
index ab1510adac10..a4565b4a075a 100644
--- a/acct-user/quassel/Manifest
+++ b/acct-user/quassel/Manifest
@@ -1,2 +1,2 @@
-EBUILD quassel-0-r1.ebuild 225 BLAKE2B 17e6953df90d1af5f10e3994e1079dea31f85aabfe8bcaf362f66ca7a49986c48ebb5363359e6b98187ea326170e3ef634226884df634410402c054b9f1db320 SHA512 dfa2db7b46740adab83ced29deffe75d35c02ebecc45fedf97923c76514fea421d3cb5e2c255b11195ed49a5a6582bc4a3136796ad279182082f701d856c228b
+EBUILD quassel-0-r2.ebuild 230 BLAKE2B b7fb48c4d8ccdbe10fe1702e869a9db3720542f0a03dce8a1bfda9742aa2c1e828509d45c1eaf7d00dd68ab999091bd8cc1e799c6a80dd99e3c02c680555dbed SHA512 e2e5a53123a2ce2dea5ab887753ddcb57569b63acb2a3914d3ca9321392f7ed6402a958abecb4a7996d16f4b0d1c3890b0a050de96ca6eff355fad6a74edf7a9
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/rabbitmq/Manifest
index a0dc4645bf1d..3fbb96f5eed5 100644
--- a/acct-user/rabbitmq/Manifest
+++ b/acct-user/rabbitmq/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq-0.ebuild 317 BLAKE2B f1c1a2dcadf76d82630a02b448fa1ea3b25c29f65901e91d440b1dfe2168782689cd212a05784933f9fcbc1a97a21fa3f95398a298ab31369388b1f8f7c7a863 SHA512 6d095af0f7fc2ae35101130aacac3f59ec426bf91f3c88469db7abec21225cdaac1e4525ed684d63d6fb89cf37191111333160968a0dbb9796f57437723c802b
+EBUILD rabbitmq-0-r1.ebuild 317 BLAKE2B 36666ca0e5dc21fae4e6f2146843cb92ae2e7f25da88ebd78e76232f96963488ca0713e37b6b04a6aa2c28cde61bf2bf65cb9b355de8cbdb361b7e3a965c818e SHA512 686d90d8129db3968f9e3e21413747f4c6666158ca36b0f5a0c06bb9f434e4cb25dede39ce76db742bb5a7859c617971b165bb96e62d39493d3eb0ea6f1aac0e
MISC metadata.xml 244 BLAKE2B 7a5cfcea42b430285e098019ccdf99eccf96c5ba82feeb5354a023aeb0c197c9e7c138b8329bc20a0080cc028c546a0fc52b74c383a64645aef2eea22b894522 SHA512 04757d267b2495bcc0f50cd5354a9bf2f5093ca396744f4cbcdb4eed249e94333226c52e346261ba8da975d3d5fc7bde3c50a5627875a15247b338bb1eddc2e7
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/Manifest b/acct-user/rabbitmq_exporter/Manifest
index f2564e215baa..2aa984d64da5 100644
--- a/acct-user/rabbitmq_exporter/Manifest
+++ b/acct-user/rabbitmq_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD rabbitmq_exporter-0.ebuild 263 BLAKE2B b5522b1a5440e3fdeb9e7555280e0982c0f2647553ab7e2919e236609367722ab2b37a315c55169a91a344708aa0cd25bb3ca1fef1d63847ea6d8202f6a0756f SHA512 4e409d9e9f445844f0df32245d18cc5c217ebed97f136f544cdd28fe036d5ee18237e1a05036f8be3df7fca2f6074e68f28769b01f651ddeb78c534afa0a73f9
+EBUILD rabbitmq_exporter-0-r1.ebuild 263 BLAKE2B 909cbeb33e86f1ed31067602b0dfd13e583cb7960fec3c4ea61e72ed93a77e0294e1b18a17863b6d6d8e8bf183cdbb330bd5a37077e53bd7edd6bc3e1915637f SHA512 3e7203e92e392cfc888f3cac8c6b1e845cbe0e6e697bfe31b8a2570a08d3c2ba0beeb7f4b2768b8ea222e496cbf13d09ee35a44cb20b24c31516780f3d1acf55
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/radarr/Manifest
index fbeee19b0095..0d50831464c3 100644
--- a/acct-user/radarr/Manifest
+++ b/acct-user/radarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD radarr-0.ebuild 258 BLAKE2B 7ccb886e683987d5648e2eea76b79d47e0138aebe160e930b0303acb6bde2237b766e8b9d8ad8fdd5160b4dfdb33da86b5c95906a88e9fc589695e40301f1a1f SHA512 5f831c6014e3ffe2e6f8fdf818bfa26400e98a6ca7e9e27c5147dcde32d75d5a7f27c96e969b40e92c8d86dd793543c78097e69545b1faad104f3d5a1e249274
+EBUILD radarr-0-r1.ebuild 258 BLAKE2B 8f79d281d07e5aa49d455334b4a1c54f2c52480527503e32043ff7c5359eaa8f1247610ba1ffe2c4e5c245660a96e41866b550d3d088a7265454f263072f74f8 SHA512 08d335debefb7f373d57cf90b1a8413646efe692e320adc9c43ff6866c3ca6a6b0f7e62ff2b63bcf092d8c653663773d2d5df275275046406c0610ab5929df7f
MISC metadata.xml 702 BLAKE2B 6ed3e3100f5d2b18f6468c6c5ea176bdf5ead4ce42adedf104f216c8dba37d2d795437e9e845d08a2dbf95ea1c653e2e1df850f73a631cf8ec850e8b84819311 SHA512 09b9d356a54fb3f968534ff5be9904a41d97203adc008378315b4faae8f7ed19dbe39ca33958f69cb219954710a3b390749e20247d2c86093bedc168df29cc35
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/Manifest b/acct-user/radicale/Manifest
index fd640055c4d0..06bf71f8ee5d 100644
--- a/acct-user/radicale/Manifest
+++ b/acct-user/radicale/Manifest
@@ -1,2 +1,2 @@
-EBUILD radicale-0-r2.ebuild 273 BLAKE2B cf85d86628fdc259bc7381d96883fe0af567fc47ff96584784525b8e467baf1138c660ce6b834d8618795ab69b04b9a7a75976811c0625187b553e3c6f2dbea4 SHA512 48a89042a550a615ce97d396e3f8821ca10d3f1a75339bfe7b19560640caa9a43afba8c74a7aa5ffd6a8b8161f38b271c3ad8426e3ffbe2604e6b3ffafc6fb40
+EBUILD radicale-0-r3.ebuild 273 BLAKE2B ba3bc772ba745c24bc4bd050fdf19a275c8822d7fafcc71efb61b2232e152a123874adf757e54df2e88b4b29a66add019f912690d907964c9ef6468e72739ad2 SHA512 ba01d4fac250f9eda6b8ba4b9856023680df862ef96fd00cd5cd7f63e86af076b87b3ba208dac8e21144dbcaa7565e23c5172b41264a2024c72aa0c4d62a7f99
MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
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/Manifest b/acct-user/radius/Manifest
index cfa124cf5174..52d1ed74f4e9 100644
--- a/acct-user/radius/Manifest
+++ b/acct-user/radius/Manifest
@@ -1,2 +1,2 @@
-EBUILD radius-0-r1.ebuild 233 BLAKE2B c92dba45cb0be09ed08d2c3c675170ddf3dcd909ffb7c56d60fecdb98bcd4077470a7946d4f630ba271f671fa562496981b0bd8418cd57b188f0419cb2dea2d2 SHA512 9cd75d55de303b1c8cb16a9fe39d975b9020cfdc303f1caac5c77c226b72e8aabec1aafcc8efe3d5c7489bfbce2b5f9b8e3b500ca0c5d2a218f4521f9e12a9c3
+EBUILD radius-0-r2.ebuild 233 BLAKE2B 6e8d66eed9911a3387356d7780de05efb7eef4e68462963b51124d16d6876f57ea25bc01ca266b39865a0c3d428238d6c25571667e5fbfbaaf6979ed67cdc00c SHA512 f14c9e9f3c9354d3408b1fda80cb2421066b8ed81134abaec8096cc8529beb0b11a25595257aa2fd55d92d18c71f51afeb11d071f5ce4cbe112a9ad964eaa508
MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
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/Manifest b/acct-user/radvd/Manifest
index 26a98cb2220d..21209c932a08 100644
--- a/acct-user/radvd/Manifest
+++ b/acct-user/radvd/Manifest
@@ -1,2 +1,2 @@
-EBUILD radvd-0.ebuild 258 BLAKE2B 6a8c6a5a2948ee870413e2fe2960fdfac17824e7abf5c8c61d69a7dec23c9e67caaa9eab2016649d8d376726b419cece11331b165639ff3ca2a4901cb996700d SHA512 6f430344c025d05772144c2c3b45ed9302902d77e681d8bacd805ce05d8f3457329cac81e6c84e74eb63c1bdbc77076170ac30f0444d6b12b8413f42cc7be439
+EBUILD radvd-0-r1.ebuild 258 BLAKE2B 288198478b32c2705ecadc482cad4bb2b4731fca9e5c19a9dbc9884112d0e7cb143a90ca2e513b7a08eceb76989fd5b609a07a822a2fc998f73bcf609c257926 SHA512 ac2102e7037cc11f954480c82d3a1c9f423fcb63c0cba9d0fddf3c451925dd1539610e393e29edbd29d0aff7e0b40de221ad3d40e713acb20a1b94f0310892a1
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/rbldns/Manifest
index dab4c193ebcc..c45aa0b95fbd 100644
--- a/acct-user/rbldns/Manifest
+++ b/acct-user/rbldns/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbldns-0-r1.ebuild 198 BLAKE2B d1a0491736dd79ffbb5be6282e10ceb491af80864f27baa89a60b5d4cc315bebaa5c98049ec5ffbe4c3efb435b9c49926fddcb8b29133ebc9e3fe35844bc8b50 SHA512 8f7a92f9848e6affa35f4b41398f878fda76cdf94601055dea411ff03adc8f3d5dc4afb5ffa97f0be391fbf93e199ea0325a2f017a75c063eca66b0e80804868
+EBUILD rbldns-0-r2.ebuild 198 BLAKE2B 3ae83dfb49cef5a21662cb464237554c17a688b336173ea528bcad5f3b61967fcc2fb5b5fa2ba9a6761694c8192c2c3f0fa53acc5c6fd0deb560940431aacdff SHA512 ea9d166bd9287e43862fa6c747b7c90510a15d70e22fad2609042e430dce7c020cd020c7781b81533ceb1a47bd10bfc7e9db7747ca1a9fa9538aa7382a14dff4
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/rbot/Manifest
index 9dd97f2c8239..b7bb51ccea6b 100644
--- a/acct-user/rbot/Manifest
+++ b/acct-user/rbot/Manifest
@@ -1,2 +1,2 @@
-EBUILD rbot-0.ebuild 269 BLAKE2B 8e10224f68393f76eb342d4a932335db70ccf6bab68d36985fed46b666e59c842b8be290629ef9e3ea4e22f561a2304726bc1fbda5600349e6f3008605145317 SHA512 8b7d57a2f138ffe0cc88d8a4dc3136b8259b1c30c0eb2d4e0b8425656fd44316dcb40b31ecb33f49a19dd24946d017ee356a6993c31cc382b2e13dfe67942196
+EBUILD rbot-0-r1.ebuild 269 BLAKE2B beb60d2ed630b9fc0b8209993e1eaea34e969d6d25775e70fe064f2c66fe99e729a928b7230285dd3e6c8b07f08e676052eb8475133ac577beae0bb478325bce SHA512 d7d330135c2ac00e564a35084ee65f6c600f3cf90f903f9ce0b09c9e44ef724d3ee3b3e17cbb969a5234f958ca3077440545c06fcd64ba45e60350e067974154
MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
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/Manifest b/acct-user/readarr/Manifest
index b2d8fd1a4abc..304e2c0eec03 100644
--- a/acct-user/readarr/Manifest
+++ b/acct-user/readarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD readarr-0.ebuild 261 BLAKE2B 1b182a8a891fb02a7f85649d9294a54d116c0607ff6270e7e9f27e0e6c7210a5761c873519ade49b26db4810465363c1c2b5a24a5f1332dac021f40d62dd2597 SHA512 b5c830b6d3b6f51eea1ff80d63622917e163f4aa5f6c60d7c5d13f5a8887553a44c6ea96a5f01a9be6dfcca768d4b12c9f96517d3e5f0307f7c03175e4a3aa07
+EBUILD readarr-0-r1.ebuild 261 BLAKE2B dd174b1667c3530ad07fa6fce952786dba16d1ce8268f243afe64d40b71ed300b0f4c47139f5767744daa74322bfdc57aa115520cec9a46ee09b175e15c01786 SHA512 934f42c65ae8a439bbc95d6c5933b3fe047d44f84f71df23b4aa9fd2b57d32cd60fa092fda89df1f095e003e8b6531b7d518ac7731bba9ca0356ab32ce7d2651
MISC metadata.xml 702 BLAKE2B 6ed3e3100f5d2b18f6468c6c5ea176bdf5ead4ce42adedf104f216c8dba37d2d795437e9e845d08a2dbf95ea1c653e2e1df850f73a631cf8ec850e8b84819311 SHA512 09b9d356a54fb3f968534ff5be9904a41d97203adc008378315b4faae8f7ed19dbe39ca33958f69cb219954710a3b390749e20247d2c86093bedc168df29cc35
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/Manifest b/acct-user/redis/Manifest
index 41e4e7aa8168..79e831879c69 100644
--- a/acct-user/redis/Manifest
+++ b/acct-user/redis/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis-0-r1.ebuild 227 BLAKE2B 6f5483beb285537a5671003c70d6c28ebc5292da16359cad317df8380603687fecbf2766a948a27f34f37b89989e8eea9fd99dca0061c3b7628027dce0cdbdc1 SHA512 c7a9bab7c8752d1e5e296427be169365ed6d4f09c5a8fd152c735022a7d1c699a0b7f975fed0421f8408e03d7f80d2fafb675ac58a2ecc1d483101f00c49cbac
+EBUILD redis-0-r2.ebuild 227 BLAKE2B a90c1c3c3f8c5398d86e3159f99215471cd12cf7b1b72677f593e142a8efedb80a6b1672325672714a02d3165b65b473e062f12f8363fe7bee0c2de339fac88a SHA512 00f9cc8ae900398e9b663165d643301c7e17abf43002c96419549b82cb0578f7c879743c9c3a3986563cd32e840fb9af26a45751c4ecade99c541587a6c29aaf
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/redis_exporter/Manifest
index be68bc7d9e80..2e5b93c1602e 100644
--- a/acct-user/redis_exporter/Manifest
+++ b/acct-user/redis_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD redis_exporter-0.ebuild 296 BLAKE2B 3fb282550a52df88ca4dcf3e2fff3222005feed09c95ba97029e34d5c2dccdb767a5cd4c9a2a79e70d72b10abf415af731e11ac9935ef84615501342216dba2f SHA512 c9ddf85840a37aa04acfb4c06e473de189fc7be8239dacca1528b73eb66ed4eb2549659363b3235eb275354068a5ecb5b758c5e05c08e69ea229fec24eef3056
+EBUILD redis_exporter-0-r1.ebuild 301 BLAKE2B 38a15039eb8554a248a3dbbde5b0fa2567a713271834eb9111de844b048523be33d99e839958ca93dea14cf17869a87d33c5c06e40146cafe2e1720aad818b20 SHA512 62003cfe128d2e62eb891583a433680ca721c12d80797bb0f0e72e90a32654cfcd94168ce7146d1e85d01986077aee0feabc787ebd205203e2e27fe6a6f37aaa
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-user/redmine/Manifest
index 1f2d5daca7bf..acac48f52423 100644
--- a/acct-user/redmine/Manifest
+++ b/acct-user/redmine/Manifest
@@ -1,2 +1,2 @@
-EBUILD redmine-0-r1.ebuild 236 BLAKE2B 6e45ec678b369c577b9f70a26fc5eb4c2ecca097c7b31c7dc23e1f94fb35ba86ad4e0d9d74ac4fc874be6ede391b08be1058c55ae1cce5c0cd14556e5f9cea93 SHA512 0cb0f1679f7aacdd424756c9d18356301b037cd9fec6bf5a173443dbf9795b47869d0eaed7de23505f6c9f522f99aed06bd927e6361014aa75d316e2c3916b24
+EBUILD redmine-0-r2.ebuild 236 BLAKE2B 4bfebe80927891a8e9000c9c474236a996f800e6bd2380b4603549048773b738e7461b79d5ac95f4d32562da2bfa31791e89127441d3bf29bcd5a160a90c48fb SHA512 c369d1a0a4804c1208a0407f1c85a954a6a8c0785269f6b632310a977988e81eb3c660d73b78622d578412b2881d352932c9f219e83c5231c7cae315b316b35f
MISC metadata.xml 439 BLAKE2B b2e195109d27e64d38fa965e29a1759e01d7bd4377b9b239ebaadd35023bff49e2981d0df3102d395f368ac970188dc81d31d021dfc48bc4f17d486bd7bf339f SHA512 b82761ab3e617b9e1edce602ad937850ee801633fe478a91f16320f6000394ce4b5653c86ab227fc0b00bcf35331fe0b059f6b101942e22ad7673f6e7b54080e
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/Manifest b/acct-user/redsocks/Manifest
index 8c1690485ec7..04d77913ca66 100644
--- a/acct-user/redsocks/Manifest
+++ b/acct-user/redsocks/Manifest
@@ -1,2 +1,2 @@
-EBUILD redsocks-0-r1.ebuild 248 BLAKE2B dd8af09bacb87f34440451d88c41c27ad5cb0b0abc761e14eeaa31c0905fb784c133af4756b34f909ed8c644402a65f3af192367abc21a27c2b5aaad73b16cbc SHA512 99759876fdfe7e4e8ce0f68afc1388551cfe1ea1e46a0de924226dd5e0ffcae5e5afc87e580b318d4e49a3fe6b7c1211cad4cf8268dc6f58439d5d3b6f8645e2
+EBUILD redsocks-0-r2.ebuild 248 BLAKE2B e6d339ae0e36dccb354b3dd6fd3e5390b5fdb55bc8e77fb44a4a6b27b394c30918dd11eb241be54d7bbe7595f831cc7639e1d624024d381e8791f29647e1fe72 SHA512 a98e66cdc73520ceb23a7cb2222b724a323d0b2d44e6da832f5ccd0de4affba6bdf4636912ed51dd15a19d6e4a9ba4322dbbe8c617eaea738ea5007413749f2a
MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
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/Manifest b/acct-user/reg/Manifest
index 3ec4b02f6beb..bf015204180e 100644
--- a/acct-user/reg/Manifest
+++ b/acct-user/reg/Manifest
@@ -1,2 +1,2 @@
-EBUILD reg-0-r1.ebuild 266 BLAKE2B afba4526f33416bffc04a02af10c3ebbbc5707893f32838ac489c6365cf787aca18a17a0fdd12c458c4328fdf640df7c91345e03ab8173d50e2993717b274cc2 SHA512 a24ecfba3bb6b449f6a50d923e902ecf74eb857fff5944803ef69c4a82ac378f8c999f598e6ecbc65adc3583cfd691c72a7de2b4c1ef96ae78d96552ef207fec
+EBUILD reg-0-r2.ebuild 266 BLAKE2B 2dcc4d93cb84287b9c83bde19fc4a7f0299edff7816dfb37d0dcb1a1723be578fb1313e9cfebbed1d72ec2d2d7ee4ef3b6d17551625c317f5ad98a932ea3e4fd SHA512 0bff441471447e110d3433e401902027481a04d00aaa64a9d688cff551bb085acbcd2fb911f18f590132d31f5d4e339b3f578f77a4be4ada5bb10b0db188ef44
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/registry/Manifest
index 53c109158c6c..dac5449dcbcb 100644
--- a/acct-user/registry/Manifest
+++ b/acct-user/registry/Manifest
@@ -1,2 +1,2 @@
-EBUILD registry-0.ebuild 260 BLAKE2B 38ee067d9a593df80ec11f19c3c19af3bda5663d8eb83c1d48c58a4e18580cbf2400ac28c8e79150ad8bc6767c4f4467baa5a80e7c329d6852371864c851cc8c SHA512 6bee03be6a291a91c41719da5a7cee74b995db22ff78c03980dc6ce037451a1f744dea08ac26aaed99e464477157aba6225b9f4a5512d9767ddb36fb23e7ef15
+EBUILD registry-0-r1.ebuild 260 BLAKE2B e78e293d142e191898c01bbbd65f0ba6a4f6d0088b048ac08fa45efa8d91a7726116e7138d61f793e50d9a7d722025bb6f6cce1feb691d5732d303732dc46174 SHA512 21ff211bb91a27732b847c1a757734dbbec30161c4582482bfd34d5cd283b623b1add069dd8ae99859e8147bf3e9bec7bfca490fd28fc32b06c02d5e136f5d30
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-user/root/Manifest
index 0a61f74ddd76..049d5fd972a3 100644
--- a/acct-user/root/Manifest
+++ b/acct-user/root/Manifest
@@ -1,2 +1,2 @@
-EBUILD root-0-r1.ebuild 441 BLAKE2B cf2d3fa5c74c9dcb45786eaeabad00969a0cde6091bc495dadce313767b36edbd5debef38b94f55b7e9519d0c67102c994b3f5e9fd48ec367c38af63969dfe18 SHA512 6f11fae662873287cf6c341a145998394b8ab2bbdc67d672a206140b3f9dcc3cf45c174e2766eca73daced0c5a1dae06a9f957cb657ee6a06be68ab6d42a5036
+EBUILD root-0-r2.ebuild 446 BLAKE2B 5293473378883e209b8dd42fa7c6c2d2f2658565ff34baa236530a5c4f92937c9837fc5ade1515f179d90b6112a8ed8463801fc5fb080ac5216230a518158087 SHA512 711f329a03412064cb6e220c6295fd0e40254779f9e9e91753d08979c1f9210893230d70d2fd59d1d8076141f7502156edc4f09ab7d04002733791ab6ef6c83e
MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
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/Manifest b/acct-user/rplayd/Manifest
index 903a8b725542..094cbf25fed0 100644
--- a/acct-user/rplayd/Manifest
+++ b/acct-user/rplayd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rplayd-0.ebuild 245 BLAKE2B cb1ad829dc0e82512496e95a0ad3ddd76434c586cc891f2fd8538e782afce7fc16ad797f064ef38f31a79c3a6b49e1950163a17fb8bcd79962f9f931a35f6909 SHA512 cb666dd1a1eae8fca37fbcabc0e7fdc13cfdffe9b6f40b472365d7d0808e6e0e7416eab85a9356c45d5488894599478b9f0decc658587bf0eddacbe64472b2be
+EBUILD rplayd-0-r1.ebuild 245 BLAKE2B d8306d3e55f32a32e4ce74d606b6e05db17567d6bb4343f3b14c5ab4e19a80f9d40662dbf8ab3b17f07151d149059b1185fc8dbbdbee0518d4e9cc4dd360ec35 SHA512 ae79ed1e4e599881dbca992ba5f0897d17329035c9d6c1c034ea7a12aff4fb9173626cb10571a1e68be383ebce11bf63ec7bdc6ce27eedcb16a629a369b9f908
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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/Manifest b/acct-user/rrdcached/Manifest
index 2d4524583e09..5bc6da7690b8 100644
--- a/acct-user/rrdcached/Manifest
+++ b/acct-user/rrdcached/Manifest
@@ -1,2 +1,2 @@
-EBUILD rrdcached-0.ebuild 287 BLAKE2B 3ef91d2abbe81b891b8aa43edf1d1a35206bae202589bf04f62cc9e9fe65572a88c72fb926b734cb8903663eaa0485f504e0d586fdcd141fb97b5a4f4e8f60df SHA512 846212aad42255a707a17ea4f917e5ce25d4f2099c9f752dc761d736215fcbd1c1914d9fb3eb9cb93e993e375a531a93f1824caa560fffa348fa5806c8cd4c54
+EBUILD rrdcached-0-r1.ebuild 287 BLAKE2B c00bb0a0a5e493df9f68e727534aeacb710c28effcd17dbc3e2c46340755497d42cc7a44cd91b1addaa1467d6d06687cc2992f677192725233448a063e22a791 SHA512 721737a412639bfe3f6bcde514af5d100e2126ea524ddec2ba55742ef1c6e0f084e1a5eb2c3551644d449f1b91c74fafadfbe969445914453c27f700707592da
MISC metadata.xml 392 BLAKE2B 96d11acefa9a7cf18f9240f08a5b1c36e769f4e7000632301d3f763169fd15e20fbf3adac95e2e0463d3184ea4baf9792b0f061c95a6b79d3f95da03dfb3fb6c SHA512 c88eb6c28199d5baae394310b0ebcd6ebc186642d4700735eb1f712b176a7750acacf2c8d5a417d2c716bc43d0cdf5f3e11ceec1895f84dd1ea4f0186e3183e2
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/Manifest b/acct-user/rslsync/Manifest
index eacd8ec4c7e2..b580f366ce9e 100644
--- a/acct-user/rslsync/Manifest
+++ b/acct-user/rslsync/Manifest
@@ -1,2 +1,2 @@
-EBUILD rslsync-0.ebuild 316 BLAKE2B b6e4aea69886af636424d52944b6e81884be35927a34192fda671a89954fd75eb53d4332f733bfdaf2961211a80fc3d7aa7082f5597bbe328a2f4fc22979e49b SHA512 b2e3cd38d8e6f98621e05b43317313d09965b0704d0d5dff65eb8e126584cae4c1d5fd88de0d15948c4da162a259368402e2eeba9420ed7d7d8d8bbe6bf26881
+EBUILD rslsync-0-r1.ebuild 316 BLAKE2B a4be5f2d215b95ca41d77f0ff7c938dac48af0177a54736a9c8ddf7bd503f2a32c270847c68047af2fc05ac5fb9af99fadc1c9c72b1b602782c2bc9457e638f4 SHA512 6826229a77fbefa0aa188b28665666804f41405da9ef1dd18fe0e0477a866cd580e143010b2f4d7b57713a3f294dc83f7b6fbbdf3cd138f9629a9a942ed06901
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-user/rspamd/Manifest
index c43231144bc6..00ee3be47ee4 100644
--- a/acct-user/rspamd/Manifest
+++ b/acct-user/rspamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rspamd-0-r1.ebuild 257 BLAKE2B 528c6849e445cf5785dd89314209da971a736da5ef56ae5d0890c7f41d6aac84cc4a4bfc474a75262ee93f2452aebc58be9330675d1b93640634d76578eb9456 SHA512 1d340ff2bfdf0031029040d75790b10825209c6da9a7161e376638c362e0a9eb16dc614466c0343bc9b49fa332a15908df58163548b6f8982303c3671600b008
+EBUILD rspamd-0-r2.ebuild 257 BLAKE2B 0c2c31f2d984760091c171f5b5bc583d4c2c072e7078cbb3ca6f6110a6b9c4f9dac58190f3c281187476be7520fc5fb5335b0ef1d1b0b3fda5154547cca14634 SHA512 4415adcd7594b1fe4bae205fe484bb2d3c2e362bfe46cdb61c5838d291c2dcefbdbc8ceeb763628d862a235ea4c8dde25b6a1fe368d5a165dd93a95e8b087add
MISC metadata.xml 403 BLAKE2B 73564783a1a9e3c1822097309be28fbfdfce03d09e2ba8b1238693ef4fb59cf01542dbecdf41ae5153550d17a39943e6e966ec1a69757f4179c2e8f756de5534 SHA512 31fe521e9638433c2c57240d7f9cdd037ba099c19f62b3b28049a730afa017107a21e5bb61603ba6aba98a11b05cfa8911404a154233269c0ced1ed53669504b
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/Manifest b/acct-user/rstudio-server/Manifest
index 9404c5563065..13e082857ccf 100644
--- a/acct-user/rstudio-server/Manifest
+++ b/acct-user/rstudio-server/Manifest
@@ -1,2 +1,2 @@
-EBUILD rstudio-server-0-r1.ebuild 247 BLAKE2B 678502a041a67595247c53ea628084bd031a880607ccc482898deb0cd87abef8ea38375ab1463b4209e7a689ee8cbbe4b225d8f94e508b42b20bfcc489fc9186 SHA512 52bccba7fe5d90ec23d9ce1d4f368054ab1356a70d2944045ad8caad549a5bf6bbecb05e454b25bf5dcf3e7399f7b445f87c989c591d6d8ff9288a8138f185db
+EBUILD rstudio-server-0-r2.ebuild 252 BLAKE2B 7290753a9f0dd14a99420d0d76d1990e2f02eaaabca2ec17b1f587f685bec43a294f13845b85277b4ebda1986bd1994ef7a7b9db116d00b88370216dc3cd172a SHA512 8be1102797aedeb6bbe9cf03eb1aaa7496027430a5aff5d7be94485a9173671cf34c617541df0cf7aa1460d46f96e08e44bcaf2a82be1495a7808cbb925ff690
MISC metadata.xml 245 BLAKE2B a7cadf465163ca1df604d88e904902634f1559b696dd48e5a57ebf2b7d27917f6ebbef65492ffdf5b620df01825f242d9311161f5624adaa709eaf7eebe0f5fa SHA512 27160785fd59931535cbc1c56f34e2f7e79f477bc9157eff9a07bd7b3f49f1c8c1c20106c9a7148123dcdc3b64411b9f706d49b544eca4415d8d13152fd05c9d
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/Manifest b/acct-user/rt/Manifest
index f76a43f14c4b..0e46b0c3b610 100644
--- a/acct-user/rt/Manifest
+++ b/acct-user/rt/Manifest
@@ -1,2 +1,2 @@
-EBUILD rt-0.ebuild 235 BLAKE2B d3576e210edaab188ae33efd177d2d97658f08852885962dbe6746ed24764c26f3443ce354ece5ca0d243a3d4818972fcd97a49dc8656315c57fd5bdb2b3731f SHA512 45ba887001b845b49d24ef9b9fc0ca485b73ad4df77b827144beab36c535bbbaccf87b9b7030dd395568de7d77f9a3c6b35298cf5412dac502399c8a7977585a
+EBUILD rt-0-r1.ebuild 235 BLAKE2B dad858030bdbc7fe8c06e1edf4721e30b51ab970b8d61ac76644dbef57ba65cf95d68ec87f796af42af5a9746eeae9b8ac28129e6df5fea0bc665484e127b18b SHA512 abda36e36e7937ce0ca3b980e1e61b8244993ac365ff7fc1430293c9566caf0b8444571cdf5bc1c5be60052fdeb70a2ab38fab18a32c770997a56b27a66b1930
MISC metadata.xml 365 BLAKE2B 525d0782e438a536ebb72d196efcaa8ec809b12a1aa3be17b4a1171cf3f41282ccf1a000fbeb3bbc81a296a7c97742c6c5a6c4794d10859566b2d4c927caebb2 SHA512 e527c901611d310ce54e32b4ec518477b8421cdde73dbb9b2d1e8cadf3de8ff291229556264a5275d94952c5b7e77ee7cec80febccae455b253a69b786a63c32
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/Manifest b/acct-user/rtkit/Manifest
index d0305710df9c..1d4804a75505 100644
--- a/acct-user/rtkit/Manifest
+++ b/acct-user/rtkit/Manifest
@@ -1,2 +1,2 @@
-EBUILD rtkit-0-r1.ebuild 259 BLAKE2B 2a06b148e92e3445611155ece596421b97933b22f232bca48757fa735f8adcd34982c208a8882dce1f6b1f00f7f5b7094350b704cb6955f4d6aab0f378dc9b10 SHA512 35d67d9a9981b619857764114e5445204ffff665d3d719f327f29469d2965b880a65a8319695e775a9a934fa2ecae8a3befdfe12c5e2e368242c8c48f532cf3c
+EBUILD rtkit-0-r2.ebuild 259 BLAKE2B 0ed6aa9b8670d967abfe1adc9670f53f3adfed67947f20afeb0b5aafe048c80bf9a14b6dade7d83cf10a8c6e81b4b29f66db47b83610e8f70fb2e246e9678d25 SHA512 7dc969cc30abfa2f6cb97bbc7e25e11fb505be6f1cf214d9e57e23fa7c5856842b82007f29b7a3c1844cc9c86fb2217c0fb332548a6b2cc23116cda51578a9a9
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-user/rundeck/Manifest
index 4df1d8e14ded..7e5f7e880d44 100644
--- a/acct-user/rundeck/Manifest
+++ b/acct-user/rundeck/Manifest
@@ -1,2 +1,2 @@
-EBUILD rundeck-0.ebuild 302 BLAKE2B 8d39433484db94f8d13b24c9f0b51ef08dd5a90da752acf917f6487662970be113b85791c0f946386331a8b2521747b7ed46802752a8efbd35cc4ada7097cb76 SHA512 138333b90a265930d835dc8265933c58ddda4a14fdfc5dbb8ea6a6162667c47b05134e185d31c3b8a21f6b106df52a98fcbb3e47e76b8f05b5d3025ec4262af3
+EBUILD rundeck-0-r1.ebuild 302 BLAKE2B 807533390326c21773e7dff3ad69ee9a265a2c0dc3c835792b463978b6e0631bf8ab1dafef2f88049a7f07845b289cd4a937b317a2d72576cdae51d43e2a1314 SHA512 fa0aa90d59f674de27c7b4bd5e8040f733640ab5c6daa563df861bec77e720403ad70b01ce893c6505a59d68484413644d487c810558ad8fc4a994b98ed2265f
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/rwhoisd/Manifest
index 2a63be033325..16c4f91ff91b 100644
--- a/acct-user/rwhoisd/Manifest
+++ b/acct-user/rwhoisd/Manifest
@@ -1,2 +1,2 @@
-EBUILD rwhoisd-0.ebuild 273 BLAKE2B 42ce70ab6e1ccacb03da4f94ccfc329870a077dcd81acb05de4eba0ea50df05c68761cbf9f7783bda5e3be5520ecd16294401e2206bf966df55ea721f35bcfd3 SHA512 4315026b3f87a8c502c882ba7812889ddcc5ef5c43cb003f3661303e73739229231f6ab0fc2c63522dd58decd29bf96c2806a52af146698fae0cf98ca663b9d3
+EBUILD rwhoisd-0-r1.ebuild 273 BLAKE2B 19e17561a1b07fbe3bb38510cf44d8f1c46bb06ef6f47475dc33ad0d895eea68cc1be343df415494b83feb33b408920ead23f651a8b0f1957d7c09a5033ded9b SHA512 645aa4c85f69676ca63e445229c52c1442fba492f951cf23df4b45b3a113d36ff2ecee33d5a47cf3559893b2055eb7796aea83f6cfef7cb3e1559dd8fb86c181
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/sabnzbd/Manifest
index cafdaac8f325..5f3bc2809b84 100644
--- a/acct-user/sabnzbd/Manifest
+++ b/acct-user/sabnzbd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sabnzbd-0-r1.ebuild 287 BLAKE2B c9e0de01f7b6d995de39737ff63858fe5e5c7ac801f06a6e23f10bf891162bec98e1135914587bebe696ef1aaf7fbc72fb6869f915cbe64bc11dcebce79f82ac SHA512 2c3a6762fdc1302c8ef73aaad3197b79c1bf543b9f9c73cf8aed5596b0b5fd1ac548865f9672149a62ed13eab3d3ab8beac47e608a7cb24c628a422985b51e69
+EBUILD sabnzbd-0-r2.ebuild 292 BLAKE2B 76b594342fbddfa015167330b2ee20d28d2bef3c51609bfa839225f33e71029b243e8e1d2c71aecda8a80692e0b090a897a01ab58841ece899ed861d594ac3f9 SHA512 d630fe74df513c07bdec2fbafc82550921002afbc59b33caf5646d6cabaf7e200fa80f8a73e49b6d7054b7ef17caf1cd1845bb12ec2717ce2e389443f0cd76e5
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/sagan/Manifest
index 71840e2c0018..d4d8292be145 100644
--- a/acct-user/sagan/Manifest
+++ b/acct-user/sagan/Manifest
@@ -1,2 +1,2 @@
-EBUILD sagan-0-r1.ebuild 246 BLAKE2B 63b7cb9412e18b329724e3c17ddd1cb77fdd3e694131d71a26dfa732bd309e1d1592b11bd82e0c048f4177afc04fddce130f33e221ff74c5b6355c77893dae7f SHA512 5ca89924496635c420791707161a2d250839540b9e5c3c9d56db4375d0b27d498a7956e1459c939a1e2dff6bc01db19652a5b1e5bc6063edec39f8b69228c46e
+EBUILD sagan-0-r2.ebuild 251 BLAKE2B ec2faa5471df7a0bdd4739bfcdd864ad20d5f11af05567182bb871198549337e47cb0f67838cf798b676722670a95dc9e87eda4825a0944299459f3c46e8f263 SHA512 999a4f0a5682dc2aa535b6c05b7adc9e59b160654bb39901522bf6691f8251d5bb8519a0686ed75db33375c437381182d8d162e2b1e61151de31ddb09b24b507
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/samplicator/Manifest
index 672299247709..e1138e37ff6b 100644
--- a/acct-user/samplicator/Manifest
+++ b/acct-user/samplicator/Manifest
@@ -1,2 +1,2 @@
-EBUILD samplicator-0.ebuild 287 BLAKE2B c8bb28f2ddff5e05f8ae762bb4690714335ef1e8c300fd8f18c20f44b4e7b033c6e8bef6df07f041af75bf85b6f0e78ea1d10f9bb157a3eaa14bdf4f79e59ed3 SHA512 92a6c830b68ef130625834aa17ea1025babde29fab21bcf9f2ef708f207ba2375488677e603bd9693d2d6f96fe2295c35db2d5c591b9a4f1a9c5115ec8d279cf
+EBUILD samplicator-0-r1.ebuild 287 BLAKE2B ae8aafeff05febb6277e7abc5e27fb10695507a75df2db2b4ac831bfc683d3a3a6acf5b9a732c4bb9c669a46d186218003bd8114d97bc4b51786f7c22fd56b3c SHA512 1a5b28e0e74206aea2ea92fbb2de4bf70709b711e103b91b5077a34f33661e46bbe4f647a56e46fb517fd00bf530292d13c0f73aea145f012ff14fbaae442c1c
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-user/sancp/Manifest
index c3cf5301df31..9cc5d71b6c51 100644
--- a/acct-user/sancp/Manifest
+++ b/acct-user/sancp/Manifest
@@ -1,2 +1,2 @@
-EBUILD sancp-0.ebuild 232 BLAKE2B 311a9295e723e5ba671b863ff5f85a909b3ab27f4bb660b3c3602b702aca0a1ffa40fd4378e7346af1ae3e6bd36f371edbb9bbeed8ba21fc388f1813bf356b43 SHA512 77c3cd2a7b2ab9b6008495832a89d23363aa5316e74566a2eb94e5f0954c5f740bdebc36c77629d87f3692f78175c6b6464e719a7f11f8cc7e83854e8c278ac0
+EBUILD sancp-0-r1.ebuild 237 BLAKE2B 08ec3659efdfd9a144556dd9551aafc70eae541b309d8075ea464ee5c3e1fc5c221ff13973e187a45cb76d0972157de3e9115f386d0b9b8ed4d7bbc5bec6a3da SHA512 f8f583d488ca539e6aa7c4ad17155d770273673ae00a075ac58fd875d2423a47b8c7fcd17504d9630a4cc923cd2fefec3e927a0cccaaeaa38295a23a8ef239a4
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/saned/Manifest
index 225bdc92070a..834fda6ed2bd 100644
--- a/acct-user/saned/Manifest
+++ b/acct-user/saned/Manifest
@@ -1,2 +1,2 @@
-EBUILD saned-0.ebuild 250 BLAKE2B f2a9bde30ef71474734b1d79c810799b6ab463d19432e9a50e5145ae45bdc8a969edf6fc452a05fb87d914a476e9b347ad8f168b161486d8d8cfb5560a6ff9e5 SHA512 d842cf932d16e6e177f650185e3176ea29b589d832e17d7ebf7af07a6180f0529da076bba338707c8f4858f1b6d942283bea7a34392017da29f19233dc46d66f
+EBUILD saned-0-r1.ebuild 250 BLAKE2B 77991e40ca6e5890d36a9059974ab000c7f69dc462508df15391137d597b265730869f2b978aa66bfae931c95d7467612b975317b727a93f8b56f70f63768d90 SHA512 bf3090c6a81ec2cb58b9457d5515ce4b44f8d2b7211eea83c2c0b55d88eb22a74577b518801f3ab6b546b1be5ab6f112564a05584b85cdc61e8099f4b024c7d6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/sanlock/Manifest
index 88a431f086a5..48f42c974a1b 100644
--- a/acct-user/sanlock/Manifest
+++ b/acct-user/sanlock/Manifest
@@ -1,2 +1,2 @@
-EBUILD sanlock-0-r1.ebuild 263 BLAKE2B 5107420ae062c4f5e4c5fec6443ca372ed7d67f325fff933445923c6fca718a1237a5076999eae01119ad1ebe3e6d0df68565fbbca472fc0468f80da69c3f12f SHA512 e84c2244ffee49ce192cfd1bfe4f4f5a06458ea46749972a47cf663aa5d3e237d23aebc38bfc7fad1e36a6e770629c2e419b3ef266fa6521f3892b6a7bf988cb
+EBUILD sanlock-0-r2.ebuild 268 BLAKE2B f14dc4a02dbb0814e424ea188f1867d0711babb6d4f2e1b6e72c06861038a07ddb152d48a49729314d022bebbfc4f434ef459b74cf80c73e49a2702e7e8af303 SHA512 20ad7ab294544b6a7fb2895e8cf08ae1d6f9836424967794b81a715a878268bd6f1de688a21714a781bf5062b061eabc62f89019c42c8eeb7d9bd0c614ee3066
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-user/sauerbraten/Manifest
index 00b50b7759b4..ff25947f6ce6 100644
--- a/acct-user/sauerbraten/Manifest
+++ b/acct-user/sauerbraten/Manifest
@@ -1,2 +1,2 @@
-EBUILD sauerbraten-0-r1.ebuild 261 BLAKE2B 1025b19e42e0b945d8372ebbffd55c0c2bc42c93df5979bbac20b8418c9f4220f5a9d052ba736a6b56f50555367e1b7578f3f636d321883e8e864500d96edced SHA512 f3f05b0bde2f5fedcf956cf5a853484298b41980cee70cff16bd154de1e6caa09f16900199182e2925938c06fe5d7019166ce3d94dfaae5686f93035c0e12f4e
+EBUILD sauerbraten-0-r2.ebuild 266 BLAKE2B df70a10ffea87c53a7384d890d1fe2d957323d3f82660bb1a4cc3cf642b9e0f00f8cc294b7b31cb79c437c9a44819028212d32b353a5c5adc68d772b1ca9e5aa SHA512 0d5aa521e1f44fcc1d8b7840ebd0abbe6d8552987a0f2f48a03f413846ac168b567bcc1211ecd87bb820b2b66ff32f67975cdbbc158a25e19c6940f1256a0638
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-user/scanlogd/Manifest
index a1f253ce4ecf..e26c0f2f97df 100644
--- a/acct-user/scanlogd/Manifest
+++ b/acct-user/scanlogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD scanlogd-0.ebuild 251 BLAKE2B 5ca99c2e438d3e234569ac47168e946f0b45715ccb97fdc2e8c930ae6f90336c57023d47432c80895e9f660546870a32325d527b5026efe40e568c7ef9610572 SHA512 ba1e552bdd48e440e2f04747167dcd20d19cb0fc5d7a1b3f6bebc649a6606b4e255000a01350c967e7ce9f0471c866938d25bf35b4d0ee698deb192c69e6bf3c
+EBUILD scanlogd-0-r1.ebuild 251 BLAKE2B d5af47ca62ca9059279251042ff265cbc9f3afea0249066533ffa70195d27b5387038319768129dc056556cd545dc34c1ed06f9467e8e9adf4bfb97cc3f3804a SHA512 c20c14856286e9c687a5a599775acc93d528106c4f471e91ae4d3246f3b10901d4a95549e0df1ec108cf316eaf3b9b56b47ade10123c1c3609e782d7e92e0053
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/scponly/Manifest
index 8300040f0f7c..febc66c4fdac 100644
--- a/acct-user/scponly/Manifest
+++ b/acct-user/scponly/Manifest
@@ -1,2 +1,2 @@
-EBUILD scponly-0-r1.ebuild 378 BLAKE2B 37f4a81b52b05d83fbd58959a1f869ad8a0040a1e57c1c8edbc5ab1db8b3d46d2b5163cc70f9511662d5e3bc57648eba2df373ce74de8b245162d0c7a960382f SHA512 d18eda238f1cac265c058c0375231f30b94e1fb7a7f48d92471edc61cb989c4e50eb66f095493b60c7dca4320b6eafe27d898cab3eba6654710077242dff3415
+EBUILD scponly-0-r2.ebuild 378 BLAKE2B 6770c852e390cb9e6fceb95c5052fdaafc1383824e760cdbbe8ba1dcc4dce1521e1aada601a572e90b28df00605e0e8bd0cfe5fba18e3df6cb14b585ef1eee96 SHA512 9a17767b63487799003bdb731aff82700f08f7010044d19ee85b9ab2d962c4ecf814b0b095d00c5e25d4e44383a31e9104226326b64509527507c208040e66f3
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
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/Manifest b/acct-user/sddm/Manifest
index a6d339134cce..216eda65271b 100644
--- a/acct-user/sddm/Manifest
+++ b/acct-user/sddm/Manifest
@@ -1,2 +1,2 @@
-EBUILD sddm-0.ebuild 278 BLAKE2B 9aef91f57e0b567a2c65aa86d3ce82aacee5337199d59b482a61133ac35e9460e58b8e0e4726d3e2a747bf88f8be2af783595110de314aa19e5099ffd3a8baa2 SHA512 29f17772e3ef81aef06810fdc8f8f3626deb5482c2b2038152757c183715a23ce3aed26eb7b92dd4a45d8addb326f44a80a1baf4e7e3514d2477742dbf547cab
+EBUILD sddm-0-r1.ebuild 278 BLAKE2B ab5c78ceefe56f341bea6f49868e1abe3fc871d186786856233a8936524de5927b77388cca1fa96ef98e7dbbce1e33e73e8bd4e6232038015cb3c2ac78054dfd SHA512 6e2adeac6e0f9a2e03857c85a8767f662e7d38b92ba54d7d87003d2549a811bcac46740788086fac579dc809a2810017871e2ecc9850081635f6ee0e3bf2cf3e
MISC metadata.xml 347 BLAKE2B d35c41092c587e21f53b8622fb40c8d2625f2ee7b71a645ec478f1e90eb2645eb87b6cb8f06b7e1a317fd9074594da44de68642de0ab45ee748aa93106dcdc89 SHA512 b9fd27f1b7465b3fdf254604066d230ce01eb1713354ed90f95f8963804d32c37e02ceeaadef01a4019abacbcabd044dab9ca0b55e9709505cbdb7d7415c2071
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/Manifest b/acct-user/sendpage/Manifest
index b214acfe2a5f..d04c762f1660 100644
--- a/acct-user/sendpage/Manifest
+++ b/acct-user/sendpage/Manifest
@@ -1,2 +1,2 @@
-EBUILD sendpage-0.ebuild 242 BLAKE2B af0c86b9a45ed780c97da55d727914520083cc6435a07c4d998f516592e3807aa882ce5699d33e82d94e7c58bdb8cb642fedd77384949ebec3203122fd640ad8 SHA512 2a607c0be7475ce85a98e57bc3bb74e011d03bb51cfe82fcae86006c38cdd7266509f7a9f51f1ef5213d5ea5d4893c5f7130b082566d2757ac123365cb98226d
+EBUILD sendpage-0-r1.ebuild 242 BLAKE2B ff88e0e1644aecde3bae1d00249ff0944f59a2ac45ffd1af78a147723571d953991d850c378dfd3779e6c48043e56220adedac595060a7ef7810669e306aa4d3 SHA512 2bb9d4cd6cc05bec6ad47d6543f92eeca83375e8891c8dc506cb99d36a3475c44bf1b12c35b78696975e1e86f20bf9fd91ce44f277872decd4381ad7a445bba4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/serf/Manifest
index 4accaf1705b2..b4dd23a017f6 100644
--- a/acct-user/serf/Manifest
+++ b/acct-user/serf/Manifest
@@ -1,2 +1,2 @@
-EBUILD serf-0.ebuild 264 BLAKE2B 0dbf1c43ac94e621e5e8016a475e8e76b275b7e1d30138aea4786041bb40ffa69e252803ec8b4232758cdb17e91e27e637ce8df4d18c85d4eb502340f6a106a2 SHA512 3637e5e938308a345ecf645ab379a9a3ba0db7c71abfa7fd391347c9d6ab68f6948e4f01dc90888bcb3243b2d93a2dcd381cee72970cce7296e29a1561d714dd
+EBUILD serf-0-r1.ebuild 269 BLAKE2B 37444007f4c8558fb7b48aa70e3bb8c965c0c1fecfd64dbe013d6b8e2aa2b7776134e23c68087a496a682246c1c9c957673d33582d5afb2ac3172755dfc9cc95 SHA512 93425c15e76425853d9da48655630234c70b6827c2957877fd3ef28ebed65e2daf6fa35cd0a07bb52e005a6bc6c7b670901a69592538ac7c020a1a37fd4233b4
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-user/sguil/Manifest
index 596969b60232..f1052659769f 100644
--- a/acct-user/sguil/Manifest
+++ b/acct-user/sguil/Manifest
@@ -1,2 +1,2 @@
-EBUILD sguil-0.ebuild 284 BLAKE2B 1e47c59b531e7d7aa405a28b775526456b9bb078e19ede68e1493440c95d8d0796595591a57eee4b72c4529d076123d5c98325dfdaee04d7381c3c3c6743aa39 SHA512 9ef071fda592ac8de68b3c218d0dd7e2283f41590a1a0caadbc7a9500115fdaa8b2b9690349549c65bc447cf6c778f7c3ddb34bdfb69199a536be5584b3e0aeb
+EBUILD sguil-0-r1.ebuild 284 BLAKE2B f7ed03fd6071b186e85fb4bf62485117544bc4a8c693d9820658601d86280aef8cb7002b95e5c79875be3d997665850ee5cd5355be45cc9c62fc14566b25563f SHA512 14949245a6325ac541418270b0a07aae27f99adab973e5fd673aa47cfcef707759a05e4ae6df19a87d9a97aaa85d839e41bee220ae1a4db4745af8aa563ea03e
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/sigh/Manifest
index 2d76e9e9af86..ae51dceee892 100644
--- a/acct-user/sigh/Manifest
+++ b/acct-user/sigh/Manifest
@@ -1,2 +1,2 @@
-EBUILD sigh-0.ebuild 198 BLAKE2B c71e87d8818c692471fe73692046c8c84d9f00bfaf744cbeb9702e325f115fd0447199f5c09ca2c8a3dc3ffbbe6b35f98fbbad13494d647999e08fac1adad346 SHA512 b31a67ecacd9892817039947552de8f5d48e137ef7029b2299beedbd4bac1f9b809d94e080c952c0eb6ad2dab3de2637d247565c4c84579cb3ecf4c172e1be51
+EBUILD sigh-0-r1.ebuild 198 BLAKE2B 5091e167b40969912ba46dda1e71e29472840099f67ecff3fef220ff32ebf73b09ebcb18ed51ca73f769a85711bf7e3c79a28c2c217a9930d2b667e63e827a45 SHA512 aec0dcdb3de5ba0c80e61fbd068876b33dc6e2ac0f8e8597c1799caa145283eef22b8b96474e184c3059226bad3a22527b664ef8fd40d30170df62a708459e36
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-user/sks/Manifest
index 9698b8743595..a762968799f2 100644
--- a/acct-user/sks/Manifest
+++ b/acct-user/sks/Manifest
@@ -1,2 +1,2 @@
-EBUILD sks-0.ebuild 238 BLAKE2B fbb07018220034f399ee5e4b9ebac259187c3dc46f701f5f0face54805d36c138822b257fbdfcfbae0dfd00c571e2d7e3f70f65a16c525a1e87913b6b6948090 SHA512 96c7193a38df4c6ccaf8739a4951e0c3df39690605d93b4d597346fdd66bc8dc8d215183194d399229a91f6275b381f71dead2e5aecd06dfe9e940cdf98dea93
+EBUILD sks-0-r1.ebuild 243 BLAKE2B 70431e0342874178f6b045df9763d51d67903bd2a28f019c9f1decce9bea415eb9c663119249cb7fbea93490444bfba6b0ce082e80b279db38314cd10225f88a SHA512 04b1f8733e3c1929795721a6da4e690d07a50729f591d0436a85aa113f870a80119e161550bad81a513129fbcb389dd72c3e6cf4bb76fcd69e056b285c5629ac
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/slurm/Manifest
index 680189501db5..003ef0660188 100644
--- a/acct-user/slurm/Manifest
+++ b/acct-user/slurm/Manifest
@@ -1,2 +1,2 @@
-EBUILD slurm-0-r1.ebuild 320 BLAKE2B 79476db6e526d029d5e6417fcbc60f7e2824daf29b8bdb70a7d0777f2d88e82d15958f2853d7318685f102a32b1b6ae0d10caab612346c9120ac5a25731df653 SHA512 7c90160649a522673dd40231300529c9315bdb9da86318b04e3511ac9b1e929cb1d6a4af0c14092607f81a1e2a1fa8196a182bda9a75b1a124cc6cc4a4f09507
+EBUILD slurm-0-r2.ebuild 320 BLAKE2B c32abe96d9886e3eb410ec801d6a0d1bee3566c4849aee387cf14e8f864e53e3c3893eb8fb40fb47f8e8bbe29ebf37e9c7ab928876e060f270ec4cb5afa583fe SHA512 6fb79a3be49bed95703ad348019d6171b1f95c9166ab8f3d968c0cbae02159fef536eed19cf56105ad16e46ef550a6006972f9aa72df6dadc14d6f0c1301464a
MISC metadata.xml 367 BLAKE2B f7377cc4c8ab6161736e0b676f04156059b020ebb1bce3eba0277b419458a520c595dc43dcc2ac7545bd91a93630d5809ab8194757dbdb092d06473ebbdc9bdc SHA512 07ecc9173013e5b0d47c90f5c5fda05bbb127e4401ccc2bc2c92ca04c4e300f1b6fef8f40f12ea58db212e3f66f7f9085af42ca8e0c6fb1e7be5d193a8a09831
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/Manifest b/acct-user/smmsp/Manifest
index 4693f1601796..6e1c75cf93bf 100644
--- a/acct-user/smmsp/Manifest
+++ b/acct-user/smmsp/Manifest
@@ -1,2 +1,2 @@
-EBUILD smmsp-0-r2.ebuild 235 BLAKE2B df9b6fdc9306b0c858743d8cf75131804174974a4c12007582768778b2fcba43febaf19c6e8fdd5e3822f7c8f8c1caf907f9a074e8cd2e18e56628920addcd66 SHA512 810420c21f883f16988728e7a652082caeb3f0495f5ead60e641d7ce7c5fda6f532f6f7d2d5d7f274346c94375d723cc97740a32b5520768b5556730c6e3d8a1
+EBUILD smmsp-0-r3.ebuild 235 BLAKE2B 36a6753e052aa48998d095c443c7c11438964b172223452edb055e95769f09615e6524cde5ad55a821b352d9c7397e91a551ab6d27a4dfd2e61f107c1407012b SHA512 66f18a5a81c071536dd4e9c1835f19e1103596e8e692c34431b79b9ddd26d6769a3523a41da943d11c8480e0275562cad1f1d13a2f97a2f3679f35a256a2a90f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/smokeping/Manifest
index f17e59c8f61d..f78769f1eafa 100644
--- a/acct-user/smokeping/Manifest
+++ b/acct-user/smokeping/Manifest
@@ -1,2 +1,2 @@
-EBUILD smokeping-0.ebuild 289 BLAKE2B 7cca7dd113b27fa7f5bf675964f6acee2dd470ba590d443866db0467eaf2cd09c940b29f377b6a38e5c3581a5dbef047d6f8eb5f34af1b5f5377f3d1b71c02d4 SHA512 17c15053df57fecceaf2922943f39340d2969e0406309156db4b163b8e1dd1fa582a375b2424712330fc77527a1ab2acff2a0c94a39a84a5488abaeae455fb17
+EBUILD smokeping-0-r1.ebuild 289 BLAKE2B 9366e1e662397c9e0e4ec5b4f0fcc0a2c8fdd07dbf61fa7e744a31e89bd092631866fcda639b473a25cfb66cfabd9f62bda279d61a8ee4978f9f64a5c8955da0 SHA512 f63ca43e24aa51f57fdf92c1f80cf7a13b1565729d3e00406f91008a2fd383379924ca39efd1041f0fd44ab605d633d122c127d772ec6a4465b7485b7ffe6539
MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
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/Manifest b/acct-user/smsd/Manifest
index c491802bcbc0..8eecf08cc5e7 100644
--- a/acct-user/smsd/Manifest
+++ b/acct-user/smsd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smsd-0.ebuild 224 BLAKE2B 3f062bf84ba5703748b4cedb90b5f6ddf153f93538e087ff714afa2080895e39873b841f20b8891f1f25c5251017b761e5b195ed64ef2026ee9b4c43a2d480bb SHA512 876238f712e3f44fad98c90cb6676b5457cefcf07bb7b19a95ecbbf603594074b8b266bf24f8a4b939397f0f3a635ba4dbed69c66a8d4b09dfe957f909c9b082
+EBUILD smsd-0-r1.ebuild 224 BLAKE2B c6e7499b197c7b5e13eeb798f705a26bb94b31e2217c3157d022508c96b15ecc930c504b741867a1fd70a7bded8d2ad15ab6d7995655eefbaaa4e67aa18066ab SHA512 bbfb1206aa3832fb9facd2b087553440d8680a94a6ac8402ac9148cdc000660e4b18f8f4cc7ddacc8a70765806c07ac63c2214b6e8045e989803f26e4545b217
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/smtpd/Manifest
index 76e9dc8891c7..e8e82aea9c36 100644
--- a/acct-user/smtpd/Manifest
+++ b/acct-user/smtpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpd-0-r1.ebuild 252 BLAKE2B da285e5cee70e745532fa19fd08bbc3c2689526eb78ef72e2fe926cae806ec3351ce3938ae0dbeb35a46e595f92d1736f834e0f4799e257439cd7e3688035d8a SHA512 18f3fec956e3ef3d97b2b1127942307a49c677e7b4727ed42bfca1a207cf62634300f6a1339dabd3a50dad5e9972dc5e120800faaed366c767bd9e0105447c7b
+EBUILD smtpd-0-r2.ebuild 257 BLAKE2B bde7c5fa697e039fa2826efd9d3a9a0b39abcf7376a1deec50f991a88affe5bb630b8a951cf9031d6193af7e08471ad541f0884992afecb25eae55ab97f8590b SHA512 8cee99bb245640d0fc6cd736c554a2c510402bd0a8f49e8787c94e070052e079896bdafb2c98090165fbe1c8be7d66a0094829ced4835b190fff95a60aeb0983
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
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/Manifest b/acct-user/smtpq/Manifest
index 2309a4fa0d84..57705b8a8776 100644
--- a/acct-user/smtpq/Manifest
+++ b/acct-user/smtpq/Manifest
@@ -1,2 +1,2 @@
-EBUILD smtpq-0-r1.ebuild 252 BLAKE2B aba98fb501321149d054f5ee45d1e4b535ea69f4bb1502e8eb658f50d1a659b16c30168e6234305f0960b281c7c0ee1e6274ef5e79600700990076cdd51071ce SHA512 7eaec7a4692d78cf421d058121ef1de5c3d32f38e900be4d84106e485fef8cd31b666a95a4c863e858f76a7598e096fe87801ca934ff210db1e18ce9e588afdc
+EBUILD smtpq-0-r2.ebuild 257 BLAKE2B a31fc2340a062968b59b3f2162848739b918c0aff071b1a90c20b359454c72a0572361ae966bd3dfac516b2f44ae2a6e384ca4056fcfd2eb3805ba4ad5f638dc SHA512 9730d9f3a864e4f2121445bd1f43cdf29d0e6d4294454947200c875641be58cf3c47dc45821a6cce8b9ad977bf4ff32214c62611d8595e0fe3f14f707eeb9e0b
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
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/Manifest b/acct-user/snapclient/Manifest
index 5cfc4a32f146..ba50bd339436 100644
--- a/acct-user/snapclient/Manifest
+++ b/acct-user/snapclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapclient-0.ebuild 305 BLAKE2B 4815a666e9c1126758f4ae26c34e7474a5392b39d8cdfa81c37fd22a1ac4da7c60487956c0236954fe311051fbd4a176a36003b2c9a0529eaf25950df27d52f6 SHA512 0454400b750cb7b62791b053a83b8992a5940593d708f89209dc82f43341c961c19240633bf3dc033850e4739653f0801b6c029af081a471aac1120ffbf96289
+EBUILD snapclient-0-r1.ebuild 310 BLAKE2B 48f69b28ef45059d0b3f48a7537889aaf732c3fd0a8fb294acaa9adbb4b411735a32ac68be923b256125d17c4983a15b313de2e2bdc6acd59dde85acdfb8479a SHA512 1949e4dff585d09b28bf6618c93b112c1e5e3a2e6e65806d1e4544807f862a7ad9483ba0d66e7272e1f94f7f01a100ac132233c466784bd4fc79682c1f6a5943
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
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/Manifest b/acct-user/snapserver/Manifest
index 45c001bb49bb..2bcb63485f34 100644
--- a/acct-user/snapserver/Manifest
+++ b/acct-user/snapserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD snapserver-0.ebuild 281 BLAKE2B b40d5f29e5209ece908fd6fd3c5b8061da43faddf4e286f7b31e89642bb8131ee43038f58e7dec0acd0dbb859ae22fff47cec6c6e6e9003813c9e8ddfd0cd888 SHA512 560d4134c77e1272b58a66203f6ee90ef0a4a30e55f19fdb90cb28fc4a57687e49512ef2cbded81a7c39cb4f6c72c66eb8f23ad5cfa1b2910df930b89d44b328
+EBUILD snapserver-0-r1.ebuild 281 BLAKE2B b40d5f29e5209ece908fd6fd3c5b8061da43faddf4e286f7b31e89642bb8131ee43038f58e7dec0acd0dbb859ae22fff47cec6c6e6e9003813c9e8ddfd0cd888 SHA512 560d4134c77e1272b58a66203f6ee90ef0a4a30e55f19fdb90cb28fc4a57687e49512ef2cbded81a7c39cb4f6c72c66eb8f23ad5cfa1b2910df930b89d44b328
MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/acct-user/snapserver/snapserver-0.ebuild b/acct-user/snapserver/snapserver-0-r1.ebuild
index b4b8bbda6968..b4b8bbda6968 100644
--- a/acct-user/snapserver/snapserver-0.ebuild
+++ b/acct-user/snapserver/snapserver-0-r1.ebuild
diff --git a/acct-user/sndiod/Manifest b/acct-user/sndiod/Manifest
index 6c35bd964eb9..85788b39508c 100644
--- a/acct-user/sndiod/Manifest
+++ b/acct-user/sndiod/Manifest
@@ -1,2 +1,2 @@
-EBUILD sndiod-0.ebuild 227 BLAKE2B f23c38f28eef87235778e1d7d75a1e2c983d932bc943adfd48db0d9ccc7da1c8f66e7fa1759e46a1f7e5fff5007f4b85d1921bca95bbb37851661e1d01971fa9 SHA512 350ffd18a975a992bffc9e2c1ddc76137a868d9c2627a96f354814bdf27e396f169edaca607f6a44229cdfe34e10d7e472be040aeac684edf5b942f21d11c9dd
+EBUILD sndiod-0-r1.ebuild 232 BLAKE2B 2d502c3f9afc2fd1e3ba14a5aed1a0650d9d6723b9f346c8af59a124831fd54687885ecdf9e63e911bb7212ad7e4c56cca21b0581e1279881d8f8763b946dcd7 SHA512 d28781d33d781e4dce8d23fa78e3bb88de95087e33913b91d576d75510d49bd16b60dc050290907d72c38688484341286a35bf8f6b0c0574b037974fee577d44
MISC metadata.xml 410 BLAKE2B 75c853b9665a82c30c29f3aa0e9171fe2665ed2f7e4c1a7ccdd04258a07e4ef753ad01066934adccc3434aa52332b7007148c818b568335a2429bd8afc61d974 SHA512 b26adba8415ba084c079fabf29b966886bda8736165fbd9f0db13fe4da80e9be373ea7ed2d59e3b8c2b9a04eb84d8327f432c091c3ee936a82650a7983a7a483
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/Manifest b/acct-user/sniproxy/Manifest
index 69caab7b5797..2ac43d1e7732 100644
--- a/acct-user/sniproxy/Manifest
+++ b/acct-user/sniproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD sniproxy-0.ebuild 198 BLAKE2B 8245a6d58456047d64afe6e98aca816155ad5cc6235f96d773500b2f034af9977b4600ff0934f6c36d957586beb9d8e2d4c97ec792862dbdf4a22be973b46d62 SHA512 02d651442209696e263bc90b2b6276ff0e616a12f2153b5025ec042876b92fdd626b399951ce2f1b251a2a79f3330bb40c4d47e51d0d526010ab5e8653639d03
+EBUILD sniproxy-0-r1.ebuild 198 BLAKE2B 1c03b7a628e2b1b68d3b0c6a05b40541d68fc7c90afef9eecd35193d2e00624270e61d46be3c7bccd8855ed5f0d0bbd7bfad4b9ae92c824d531f41389ba83fc3 SHA512 2782ff5a9257c2d4a7aaf0b12db95a6955225d292d9920c2e1b60cec30da152a2f8b951d03a6c15c75c82c72fd9e93f4a5de6cf2ae9cfbe14f32c751629ec400
MISC metadata.xml 406 BLAKE2B bc61a6843f023449cb2acad6b5076e059580484facae3b648e0c6299d1687f2389f862151f5b328f0a18ed9a6fd870422007a9344e8097bbc129d9bd9a830e00 SHA512 08144674bf6107015f11e79e788d5fdc1786d55e990fdd62a49c51d5392bcca19e655a13a7d8ed3ef2f455e5885969a696fbf10b722210b1928766e3395b2952
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/Manifest b/acct-user/snmp_exporter/Manifest
index 7f129f54b438..46d4584a87d7 100644
--- a/acct-user/snmp_exporter/Manifest
+++ b/acct-user/snmp_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD snmp_exporter-0.ebuild 255 BLAKE2B 33233e7cc09237a828b4727fdffb970f00c1e6dfb2a404a3dfa7d36c262ca7e43abbab711a120eac98b07ad096c1275520199e89977e23aa2f261aae816c315d SHA512 cec9e071a5ee865de18835dc0430cb3c87fbee9b1e1b35ee9312065d97de88318b078db60457b419c630226cd839febbd37f33c5b5529e13a493df353ab1776e
+EBUILD snmp_exporter-0-r1.ebuild 255 BLAKE2B 2a008b1d6e9a49aa882566c9019d51ce1db74f6b172b95e645ddd4f350c9e3b65e5c1b326cf6a13bba64ae305c07b947b3d210947b4a3cfe41eb81d2515dd8c2 SHA512 ede8abedc4211d81650ddcaa26a651b49e41b7893d121ff17b6db201ae6a6c9b491b59fecff3848479a14f96a46f7420e0475e177f44517293eb4d5d163def36
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/snort/Manifest
index ef9b4a93d483..f82402208527 100644
--- a/acct-user/snort/Manifest
+++ b/acct-user/snort/Manifest
@@ -1,2 +1,2 @@
-EBUILD snort-0.ebuild 220 BLAKE2B 182b20f6e477e5cf055bceed938dece508ffcb144531e445d4db11edbd7c75965be861078a7bfea22ae87f8dba8bd286b56038a3760afdb56d5340c012880a79 SHA512 32ae2d723d3743a766e2939d4d196f9f014cf492f0880db9b75360542144543629d54104c0f1baf60cd97848bfa81687f3226e468aece4a61ac4cecdb01cfdfe
+EBUILD snort-0-r1.ebuild 225 BLAKE2B c287337bfe81463b4f839b02ce4630c8ba796ac7fafda3767e0bc18e30994ae6df395eefc4eff2486a09ff57d4d0e7ee70c17b0ebf99e92a1df2ab7db7641873 SHA512 1a510cc129719a099253e29efb9ea7c1ef2a3e274f1d689d137408561ee53655700d01d16fe969b100b7646be1b4eadbf711f1ce662ddc93eb77a7a8b7053e34
MISC metadata.xml 389 BLAKE2B b2f0c48986e152a58902a98acda9b6ebc253156c5ac3d13bd16b71ea428ffd7456bbe58a8565c5900a581242c11ea482b4f71a65b30962c96c4b7f26c292a86f SHA512 bd0a333026d7f5448f2451950ec3c2dae9a8fbeac03faf2fa9f516c331913e5eb6bcb8c43bc935d25cae1df5a275cc43df301e8834e585ba174fef4d336f8392
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/Manifest b/acct-user/sobby/Manifest
index 7c1f9e721cd2..f23fd705cbf0 100644
--- a/acct-user/sobby/Manifest
+++ b/acct-user/sobby/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobby-0.ebuild 289 BLAKE2B 7e40c55984166f67ff81ed3f390fc48a25c6b5016b1d1518ad05546aa87e7fc7292669ba4d87f61a6863e8b75b8f90bd44fe97aa3b313c353705ac2c5c4558c3 SHA512 f81a7ca7f82e65e57e245a5424c9819d983aa6dd9cdc23b080e308fa987492ea73d7bb6bce13093046c6133b926b7565e452c32bd604e4565c01ff1fcdbe8c4c
+EBUILD sobby-0-r1.ebuild 289 BLAKE2B 58b6ce3ea2b6608b66eb60348fcfbdb0b31b4eb0934f9051a6537142f65d8ce20fb783a871a9be11a76567d697f8a8c53f1721ae63df161eec04356f799f82da SHA512 39a1d69928e6a351bf444ef04c9297f1100cb0eb8f4325b9cdcc6bba359c6b2dfe2614f5647445ec48476f828a25c4d6bb5cae0ef4ee072f45ed432a737d1b6f
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/sobexsrv/Manifest
index 510c9bdea1ea..7568f0608bc3 100644
--- a/acct-user/sobexsrv/Manifest
+++ b/acct-user/sobexsrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD sobexsrv-0.ebuild 284 BLAKE2B 1cca06cfb4fba9bead35f2555fe43d2c5ef82258701e37fc619082f205f32b25ac0704d6765cebadc0bd88634637467baa5c2568ca6f2d6b3f29930581aa851c SHA512 9638f612d2ee35c2c75f59df1c77d90e10293306d8c444b69cea0951c9530a363576133170c708ed4d1ea69d67c455ba242a8670bf93f8509155b34e0023da10
+EBUILD sobexsrv-0-r1.ebuild 289 BLAKE2B 2bd7a6f4bfb12b5c382046c86dfbe951717b91b01c58ce4ccc453a69795c92198e950847db6404dabb42750a99c1a4359446ea43fc4ed4416e0ce9040ae35fc2 SHA512 45c8946515a0cdd887444f716ae7baf8a57da275ed3fbc6094de914bbb408bd9c7a46ebdd2276dfccb3ec752e12c53c98c9f3a94af5e1088edc307070890d333
MISC metadata.xml 257 BLAKE2B d3adc430e193b7b51e04bcaeea4720ce089f3c88a47aec8cf443a3f02bfe3c663bead6ed4ab24ae8a701ac1f63f5789d52ead301c615bce1555bf9c93393c199 SHA512 3644ae185f5b4ee916bd0c26528448022285b555db910d797bdec58ff17dc4282d08570b323ca12af451b9802c261a5f14ffe16a474bbbf269eb2edaf55a4e7e
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/Manifest b/acct-user/sockd/Manifest
index b2ebde859cd4..1fc9b8953d28 100644
--- a/acct-user/sockd/Manifest
+++ b/acct-user/sockd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sockd-0-r1.ebuild 242 BLAKE2B 410be555fb037953b618341fbaa1c283a116bd5dc841d682112de6b601b7487563e42cdbff960f733c2187404acdcc6892f2316c2745b7d9cd166c03ab504339 SHA512 0ef759bdb8f263737267dea28786ea0025fa02c0500b6b519a4a9f68426f809c81b9a7298ccbed137a516bf1988029e76abe1c092f059999925b60deedd9c06d
+EBUILD sockd-0-r2.ebuild 242 BLAKE2B 0e5fe92aff767a7991f89796d03762289e5b5e7c951f02570ecce89a121e91a7cf8c4f423ccc776f32a0e975b8a81c5088c03c2dc658f3277b22c4bee29bd0ea SHA512 daef1e8a35e3603c7455df11586d7f910817e12c96b47f5c2f32f534d117f2f0d7a0649b1f5ed3a82dfe4f4b11855c0e0abfe992af424c8e828fcdbc394abdad
MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
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/Manifest b/acct-user/sogo/Manifest
index 72d823927bab..0a54f6b95615 100644
--- a/acct-user/sogo/Manifest
+++ b/acct-user/sogo/Manifest
@@ -1,2 +1,2 @@
-EBUILD sogo-0-r1.ebuild 293 BLAKE2B 43e4a660e351f631eae2dbd6eb90660c61e17d8db493d55f97266151fc79350c0bcbf8c6795f351194c56083222743a7e079eb6df05a48bfb0775846fc8bb7d1 SHA512 1d724dfd62bf209c51c99a73cd7a69f2bcd213761c1b180af0b4768b6c98ca3018079bd7398c730ac259b5bc0d08961d9810e1d4aea322e3795a4a93ff796bf3
+EBUILD sogo-0-r2.ebuild 293 BLAKE2B edcb55a1e4a644d58d4d862759c3a774359c7ecb8d43ca42eec73e761c54e2729325f9b19e48ecc709d82029ea357227a10e4bb3f8838c0a12fc0ec7a479d559 SHA512 a6db807bd21801c1936fff0ff0ee9061cdbc85ffc53cc9dade7f52c9f1baa86f4dae979b4e56da537047782c7b0f43bd753374106d16d8c81ad15c53f762a76a
MISC metadata.xml 254 BLAKE2B e0f44b5b45dfaee5d78327c0a786de9629c29eb26b6ef1e06e499f8ebc1c72c0d0cee20d68992fe79df2498d1664a49f2bae19b5a115b97896300d741cb4a0d1 SHA512 48119cf18eaf9e217ca2203ccbfcd28aa8c6d2f7de7b21e347ba3c4d5f23147908620d158fab2bf0b0211670d091949b5ee3bed0044d4c86656703d20bdc6ee1
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/Manifest b/acct-user/soju/Manifest
index e57d27325d9e..e226e43ce436 100644
--- a/acct-user/soju/Manifest
+++ b/acct-user/soju/Manifest
@@ -1,2 +1,2 @@
-EBUILD soju-0.ebuild 297 BLAKE2B c5fb4b12aa340c1a649acd8dfc807a24434d578e966333f6736f9b32330a34b2e399cc39c41b87eed4f4b0f421bda20faf73766691f2d96cadac25bac7687a9d SHA512 436393cbe1e6b0b12b7d6bc5839507bcf357a908c8bb1ecabd418be5c4196ab910b7be86856d16bbcdc14da1e434ae8b1e8c1f8c3670520166ffc5de077ca2ad
+EBUILD soju-0-r1.ebuild 302 BLAKE2B f289b2a0a26d8b4db19ca39f7dab01332d6f3852e39f11dec3eae43be85089d5e84fe856bdf6294ca8bea9a3838ea9a93687e643cd612ac04d240970f1d3974f SHA512 4680976aa40a9d2575d79f9f7b23dac7240b2ba047cac1952a6a5f200ceba4876dfbb35232b025843766ded2d9dc57cb17ce9bd2c9d26a5fc9e4b6020ad7a960
MISC metadata.xml 422 BLAKE2B fe4d62d0b24cded0b5aa967f6a05c6ed0bf70dfe8a50910194ef9d6de170b9e9f696854839207417e6f4bc4cab2d807133efbbbdf9c6ab30c743bda5bc749e2e SHA512 c3375b49d2d26fafa1bfbd91f4ff00c0c57f9bc0def840ee2e20c8f2f45ecb5e1d857c8170261fa32faa1afc6b72b2a975e9a6b11d38d6f8e9cd3243951fd41b
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/Manifest b/acct-user/sonarr/Manifest
index c5b5593fc54f..dea7bc02457f 100644
--- a/acct-user/sonarr/Manifest
+++ b/acct-user/sonarr/Manifest
@@ -1,2 +1,2 @@
-EBUILD sonarr-0.ebuild 258 BLAKE2B fb9734e4014c1ae5628a279edc0b33650fa66d40dc861adda6590d3dbf7ff051cddfba62289d2151c4a2bb429b391bc69e104ace0cddaba7288dbcc922817ca7 SHA512 30a01aaaad28f4b33ed4ce0a2df4eaf86359f397c9bba607317d588341a9f95f406da38d6e5751888f66947da9c3a1f691561d8ebc59c4afc918559b34924d7a
+EBUILD sonarr-0-r1.ebuild 258 BLAKE2B 96c87acce8a186fa17e018179c28ced9caf3cab4ee4653896be41941f8eae52dd238f667b6db74a0d08fec111bfc81f23ef43d47949cf2f85eb8db0b5f32cf0f SHA512 3136e9a5af3480bf0d88e20046a6c36964cd73ba1ef0b6300649ed6f14c4c9bced82460558065ef27493ddbb709dbf606c6707eb7275c668cdb6d6e665a22c26
MISC metadata.xml 642 BLAKE2B 07b76043cbc16155ebb695d0da638c0b2c07215d14a41c9ebbbee672d585a9d46ed5073d85d3b1e5bafb5ad63019c9c67285636e97e1a52984abf0dc3651f3f5 SHA512 2ff3b4e96e6811da3f832a142466be9529287427f4268715e574b97cb7653d6034e0aa20ae88b549d177c53cc1881e646743f0ee6bc4b45006b67a5d6f877755
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/Manifest b/acct-user/spamd/Manifest
index 91992f73283a..24044cbd0ee9 100644
--- a/acct-user/spamd/Manifest
+++ b/acct-user/spamd/Manifest
@@ -1,2 +1,2 @@
-EBUILD spamd-0-r1.ebuild 731 BLAKE2B 0f219605b86301fdd33a1cf0d4a2d45d3f97167de46b1cebaa45c010a1b4faabd42e92b69ef3d39c83bff145889fa6a6abdd66aec236c91758911ce57e4bf5e3 SHA512 ed22f0112627def013342d1998f5580220cd078dd03dcee6801c332dabfda17680176ae9ca9e0ee1e950f3aac897b3a364bc04f6c097a8e9598610972d66e3d3
+EBUILD spamd-0-r2.ebuild 731 BLAKE2B ae140b5b2183c44573f00d4900a767553e331c4db1a375656f075cb022f571f5fe576eaf74c47c4dde81e28d3e58e74ade618e1c15f27c1022eb2e34707bcb4e SHA512 6fbc200082bf4684eb432465b1409db64f1e0881862cdcd08652375daa01063801f05935a9f9cf30be1e18f904286bc354b4d69ed35f3864cb8d26b7e8b019ab
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
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/Manifest b/acct-user/spectrum/Manifest
index 41c56e4d3207..435f588e7770 100644
--- a/acct-user/spectrum/Manifest
+++ b/acct-user/spectrum/Manifest
@@ -1,2 +1,2 @@
-EBUILD spectrum-0-r1.ebuild 298 BLAKE2B 6b19bb252700092bd37b3c152079b37f713af6efae7cf373fd62b713db2dee9efdce18e7b0e747302f1d3b7536d44479f7f410da091bd783c97be5da94aaa30e SHA512 b0a39b5b390a37a0c73a4c5ccff1db7b6d3c7e834782f4658bbeed3066c0b2165520b4754375172fd0458684ee7259872a504455c5ec406d3620b17c9de2bea9
+EBUILD spectrum-0-r2.ebuild 298 BLAKE2B c87157f715c19e52c4f0c650b8859a96911c893d470ea6a29722061e9c426219862b6a2c3e4bc9691bd16ae9192d1afa58bf1e3bd26d38f04e61f464e1f2ac99 SHA512 17705e6715ed813a74479d3984dee77a02f5b95230dd5e5ecd47b4d81cb28c3b84b49d7dad932d50f9e2c3237a02165a4e2cfdd7c358c72ae7ab52f943810f6a
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/spire/Manifest
index 369e8eefcc3c..7657834538c2 100644
--- a/acct-user/spire/Manifest
+++ b/acct-user/spire/Manifest
@@ -1,2 +1,2 @@
-EBUILD spire-0-r1.ebuild 246 BLAKE2B 2399a1ee5a750bf32332bab0ec053a4e552731763c300069652679213baaf619bcc7375e6e3b7233ebfb220f8e609902a644ce200a76464e2640e8d127cd47b9 SHA512 64fc5b5b4479ddf0f577eaf62f82844d0adbcb4e338c81119b7d9e08e12e0f40851ce48e3165d2be64e2813b1e997cdc82ee28ba216d932b886933b56874f5ec
+EBUILD spire-0-r2.ebuild 246 BLAKE2B f5225e883f4abbe59e9ba1323b12a4a44e077b116df191339fd8656cf21bdeffcc33431b3619da3cf9e7551a2aadfbb8da27119e07361dccf1b58733a534eea4 SHA512 d1b677c7efb251cf5af0ac5f5327db246ca798ec0bbb89e0d33adc1475b3878583c464c68f9b6318db2e6872bb035d246e9b16d1901cdf9c3be9119baf3620a9
MISC metadata.xml 255 BLAKE2B 449a9f046066549eef8c7a599e917d27a5e7090383064d1e94786203c2ebe8da744e8a4c241e4ca7fd82e6eeb55f1c22e9c4ee2205c31b7831bdcf2418fab986 SHA512 c8a7a52114d5f8dda8fc29cf222f7a35c22e53a09c863b30f41c29262a09fa89f304485ac3b8f22cc9b659c044c02e3364a4d279f7047b282a03f827f0ba0150
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/Manifest b/acct-user/spread/Manifest
index 6c80b3235120..b7c46974db8a 100644
--- a/acct-user/spread/Manifest
+++ b/acct-user/spread/Manifest
@@ -1,2 +1,2 @@
-EBUILD spread-0.ebuild 243 BLAKE2B 42b87ad57755d4f18c74690b61a6de8d3688ceac7b983342c26f982a62ed6465d443c6d2250c01cffcd70df053ae0f70714431b4b20e7150cce59d2ffe79c05b SHA512 f3a8d28ea3f2761d349b84fcf3efbd0022088298f2259e0fbf2d9f09c53b71092abd9a37db918cfe92165fd9ab0b7ca2324567a0a9c801f56dd9f05612a13757
+EBUILD spread-0-r1.ebuild 243 BLAKE2B 6001f4660d40b8e050b2d0dffd422ff4c4cce322ffbc37ca2b510795961a3d4af7786a2e801c67bcedde1f1deb90929b5dcd4226eb847ef573ab75898db98a16 SHA512 7b4ade2b2ecbb9abdf7a29bb82605ff7fcca1243b50916a1c1a03d85ec11a9ff229e0e1304f9bfe425b393623f9601100a127e5e914162e3221058a81403328a
MISC metadata.xml 246 BLAKE2B 8c6c4ab0f28d2c1596e95ac77be8fc6cf749d8729b00dd5020e45d3ffd91fc171e6785bb8d4669d3ba6384acac52ab891092fe4b02b70d04241a346e5af23c78 SHA512 ab9a981b4aff83ec5b1f003eddd7768a0d74a7701ce47ea0f813be72552450e02493c8705561b02975776537d0896539537bd95b89921b15cd2faa501339998d
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/Manifest b/acct-user/sqlgrey/Manifest
index 34f9f46fc6dd..357b3606bce9 100644
--- a/acct-user/sqlgrey/Manifest
+++ b/acct-user/sqlgrey/Manifest
@@ -1,2 +1,2 @@
-EBUILD sqlgrey-0-r1.ebuild 266 BLAKE2B a8c08dc3ce0eec728976d5b7c5cec3bd1ff14a8cf42ca72c32b51dbbc9030a0e48689cd27ae062606bee1c631b0fbc6bc96f27d978227ee7adc438a9ff04465b SHA512 416b9c749ba10f7453d2b7aecc4ee69957810c00d421b2369eec1e0fc2873c42df063f8c40805c43f5d0b33c3e99f074cc2b00624d4f9efd9b4aa1632896ffca
+EBUILD sqlgrey-0-r2.ebuild 266 BLAKE2B b538665a15206f3459888078ad15fb06b65305ec6855f89ccf5dd66d80751b660cae47bc9c5eb4812b227bd6098364b929432721d041d4ce94a3ba54b5ff3c83 SHA512 8eef292307571eb4adc1211b2ed6cf185dd56d0be23bb22b1e10c524d2f7a861ee59c96687963ec1bdbb01ad40a9773f23715842245a14a6289981d920d4898b
MISC metadata.xml 431 BLAKE2B 3dbbd7403ccbe25665bb60ef1010dc0c28fd31294023af8f628ccfccb84b208782ba2e60e25cc1830a572b790fcb6be151b8b4c45519339519776ef09476f744 SHA512 c299214673cb17325875e15af18859dfb0e1c723b6ef1315332798ee8912e90d0bc11e49f4a537156f67d168fdce8ec0df34b59bf843d86964fed485a52750cd
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/Manifest b/acct-user/squid/Manifest
index caddc646fc8e..80e4d6ca4bad 100644
--- a/acct-user/squid/Manifest
+++ b/acct-user/squid/Manifest
@@ -1,2 +1,2 @@
-EBUILD squid-0-r1.ebuild 275 BLAKE2B ac7ec04e332a257ed77aebd1d877edf95b32211f90a492159b071f6b3dc578e7a074e932068a425609db0583dad52d7dbaffe30b405ce7ab3e17a3b024db20c5 SHA512 bbdf6c82363ced54f1bef26c6bbb78ffe9c0dd1a2f32b46c3d4dae43fd047f3ebf387a82c30d91d5bb56139e0fa7cad45819bf03a888adfad5a90835d8c3a2a3
+EBUILD squid-0-r2.ebuild 275 BLAKE2B 7bc15115d27837bed3d4cef0ad23f57d947c4d3d21f9943651454e3d994ed27ec90e2a763ae47c9c1b54db7e2684c5612ad870d99df5e557fae6d387c5b0c31c SHA512 10c251cde8a214ae16977043be38b81ec32c8e0aebb19bdb74ff60a93cae255d5d3a3cb968e3f4338fe22425a042195c77b30fc1e1b1add4703d68cac1c4033c
MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
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/Manifest b/acct-user/sshd/Manifest
index be8e8b922f6f..9f8aeb904718 100644
--- a/acct-user/sshd/Manifest
+++ b/acct-user/sshd/Manifest
@@ -1,2 +1,2 @@
-EBUILD sshd-0-r1.ebuild 274 BLAKE2B 1a2b901a3daa6acf6a7a2b808ec1a772925c3696485571c9cd859496b52638ca2c3e64ea415fca4f65bdcde0488bc4c5faaf5571d2e7f28cfa954d0b6aba7346 SHA512 4c3856ef2c73749079cbd5595aa44d47f1951b9d2ca5b8494f37ab1ff97977d65fafa420c23481014b249d30cfe0e766ed8538700b2aa8212d04ee711f7951cf
+EBUILD sshd-0-r2.ebuild 279 BLAKE2B e4efa829ebf6cb1221ea975c1ae062db53c1db7a3f874977eb59bea414ff74981abbe4066c8d2d4d2f3fb007521b9f630e83b56c5d52d7b09aa40428bdab8077 SHA512 2a3bcb79baa0a7df4bb83753d19e01fd40fed90364c93fdc469d8432bdc3275ba0708994357a7b0690b00ea5767bc4537b439b57632c8f095650f561404d7f11
MISC metadata.xml 264 BLAKE2B e7df46914e907e08ef70df046d49d1006ae8e49b053923cfba371e3e389198d74154feadb465829801d09dd34546bd69e0fd27998e96decca648f5c7572900e4 SHA512 ed212a934b90e948d27bc49728a14fac5f976ab7f9056a754dde610c78bee7ecb85be87084354348c47dd17e1d86b88573f8274a07383d1d2562cc09585be1cd
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/Manifest b/acct-user/sstpc/Manifest
index 61cdfc26251a..5670cb5e6c05 100644
--- a/acct-user/sstpc/Manifest
+++ b/acct-user/sstpc/Manifest
@@ -1,2 +1,2 @@
-EBUILD sstpc-0.ebuild 245 BLAKE2B 4c31475643f5cdd650b916f9572a743767fee0e3f4d702603cff0d8749f7262c3ffb717dc1d3120f130facff6f583e1f8dcc1b358a06ac671ab9b17af7f1ce93 SHA512 ebd010822c21d381c5cdc70872502af3179466b6ef23edac09388c7209dff13c86fdf25079f9827d7b39e5462abee86bf83970c033c25a82dbf3a096e8df0715
+EBUILD sstpc-0-r1.ebuild 245 BLAKE2B bf997794850030a5c7b5cc76c3137e204276ade2ebc07870252c387ba63d9ea487161ee5964b604bcae7ff485f293f319112cc27c63cf3a4e0af4f440f8deec8 SHA512 1209fe3e9b061bcc1cc549f5828e21b2957113fbf031ac33daa158e3f5555e4cec4bf5c59d300fc737b3eac6a587885d4565a58eb85d8ebe778c464d1ae1d7d6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/stdiscosrv/Manifest
index 1c984046190c..0616269155c4 100644
--- a/acct-user/stdiscosrv/Manifest
+++ b/acct-user/stdiscosrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD stdiscosrv-1.ebuild 682 BLAKE2B 2bd28a6db284f6ad8693703e16bfae5f7ce8183546b8e6945e0ae44cf01c32d2452eda673e39e63b42b741a449d66a09833a8337caa076603f5ec749b3630210 SHA512 c4147a460c29581da50c689107a467c9d61b559932eb56225bcc08d740d227578c2577cbf1011a2721c24aa89097644569bd4668db3dd9dc00a3560f01bd5e2f
+EBUILD stdiscosrv-1-r1.ebuild 682 BLAKE2B 7b42a0c73e254b87b67d41778a9b08c8e7937d2854e354377207a195f4ffc6be5fe5a0efd4d7030424bc97dcfc2e1b7ceea607794d1c4015962ce7ffb9c6eee1 SHA512 bb97fc7d614842397f01cda35a48797ceccb9a88111995d35ddea040b124141f2650653c18d14a2f53102124ec682b1b7aac7056fdbf249fb1aae29415c35974
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-user/steamcmd/Manifest
index 6c0a73fdd0f3..4dd82d3beddd 100644
--- a/acct-user/steamcmd/Manifest
+++ b/acct-user/steamcmd/Manifest
@@ -1,2 +1,2 @@
-EBUILD steamcmd-0-r1.ebuild 280 BLAKE2B 9df3d4a5cb2a5298fe28a2e715869e487b0a360a10b25740b3f06973c64524ad9463a8b54738163685e70ffb4f8ab19148bb86b44a9dce412ce20fd3c917e8d0 SHA512 9a71363fad26a6edecce9b77c7a2aad676011f9f2a9e9d6823f0caf072925812f405cba2f247dbb7f1207a299cb71a6a43beb81c586e45a63fdec1637022d437
+EBUILD steamcmd-0-r2.ebuild 280 BLAKE2B 8b6c0231de46c079cf984f93d77b83d1c0411d7c6215155b908669713109e98bb39a016379e3d4ba456e4113b924b4564dd109ac9b8147ed26ee5c69e4613a01 SHA512 aea3d431b858da1efea415a04f0444ead4a20709853c5c6ab652d9eb65959d4be9d648ac953102d84f5a3463a510d07af485f009f73e6fb06602dbc44c38bf01
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/stg/Manifest
index abdc6da2310a..c5d8b6f437f7 100644
--- a/acct-user/stg/Manifest
+++ b/acct-user/stg/Manifest
@@ -1,2 +1,2 @@
-EBUILD stg-0.ebuild 243 BLAKE2B 08c1fe40e5d1ee366456fe6eb29f8f3f6c3c123fd75adca618e04d2053c3c6c1e163db54336d13fbe8652c4865ec7d3a8d00dbb6d09a7c59d63495bf4d9dddbf SHA512 f8804579b797496f6477e6f84c4d58156356ebcdcf30c6e2c3bccac3a2722cf4192559600ca0e6373bcf18569ca3c8e217bc001f1173b330a87223fa05fea02a
+EBUILD stg-0-r1.ebuild 243 BLAKE2B 49df9e5e5321650ae415c66cdc2673a9cc1ccdae71a98efcfd1df4bbf8c749a52762917b118ef224f763357babe779e37e3245e2aaf2d06ec259dce174d71327 SHA512 a783dedabf7ea88e905dbe9bd0a80a239d4f2451fbe34c20af50472c78212a2096f16a0ae5f64929e173788df0ae4984598a15dbc6bfad2a836cfa36ca99921b
MISC metadata.xml 407 BLAKE2B 45b71e5db07903b8a89609d844db897d588863c2e64651561e818c004034183873c2cb791ec576c82eb8a9062d81981a676f647a67f6cda40e59424e2a17794e SHA512 dc09409437d438855cfb64d57f8a0ed0f368f1942beed647a578d09af798c18fdce3eeecc730684a32614feea581c0d090946e96f512a3d76422e7856606bf4c
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/Manifest b/acct-user/strelaysrv/Manifest
index 9383f429d0cd..b04ca8334c45 100644
--- a/acct-user/strelaysrv/Manifest
+++ b/acct-user/strelaysrv/Manifest
@@ -1,2 +1,2 @@
-EBUILD strelaysrv-1.ebuild 678 BLAKE2B a9d8047f40daf1c9b8b67edcdb577d4686a15c73813734f9ac26e84b76c2d9b5d0b00b5a67b0c4180550a25c78bc35f42e94c060699656d2e725f0f6cfdfaace SHA512 51322e2cd3b58282278e7a94489c74c7847587d08000131fb42368e2e30ccfcc27b701b08bae99b49ac7131cb333dead23042dadd63a770508414c5b993aeae6
+EBUILD strelaysrv-1-r1.ebuild 678 BLAKE2B ff8fba1422bdf78a30d2ef4a0dfa298e08c122878c7446affed61680b03dbe2c1740aa6c67f96fa63caace4a9204cf3a2d216c5228256cb386abcc4424272d1c SHA512 f7d861379fc156ab36f4450be5109457d2e40e99666b745b9fecefa5fbedda9b783ab91cfc4b48ab711f2804014abfa4aabfc1caf2f40aa449c708886c88ca8a
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-user/stubby/Manifest
index ad73ed0c9a9a..ccb6758256de 100644
--- a/acct-user/stubby/Manifest
+++ b/acct-user/stubby/Manifest
@@ -1,2 +1,2 @@
-EBUILD stubby-0-r1.ebuild 253 BLAKE2B 47b5fee9e2a33cc53ae3cbe67504dd4f9bd3615057b4e62c9913ba9e615e3bd4f118c581a8947acd976087b131dab6cd3fa5b5b5bd4b2063ed0b97d0e4444de7 SHA512 8de6a36fcca7f04256229cfe80297cbd0ae476d624b2395f8fad4fd9384d7e8b44f5811beb1a993b5513bbb02b94b9fd122b9c20210b41a7ce6176f3403644a3
+EBUILD stubby-0-r2.ebuild 253 BLAKE2B 85a950e6b5b4147a52711efc7726080fbc55829fd551d58c77c869667a7353c93ab032e679ce6bad80bdbb941c6b9e677b9f4cc7095980059e092f21fae4b91d SHA512 39b669edaff2c179c7b3df69b7c039709f8baa2954746a3cfb441bbe349bfa70d3678cf2d0a3d234baba80de3d32808c8306662943a93eb2dcbd8e5b28085c24
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/stunnel/Manifest
index 96a967b9fe3c..417633e471f9 100644
--- a/acct-user/stunnel/Manifest
+++ b/acct-user/stunnel/Manifest
@@ -1,2 +1,2 @@
-EBUILD stunnel-0-r1.ebuild 229 BLAKE2B bc81dee51d4642c16ec4f06e00401154de43049c15b4ef6306b20752da8b732728055efde497df4f37306d78bb65964a81a776dee0584fbe5c7590176b3f5f1e SHA512 16ce2e8b3db25342ae03d409464c1319ace4d47aa2e79e399ef3ab8702452ccc374e5a25544016e0598cdbc2e8b3250a84e6f5b95ab6dc8f6878da687d2728b3
+EBUILD stunnel-0-r2.ebuild 229 BLAKE2B c34ada120d208ad791b21c97e7d01f65f281684e908173bff11a9e7b5f66042f28e9a620e3fd82b23ab184af05daa226531732ea6a5528fa15d5b5fc7a6b83a6 SHA512 da56ffc4e2f3589cbc6d10f843eaeda1ceb4854477e8f3fc28233f1306376679ab17a60f056ca6ec9e983a84361c9b041a264485429fdf46c6641460cba60791
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/subsonic/Manifest
index da78619d0032..80eae668089d 100644
--- a/acct-user/subsonic/Manifest
+++ b/acct-user/subsonic/Manifest
@@ -1,2 +1,2 @@
-EBUILD subsonic-0-r1.ebuild 289 BLAKE2B a423eab553884b0ef6fa011c946b1e416294118e08d09dbaa036db45e348613869b23199e032b21e38bd16f154a706862b9d3b017266acba132446367d836b7a SHA512 8273e612e96c6a3a6107de37227ce4948c8a1600b7a3ad78258f92f04645022894ef477f9172fb2be8a9743607e8687beaa21e8700b51bf124df8b2e2af0767c
+EBUILD subsonic-0-r2.ebuild 289 BLAKE2B bd7f6ea73d100a5e994568ebbc4aa010f6cd26077c5156d2d64207795de4567d8010bb6b782c39278bdb5197d96d0027f8e6bf1136698590f64121bbb44c5aa0 SHA512 94daded5da0c5db9a00b162e4fe19dc85db4332ac5d4a908d1fce35350c21e06c7cfb4dc317f768f978212b87214ac8d0511743d100013b23b6b3159a6f87466
MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
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/Manifest b/acct-user/suricata/Manifest
index ce937d98c62b..0e4d3dbc585f 100644
--- a/acct-user/suricata/Manifest
+++ b/acct-user/suricata/Manifest
@@ -1,2 +1,2 @@
-EBUILD suricata-0-r1.ebuild 234 BLAKE2B df512404da28d9c8f619d6f0790099f4187ea7d0b42fa1004e2fecd483c1d34ddc17742ceb94a6460c55c0e4a09517508f994eaa7de6f3bbd713fd2365056095 SHA512 0df82ba4cb86587c048881b18249835ba89fcf9f976a8c2fa9d4df08a10ad6841a1cefb70750a66dc8507b4699b4854fd128a80ad83d6723ba32c6e583eba774
+EBUILD suricata-0-r2.ebuild 234 BLAKE2B dd15990ac2d36f1a0e48879e513ba1ed0fdf8b9ead0d7a7b9597ce01a8886c115d73ce3af6de2f49b6d0b6a45c474ac1049e1b6aed0ebf2ab7c969851f29f687 SHA512 d04ca9a63473d35e892f18bdfd7108a09f87d7575531f76861b98acff7d9d3ef49d6bde3033700e9c6a57e11680538cb58b76f92bb6ad52336c0b5f7e74548b5
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-user/svn/Manifest
index d1a5e8a82dff..c2adb564d2af 100644
--- a/acct-user/svn/Manifest
+++ b/acct-user/svn/Manifest
@@ -1,2 +1,2 @@
-EBUILD svn-0-r1.ebuild 199 BLAKE2B 2d27885d7816a6d5275f358ac9df4f3a703339cf044e1ddae541fe95484ca31c4d02365a962cba526ebe92448fa363b07c1cb6f344410174859d1aaec1872197 SHA512 92e42e07dff6a1412af61b9a766eadf503d2e3b22d8a61d3c6448f1106e0c9d5402abd23b3051faaa2d20a641043de54f720d25d8d7a0a93a23944abf825324b
+EBUILD svn-0-r2.ebuild 199 BLAKE2B e74e5efd57bfdfc0bdd7dc09a5a4bb7bf5486a60fd73b5cc68ad24f8817c033b23e8fb0e9ec4c40891db3de4f389c1dc9e5f16e261f5c0ca6e9652f2a9cce467 SHA512 8fce8975f4f5ba76059f0ee8efad2ff4ad37d0084a514a7bd8365dd1173b59ed4fc12fa10a02b567375046866803d0a616273706c673b96211b7d1e0a57a8e8b
MISC metadata.xml 255 BLAKE2B 6d9704c53f3cb2feb306acb4fda9d377fd979897237080046e5e5285bdf057281bbb32309764e654c06cce3f6690196f39896508ae6c1dc937e5d3e632fa3cd3 SHA512 ec50c1a81ca10bd96a826462eaec981359cbc400462e7ba7c3d0ded5edcefda5433c21be5df7644adf567e518bd865775e298e48f7d13c92740a80e5be044be4
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/Manifest b/acct-user/svxlink/Manifest
index a3f3132324e4..89caa3e38ce4 100644
--- a/acct-user/svxlink/Manifest
+++ b/acct-user/svxlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD svxlink-0.ebuild 242 BLAKE2B 98c2df3a23a3a2bdfff0462f1617a4a2209667d6cf5719e4ef1486d5708abfef2b350aea01362744ea7ac5039517be8c331654e52bae48bd305bf1f1d61aa894 SHA512 eb4622f9f52f2d4f9dbcbe7a6f446ebc066b21a0076479ad7083f1e8f8a3335db201e144c2783b3a2b90adae289d4600579ff5bdc0b7c3300e7a8694a36483b0
+EBUILD svxlink-0-r1.ebuild 242 BLAKE2B e805f600357d7aecf462a8f315038a54ee42b25b673a1b388bb0313a3494e4f435334e44014c5177661fd74642041fce50314aec6527a4e7b0dc407df1dc8a8f SHA512 637a4353c2f2d10439d47ea29b2747ee748ccc2b4b89a5b3afd1ff5de2272356f57936fb5cfe2210b450fee71a66885cda4a0d7298c4b39119ab29e252dbe116
MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
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/Manifest b/acct-user/swift/Manifest
index c24fd7634f2a..51946f6c7b80 100644
--- a/acct-user/swift/Manifest
+++ b/acct-user/swift/Manifest
@@ -1,2 +1,2 @@
-EBUILD swift-0-r1.ebuild 255 BLAKE2B bb90b66e836ef91980365a23621a00b44a92d03431927571f884395e95adce2d8212457f2aa80c7b59c386717d073c0df4b3dccdf046ae4a1f39aac0235bfc9f SHA512 0e18a41e1094e0c237b6a11475e0f22d2f3024a74093d6717b4bc3ece92a40490b4f22f4c3adecff2306b17eb8bf54230c213262a1d3a14901973231034f6502
+EBUILD swift-0-r2.ebuild 260 BLAKE2B b3c90d902995b95db618a48143e2b4cd1aa2b2c9f9728a42ede1d72efe145f905dafd8f8a7b5e511235bc09ab57b57eea8be62fb98b9b62b846a69073baa8c69 SHA512 3c75013e480cca44ae6da2dacd4f68cb5af2d411a2782f5676f66d8188d9523dd9b6d7e62f1c4d2377580a8b0040044e35eb154b512b47fd617a0c86c76a4de7
MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
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/Manifest b/acct-user/synapse/Manifest
index a325a8648fe3..bd945a3e9b44 100644
--- a/acct-user/synapse/Manifest
+++ b/acct-user/synapse/Manifest
@@ -1,2 +1,2 @@
-EBUILD synapse-0.ebuild 233 BLAKE2B 643656e5c2bc4531c4417731218e3727955662961421a7391176065c14ac6e4a23eb75afbf021144e0fe19672ceff35706608ca1ae8b9d06316dd015b9ef37bb SHA512 5025226fd564c361c32bb97dd6c003f24b98a8de2419433cf40e5fd8b5c1c00abd02abba24d247f8786788af9dfaa2ae3832e0ad4d673c2591c299514927b75e
+EBUILD synapse-0-r1.ebuild 238 BLAKE2B df77efd28b4c7b7d736f19735b19a2e2001ebd10acc6e2bd0790375f6aab8bba987b9358068abae6063744eb7846479b6b056803a9e48f90596c3fe3838750de SHA512 d8468cd4f0bd8e632b451bc877479f119e5f1d8891ae63ced7c815cc3ff285e2f337aab95fcee456b286d09704b6dde47bb3f0727cf4e480fbb4a1023af9f5b9
MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
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/Manifest b/acct-user/syncthing/Manifest
index 99808d702f87..fdca12c0b648 100644
--- a/acct-user/syncthing/Manifest
+++ b/acct-user/syncthing/Manifest
@@ -1,2 +1,2 @@
-EBUILD syncthing-0-r1.ebuild 324 BLAKE2B 0f12cd1c2d08b11088cbc7a542480792f2fd800a1ae2dce6b707eb22794b198cbba03eb9461c8a4247737d058190a2a3bacd8196aea73a0391ebe56d8f8d0f57 SHA512 9140c7945b16315c5cc50a001589c2585053a98baf5fc9cbf0f15cea0965f75b63ab3aa197c0b3a6ea6810ebe4b219312d0752a73ff8100f1334c0690a62b8bd
+EBUILD syncthing-0-r2.ebuild 324 BLAKE2B af417934b4afaa17f4cd5786126599f184f05790c8c39bfc1a2f1b29b4564d8cf4f7f149513cf503ad570fe85766e50803ff39ed6e94c32f80e444d584d0e32b SHA512 ac6ed4a8f6a811c15f89f4f7c685ae12d227ccc8db6dcff866476be885a5c06edf8ade6e827b893d0a823f5e5611427663e2c6d05eb60945d881c39e0b8df9c6
MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
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/Manifest b/acct-user/systemd-coredump/Manifest
index 168721075e85..51c946e1244d 100644
--- a/acct-user/systemd-coredump/Manifest
+++ b/acct-user/systemd-coredump/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-coredump-0-r1.ebuild 207 BLAKE2B 9de5f9da8eb7d3500085de6e4d2e3a1f60e0c257136edf76919cb45f615d686a22761bd819f0245f920bc77f97bdd511ddb978e3ed39a56a4d9f8211e8ffd1e8 SHA512 f78f570dc9cf80826bc9d066a016d00fd5f122a1fecefc76fe9727b5e2c34129edea987ab68b642c06c6df7d5e6325aa741c740654e7f8396798bf79897d13e1
+EBUILD systemd-coredump-0-r2.ebuild 207 BLAKE2B 34c74113c41bb33c7bb1e9ff01ece409e504dda9fffe6d77efb8c5aaed0ea530d4153fafc1148d264963fc9e751ab3b2fa5f5520dc9baa36ca4d7b9a62ee9c51 SHA512 35d52bab439a172248a4e8a7b1ea997f551292c9b7a348043be401ec897fa762573518ea2a31cd7f9f6af9d81c2fc13afaf6aeca37285cac0f00400bc5d787b9
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-user/systemd-journal-remote/Manifest
index 92043dd7046f..a7933da23bbc 100644
--- a/acct-user/systemd-journal-remote/Manifest
+++ b/acct-user/systemd-journal-remote/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-journal-remote-0-r1.ebuild 213 BLAKE2B 98e5579aebe2bfdb7317cc1ba83c58d3884977e10f728e716e6efc62a9261c3ef571df11b81e71a49f2fb0a778089a149a59627ea26399a3ac0ae080defed1cb SHA512 3ef100e964263877ba2c328140e9a931b35bba8ca4859503cf3295412b90147437fa4eb1c8ed2b1a61534c5185ab7c39ad7f1c6db0250e2cbf731a10b1a3aa75
+EBUILD systemd-journal-remote-0-r2.ebuild 213 BLAKE2B 36ae5af00a3c63ae23e107db0584b23b9bf4ad0672b8604f57ccb1ba790068c5a8f68c581ea47cab306ff77ec441e30e72199bc8563de4beb577fa613ef25e43 SHA512 c623b3334f8a8aec656265548a1978e93476e11575ac2e0121e83fc8150f670783a5cf41d10e3a1c71dba9538e85a62699f324961e28f7ba0131d1ad022826ba
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-user/systemd-network/Manifest
index a459a8323845..2fa1413bf3b1 100644
--- a/acct-user/systemd-network/Manifest
+++ b/acct-user/systemd-network/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-network-0-r1.ebuild 206 BLAKE2B df7d7b2d235d862820cc781a08f334102c9f5f94dc670c8c64bde5f2a55761bebe20bdeb2344f1bbb21702aa825ee539fed8388f889fa2592a516c53bf66ad4e SHA512 9235c82c06834fd2664cfc84d25a3828fdd69851ba477e7e99f007d262a4d14a54b41dd0851ba6ff5e3f325ee57828ab75763ca2334cdbb7967ce11d2fd8b82e
+EBUILD systemd-network-0-r2.ebuild 206 BLAKE2B 0b0dedea20c22b2ddc7b12831775c3833471fd245c9858c7750c8c0b8691152905026536f2ed5cc860a729421d257759ed7b51bdabdaa0571dd5e68dffafdaf7 SHA512 f1dd4835f4c810dcc5e8b633a857989a41c483840d0be1329ef82b425ed129ac2055db85b281517ea9641c3510507a866eb7d9bb3b2dd58bcdedaf61ac424dfb
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-user/systemd-oom/Manifest
index 06ed435f019e..9d410490154e 100644
--- a/acct-user/systemd-oom/Manifest
+++ b/acct-user/systemd-oom/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-oom-0.ebuild 197 BLAKE2B a602003eb64851ee796044e1997a62a05b5d4e62b8cf80eff4d60ae09da76fa2d87a3fdc3240c0074d1a9c13cbc5556437190fba11daf30ef6a929ac5a2ffa91 SHA512 f464b98d3e731ecbea2611b19dd624c706c1a88c5c19c243914c84333a5ad386db809063e1cabd2f2ba28077b4e100ee92b61011482f663ef3d39951ef8a40fc
+EBUILD systemd-oom-0-r1.ebuild 202 BLAKE2B 04d3746b8aee287256650e62bbba61867e56aee7d081466ba4c102faee292fa198247eb235cd968e6dede6cbbdbc8a514c354a00ebbd3be965e7d20d45d1d9f2 SHA512 e7d4688723503aa8217635f9014bebe263c9aae70db5e0e93478821a97df7b8950ef4ce4449fa1a1cb7a0e7f876c03a89994ca99360d8e2fe8b6d1e7355e10f4
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-user/systemd-resolve/Manifest
index 056c1738b68d..582032828692 100644
--- a/acct-user/systemd-resolve/Manifest
+++ b/acct-user/systemd-resolve/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-resolve-0-r1.ebuild 206 BLAKE2B 1ed87c559f342baf19eb3f60fd0bd63dc5d08fd083688c79041bef23e31e2404c3d3860be79381f08c778a5ffc5a237030939fb172a689c17002dc12c4e5eacb SHA512 35a495a0ff3b7fa51b39680ae803eae1ad882efb297131bcec6fa3e64edb3af6e60523296074e4e044ab3fddcbce62f30eccdbe1de0221e6f4a023d015c9f2a1
+EBUILD systemd-resolve-0-r2.ebuild 206 BLAKE2B 51ee552776b7de3fecc99e960e15a4e0f280b6b6921de92eb431a63c9ac2ca1a99469f813ff5a69486661c291acb44bb6f0f3f2a05d55744121b87546d04cd39 SHA512 032664be2e795ccbfa5096f62ecc34ce9c1477d4ed75b29e612da8f7c2aa0ae1e6ac3db70ae0cd29007330ccf380d08b416091cfaf24339fe4bab154e650e271
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-user/systemd-timesync/Manifest
index ce365a37807e..5890ed34d011 100644
--- a/acct-user/systemd-timesync/Manifest
+++ b/acct-user/systemd-timesync/Manifest
@@ -1,2 +1,2 @@
-EBUILD systemd-timesync-0-r1.ebuild 207 BLAKE2B 7d236f52e15d3860188827ae2d417730d745a46a71ac8350e39fd804819458ca54a0a7b2ed425eed315b6908c2a9c16ec9b39bf81b961920641acd9ad0b65ad1 SHA512 d210304f0730b4dc1592aa5791868aac8b3e24d247018394a81df3e862826d08566b3d4735ab9061fd3cfbd4545a76f88e8d15924ee103b1ec336eecf5156cb6
+EBUILD systemd-timesync-0-r2.ebuild 207 BLAKE2B d0ae649650d6193feb5388d33aca6c200ade30671ae7c6e244ddcf1715c0412a3d1a2132505fce1d6a2115ff6ea6a0e3bcb41b69412e03e04f204d373ed59836 SHA512 b8f0a27ff1d6e531df0b29b19272154a9f6f83358a630dc3578ed0fc7bf8db281da17db788bb47fedb73d112afb2dae7129661276671074920b187f94cde8846
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
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/Manifest b/acct-user/taskd/Manifest
index cfa61b66932a..e4fc3bd8b719 100644
--- a/acct-user/taskd/Manifest
+++ b/acct-user/taskd/Manifest
@@ -1,2 +1,2 @@
-EBUILD taskd-0.ebuild 301 BLAKE2B c2362be0d6bcf628ed0d81240d5c6c4cf8e1964ad3f9b5ae4dcacf6d61999a825c28ede707ec28693fd14baf3aeefb8085c4aa732367ffbd265e06f2c238c29a SHA512 871f65a0942d0a28b2a128c50f1d7e410430c6e209c9656214e391fd142d60ba73132903ef262558ec9410422b0f7931343901192c286ab281e97eb5179d5fe3
+EBUILD taskd-0-r1.ebuild 301 BLAKE2B 352fd504542dbe14d73258d5911cc02b1b810f3d9409ae5134c13e0cf5a3e0b5d878f0786445fde8c6fdf41b091564e26cda58f38a908891747944f45b3ea7eb SHA512 83bfe7539157a710bfc75d4c78715470de83a00906869a1b3855e5d61177638691331cca2aac0f889c38ecfe0b23d0873d46035ed6839efb5215c23a14e3d7cf
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-user/teamspeak/Manifest
index ec79ffbfc170..0fe5a2598df9 100644
--- a/acct-user/teamspeak/Manifest
+++ b/acct-user/teamspeak/Manifest
@@ -1,2 +1,2 @@
-EBUILD teamspeak-0-r1.ebuild 291 BLAKE2B 0dc46ccd74abe8fbda99204f8e160cd52bb5e073b176b1bf9a34a47f907f70e66706ecb29a4f694cbc34ce526260caccc31e5821aaea87050099f2b8d3a5df1e SHA512 9bb4419927530d3280546f5003ddd1c90bcb21a842f6e3d5d6e8ca531a1858082a192e1f7755626a6004a92e2848fda1c0ee879ea27e346861afd53ac4002eda
+EBUILD teamspeak-0-r2.ebuild 291 BLAKE2B 73b2e7e042a2110c0654294ea84130c49de25deb336114064664c6202b82610811e5a26a00b2df1450765b4b6955b5bab58d7e2273324defe586d94c1a22d12c SHA512 56062989ea1420379e55d20394c86043efa16ef79af39661818d1305e636c83ca09505f963b3aab33d75465913e4bba0432b0e2a9517728c93e2b66697fee3b1
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/telegraf/Manifest
index b2af3371acab..244fab74fb1c 100644
--- a/acct-user/telegraf/Manifest
+++ b/acct-user/telegraf/Manifest
@@ -1,2 +1,2 @@
-EBUILD telegraf-0-r1.ebuild 226 BLAKE2B 55454828f2f9271f33eb5802b23b7df2179b5dece5c3f52ee22d1ed2463d1ad5c89e3ab693a2f660e2871c506fa7a06a64c8ef63bd28b5396dfc30b4a471250f SHA512 1774cc00c5684545480f4dbc4c262d5ba5a5ddc0f191e6b84c40fa32db88e7d0452ea35dc6a105c4e64b93f1f229ad9503013b68da1ea1345982ca97a04de9ae
+EBUILD telegraf-0-r2.ebuild 231 BLAKE2B eeb73adc0940e50cee15d98d1900a0cd0df00af566c5501d9d8e85070e4484fcf2cb553b4ac0bb7059b176a29375121aae0e7ddaeef9e22fdd2eed15aefc76d9 SHA512 7647c718a44104f3f5c0f3836b457e418de8b9cfe9ab8d0c94312a5f72a6b246fe20d742a14a32865a2d128949e4506add3f034c8ba3b5a27f65bd380876b5a5
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/tenshi/Manifest
index 95bd506f3cc3..b3a7ef2cfc38 100644
--- a/acct-user/tenshi/Manifest
+++ b/acct-user/tenshi/Manifest
@@ -1,2 +1,2 @@
-EBUILD tenshi-0.ebuild 275 BLAKE2B bd5522374a767d166c11a53831c8a9aa71c18dd185350be7d51d6b5999c6d1981517cc486ec5cee881810b445f0b10d11ae19239b06d7a5e078fda7762056c6c SHA512 e50b1a327791900fe0867122c97e7aa0afda9035e78e4dbc20af46fb2d9f8cdfdb7a6bca030b0d8c7485e5e6ec847f89f0a4a1b3d66fc686cc1e05b47517c750
+EBUILD tenshi-0-r1.ebuild 275 BLAKE2B 58bd5e9cc12da21fc4e2c19d489fcf9528f216a44df2f7227837f38c3a411b6d87e302e80ec6be32ec75ea301443d56cc32f00c263ce75ecc0c8ad6af03b72d5 SHA512 afead065da14470382032cc5c80fc8eca0dada6c5cf9a65cc6e5e41d3cc64da45aa69355f48f1bc75266f08400dd70316a2610acd887552a11323501918411c2
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/thttpd/Manifest
index 448091fbacda..f4dcdabe255f 100644
--- a/acct-user/thttpd/Manifest
+++ b/acct-user/thttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD thttpd-0.ebuild 246 BLAKE2B 7c68fec86f532966eb754503f62cfa1bed197681336afcec1865fe7a9b46840983d94902f0e66610dc968dbbdfa9224cd6daab7d3bfdffae4472a69dfba1ebb4 SHA512 e73e97b870bafd17058090152d080c9eefd4c5e8e62ffdddd46839894b2e8944c0adadafbf75951de301dd3781e49eba563e708eb811d41a4855e5d56afec9e1
+EBUILD thttpd-0-r1.ebuild 246 BLAKE2B 162411172bc36b3da2f132170183f9444b8b835a49e31b88857d1d1cd65b04b040cfb791175ca4ba6d38a40646cb55f5c93cdc5a83fbd3f69c7a38d89d7d7b98 SHA512 40a3003e4cb07e3c67a4f8cb62319aa68cfec06167e1c1aaf766b90fcce7f4580be25b80ea250c32ef4690793723901795f5e0173df0fc8ae38cb1d3da3a76c5
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/timidity/Manifest
index 690992fc8e3d..943cb3c4fb43 100644
--- a/acct-user/timidity/Manifest
+++ b/acct-user/timidity/Manifest
@@ -1,2 +1,2 @@
-EBUILD timidity-0.ebuild 313 BLAKE2B d3b6a42dd652ec2001ed91e4e57956a9683fed36da7ff094e0b0d8526f2632bcbea17de54c4b0b66b7e7233799c6057e73d8591303e7678efb3d47d92372d829 SHA512 7ffd1902fa991204654aa6a51fe5df8eac60c5890eb6ab52158431e94d8406410521ae85be91dddae332955a7d6a870c1e202ce5ea6a3bba2918415d3c0ec8fd
+EBUILD timidity-0-r1.ebuild 313 BLAKE2B 7a38a387a1cf04458ffec2f5f84083eca0275b6872976d9d4f37c602ee90d7324c8fece7d02cd154d74d1abacc40af4bb9e444ed1cc790079d4d96bc1a928fb4 SHA512 53cc528859730b593205286268b5530306a21478937df02f3ba59ef0e7a293542823fe722b37f895617b1bdd8ba5667f85dc59f7ab35418c40caaa5cf50261f1
MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
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/Manifest b/acct-user/tinydns/Manifest
index b64da7c9cd16..80cacdcdd269 100644
--- a/acct-user/tinydns/Manifest
+++ b/acct-user/tinydns/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinydns-0.ebuild 198 BLAKE2B fa2ddfc2da1469a91ffc62115e3a4793e40c1e53cb2e0ff97a5341f1d81da7d55956a40f2be7974396e1c5c112f4d43bbafa1fb52926f85851e0ce89221abd4b SHA512 baa5323c7b5985dddb3dae404ae4a9948ae93fd61e0bd97c4d45d9cfe0cf563979b9ce9a706df800b65670ed55dc4a2284a27c7655656ca8c79a818c82dff158
+EBUILD tinydns-0-r1.ebuild 198 BLAKE2B aa47c14cb31febc727f10318a783ce78e218d3f4b9b55e979ca5957d11a6799c7474678d8260f87d3b5537cc62e87c5bc4b236ff92737d87b8093073ad6db839 SHA512 002e27a6f254feec38323c5b78b987ffe974bd10304f2b8d50b072dcff2ea9a9af812606a3f7e26f92de9f6c451e019efa6de97667f39329f9eea406fabc5020
MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
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/Manifest b/acct-user/tinyproxy/Manifest
index 1fd5c84dd189..2fdbbca4fdcf 100644
--- a/acct-user/tinyproxy/Manifest
+++ b/acct-user/tinyproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD tinyproxy-0.ebuild 237 BLAKE2B bb7a90cc5110c82e6d9964d2d4b70729c7fb60f90d744e50fdbbb2f53fc7697b6336bd393e261a9a7cb228a6b54e001584b2f303de994d62337991dbd4bc3083 SHA512 420f426fdf1ecaf90a0fb6a2cf108f15e4555101afb6c63fb3948435ecc3c9385dfda1d7a7d7a3302879fe81819f9dc52ed8767dc11d695a95c4a4dc34e2b0a5
+EBUILD tinyproxy-0-r1.ebuild 242 BLAKE2B c4c625723e62b89c2dc2d20a7b844cd48ca282b75e95d04095c034ac1b6bf37e3e90319181a2f10ba0911881d6dd187b597c125d625d424d694ea158e33bf33f SHA512 41d17a787e756031ac65e2dffbb3ca9169424e96a53497835b99798f24bfceb9d4b87a3ea4259ca3d9fcbae1b860b2fd2dbc38879549ca01027128ad4615d460
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
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/Manifest b/acct-user/tomcat/Manifest
index 975537055641..29a0161438e5 100644
--- a/acct-user/tomcat/Manifest
+++ b/acct-user/tomcat/Manifest
@@ -1,2 +1,2 @@
-EBUILD tomcat-0.ebuild 235 BLAKE2B 7455005d468cd6c0cfdf14e1bc11e2239fb4c9b8825ddf1f50cca656d60410760d8528a82961890c618f1b3fa14c40a0cad842c7ce55e2250e08d39a363f7e31 SHA512 b96b328c2ef56620fa64ded3acd159889cde176c786c5e38b6f1b012cc356cc41fa5f2a10b6592696d3cbbef5bf82780fd1f9641258aeda1ec73c47265c31ce0
+EBUILD tomcat-0-r1.ebuild 235 BLAKE2B a3a4298d83bb1e49b578d6b068091634656fcb2b8315ac36ad8f4e0ce6c6511a59589b9e0b992065107a57d47bede9b18d1da890fc3120e354a51f5aca44f9d1 SHA512 424f7edfd11e466c790c51a058437f3bbcf1469780e4ba3080bf6d7561ab024def1fbd42a6b2ee062a23872b6030ab5c5e6b367f07806d0c79dbda299aa55dfb
MISC metadata.xml 252 BLAKE2B e978e2d30d81f57b533bc3620751605e0fd123c669e280af424c68ebeba5f7e61391fc59ddea55598107aaf3c9f901e38de6bfd4da55e926a9d3567de08e7d2d SHA512 e509c95968c64f0f3cb9c16a437f100e3d1f64ee8e1d412baac733f4698b7a0f0c91136c480a9078eab6c3c6497eb93b7fe891f9a28e43e31f0bdb73eb3ea9a4
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/Manifest b/acct-user/tor/Manifest
index d0ee368c2181..b5db64d6f382 100644
--- a/acct-user/tor/Manifest
+++ b/acct-user/tor/Manifest
@@ -1,2 +1,2 @@
-EBUILD tor-0-r1.ebuild 227 BLAKE2B b9744b164dccae7d5981ea8a757906212f73589d559e075f71fbff5a59ccf80f708df92c56c7cbb1397565b992830190d1c45fa8c4d5f7d2be94ef739977653b SHA512 fe4d39ecc77ff1cc1d9d9d350f24eef08dd5d1eee3ccba86c1a57bdf7de9d4fe34f6d19cd0996bb6ebf533db34764375747e1e728b1eb68e76fc0d4519ca76ac
+EBUILD tor-0-r2.ebuild 227 BLAKE2B 043918999ba31996165b88e31340a4e572bbfb3402c25105ebca291ff2d93532ac79d69b29bfaab3a43ce9d56b24a3ba4c969aa76b8482319c65d60ffa60bce0 SHA512 ddec4aeee20dc57688c7e9f05ea414804c2e3af746c6b028acc0c345d145bf5d91be792c425c7e21d604b853c37f48487134ad85b97993bcdde2e3e55ba0fc03
MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
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/Manifest b/acct-user/tox/Manifest
index 4e93f0367b5c..4d29c98f5a99 100644
--- a/acct-user/tox/Manifest
+++ b/acct-user/tox/Manifest
@@ -1,2 +1,2 @@
-EBUILD tox-0-r1.ebuild 270 BLAKE2B adab7b62c1f8e01390b55d91621e24ee01e13ffdde29134a6f4c4bcbacba0ba346395ebd52a89fca4f84b445b9e8f23d0ee6a03c53647e4a5801e37ddc102ffe SHA512 f0e7dec78bbe435bc45254121c1d24f3f3bf20c24dfe6d5e4511b97b7c8a11d5796f3fe30d4bcb137ef858876623c507aabf76f2ed2ae0838db50ec83a62f472
+EBUILD tox-0-r2.ebuild 270 BLAKE2B fbc78416aa6f9339a07f20249d3568129224bb3ddfe4b016071bb7fcd67e95916ec6037053aefd3a0926813f761ad735bc6d5350319585476be69ca3bad41f2e SHA512 0f7171366b6a341883617315d1479bf0693a87307d0dde2a2ee9908d1d99104d5e0b8fc395cb589e726adbbe4b1747b1e194f79148f4f70a47cb5e6f578f8591
MISC metadata.xml 401 BLAKE2B 0a0d5a25868d5ad4b1b9b6212ab038e94628f9b2428fc62dcaf1e0fa672a6a4ef4b555767dd6d1ae1e58f82e31a194e6ac5f914fcb21b7a4a5f52bee97ad2eb4 SHA512 58b858736e5503593517b113c9e5417306caf20137303fc03afb43071c088ad5314495f6203e401544e48a87793a0d09d8d231d6f6740639836415c4857a22a2
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/Manifest b/acct-user/tpm/Manifest
index fcd6f91ffd59..e3710bc5317c 100644
--- a/acct-user/tpm/Manifest
+++ b/acct-user/tpm/Manifest
@@ -1,2 +1,2 @@
-EBUILD tpm-0.ebuild 223 BLAKE2B bafbc12109ddbe37e4a32c9908ad88c87ff4d3e613bc7edcd54abc9438a5ce2038db3b5e3736623ceb66b25915ca6a855bdbdeaf5169fe488ac691063e3d170c SHA512 244626c9eab3c5885be688fd1788517d6b14b7fb6f926e872134d327076231d5c969bbec3195b3c0f232eef638909fc8036c08e79d56374eda2e0cacd038c291
+EBUILD tpm-0-r1.ebuild 228 BLAKE2B 024cf2ff78d5c62ec71df85d4fa6a9b07cb01e4fdfecc2368307724cf43d0d060e403e2df5d8abda2f5478a32567fc61ba2fde0fe913f260fc982ebdda0ae3e0 SHA512 4d2f0becf56338f60592999f2d29a4b0181be5cb0ee956d629a31c324c8a1d20ef92541a476c25c58507d909cf47eb2bfef38278148efee720cc8eb336e8e8c6
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/transmission/Manifest
index f7e901db8fe3..39d5dccb2934 100644
--- a/acct-user/transmission/Manifest
+++ b/acct-user/transmission/Manifest
@@ -1,2 +1,2 @@
-EBUILD transmission-1-r1.ebuild 203 BLAKE2B 667a5546490bd54c8524e29452b7866dce7382b52d870f9ac868c73a975f5c247ac44bd5cca8f56667efae93a204bcb2f70871428df7f9f2708f90f1ce94fd0e SHA512 ded2afb7003a77751ef159cf5dd9ed0396c34b89e4c17c368488009e31b9e903e760f6bf4d219a85ade06e25e49100628a4fac6340189a453a7a4d5dff086c4d
+EBUILD transmission-1-r2.ebuild 203 BLAKE2B bd83de359298a898f6e5f52e3945ff98c8820baa4513226caba8ed3565c3cd559fd4fd19f9ad048837a3ccc559ed919e771111d85885fa84a9f25df9d6f85d5c SHA512 921f3f3b0a3be04d99483f18fd05247fb23d4edb6bc3c5123bb4d46d0dc0184dfa621d1b76eb47d567f92d1eecb22c7cbc2c066e43248e8cabf4c922d9ffc811
MISC metadata.xml 247 BLAKE2B 9dcf90d404c84f0ce3da367274c25984b6497a2d8fb68496f497e76c7061c9c7ca7f444f7e4ccb62ba06223caaf0eea4d6aebbb2409ba1f08bb57123e72f0836 SHA512 4681b02c210bf3f869157694af1f80cb3e9b2dd619283a249aaafa85d3bc328c1306af5d61c69040fc503feb3271490bdd2e38e61479a94940fa225810b9e8cb
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/Manifest b/acct-user/trickster/Manifest
index e77f015e563f..c09b9ec9569a 100644
--- a/acct-user/trickster/Manifest
+++ b/acct-user/trickster/Manifest
@@ -1,2 +1,2 @@
-EBUILD trickster-0.ebuild 245 BLAKE2B 35122cc50a9d56ad75bd9aacd73dc01381a354675764839e5752409bfaa27a8f46cfc96110c30cf38915e71840806b0e221bff62c7a0b25975aace609af80e2f SHA512 7c7337889b692472d75abed90c3e867008bf19e0a35f9b65318fc3609ee7b2e8430734041eafa9deb0d688d92d63f223d73b40b38fb2c16ceeed8c4fa84adb72
+EBUILD trickster-0-r1.ebuild 245 BLAKE2B d81a3835d326538b76b159a2074c55236f70501e3eedff6a5badb5aef996c28ea919ae00017836dc7d4c14a253ee88c135e9e3f5ecf3a1d63f5b0fed02aedf6f SHA512 fa80ff3c63ec63dcb76c93ad006b832e938ff3a07ca06501d6f23f5b7386290bd3bc2d3bb5477b7b758c4379afb8238c33b644f78cbe901ff33575cabb460bf3
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/trojan/Manifest
index c3b76b09072d..97fb0d2bdaa9 100644
--- a/acct-user/trojan/Manifest
+++ b/acct-user/trojan/Manifest
@@ -1,2 +1,2 @@
-EBUILD trojan-0.ebuild 237 BLAKE2B 4deadf59a3927452a7a469fe43876dff3d7f8f84897d8becd8f0c5732b4d905095dc30179a9a6d0daa87fe1a495398232cacbd8c9d3aa5fe6cf294744bac72b6 SHA512 36cbc089cbea26dbd6d4721d77690e7e96291ba065c182c98954b8767cc1155f6ffdbec8d877ede3e8408cd47ac42049b7840bf87b803025331f2bbc2ed0cd91
+EBUILD trojan-0-r1.ebuild 237 BLAKE2B f8780a02559b6c3d032b9acf0f7243fe7d24cfad96a8341ae97a5c798c7e045afc602a8eab37a7107d8d39064f5ae619ecc590b4dd5ef6b3417d26047762ab35 SHA512 992101288a8ef84291b221a81e8eedc5185b2ebbfcf67f0e653a4d31f5754b2b8007dcef24de249606419612f41cac0d2e71eea53008a169a3aa9118598d57b6
MISC metadata.xml 243 BLAKE2B 4dab510dfc22f0316308b8d483b8e96c7c0653d3bc091820de0d8208213f39c165322c661abfa6fafa50977beb3839a0439079f949cd6a3f590122dbc59e53a4 SHA512 917ed98b7482f15c8444aaec331a88ef97bf689d708489c3bd68ccc1f2f4093a8739930081dcae9db5eac912c638c0ff286015b8bd9d51da866878e64e0f7248
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/Manifest b/acct-user/tss/Manifest
index 9156cb404522..6ce98fed27e6 100644
--- a/acct-user/tss/Manifest
+++ b/acct-user/tss/Manifest
@@ -1,2 +1,2 @@
-EBUILD tss-0-r1.ebuild 244 BLAKE2B 45ecfcf0930cf0a341c1e2170bc27d051f7c491fd0e95c4ca002696d3cc07b82ade747bd9846ce632c1edf306f6eba774adbc243e05443d9f0586d304f462f04 SHA512 39a1af5dcc193cfca73e65c505455cf9667b49be02c09ba651ee5d0a2173186a5835fa5169243d1d3dd37659d2a4a65c6fd94588f1636b3d437de0615191438b
+EBUILD tss-0-r2.ebuild 244 BLAKE2B 8203fbeaa66875d1c11b5576c5dbd94e9bd4ebba4b5b0ee2fe09a4c09191f097c68111acd54cfa2ab0c7c310608c46d008af0cc8aaa4558f453c9b2367205966 SHA512 f45652e8b886be5c4a1e25b8529f50381a65262fa916dcfe1daa2de8e42eaa6a7a74bc300c6ab1ff5cf4ae32bf50274d73116b98fa6c00b485f3d3d026f74a3c
MISC metadata.xml 404 BLAKE2B 08ad2d09bfd3697b69bcfd85280cb3965aff26e91a49f0840c2fe81d02a5795254a283b95124bfc97a610034e668332d06abae1db1c34657d7aab8ed6963654b SHA512 9b8ca2c33c33a1f4e3f30244069486fb1dd970555c9bb719a5bb8c4e2bc979745e0511216ec70481f0c3b1e716dd631662a1986e1c89628b29b0a85d6b4b9f76
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/Manifest b/acct-user/ttrssd/Manifest
index e90014d0ab79..d52f764165c2 100644
--- a/acct-user/ttrssd/Manifest
+++ b/acct-user/ttrssd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ttrssd-0.ebuild 231 BLAKE2B a051a89c8f058c775ecff1b165fa391a2bd21784031649e272f0aa099ea14b90d087820ac604520c589ef71f399bc8d766c59c53db40fa5e1247d6400d7d8ebc SHA512 ec15ea80ee3bbc6c331cbead869902615ec94ac3e07970a66f6371168bbc6f357412e2e277d31e721be10a47f3182a668f53a3cc52ba5d758fd22a184e4f00db
+EBUILD ttrssd-0-r1.ebuild 236 BLAKE2B 4c428f50273171c8794c6489b7a8a4ea50a805e6736c9bc944fb88703ac1a46f47360bdea5ea315371a60e080fecc1747e6f4153252abfbde4285848ff93294a SHA512 828578fa7be089546bd6e2b30b8659e82813da350efa811295077cf5394ac9c1371ffc86f9d0f0e1f8b53418c1308217ad6487929acf654056081e990a10ac92
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
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/Manifest b/acct-user/turnserver/Manifest
index 7e3228f53e7c..12c2d23fc1b7 100644
--- a/acct-user/turnserver/Manifest
+++ b/acct-user/turnserver/Manifest
@@ -1,2 +1,2 @@
-EBUILD turnserver-0-r1.ebuild 252 BLAKE2B 9b0067470079f14af9db80a1e87cb7a2cd0ddf7819e49ad4a757c66bc6889f4747cf6ef5a240e55753ce8c5d9261b83b6420dd4e7fd2b9e94926b09d8a51f00b SHA512 94e8e6a8fed74d29a0bbe54d26c00629d33a3326dd2de4bf1cd92547da0f74da63fc0c86542b62aabf91c32dce68b6d1f3b245d1aba66f4c568ba576f4b4779b
+EBUILD turnserver-0-r2.ebuild 257 BLAKE2B 98ad7dfce5363309ab50508f6b14886dab53e6a316a95b44417220ccbb162187683303b9ceb7684483c407226634aa1a420066b19ab7b04a9b540fe41fb06c37 SHA512 fc7564536c04254461d78d20087882d1b1d86f79020a6354f4873af0e7710c5ebc43671cbcf7724b98ed253d24fa4769871656844243d25098ac2771c506888b
MISC metadata.xml 253 BLAKE2B 48176bf4d3261fa1fa73f54f89eb55371dae1f30f8b6fce3ca78b404418583f11c35e1978342d406e1918f737bb8e971778a780d4195f4a1936f866a23cd8423 SHA512 26103b425624e485d98f014bc88d2574fad61a638f750ff21507690509c78529885f72d410975d4f3586b11192d86d8b6457a86330e39d64312c24ce58aea7c9
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/Manifest b/acct-user/tvheadend/Manifest
index 00a37afa3dd0..41c4cf15ed28 100644
--- a/acct-user/tvheadend/Manifest
+++ b/acct-user/tvheadend/Manifest
@@ -1,2 +1,2 @@
-EBUILD tvheadend-0-r1.ebuild 284 BLAKE2B ba491eab275ce324a7d89f7c8397c03cf9110ad43fbf03bb65b9bb72739925f39320941f2d9efc46e45826f0f4f378c249cdab3aa12f270cf2fd3f4543f002f5 SHA512 f214a3cc4eafee1d4749713d225541df2b85c75b791ddebda9c71ac4fb416e94d27d8ff692dcaedf5628752a6975f016b02954b7c175afb359a1b694a7301c99
+EBUILD tvheadend-0-r2.ebuild 289 BLAKE2B 8e07c1cba79a55a013f16f73c8bd0e104684a1446242d063c7e1fb537de09436bdf60cf4b245bc28eae17a7a0d63fd49d068c7cd3efaf36c7569743eca829b16 SHA512 c6e2995742b73d336570cfbee5dbecba53fdcadcd48778826e5b323d652ae542c3716b2f63d46dbbefd85f410fac52d57de77c5988c1136c95e9fd97054b0022
MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
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/Manifest b/acct-user/ulogd/Manifest
index 6aa1fdc13b02..bdf022d8ea29 100644
--- a/acct-user/ulogd/Manifest
+++ b/acct-user/ulogd/Manifest
@@ -1,2 +1,2 @@
-EBUILD ulogd-0.ebuild 225 BLAKE2B c0b96b744ca1d4a23f702aa29ce86406674f5557fbc924998902c21bffc7f848b15787b1ffa5ce7feecf31e680789b9e05200ec552b4d49ae67985fbfe39807c SHA512 4c92cf2a31900ba4ed4d1841dc3a5a965e83411cbef582becb1ee8f94e9ba415ec24c38860a2da958406a7bfd6bd0cd3c58615198b255cf582446b9c5052700e
+EBUILD ulogd-0-r1.ebuild 225 BLAKE2B 41c3abea37840071b2190ede74f3b37d493f1925ea44d05e3e4c0db8875ef8a6d7487f4d27dba598a67646c320474b7e1fe3ce84bcbc16f258a63ab199d982c7 SHA512 34a5aef6383cb73613cbed270108ea1cbf94c1f8910f010cce79746e5f2eced8547d13dab13ad4154e1bf462dc409b9c40815d0ded198f2b1221fcb407eb2bc3
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ultimaker/Manifest
index 96df5d849770..ad676fa004ba 100644
--- a/acct-user/ultimaker/Manifest
+++ b/acct-user/ultimaker/Manifest
@@ -1,2 +1,2 @@
-EBUILD ultimaker-0-r1.ebuild 224 BLAKE2B 08b32a28d645f5abb2746d1a6e7145076b276b577c6fb9c792dfffeb20e55c8347007acce827535f82daddf5a421dbbb23d0f1087489c125d433a2a3ae663890 SHA512 2281989b7558915568473cf658015e9f856f626c71d2e4294f49825df0c2799af97914e6d8dfab6ee50b560c8b9cf1542d9bd1f3da58824d01231fe583be32e3
+EBUILD ultimaker-0-r2.ebuild 229 BLAKE2B 597616b609281633d61999ac05b1d12b4077cf7f30236f1144901ce6a41da33867968e402880564c5bad3302b912f9aa0f741a92548cf76887f5c32693325e10 SHA512 cd29202c1456a7dc63b5f3acc3ea802f9b2615cd520e963c2d0610e0a5588e581cf635013e90ddfff2e40606db2f78cbf906f27b5deffde013f5b20e085bba44
MISC metadata.xml 261 BLAKE2B b411d17d40b41f8f5f79ed195f3d7ca29655c5c6a7da8284c4d111b1ce405f2a881bcd675081561a606bb37df59e3344892ed4277cd5a0fc06f9138595c30f80 SHA512 5cb7f83ca6a8b52b542c4060c67615c400556b98837f9e6fa989cf60999446c7e14c91a3d335734f835652019ef64fee3f9ef57a403657df21b09f843462598f
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/Manifest b/acct-user/unbound-telemetry/Manifest
index 1f9676c427ba..df812e36c013 100644
--- a/acct-user/unbound-telemetry/Manifest
+++ b/acct-user/unbound-telemetry/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-telemetry-1.ebuild 257 BLAKE2B 8ab8ef2306cc1baee08dccb07432c22e8c8e46482a18ebca09ec4763a0864a27e9bfdf7518acdc85b6b4f5f6d8b3a47c744ba5cf3d466edcf40481035967e1b6 SHA512 9f151814d73419cdbd538cf4f29fe00922ca709525b424a83087851bd4a1c1aba1e1eb522601d15c8a69a6fbe239640eda081f695dd170471badf673b2bf3306
+EBUILD unbound-telemetry-1-r1.ebuild 257 BLAKE2B 3a4d850f649ca74bb12bca66f09d9d7cd72aaf9da79b836db063438354db59dbcebff42ac3f42fbbc8430751ad0f49e9d3c1d47f20d9c8d896c2945ce70374a5 SHA512 c392b469a5e58379867c738a1024eb874ad7d3149b01a1dd93370b3f6b5e37058fdf123a76314962145e8702359272d2f921b61c52a0f6ceb456e3a8291a0fc5
MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
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/Manifest b/acct-user/unbound/Manifest
index 52b8c2204b33..2947466e3529 100644
--- a/acct-user/unbound/Manifest
+++ b/acct-user/unbound/Manifest
@@ -1,2 +1,2 @@
-EBUILD unbound-0-r1.ebuild 315 BLAKE2B 36993b58d0602164884f3343c105602bd535489b42de04359c2db8bf2c2670a05aaa7c1352cc3ec99081795f63a9cceef65dc9648141d3cf8bed845c4829ce41 SHA512 2002d227d8ce62b3c211afb72518c65926ecec508d4938b4f9cdcfc9bd92f56761ad6245d7ce74512f01fd9a2c9853dcf26bfcc6bed6ee79888c00d3411e898d
+EBUILD unbound-0-r2.ebuild 320 BLAKE2B 289392878f28f84f1ccb17c10d2c55a3682eb4a28b92493476894d51d064edc4bffa44184ad204c85328e05e7d74e7c39a7e088f494c3a9c542a7d269a1fb038 SHA512 26b118e823256a847438e9922c729b00ca5019787d1a323e9ec6f7a12af9fd000609c54db5137d1083d1010ce8c233eceb5e3682a37a98741e21a87af4bf713c
MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
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/Manifest b/acct-user/unifi-video/Manifest
index 72dc91f449b5..2902822b86b8 100644
--- a/acct-user/unifi-video/Manifest
+++ b/acct-user/unifi-video/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-video-0.ebuild 232 BLAKE2B b79e38c349bfec6cf716a2c32cb012b51fd47bbf5ac887c657601ec53e6ae2d5062fefd3663c60fe02437bcf3f5a14d2396123a2d301fe8f14844eacbfdd9b56 SHA512 6cdd7be966484189efaa482ac6cd673480c1036b7d814c3f1674ddb15a822ab1c18116e6d9bf41d4176ab7275e040440def5d8119364911e1e35914e2d6ec2d8
+EBUILD unifi-video-0-r1.ebuild 237 BLAKE2B c3c070c5e493b9d5b94a8a6d639b2cf910f89e6e1ec3a8760e617fc3b685d56c121d889bfa2531974b7b16546b6fcf027264b4c3c0a06e737d3b14d3eaaf71e2 SHA512 7542b79fdfc1ab0a1d56907409e59c195508cbc1ebba5836bfb5bd8df965f84de6a12c1b089f95eafff2712c565f55915644b0532eec5eb12a51fe839eac42a4
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
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/Manifest b/acct-user/unifi/Manifest
index fa9d972e016a..35272b4d92d2 100644
--- a/acct-user/unifi/Manifest
+++ b/acct-user/unifi/Manifest
@@ -1,2 +1,2 @@
-EBUILD unifi-0-r1.ebuild 279 BLAKE2B a62cf945fc8d484af502d2d5dd2f0e43cfe738aff7bf1eb044cb4d2fd234b547d0987981d689172612e5cb3e085a1802b7b74c69259ff392fb7ad6d375e27198 SHA512 efca3e2d2e9163b951a09ac1cf9c86b13069ee30d8dc24ed02fa2d39cb037dcbbdd1b50ff1e5328f20950e94780f136321b3f96f74797a11d4defe54f3a73fab
+EBUILD unifi-0-r2.ebuild 279 BLAKE2B a62cf945fc8d484af502d2d5dd2f0e43cfe738aff7bf1eb044cb4d2fd234b547d0987981d689172612e5cb3e085a1802b7b74c69259ff392fb7ad6d375e27198 SHA512 efca3e2d2e9163b951a09ac1cf9c86b13069ee30d8dc24ed02fa2d39cb037dcbbdd1b50ff1e5328f20950e94780f136321b3f96f74797a11d4defe54f3a73fab
MISC metadata.xml 580 BLAKE2B 29e2c3d6f265a80010ab1c110bddcf2b32d0609c6cba665096ef1842d1f964f26672fe4f1fb051861115b7796888c98b8f458cdce4b5bdbc1ee94d5c2ea69c47 SHA512 87b708f2edca5e9b1bdbecf9ff34ab59ac4c2523840dd011e86fcdc91c7fa9cc7a908ae55b11eb09f3dd435124cd5689c1d370eeaf62ca163722ad75b9bf1e98
diff --git a/acct-user/unifi/unifi-0-r1.ebuild b/acct-user/unifi/unifi-0-r2.ebuild
index 6e7e3dae218f..6e7e3dae218f 100644
--- a/acct-user/unifi/unifi-0-r1.ebuild
+++ b/acct-user/unifi/unifi-0-r2.ebuild
diff --git a/acct-user/unrealircd/Manifest b/acct-user/unrealircd/Manifest
index 4e5d115493ac..c165a7069791 100644
--- a/acct-user/unrealircd/Manifest
+++ b/acct-user/unrealircd/Manifest
@@ -1,2 +1,2 @@
-EBUILD unrealircd-0-r1.ebuild 201 BLAKE2B c9a249832accd6b4d8bb131ca55d7ee25a718a9f550fb828c47ff014d7ba0d8e39732c7ef031fbc4afb7b8c5d8c005bc3f9f6d6b950cb22708b7306d00c289d7 SHA512 cf7ca352430d3e5556ae49f38f3809c837031b38d727eb8938a3cea4eb047477d43fc5926f39916b633bb3bd25ced25e4a9bae622c0b4f0c3801b900527ee62a
+EBUILD unrealircd-0-r2.ebuild 201 BLAKE2B ea03689d8c13ff305ab47df75195864305cff9ecc776f3cdf7ac3dda47fa04f9e8d74051a7047bfcbd16723461791df2d03ce17eec2cbf765b37e8059684d34d SHA512 2dda4cab8e402fbe82c244ffab52c7777807e113b9a8fd14c9566fb56ebbeffe77276c8142a8141cbaad681347906c4dd1de8c6fc6150e15560f84217f46ca99
MISC metadata.xml 354 BLAKE2B e6293be3ab53054ee019e6f1ffb7d9708ac9c484222a3c8246f071fdf330f5a55209e5795b94bf54ceac52d914aa769fb8be9516133531eb656079efe5f8b507 SHA512 3e73bc21404a047c69d7144e7c1daa0bb1b2203778bb1f98d0de1e6298b6641fb1e02c3dff88ef9ea11f60198a4fe2cbb6e884bb914cdfb0277c018f4406538f
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/Manifest b/acct-user/upmpdcli/Manifest
index 6af2954e0256..0d0b60007e80 100644
--- a/acct-user/upmpdcli/Manifest
+++ b/acct-user/upmpdcli/Manifest
@@ -1,2 +1,2 @@
-EBUILD upmpdcli-0.ebuild 226 BLAKE2B f223bd96f4e726267663b6b49ad8787880a8310f070d2bf3af2399ac2026a5f005eff5b302e14f3d3d4b15dc87fd87452542ff9c38d28599b2af289a6a52f802 SHA512 885ccde303d62d6df25cba85bac6ef5244186eb2eec4e8dadab499b8f10ea335290e7454251b3c2a31dd53c3cb7b78e1b1fcdaf736a317c045efe536cd9da4a2
+EBUILD upmpdcli-0-r1.ebuild 231 BLAKE2B c50db5c6e723240ed6bf409c646e4b2c17b0ef62af65558aa2f4365dd69fcfc9fd3f688971db694da2cb1560d3fce8eca7ffa875204236513408e6fa5526ce86 SHA512 73f9ad55f17c4e6efe78a7e10cb2102109f832595d202e55aa617e284d5b745e623f6fb454e83c0d13925c79c8bc38173e8c18d7cd0e1b13dad74c05cfc4d40f
MISC metadata.xml 221 BLAKE2B 2d476ee9b4f837c436a8d48ccf3e1701c26fa9425db522f35db7eb9900b4b138e44d9f268157ad2158798ed289514445a8d67215d52276a040273bb390f54a77 SHA512 8ebc577b68909c54481d68bac9ad40cf736dd58107bc714adef6782eca59cdde7aca08edf3dd8f595138c6a5cacb8c7ff6af9633321f7dbf37a7e865da37bf0a
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/Manifest b/acct-user/uptimed/Manifest
index 23da8193eca5..4d3e477fcd4f 100644
--- a/acct-user/uptimed/Manifest
+++ b/acct-user/uptimed/Manifest
@@ -1,2 +1,2 @@
-EBUILD uptimed-0-r2.ebuild 240 BLAKE2B 11dc5adc3bdc778c1de9fad5208e7ef8d95b4beb51998c86ac48b3af29e232df1ba42d31b7ab1b1e2d91ed357fea8841f2662e0a41f451ab99c28f07609690b1 SHA512 dd51f5aee491dffdb2e2e23e06f2903ed9b8af464b58abb6017d8592ce26e4e7065790acac727d74b33aec5c627d352cf49f406936f59e443cf30c0734017ae9
+EBUILD uptimed-0-r3.ebuild 240 BLAKE2B 2def9236e775cc5534435101a21156910e0127f754a1ac4ac08eb189998df68acecbdcb939e2948ab398d245603c29a7e6b4fc3b7f23cd10ae1cfda1ae2322dc SHA512 448831a6bde24c5b02efadffb2aa2542d658857f0b465451b02f204f6b2dc5bb42291b715ffc56969272474170eaf84964f3e6e3dde19bf49f00652a5f368d2d
MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
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/Manifest b/acct-user/usbmux/Manifest
index 9ce4cc78826a..c6c89976c88d 100644
--- a/acct-user/usbmux/Manifest
+++ b/acct-user/usbmux/Manifest
@@ -1,2 +1,2 @@
-EBUILD usbmux-0-r1.ebuild 239 BLAKE2B 0dd6be66c31b6fb6b02d14a60d5da0d65e40d9706f91163a49a2afcd5c31dfbd55eaa45e9f7067af729013d18d3186fca807d1e48b650a8093799d38dfa092dd SHA512 81865b809cf0a5102511af564400f8014dbc77e143b6c9996679096c951b60224dad8307223c7df35efbdaf84547b4e08610e9ccfc480448e054923910342901
+EBUILD usbmux-0-r2.ebuild 244 BLAKE2B bd3232c9dc768ead3d68c5115941a4a65bfd47dd63dd12c8fa390cc61248cf5835dd65d2edbbf992aca0cf4c40a463b815bd139b257e7b10ec7a9a7572be1bab SHA512 c922c90a7db2f63c140b0d1750a6ffeedeaeb28356ad4da39e53ffb82e394fb06d6348374167b14fda1076687bd6dfc611424a714b2d181ed90494c4e06a0969
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ushare/Manifest
index 76d25960cf17..45054f364581 100644
--- a/acct-user/ushare/Manifest
+++ b/acct-user/ushare/Manifest
@@ -1,2 +1,2 @@
-EBUILD ushare-0.ebuild 222 BLAKE2B 100185b4ef76580c293e173d2b92ad08b91a7170340adda16e87622ca48dda5a6a287d2d7245be4763221dc21e574e664d70e67867f7937d35bd7e4611cc9947 SHA512 be905445552789caf076d3b4dfad08950add8e277bd2385d11fdc8709522e679501501a0d20d0aacd4330724b4eb940c55904ef83fb51b4508954d49dec2e227
+EBUILD ushare-0-r1.ebuild 227 BLAKE2B b72677b3e862147a46d789a89850533eb78864011c5a4afba0f09cc17423cfdee203e149e6cbce4f10eb28a448f78c4f82ddb967d40ccac8cdca127a89bf2bfb SHA512 a5c926ff6431b484983a9a80102aa72102d8ecfbb6b8596b3b4ed3c3506a27e228df4b95d5fdc6671c0493925ec2cbe7292388155161e3326df1c4a275a8dec1
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
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/Manifest b/acct-user/uwsgi_exporter/Manifest
index fd3a81ec4211..740b48fdf9d7 100644
--- a/acct-user/uwsgi_exporter/Manifest
+++ b/acct-user/uwsgi_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD uwsgi_exporter-0.ebuild 262 BLAKE2B 22587220b370c6dee95583d3a4a227ea9fe0264d61ea24777d5acab159e8623a7e28dd37498975d01310e35fe0f74a0b588f9736ef17ac90311ac97acfc0a84c SHA512 df57d00697dd1e64d3115b9c3706beb21f7f8a09e00a8c8e95e354c595cc59dddde85ce94a3f2e32e3dd5f49ecde1b0ff7f1c3e3560b16e3d9421f422d3fdaba
+EBUILD uwsgi_exporter-0-r1.ebuild 262 BLAKE2B 1eecce84eb6ab97fc90a138baa2321c08586c5030b0d58f22abd7476590dfbbbeb27f90483a031b69206a88748f02a9b8de13a61b0e3ed0790f17bb1b0db7f6a SHA512 f2c075e7145e42565195c1559c4a7bfc8cca613ffc030d88ab4fb9084189e1159006338802e3eb8d8af5116140fbbbded95ec863249481ffc568c7f785b6ab6d
MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
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/Manifest b/acct-user/vacation/Manifest
index c8baa7fca130..56ceb100cdf3 100644
--- a/acct-user/vacation/Manifest
+++ b/acct-user/vacation/Manifest
@@ -1,2 +1,2 @@
-EBUILD vacation-0.ebuild 251 BLAKE2B 2f90a12abd0d44bed2e78a576042011a79643349551285e00f08f14bcd3622ea26a8023633b838deeced25e0e0f88d6b3fc4502b786261afb5e06b75b3c9b6d0 SHA512 ff302e688ee57f27d223c42c5d69a27ffd6ed288740c290e7398088aef8148ea75680bf97b06bae1e6278db126cb8bd152b4033b5d928b1ab06231ea342adb3a
+EBUILD vacation-0-r1.ebuild 251 BLAKE2B 45a3fa1fd22e458bf6568341c2ccd0237cc4200e596b4345bce4bfcda108c77e8875ef5ccd448f7f04badea0ca2b1bafdca2c4a38dcb6dbb842b8c24fb2540e1 SHA512 7ec13d0385860989b94ad4e0da51770c283d43cace258e05591b48d6f2c5dab95c0051e9edff16eee8e180db59baefb88c2e1ba971737077342d5c93c5e664d6
MISC metadata.xml 389 BLAKE2B ac06410660acab2a286a3b05b8b7a555a2aa224a1367637df478144817edb912a8b6b7029214b1404d813ea1e83c553a53fa92069932a63856174039b987f501 SHA512 3871c02b144d3f4bc9d03a21b29d44e18fbe48222f753324810bec5f8f004a4ca94161c322c3b28b31526d4c2fef91b137a19e0397280608d5ef276ac8b9df92
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/Manifest b/acct-user/varnish/Manifest
index 49dd796a7f41..32bec8cf1371 100644
--- a/acct-user/varnish/Manifest
+++ b/acct-user/varnish/Manifest
@@ -1,2 +1,2 @@
-EBUILD varnish-0-r1.ebuild 287 BLAKE2B 339e3e77ce26135cf94988a3c0dd26f2ddc6f83ba754bb5f80910b3973c02bf8e34df9cb1685067959f0cb90d1fa74703ed935ea1f45f78c5e7e892983c75c7e SHA512 4ee44a2679a59f7e8535295f200730b8e1777e9adc65fba62c895a249730ad5e7280fc3cdd491abf4386ef4bf4609aee46b9ee497c8ed7a46551262e3d3affee
+EBUILD varnish-0-r2.ebuild 287 BLAKE2B 5689740b1642ca99c427d00d769b459b30366ae2fbc55f7f941ad4eb0302001d83a7a7d09547c6589b877891a9956aabe9fcdf428ac4e17cc9c2b66db84d7f08 SHA512 4fdb16a4da64e3222195d4dd5e327d2316c85b661a8f228947617f1dd3ecdc0b9a45a7f3d64316fb822315fa7f765482764cb2766d477e98def89496fb1ad593
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/vault/Manifest
index 218d20d6e553..645b0994d411 100644
--- a/acct-user/vault/Manifest
+++ b/acct-user/vault/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault-0-r1.ebuild 220 BLAKE2B c0f10627e14098b5b15a1aaf7ea25274ee7c541b9dff36a2e5d1fe44e104e889379154e9b33a5274ab076ea849234efcf74d3e09b954ed3f09d8fd34b29fee26 SHA512 3c9f21cf9b7131224f5e083b20bddd4e7220322ac8e8c84bac5532a2c1fbaaee44f6c5c42ff9a075251cc2462fdc03036331ac42a1323eff6e85de82ea05fd3c
+EBUILD vault-0-r2.ebuild 225 BLAKE2B 3bf68a3d7bf750c5f447ac1ae0f1485d999bab8ff09b3aa718bbcec3c53338e8d0a4ce77499ad2457fae05495e12cdad905204c4fead61eba9c76e35acc57259 SHA512 ba9a34159637fd3c59df3a0ede7e8b279877952e5ac066bfcd2a525a8b453fd5c0af93d748b17c2a7f615e2bd15c5f60b3090423405d5b16281f428510879a1e
MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
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/Manifest b/acct-user/vault_exporter/Manifest
index b10956c8ee8d..0b3862e1d192 100644
--- a/acct-user/vault_exporter/Manifest
+++ b/acct-user/vault_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD vault_exporter-0.ebuild 262 BLAKE2B 50a4741285e9e65efb2ece1ac814965cf87e50683bc6faaf94421af0526bc0378ab47f6077bf606621061db8ed6c90f0698919fa55ae40cb97232aaebce0aaab SHA512 00d91375e8e82e1270f35fad4e99fe917b5c83f16d204f3b56619fe4f1022388e042fd58e974e65af31819de6936241e44375c7de4f0875808e50b8cd054f4af
+EBUILD vault_exporter-0-r1.ebuild 262 BLAKE2B f0b56f58a9426d786e955c50f64712a82cb2d2fc3cda535c081d5a23cb17d6882338c2960799a4ad3d9416539a5ebb8b16b7b51a422baf4d81a88a24e3d1b3fd SHA512 acb1dda6d7766d259c9a80355e0ed157a14ce37fef8a928d43b6ee7b8e533f5b644d51737b5baab31210a4b8815086accc4bdef63c0aa64a67a57702cec7e784
MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
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/Manifest b/acct-user/vboxguest/Manifest
index b92ce4d79cf2..ac0490aff6e8 100644
--- a/acct-user/vboxguest/Manifest
+++ b/acct-user/vboxguest/Manifest
@@ -1,2 +1,2 @@
-EBUILD vboxguest-0-r1.ebuild 276 BLAKE2B 4a33892ee812adbb8f0b1933a178631b351bde885f8f264e74c53b81612761c2ea8412f4a9eef9f4dfad58522319cf17c240484cedc5daf3755782849cc0fc1a SHA512 1227ef2412cff5bae41d11fd42fc6d062562c50ceb3c41496b6e3bda1c1eb80db921ed7eb79d786948cede0326e7cd72c1753f64c3cab7bd975a15e1920f547f
+EBUILD vboxguest-0-r2.ebuild 276 BLAKE2B ce0c6be7b81744307906b2f7d111ff6fccac7ce50572530489d9b81c6133c17cc1adfac62731d8050602ea8aade34b013190b1dff12156e84f6af99a11365ff4 SHA512 ec12339422ffb6a3a4e303f715ecddd14a5648d624b12cb6dc0d713c0daba315342a9f4cfe987c3475bf940e0b8e079d1a0a1074df7f4b25bbec7f3434958bf4
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/vdr/Manifest
index 352c35d6ab50..4a6769de00ce 100644
--- a/acct-user/vdr/Manifest
+++ b/acct-user/vdr/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdr-0-r1.ebuild 1972 BLAKE2B 629b351969cc6e5cb5960619ece6daa4035a2098186e2a0ff1a325f2f01b6c7639bd2ae0cda9a5d24ed1905be1809ddfcab1cbe707b2ce6cb91c2afc5ac56935 SHA512 d5e131454b5817069a38b2479d6718cbbe78d154b43992b7d40bee65a6c1eaecf972465910fe791cdf139ac8957979e63d73989b0f6865e2f43de331779d3251
+EBUILD vdr-0-r2.ebuild 1977 BLAKE2B a04914f4fd2eda6294988aefe51517d855d36f505f268caf07460310bafc97b4f8ac3ceb47e4d2c32cad16f3a1064c31643be7e73914fbaf2bb58c8174557016 SHA512 3e90b247faf6e910a713497459d8fda5de7d5388b4d80414c774df73a2f19f09f962a9b2700267f4f7d21f80ce056384190bc388d6200b93252f901586064205
MISC metadata.xml 1006 BLAKE2B 20307dfc3e06caad49997853cf0e6349243b6cd464fe83346e93369d7c691633ae2882f3b6c0c700404fc3dca0013b36a320c32d3c236199221561ddc6009b00 SHA512 90da2b83cafd636f6be7d6a10ba281a63d9a10e897e6108abaa9bf88625a5431a3a527aff6c918fec8a5a8d59c41844f0e7ad3ddac5ce4fb19dedfc76dafc1b1
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/Manifest b/acct-user/vdradmin/Manifest
index b559c85617c5..dadddabdcd65 100644
--- a/acct-user/vdradmin/Manifest
+++ b/acct-user/vdradmin/Manifest
@@ -1,2 +1,2 @@
-EBUILD vdradmin-0-r1.ebuild 305 BLAKE2B 359e195282f1ddf53fda76e1976dbdc67f9a414cb22bcd4e1e091de408509bcb7095ce0f84263c69276a73777bc387e4372c299eae6831a137bc76aabfbb4db3 SHA512 d384932dc59d8a8fe8b45ac0276fe0c30997d94739e3ab92530dc61d1f0aff14b13fa5c37c50b5b849877ebc2ab268fdbdd7345b678b010ed2949580083799da
+EBUILD vdradmin-0-r2.ebuild 310 BLAKE2B 66122597cf9fd9fcadc8f93724be779bb0797e088991084a7a082a608d1cb6176d009d49a5b815898c4b6265d87c691d8259fc4e023cef50dd1724ebc75cbd15 SHA512 64ceea49884eb17bcfb5f8a22d3d2a613fcf1f8b13f3d48624cc0c21916cbbc415e38149eab79dd8f3be9d48fc8564fb615ed2745262328be274f6c90dbace54
MISC metadata.xml 246 BLAKE2B fa708d64ea2840e21fa1a00402de140be19ef4c1cf90b00fcd40f2ab10fe5e1397e5bd0a259162c3571a01056535d42d4cb492e97e6ae1756d38831019463db0 SHA512 503c7151fa63101f3a082546d033ecabb7f5ac47f752200d450faaa46c2cd6dfdfc387aa029ad8cb5786d91f7217a3ba64d92dc21ce9268de823fd58feed7db6
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/Manifest b/acct-user/vnstat/Manifest
index f0965403756e..441c9cc5edca 100644
--- a/acct-user/vnstat/Manifest
+++ b/acct-user/vnstat/Manifest
@@ -1,2 +1,2 @@
-EBUILD vnstat-0.ebuild 241 BLAKE2B 5c5877ed7fd47b7196f62ca71cc4225783970fa35e76d0e82130864d0ccc6bd8e3abebd98261ed064a14cceaf7d83321fbaa04ab67455adccd7b10fc670cdb04 SHA512 0c74e637fa4bb6fc1e09ca67a723f18477efc10b2790ac955ca2472f1ff744b5fe10242a2a7f6316838f44a0e7eb9ebcea43d99b99c5d73e258430ff60bc5705
+EBUILD vnstat-0-r1.ebuild 246 BLAKE2B 2944b091154692403186822fa6c744b492ec41d74d2d6926fb578bfc002e2f9c1a1c2e627e0bccfcce5e85faba3e6c5dfec61cdb54611c0079dff8013d38715e SHA512 7045409f5059ae95dea1c30cce01c347352bb0eb46c7866ad53a58b121a2476300bd5fdacdf74e9ec4979494487a741038418953a9add1af5bd6c892a6996fda
MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
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/Manifest b/acct-user/vpopmail/Manifest
index 6fc83181f56e..30f914233db8 100644
--- a/acct-user/vpopmail/Manifest
+++ b/acct-user/vpopmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD vpopmail-0-r1.ebuild 259 BLAKE2B 7979697a3b27841574a9489797bdd95ee6e26410e678314a044f6b711004a79c7af6f27abfc7fe6c834c759a546126996f477b6a3296f17adc830dfcf0d43032 SHA512 4a8464ff13af5f0dca49a2d4491f3fac6be23149c84293f093f73af7728ed912a296dd8ee28ff624d9fcddc25d50beeca7a731895c4ba16388f79ed43e1e0fc8
+EBUILD vpopmail-0-r2.ebuild 259 BLAKE2B d3f509bd19e62f97395938a08ce44766db82610d4e14960d742caa19533d8081f5c89565b99e71f551b1f24e2c5ffbb2d8768ee33d24f42f25655f6f32c31a67 SHA512 c53c4aca2dec2ddd1474d69e1148f76806e6dcd2c1e66a9da6089f7696c27413280c76b58fffd17e726e54a96ccf4b81cd5e5d31d61f7dcd4e79b6f37f3c9d55
MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
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/Manifest b/acct-user/wesnoth/Manifest
index 3144eaef0215..6027e176dad5 100644
--- a/acct-user/wesnoth/Manifest
+++ b/acct-user/wesnoth/Manifest
@@ -1,2 +1,2 @@
-EBUILD wesnoth-0-r1.ebuild 272 BLAKE2B d4b0732715380974feaeb099e5fc537c4b50d7ef6c1767dab8434f9d5ab0fb8c567fec72f6d10550c7628ef218dac7f3ff21f17cb956b2af04a82f6c6e6a7d36 SHA512 046c74d8174da446ffae33584706b828245be3990af292dede5c8b8fdd407838f67b4630516e6bcad7602815f5307ef6982ad1ed1daa736a109c36d199ecf2e1
+EBUILD wesnoth-0-r2.ebuild 272 BLAKE2B 1526fc0a6388b0e32063077767022228645d11c070aa267ba1067db0b5fdbf82071a3128c2400847d4cd394cf57115581682fe9398c375391b7dd6e3e4003d52 SHA512 5169cdef71754e95466bdf998c5982b1e322218205e923dd88e6190f8bd700fad504caddfbf6145d26fc712b2bff2dc2bca5e0f4d1786291d4e77c8ec8d8447a
MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
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/Manifest b/acct-user/wwwoffle/Manifest
index e70aecb23d16..280b50a2f1ab 100644
--- a/acct-user/wwwoffle/Manifest
+++ b/acct-user/wwwoffle/Manifest
@@ -1,2 +1,2 @@
-EBUILD wwwoffle-0.ebuild 283 BLAKE2B 2068ad2bf804da3d40647d35f76517bfbc39d972582639d8eaed65e2616337063870f28da81ac3f338e69fe708dd6c38d2494d64eb8fb30abede241aa1f6b493 SHA512 478e83fdfc2f24281ca4cc5a6fe1a9da49f5bc952cc07bcce86e4c5e13c98ec2673159fd73fabcb2cda262dd0c5c5c9733c62e2f6d73666e2b27c48f63ccff6f
+EBUILD wwwoffle-0-r1.ebuild 283 BLAKE2B d885d83b5eff9b709a48ce8851073fa357edffcf66cbec57a16f41fe4ecdad1bef98695381568b721894d49525bc1147c91255d941f350219db7197000a8d503 SHA512 5ca0285ffeeda456d04b80a44c8deaa0cd11ec79848192edb8fec88cb3f556ec96b92726c87cd21b68f95fa071bb62070d655acdc878f49c71d33ac8d8e3d0ca
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/x2goprint/Manifest
index e1bc13bea778..c7a713ae4287 100644
--- a/acct-user/x2goprint/Manifest
+++ b/acct-user/x2goprint/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2goprint-0-r1.ebuild 281 BLAKE2B 2f5bcc1f8161991fe5b3ace5ec4d9398dbb8f6e0643a220cc3458e1c6abfb43f8c6ba97bfbb0bde18b857a6ff744e3ec823f53f4046ee56bc2ae15528871918b SHA512 aa5048650a20bf37e349698d4c215d30f9961417b3a969db4309aceea2a1ffdbd31736e34344502c270cf7ffcc14551af2e9d363352b99198e4f44b7cf2c2a3e
+EBUILD x2goprint-0-r2.ebuild 281 BLAKE2B 26c8f9b438b0dbb2be2a01e9dc331e5f023f22bd25793ac829ae0fbefb73fceee45cc66af26dc3ccda0b1b53c30240be3c58e16e255eb709b45781781f98688b SHA512 8ea215ba40272238428be21dec49dcf8233a8a32383c6774b3fb821b0b0446f1421f80d4c5a92461f709eecf704efa84b5dbcbf12320fb68c0ca4ba992acd8b6
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
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/Manifest b/acct-user/x2gouser/Manifest
index aa62c58a6629..736ef3568c78 100644
--- a/acct-user/x2gouser/Manifest
+++ b/acct-user/x2gouser/Manifest
@@ -1,2 +1,2 @@
-EBUILD x2gouser-0-r1.ebuild 273 BLAKE2B b5ef6f55e14461cd6e88603697b18b04469861c70d2b47ceaaf20ce7b7107cdca09f54ec50df26224d5a7cd8cb5d9f396107d2d273f7b69f90a1bcbb6aa54675 SHA512 0932580f26f4b870c7b6b0df62bed14ae7e7bbe401549bd3711eaf72c661ce77fa9085c1da4924fed732b4189c5115080375ce98f1f7b58aea7f654af7fcc6b2
+EBUILD x2gouser-0-r2.ebuild 273 BLAKE2B 19c4cc1654e4f54a60db2e9c142521e897712374d3111cd79ed80a929cee47bdcd172370927fa830aabc6b0db6c1e22257472c2e8805608418be668c47a401e5 SHA512 0b3e7a25a19a0021b48351b247406bbbee7d8caad6a48634c9ed7f42de592c5832ae0f24c982a85ebab1f2ce6b4db65e6279188d34337ba7d86fe95c5cb242f6
MISC metadata.xml 249 BLAKE2B 0153132cdbd5cf2bbf3128266a23cd6da1b13a5f4aa4205154950d10c484b1526502e508661fea461dfaa8f8d8ec658c6b594cac7402f45d1838ea192bbd2ef7 SHA512 51fb51c4887cec036eb0b057678e18cb6fb302c9e90f2b6a58e73bb826a8d4f07ab2d936336ac0606152fc2686ceb3435552b21df2d78f61535aff042b93839c
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/Manifest b/acct-user/xrootd/Manifest
index 7ae80d4d96f2..1475a0ff186b 100644
--- a/acct-user/xrootd/Manifest
+++ b/acct-user/xrootd/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrootd-0-r1.ebuild 239 BLAKE2B 0487d209a3e2a3e379394743272b9e29f5622cfa67ca1622d457909ba7cc1fa515fbf87cd6832389b3165a98b0782fa56f29c7ca2b7e52b826edbc6f30209975 SHA512 a4705afa9d2a91f83b6b260e1f5d3a58680bfda51099420bbbd5c81cce4328ef7e523cd3f15a4346e43fc4abb18c5c8efa71a8deb9aeef896ecf7e9c9ec5f22a
+EBUILD xrootd-0-r2.ebuild 239 BLAKE2B cced29616d0bbb2da3fd22ea12f1ed52ed0f60bfe3512f86261d9b09686f6a5da959fff009b200be2cb4a175259862d05b61f19edcf0b2710d3e7059e9737e9e SHA512 7f3815cdd78e6ccac51848259624cdbd39a75c36696d7fe3d5394f90d38ab451327e601bb376a35a509399dbde286583925960919277d3d41db7cac5d5247af5
MISC metadata.xml 262 BLAKE2B 093caff295b61da046a1c332129214863d756e34173d312a86e6498fc7345fd442f3a2205ba01f4172ddf1849da6af96d26adedccdc4f152effef297114489d2 SHA512 645a336e558a631af5306cf43d6d49fdd665ec8cb2c1152fc535b2079849bd2e3cc2f90f2ddff68400342f636d73ea4cafa0d3f3016b7677914acf97e07593e9
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/Manifest b/acct-user/yubihsm-connector/Manifest
index a99efb10677d..af19956d4e24 100644
--- a/acct-user/yubihsm-connector/Manifest
+++ b/acct-user/yubihsm-connector/Manifest
@@ -1,2 +1,2 @@
-EBUILD yubihsm-connector-0.ebuild 256 BLAKE2B b9f4e71de2acfbfe8c69f3e229116f2f543beeee85f1bcff3bfac59931e2eccb7fc28b4bcf4fbda4ff038da6188e20e64a1b17cce9e5386b07ab0bd1094efb33 SHA512 fc6f05712f3eccf9b998ffab3cf2ef0a5f5c7e539ec54de9e740aba01c996ebdc19ff4a423768a95b41f062ee650e92f36b38c274190d90d2d7a355edb286f9e
+EBUILD yubihsm-connector-0-r1.ebuild 256 BLAKE2B b9f4e71de2acfbfe8c69f3e229116f2f543beeee85f1bcff3bfac59931e2eccb7fc28b4bcf4fbda4ff038da6188e20e64a1b17cce9e5386b07ab0bd1094efb33 SHA512 fc6f05712f3eccf9b998ffab3cf2ef0a5f5c7e539ec54de9e740aba01c996ebdc19ff4a423768a95b41f062ee650e92f36b38c274190d90d2d7a355edb286f9e
MISC metadata.xml 251 BLAKE2B b1977a04e8904e65636648bd24804893bc0a317a7a20a8b4bac3874f0529dd15b2c058b0002b13febafcdfd93cbef59ef7bc1c646f3996c381b994d384b73ba3 SHA512 25f6fc31ee9e87d78b143500e706ac3417896e67a183470867130b23a42ec8ddd4cdd9a1da40f32903085ee4add969b4b07466b90fb0275308a2518d2d73a270
diff --git a/acct-user/yubihsm-connector/yubihsm-connector-0.ebuild b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
index 1997a39e2cc8..1997a39e2cc8 100644
--- a/acct-user/yubihsm-connector/yubihsm-connector-0.ebuild
+++ b/acct-user/yubihsm-connector/yubihsm-connector-0-r1.ebuild
diff --git a/acct-user/zabbix/Manifest b/acct-user/zabbix/Manifest
index cd8c65e1b24e..ac277f4e1a72 100644
--- a/acct-user/zabbix/Manifest
+++ b/acct-user/zabbix/Manifest
@@ -1,2 +1,2 @@
-EBUILD zabbix-0.ebuild 362 BLAKE2B 8672076196fcce609e42278bf4745b4c2d9dac7c1bb42a5c31c3da6808fa09765d682658132390a7fb8420d64a42539841f4c2de124fbb4e4164f36f2d518702 SHA512 78ead6c3cb34eab55461f95563c9fe6fa75570cac81ce6197fc5e7718ec2cdb72f130a372dca4f76d61dcce2462e6ab20975b6ef62bea545e471857d72c09785
+EBUILD zabbix-0-r1.ebuild 362 BLAKE2B 9aaf9bb25b83776d0359e98843b0137c08bc121a934aa6d30fa2ec06147ee8c9474b9f1d1ae6f013e8f8f76923b3dffe92c921a3f11bfc04a26df18567cae0ec SHA512 ec5c0045820d62694af75a22f5c5f09c3fed86d70093e8211db71d515aae7d297420e20063d883d7d1a0f2678b7420fbd23c1f2dc46c300ab2b6345c564bdd1b
MISC metadata.xml 250 BLAKE2B 2bd2a200020745da1f097ec123623682c370bf39f88991aed60c1682b0c18f56a698812a65e2f63699cf61fb6f433bcfc91de65b77290fe6053ac122a3ee21cd SHA512 bda67aad1f4c4e8949671e4a7a0e757359b53050f6873aca15fdaeea73064e1523143a8e5132e2f665770489442f0f6aca1d061577f6a5befbc59f2bb52ce62c
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/Manifest b/acct-user/zeppelin/Manifest
index 8473aea89d78..8ff27f3e9a51 100644
--- a/acct-user/zeppelin/Manifest
+++ b/acct-user/zeppelin/Manifest
@@ -1,2 +1,2 @@
-EBUILD zeppelin-0-r1.ebuild 309 BLAKE2B f42bd9dcbfcedfed857d7d67c44dc0e7087be0e5af06f2a3323d5c8fe0851ae61af3e1b5fe4c7ef08ea8019c8b2fd8b0a8410c28592dae20dc72264041df595f SHA512 d1a7209f640bfc8310f8d6fe83f80bdfd3b99890f95d4a06cfd15e8e106ad612e69107f8a7bb7aea994fab67555a56cd6112030a15adf8eda6b0eedf3999187f
+EBUILD zeppelin-0-r2.ebuild 309 BLAKE2B 561a8842ea282ae6bdc10919d96cf1419ad520712d8c30de12e7db651a419005938a1d36e5e94790e135dd07d8993995741b8088dcfa4cbf970f06fe96b05b50 SHA512 7cd898d5ee551a80fb5b72841ad1ecb3fa5dca9346e380ddafd583198d4bf104e23ad30c39d13df66c7edb196c2be61fb955aa49c4a6595c13da4d2c099da92c
MISC metadata.xml 342 BLAKE2B 1684316dabed0d0d2468052855244c3bb2504173b417c5b6f9ff9d2263ed3adf90d406201e19ca132d46ef7a5f072e571e8f16f9f5dc0a95ef0e0723c229ec5e SHA512 cb9dd8f18c328d49b61d1de97b20bebbd1261e944f7a56949e1ce72e7b62413716d83d77f72bce4387fa245d3414fe1b379f0d283487f7be55f2e2c256718a68
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/Manifest b/acct-user/zetcd/Manifest
index 7c577988f9be..59169b5b26d0 100644
--- a/acct-user/zetcd/Manifest
+++ b/acct-user/zetcd/Manifest
@@ -1,2 +1,2 @@
-EBUILD zetcd-0.ebuild 242 BLAKE2B 7376603daaf30471ddead48659ee7e317a39b9a80c418854d23e456a29f578552b2f646491e9be7ffab457a418a3073b53e733bd5cef607785305a3c644e096b SHA512 b048a7944681b4de7917ef972be01b3f16e14baee92cb267b1bf1f1dda1380ac296e5ff288279019fef5a27f5f106665d6a99561f4cc72f11024f10425b3a11f
+EBUILD zetcd-0-r1.ebuild 242 BLAKE2B 3cc558fcdd32b9435caf230260c8ed37686536cd9547f5d4f1ee01530e4556b9124b8d21bd1d2cd23970dcd270f2231eb051e5a4e7a0648ef4200c962c766d80 SHA512 cc3a04cb36862b87eda1138b99a3d66c080812002183e5f99ee448739bdfd1ebc7dca2ca2096da367085aa0f6e9c451bd14b0b7d9a8d02b32d12d0063491a891
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/ziproxy/Manifest
index 497a3ec0b976..dc3df0772235 100644
--- a/acct-user/ziproxy/Manifest
+++ b/acct-user/ziproxy/Manifest
@@ -1,2 +1,2 @@
-EBUILD ziproxy-0.ebuild 198 BLAKE2B c87c7027f6a209f3bc63222cbc919368163af6455e3be36592f9335f7f83c1db4159a42fd647ab15bbfe6ce1330e76086436b97c9235e39dca9a285dc5ad222c SHA512 174a0454c88a39b6c85885a876fa644fc969ec2baf3ad6ee787957cd717f2262d4a08cb4ba25de76c6d72995f1fcfd31f2cbf9cfe33acd2bd690f743dc2e59f2
+EBUILD ziproxy-0-r1.ebuild 198 BLAKE2B 3fa3f4a1728872a0944219f030fcaedcf4750410d53763be622c3280252a1b992ebb09181702a3cb8199997ced7925db1917c041f6b8862d3fa7848668c9ee8c SHA512 8d70b3a2e04825f3c25529fbecdde22391dec1b12aa8df32f152c01888e022c391ae31c5111118a1ec81d7605491b55bbc3f23a18c52ba62c6a4191cc7c6d091
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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/Manifest b/acct-user/znc/Manifest
index ca8c327fa576..b5d389d87a4c 100644
--- a/acct-user/znc/Manifest
+++ b/acct-user/znc/Manifest
@@ -1,2 +1,2 @@
-EBUILD znc-0-r1.ebuild 358 BLAKE2B ec1e6319f936e475ca1ada9e638aacf0c1894290b3981ffd3d04b62bec972ebaad2c35ce54e886dbbe2e1f2ee3d2a431ff626d5a7be69d18d1b1bb88f371b4a5 SHA512 7a77c6ff3b3c36c4960eb4df54b02d7f34dd661b1ca5c9f5e352bc993fb316d557c7cd9562911ef74f9c1cfa51db2637ad30239f87d73b050d3e76bfeb79aad1
+EBUILD znc-0-r2.ebuild 358 BLAKE2B be3f7674b1a30e7388da85ed69de0111b1ce3036b05355f801f6bfcada7161d287ffc8b0b42d196876dfb871660e8de44e5083940713d0868ea9166b1e06cbb4 SHA512 392c1d59dcdc86ca55fa468178747db1fd0b3552170919162efa20b822999eb6a48b7f24caa8f7d78464db869d9047394b2a3ba308d9ba47e2a9a149bd8a108b
MISC metadata.xml 246 BLAKE2B 44dcca1471ce0722ca1da3e771bb70c805e281f67729dcdecf7fc9ee0ede301d77d98030b983f93595a536765bb6ea8670e9f3c09d55601922bcda31182cdcae SHA512 dbc08bee1b49ffad36fb1317628955b988f7fdaca5b9cc04bc61710a8aecc0f39d9c5435553b42fa4ff97d9f99310f28ddcf6e1bd3994cbdbc1ee3e79c5b0fe2
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/Manifest b/acct-user/zookeeper/Manifest
index 21864383cfd5..d965cb8313a5 100644
--- a/acct-user/zookeeper/Manifest
+++ b/acct-user/zookeeper/Manifest
@@ -1,2 +1,2 @@
-EBUILD zookeeper-0.ebuild 292 BLAKE2B 9d0c12d3b3933334e377d152b8b4ef249af4f2837e97e59be2adabf57ee34b85784a37838af9103aca60cd566cbeea0138ed8b19e0a891b27a8813fe6b95e1e1 SHA512 e5c7f2b36a353b9855e87127bb666d4469a28ee087c9a934bdd06e538b34cf60ba2476bfb1ce111ddaf7d90385eb410df9bbc83039a65e9551eef1e7b7e3bb19
+EBUILD zookeeper-0-r1.ebuild 292 BLAKE2B 6a7d023d5fc8a77b0569b422d795c5a4f52e40ade691c5faa3e5740a6e72cd44c519d650bd54327fa496e53319eda39552295a3090acf55d4ab9a759468d1f1e SHA512 709f5230999007c555bc7114a872f10a0cd201142e329f844b714675fd0863aad54d5337cf948f13703525e3baee9b25bb9c2469c2b6321ab8948c5cc55291ac
MISC metadata.xml 366 BLAKE2B cade4c3fba00dbf1cb9357bf0fcb0347ed6f6162584250545c4c426a86c71cc82de6f7ae39571943d15e8ea32330e86b546c2135c265316ba5dd127472015451 SHA512 5fafae2b9877b5d46da31662ef3b76ed51604131f23548e945014c73431af0462f169b9dde330a2d3be1f079acdda204df351f3784bda51f14a089bdca2887d8
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-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 35a0c5c69103..258b1ce35ff8 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
Binary files differ
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 448f4428034b..f72ccc1aa779 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,5 @@
DIST diskimage-builder-3.30.0.tar.gz 527303 BLAKE2B ef364ad61932e56579c150935d247ba83a5d8bacf4aee196404f71304b560081fed5089129c74f4d3b3d6054165438dbf150a6fba41aaf4065b79cdf747e08f9 SHA512 aa9580878a4606069262022117abea6e1e4f9d1fb0f5951ea2b47486e844b2bfa330033e627c6a5bd8d50d97bf595a3380ec5b084199192c6b34849c41fd2d5a
+EBUILD diskimage-builder-3.30.0-r1.ebuild 1147 BLAKE2B 0a2b1c0b02c91e39b784599fc72eb00fa640250a504f31743a8d08ebdb6dcb4a2ea7c2adc9b1c615db51f76b6cbe26ee97d6d6753222e1780e397180f39b061f SHA512 b71f155820cbbbb8f02e84b3dd0df18fe9000349d3e1a1006244c56c210490e622e16fcbb37c1d86b94424feb63a64d2fe4ad858154e7110bf7a033f738a5acd
EBUILD diskimage-builder-3.30.0.ebuild 1105 BLAKE2B 426a38791039e008b22cdcf2c23f9b58121548ceeb6eb3ce175ac744cd57316960e89a7690044473dc2334dd589bddd856e638f54e4caabcbf0b2d41d91ef6f9 SHA512 4aa2831e7378730e3a269f74ddc68aeb1b77bf5c78d6e0ccf7558f2a98eca29346bce232b33f763cd33e1799a0273046fe18d7232025101a2ee0af288fd457d0
-EBUILD diskimage-builder-9999.ebuild 1107 BLAKE2B ad3df486c212c27651e378622ba558ba17732dd028467a8264d4d07da821c9ce810366f402853bafb30822d9c89b70ec869fe9a8b99b4f92d5c6b01ac7cb1ac6 SHA512 beabcbaae1bdcb72dfb145fb9781bc677f18042733b60c271d3163bccb2f5730f6dc3b5be2d950cf21938138bfaa6be6d7a21e4b911ae7a6f522d9e912e0f75b
+EBUILD diskimage-builder-9999.ebuild 1147 BLAKE2B 0a2b1c0b02c91e39b784599fc72eb00fa640250a504f31743a8d08ebdb6dcb4a2ea7c2adc9b1c615db51f76b6cbe26ee97d6d6753222e1780e397180f39b061f SHA512 b71f155820cbbbb8f02e84b3dd0df18fe9000349d3e1a1006244c56c210490e622e16fcbb37c1d86b94424feb63a64d2fe4ad858154e7110bf7a033f738a5acd
MISC metadata.xml 719 BLAKE2B 872a4d37e8ddb2a28eb85d18cd88990934327bc23194f3be9e5dea03627a6169987b246a93b50754cbe5e331f8c854a808bf307b70521c481d83b846f7385606 SHA512 d151fd95659211b2057ef0a61a6020e2f9efebebf3d7c5e1392ddb9954e3627e1040f2a9fe84ea4caeb65a745411fefebf2d896bbddbe0ddbb56acf42d2fedc3
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-misc/Manifest.gz b/app-misc/Manifest.gz
index 0605dc307add..59c1f9ee1495 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
Binary files differ
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index 9684984934e8..175d00675031 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
@@ -305,4 +310,5 @@ DIST xterm-query-0.2.0.crate 6342 BLAKE2B fd6a99cdc190d4e7bbf03467f1493c909cfd1c
DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
EBUILD broot-1.22.1.ebuild 6744 BLAKE2B 05c4f09c09b9cbeabb28110ea8c3c9f23312276964ece128ed51606b4c2ef0ec965e4f325a4e331bc411832d9079ae6a6d8b5473d0dae9453ae29010f0baa6cc SHA512 06bfe212ff23074ac46fc56e75afb7c131f385c7e0091f3ebb6ca72405b6d38e46f0b0c22216c66e36a54ac03281c41cbef181653c3cc6e49e08d5a1b392d5c8
+EBUILD broot-1.23.0.ebuild 6745 BLAKE2B 0282b236286b3ec5d3ae660ae0cfbed6b4e89090cfac0319f3d3cff48a43628cc4377af3892c8bd339ca7ad491020726f5f0b70302c63d061c4db443755c29f4 SHA512 4d5d4e1b760ed6dc16b741fb7c09488fc85645fdcfc9c14dcff62d0b42d097e1af1bc9ee5f2fd4781032a9af6d23dc144517d6bab274a8b95b878bca4ed7866e
MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
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/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0f637479d938..3d748e93e51d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
Binary files differ
diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest
index 0e173813f96f..777424d51a80 100644
--- a/dev-libs/apache-arrow/Manifest
+++ b/dev-libs/apache-arrow/Manifest
@@ -1,10 +1,14 @@
AUX apache-arrow-11.0.0-shared-lz4.patch 456 BLAKE2B b6c8263ac0cf52e49004836ebd10095aa35e5261265f273d7c22dfc6b7a90ceae5882b9c4de51674f11e8b96e84f881141212e197a80dea9db567da7c033a3ea SHA512 11fab04e1c1da46b6407c52a3bfed12e7bffc36046dd8dc379d1a368010f01eaf7b5f791ecb9fb4d15dd778106b401663ea8c1aceb80e799201b71837c18203f
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
EBUILD apache-arrow-11.0.0-r2.ebuild 2769 BLAKE2B 5980db7dea23555b53bf6ba67114fce657286aece4a9fa88a5c4a2d54a6ce63849442ee77c37ec80f65abd55557676e0d7f6c5162627c681c8887c0c733ffacd SHA512 dad0f7bc837131e3380577e05cb33d4eb19754378ed6174ff5105061028a47dc87ee3c1646b0356283b0564a0d0a137babcdcf6cb1a8faba2ee0924b9a8467cf
EBUILD apache-arrow-12.0.0.ebuild 2811 BLAKE2B 0904addeae5d3e83b646f68441cf07a79b40cfdda7e4d66f346a65979bab86d44a0b1f998d00399341bb8c5b315e0cd0786821dc6219693a48cf13df580e4890 SHA512 4b670550310209b3380bebaaaf45a43a1c3180ffbb1ab989fc8856059011a2f3999efa39e186ed4510e66d86a7939fc60c062c15a1b28f7164cbaf1019458799
+EBUILD apache-arrow-12.0.1.ebuild 2811 BLAKE2B 0904addeae5d3e83b646f68441cf07a79b40cfdda7e4d66f346a65979bab86d44a0b1f998d00399341bb8c5b315e0cd0786821dc6219693a48cf13df580e4890 SHA512 4b670550310209b3380bebaaaf45a43a1c3180ffbb1ab989fc8856059011a2f3999efa39e186ed4510e66d86a7939fc60c062c15a1b28f7164cbaf1019458799
MISC metadata.xml 867 BLAKE2B 0b986de9d0ee6588aa890f0b841f5a7f8da2798b5e7049fb9914dd20a4006008b84fd13829a4681671c775ea55d5c143120a8b2f025d227513998b8b2034e5d6 SHA512 3e3c0ffe114a8eafefe6979c2f29e463f09fabca6709a4bfd106c32976090eb0f1013ef8abe922aba4120161f3057d2b6a2f6006e1a697a11f173ac5ac9deea9
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/Manifest b/dev-libs/libxml2/Manifest
index 2b83bf97ab42..816bb086a8ad 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -5,6 +5,6 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3
DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
EBUILD libxml2-2.10.4.ebuild 5626 BLAKE2B 84a0bdd6b327e1c8232070cbc98a28efbf82f5cdda7677d4b136b46ca80b3b70eea3965f07d7408179109a54d4a8b345d14cd110cb2debccf62646cc5153d620 SHA512 73eb93d00a2772710fa8e89edada77c23f44e877c8fe226aaef8ec20ea57ddda3239be31da6b303f567c2a7638e2b48c3d9c55e15048c96693854b19b0269db4
-EBUILD libxml2-2.11.4.ebuild 5440 BLAKE2B ba8d648bf9bd8af896276a45502ae22a2e20d9ab38494f2c7a9eb022aa0e90debb3bb5cd107579aa02fc9994395b2f2777ace4dbc7483034a2e06ef7dbfedca4 SHA512 86a6cf47225cfe20e3f32d867889b28c604289460945e684f71cb70c60bd51ae4f486df03e3bac9e54b7de67a1f722f76cf87562f2f0ac5261eb1f44583b869a
+EBUILD libxml2-2.11.4.ebuild 5439 BLAKE2B da677210ca956baa81e38c23627d0a3538b73eb94184e798be75f1ca45d505289e63e4bddb252686b8893f116f79584a1e5f10e013bf6166735adb60ea924878 SHA512 3d70ef7f039d8c7250daf9d7d98628c683a3c76d57834b044f6ac51cf09a4e231123b502ea9880211c26d2d67d8e741aee157833d7cf4dca0cafbf04243111d0
EBUILD libxml2-9999.ebuild 5256 BLAKE2B 6ae063d26c31b7fe9ddc30795a5ff5d22a85122ab0411038b4b370da3bf70682dd41650f5545ef8956139657be072bf8cae3047d2daa4adec68ecc9c3918e4f9 SHA512 010721d7e45da7da6441366f5a4e2ecd58bf43acd10deb51d0b4cffb540e2cb649fe091b9afe2aaea76c2b5c66cc23d90ecbbfb00de357e24691f5589df5948b
MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.11.4.ebuild b/dev-libs/libxml2/libxml2-2.11.4.ebuild
index 666a2465a7d9..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/Manifest b/dev-libs/libxslt/Manifest
index e215dc3a877c..0535bbe0486b 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,6 +1,6 @@
DIST libxslt-1.1.37.tar.xz 1588572 BLAKE2B 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8 SHA512 a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca
DIST libxslt-1.1.38.tar.xz 1576676 BLAKE2B 9397be8b223bd68b326b954fe6a749a269e969b4669747678715728f553916c23475232fc2894a5e4230e15b031981423adeb8f83407f4db8075a784c7e6a55b SHA512 2836bd2990b95680db0960ac4c465d0c6c28a293ad095a224c05021a1c8d2576a45e41da8947a31f4ef3e6ef368cbda65243661e311c9886c19694be5a7c9a8e
EBUILD libxslt-1.1.37-r1.ebuild 3094 BLAKE2B 79420465dd0ece4b8bb2c8c537e30b47c449cb2fa0366ba999e0f77f9888acba8d9470c97ce2e70c2721642d079f5192c2aa9d110c8d824e462e2e84bbe2c0fe SHA512 1c5ca970a00af6fdbedc27480850aaa85981b10e9e1efe5d94a4d451166537854a48117f9c56bb0828e0535c0f6a184f8d3617163523bcebd9c365945d7630b6
-EBUILD libxslt-1.1.38.ebuild 3054 BLAKE2B 2c78533e20fdcab4ddd60036fd322dda821044aa0d6fc58a6268969017a8302cfe7f8dc5e045deb99f1389a0aa8228183d9605d3c79a4795f1ce36ba5be24db8 SHA512 b6377a0e7988b423b161e111f0721c4b643f484b713efe8670c1571c03c70c858ab23e6bb130b4a61a22121f56a059428ed4e6a6dbc029b90f011a2231f3274d
+EBUILD libxslt-1.1.38.ebuild 3053 BLAKE2B c51be5bd53b09a83142cd24b8359a73fb50cfec177635746fc5364b05e8cfc24d8cac2d4968d10991002619d5960eef1ca035c9eff72c6537352f7d0a4a23775 SHA512 0b10da5f794feb149428cce440638fccc4b4a758d749d353aa5a3496d003599a19789a1c788ee878cda03f3fdb52326f85d3183d1426b7799838acf2f62080b0
EBUILD libxslt-9999.ebuild 3060 BLAKE2B c218a2ec42a1efdc2f5ecc935236d72a7ee7c8255748781ca0d60ab2beee3a8ec1078e9ee5a2ab777033016615a55b26c53cf312a1f2dab5bc686f8db92b518b SHA512 7a9463edab4a317260a4856eb2c4c7015fff088a068408937d55aae7b13893edb79986e179340bd8a2c762bd867ff7bd17135859e414ff90130930da4c29cbb8
MISC metadata.xml 519 BLAKE2B 19c44d930c1d6af33c7cd756ddd74fb29f93d37dc4953956011e8ff5a563caa119b8848ef8e47ca0e71ced4134b7dfc9092c89a14cf1000148e0383c01183ddc SHA512 6c5e8dcd014d9203f0f50ba2e11d3fd52d89f226ef2f4d1d39143347a8de4433e1f6fa30881f87701695438da263c13dad59230c957002aea2950da01eb66c00
diff --git a/dev-libs/libxslt/libxslt-1.1.38.ebuild b/dev-libs/libxslt/libxslt-1.1.38.ebuild
index 417648eb9fcd..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/Manifest b/dev-libs/opensc/Manifest
index 5499eca80294..cfc719bcbc98 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,7 +1,7 @@
AUX opensc-0.23.0-CVE-2023-2977.patch 1936 BLAKE2B 6352f5b1e596973a0049e38ce454df6932f72669acab8ab4d117ead9f0b5a88a69ad99c8d38eaff032300fe291d863182262fec0a36bbcabd7f7dad2c5c077e6 SHA512 08924312d7a29ce9692a26379d22651fb6b38a75ad0868f1a95dadce34c2163a8f0e72718642488018233f44dc5539b102f0879f6bc838cc178440283fccb5f7
AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f922f8a03602f15e3b1a98570be0a1f3f2db922c9083976eeb164d011b981c8709a9b1459e959634f SHA512 52a0a47963d0938a3a644dedcd913bb22ea6d5e3d539b759872c4175085491cc11a3958bb308029eb4942ea20e0f7890865c21cb063e335e38a154957a64ed58
DIST opensc-0.23.0.tar.gz 2366469 BLAKE2B c0f74379a70347a58be27684ae2cf833e6f35328b566af2c6daa8276174864406fa176acf7ba84931970fe07e3dd8d6eccf7884f079cb0110c4d6ff9a76792dc SHA512 cd102cd64e719c59153960a4921b7525055045f16e6f6ffa8c9def6ce999a9c5098267b41f8753b41107f626bea20c34561002f5d38eddb4ce6b371913a17a1b
-EBUILD opensc-0.23.0-r1.ebuild 1938 BLAKE2B ab4922f5c3d766b073be05ebf7dee44c202fa96ebf44031a4cfec48e58ade7566673857cd8529e2706c96defcb4b5aa327945b563ca5f76f0a7e5023e1152b06 SHA512 f117a1e323fc7accec702ffb5c5471ed92a92e667aba5271e81672d9023a9d99902f2e6f6aa9a8a5bf6b05c23915ecc0bf1af9ebed6da5059498ece58acb34a4
+EBUILD opensc-0.23.0-r1.ebuild 1937 BLAKE2B 3e98c2b42c2ffa84b45288666205cda20f22d74b6bc961eced4af8271bca4909dfe4dbcfc33482476b0276932c82d68023a68b790ef41dc4638816f27a53a356 SHA512 0e35040d626348b43520dd5c38d05d3bcf904cd4f3fef186deb3257f828e2125bed1ef80d26926c2dfddeb6ea1e251f84d85b3af6cc3abe426bd7ad25f9f1731
EBUILD opensc-0.23.0.ebuild 1878 BLAKE2B fc0859070a61c2a07d8358525918e3775ba9b1e6b6917389e23e95ba7aafb8ddb24a6a89fded06f5c210623de6e8d843cbdb72b8501fd6c4986cbbbd7ecba7a6 SHA512 9496512a1b9565196de7202aa2294e0ff24ccea983c4d35622586c6e77ab0fd5a7c7c5e8eae0672ba0f872a90045007a7a7f88f624702a15f082bc1918f04fcf
EBUILD opensc-9999.ebuild 1881 BLAKE2B ae0acc8bcc7081ceea38b6a59ed04dd6acf37bf4e86f3979ac317e5bd8dffba6cfdb0480cfc574ca23d5ab5f491ea2b301ce4b2ae86835e8210af391cdfe11c6 SHA512 8ce8e223359c15a15159a006ecfa2b1c4f10063902450c4fa120902cc1193a0478e87cd0678241b0f4e96aa7cb870267d4d80e44e1e13c952a322412801dba26
MISC metadata.xml 1305 BLAKE2B 8560829a2784e38e10b41f5e083568a7fafd19e9fe185b1675c787b2514ea01a18b3fa6c7d0018b6e45638512d02e9bec12fbc5df4e50bf49db6558ef89a9af8 SHA512 8b477d96f6acb7a808e24af1d4b29e16e06b83eaf29799dbc6b74181ded74de47d7527712e21412bfb92a26e1d03974368a2c1790208785230280a18d21aff06
diff --git a/dev-libs/opensc/opensc-0.23.0-r1.ebuild b/dev-libs/opensc/opensc-0.23.0-r1.ebuild
index c81ebc1ee58e..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-ml/Manifest.gz b/dev-ml/Manifest.gz
index 64a32861a88c..b580b0887586 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
Binary files differ
diff --git a/dev-ml/timezone/Manifest b/dev-ml/timezone/Manifest
index e22d67868f5c..def83b1c409a 100644
--- a/dev-ml/timezone/Manifest
+++ b/dev-ml/timezone/Manifest
@@ -3,5 +3,5 @@ DIST timezone-0.15.0.tar.gz 9480 BLAKE2B a47fd0efcd659e2bd3adcb07776a4ca25ef65fc
DIST timezone-0.16.0.tar.gz 9881 BLAKE2B 839cc11605bf8e9215c6629918b5a9423f3f5d67cb896f3b277707dc22e3570c9dd7f264aa0baa43aaace94500cde47915cd20b2fddf04c87bda445714691438 SHA512 d01f9d0b0cca379a6741d0af35e39860d97e620cd2a064d5498b724319a88e8088bdad5df52b2972a234b59678d99821edce4400c889d98857023a8c54149889
EBUILD timezone-0.14.0.ebuild 489 BLAKE2B 11dac57aad8d5a65501534c86b3a3bda04e6e6aa180afc6bed4f9677261cedf73e181cd1d449b8994a1a13420737445384cfa692451ab2a94f9859aaa5e937be SHA512 7f35a0b8797c0017cc8864c409a82bda853584ebfc622691c95e052f266a21ab1d8fea655d3feda2188e80c90978be388ef2837964726b59b3d9ba1595724528
EBUILD timezone-0.15.0.ebuild 460 BLAKE2B acc4860a23acc112afecd759f8f8721d13093d2903926a639eab73d8521bcaab043da972cdb3f2826168da0a100cae3ec7e2bd37829e4950c200210753d812d3 SHA512 0f83480dcb9b527b5d627cb8aab5cc233b74993bd4797a01a9683bfd8fa43e8d05d46d11db6b266aa9daa9a486a25cd10e42db4979cd61324bdd0944dd308f6b
-EBUILD timezone-0.16.0.ebuild 517 BLAKE2B 930e45f7a23afa3fd0fa5097133b5df1c0840e25489084881a2509b3169435995eab1667874a7b1ac29f17d535bc05c8bb12124d820003c2f155fb287617be63 SHA512 682540d33281c826b29658d50fcc703cb28814c58927c7e391e4f2566e43d94ace5dd156094044e535b47f42d2a3732d947d8e14128ca92685c6f5ad23ab0db3
+EBUILD timezone-0.16.0-r1.ebuild 515 BLAKE2B 49f6c319a8bb9ac1ad5c764f4c2b213c41a52c489fe18c0dc25d9624ec8b8c7dd1090593b67056d63928dbe88cfc22a554d0abb93e3cbdf7e2d627e4d055ada2 SHA512 ef2780387d7d7a6882f9fca88a979a30acfc89e883e248b055ddfab923b48d89692946a520ea765ada60578252639e12441c5ff6b192201776c89983f5c26890
MISC metadata.xml 317 BLAKE2B 2c8122e72010c3adb8e6f58fb7e3f30c7c790110e35d371cc7339670f58088a695f441559f194d85781a0f28fb1bb52c6388cb59b9fe55f942540815accc8928 SHA512 3f6edd5919bc0c36f2339b3af3fc36884a1c7c646eb521c4be1b14a017835a6aa9a10fa6d9952bfd310cba1e9dc1ed81ad51b5b2fee99d6363e37e6f86d3c17b
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-php/Manifest.gz b/dev-php/Manifest.gz
index 7dd97c699ae8..3986e13d5604 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
Binary files differ
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
index 50aa6c7f8da5..27aea932d5c4 100644
--- a/dev-php/recaptcha/Manifest
+++ b/dev-php/recaptcha/Manifest
@@ -1,5 +1,5 @@
DIST recaptcha-1.2.1.tar.gz 19935 BLAKE2B 43077b25d484940951bf070fa440b5d13c6992c2a157e06b81961b9692683a277d9507e44102dd0ba0cde66c892fd4736ed34cae4b001bdce0d4ab619828b432 SHA512 62df22a6f4b05006a6051db689994e455ada43f76406dd62c5c13f1d90ae64401e9d75c6a92f2c620a14c070d2b49199c20e70eb6284e42e676d37412a98abe4
DIST recaptcha-1.2.4.tar.gz 21762 BLAKE2B 46c00ac95f2d2643a719b8ea4b53f33f92357406168e057dbdb87fb1419dd6626d1032113ba5842c69bdacb385887563b52290a55a861b57ddcf494e325c0595 SHA512 7c0bee86e532547900a0131c2c52d9d3e427eb0465d7ae5ca2bd3ccbeb7620c8b3216313e4ab382013045310f928364c1284a77eee2f2216d5b241e2d275597d
EBUILD recaptcha-1.2.1.ebuild 961 BLAKE2B 1148399f70997bb7e82122b444191fd16e8da1656ac143aa8e521c0ab48f140dfb8a34a63e2a086dc63d3a4429ea50297270f2d7f5d60472b048375c8a309919 SHA512 2ac8660be8ce12e72dd56fcac4725aecc0271ee291ff0a7f1c40260aaad98cfbaac4a320e0a2cedcd5a447fdc2dcd8208068fddb5a92ed909a7ff248b197ff0f
-EBUILD recaptcha-1.2.4.ebuild 963 BLAKE2B bc45efc2e0e5e2fc5a2cb067ba74874d3f6b8be856da6b844b9a811bc27daccbed286677e45cdc84476937cc7050438e33b856497490bf5f8572acb5a84d62fc SHA512 998866c13cc5a0d4b9d8c5ad10b307e43f3659df03224a5bb8c5987a04da331192f2db25122977c814fd034df21d4410cf0d4a5f21b2e2edb6ab0cd891d34a75
+EBUILD recaptcha-1.2.4.ebuild 961 BLAKE2B ed80870596257ccc8e4469855c94d221bb6ef3a8d71bd6b430e8dd5d1258cc393499f065507172a70ae2ead9a4a81e39900ba677f71f168c38fe52b16d8568dc SHA512 b2c7fd3154a298de3a98d657890746b3f859294f1c47fe91370f7542dc96a7da260cb0ebd0f62d8fac27e34e37982ff7f39821b6e18ce21a1dc7ed9f5c4727bb
MISC metadata.xml 338 BLAKE2B 4996f6af2e4d27d365e99f80193f68f46977e5b9def7750a44e1812da4a30874ba0c059ae54f182164acd3e74e8000023896376a25a980f0c622c93d43b289ba SHA512 fea2dfbde221e63be154fb8836b63e5db399daf6ad4cd602e7f7317c5b35c4a363a8b8eb21fcdfda471486dd006fee948a06339385bcbd202cb32d4f886ef7e2
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 5e0cc6c62232..0da93ef7518a 100644
--- a/dev-python/Arpeggio/Manifest
+++ b/dev-python/Arpeggio/Manifest
@@ -1,3 +1,5 @@
DIST Arpeggio-2.0.0.tar.gz 767813 BLAKE2B b4eab5b0a049560e8f3d775f34e9d1beffc26d3969a11a2043d203852c77385adbbef876e212b09c6af8630f2b8de6dfb088760bf9ade332af981d4e8d8267ad SHA512 b5a75eea515b7dd0ad7dc261703300bd5b3e5a70f0946845f8828dbf7c76613aef926fed9538fe0f9a71c1666edc9f8cff31afddd551bea1d7b1b9ad7a9cc405
+DIST Arpeggio-2.0.2.tar.gz 766643 BLAKE2B 9cd3a40b10594868678b6e0e625a094a978deca22a0d251e348e25a7358afb64bdef337e1c93afcde00d1347a9b22faa694678217c3e2de49690e923f8f0ea73 SHA512 6f8ddf8ca19f968de84730ad4861585f333be8315e70b6bd320f838731cffbd28b5b6245edd869175834a95207f39b20674795f0f31b226c9387f4a0376c9adb
EBUILD Arpeggio-2.0.0.ebuild 705 BLAKE2B c3a1d5031b281d338740075623f4c368f79c53d4320ad3a7065758d912e45a3f4cd98a2444cd620fcf27822cabeded09b1e8a6c6b5f9a9d1cbb52b822953e3c9 SHA512 88bfd3337ad8a49bae71cb7e231c6bdda67870fd98d6f921cf8e27d64208d3a026312cd60d9656f2cc99b7fe69f3e4d2effdeb85fcb385b6679eda0fbdf6a3f9
+EBUILD Arpeggio-2.0.2.ebuild 531 BLAKE2B d8e3cc6763d3cd3a8827b33963f6744c843b1ac9912bc9b3275ff2413ebc16513057b7b1006f1c722e2658bc6088d6dad2824a9af0401388adabda4fe2708ef7 SHA512 2ad6480d363d65b5dfe89b28eadb42fd3334298e42961741da2c0ece9f7f2d179db0db975a9a41039bbce027fb99e47ceb16e44e5fd629d125448a7b2088357e
MISC metadata.xml 447 BLAKE2B f4b144e8b81282e3d6c737c94ab3a21c1c5e9c9c188c21bd8d7e421a12ead133f26c226edbfa26410abb34f32b238571ca59d18f6870ad6e4eec1e9e54a20fd6 SHA512 f46f964a5cd2c23e00a6553f7a56324eee55231678cefa8538d5c0f4bad073478e99d7087989bd4fe2644bbb649e29e6670dfd409902750aa59534cd0c9868af
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/Manifest b/dev-python/Faker/Manifest
index 15bcd77b04a2..996b34f438a2 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -5,7 +5,7 @@ DIST Faker-18.13.0.tar.gz 1672316 BLAKE2B c7b3a040276508c8d08c184e90dfd054d62ef6
DIST Faker-18.9.0.tar.gz 1667357 BLAKE2B e1086168201969a1a0410d7bb6e97bdf31d0f470d6e39f011b8d62733818a4d5108a1ea058d19f41922efafc0a056bffe14f76ff1a77c9599097a3d172d0accb SHA512 9ad60cc30121405fdac38ef479ca1f8bf9114a599575caeded5be4fb8fed80a3268ad02705217ab0ce006e017d2aae7be3c1b50cacddc49bc16cdeb9bc9347c9
EBUILD Faker-18.10.1.ebuild 684 BLAKE2B ba5534b18ff5724badc958119e79253c9048be857a726297d9dccc7bd8a09c2dd9781fcd4c299624abe7f780d70988d3f9ffbdf40af6a93fd595154c3236ab86 SHA512 260d0a22270b6faaf1547f18c07a969703f763a7f3ed339a9f4be1e447375faa7910312f08faa00b95977c4dedbc713edf4e76792535d843b2efa5d5947b9993
EBUILD Faker-18.11.1.ebuild 684 BLAKE2B ba5534b18ff5724badc958119e79253c9048be857a726297d9dccc7bd8a09c2dd9781fcd4c299624abe7f780d70988d3f9ffbdf40af6a93fd595154c3236ab86 SHA512 260d0a22270b6faaf1547f18c07a969703f763a7f3ed339a9f4be1e447375faa7910312f08faa00b95977c4dedbc713edf4e76792535d843b2efa5d5947b9993
-EBUILD Faker-18.11.2.ebuild 684 BLAKE2B ba5534b18ff5724badc958119e79253c9048be857a726297d9dccc7bd8a09c2dd9781fcd4c299624abe7f780d70988d3f9ffbdf40af6a93fd595154c3236ab86 SHA512 260d0a22270b6faaf1547f18c07a969703f763a7f3ed339a9f4be1e447375faa7910312f08faa00b95977c4dedbc713edf4e76792535d843b2efa5d5947b9993
+EBUILD Faker-18.11.2.ebuild 683 BLAKE2B 0fb9d3e47332f09bab0294fb6b216831bcea180ff940cb6b9647405097026af0c6f3a5b872e7f64e8420947e0886693524ed068abf15c63be8c14639681e34b8 SHA512 14ad06864e4d307d6a7f996da49313d335ed9039c1c34c3b73c589d9064ccf3053cfe0a04e58094293a3532a5c80afd9f546aa6f90cae0acc78dd515fcf02e2f
EBUILD Faker-18.13.0.ebuild 684 BLAKE2B ba5534b18ff5724badc958119e79253c9048be857a726297d9dccc7bd8a09c2dd9781fcd4c299624abe7f780d70988d3f9ffbdf40af6a93fd595154c3236ab86 SHA512 260d0a22270b6faaf1547f18c07a969703f763a7f3ed339a9f4be1e447375faa7910312f08faa00b95977c4dedbc713edf4e76792535d843b2efa5d5947b9993
EBUILD Faker-18.9.0.ebuild 683 BLAKE2B 0fb9d3e47332f09bab0294fb6b216831bcea180ff940cb6b9647405097026af0c6f3a5b872e7f64e8420947e0886693524ed068abf15c63be8c14639681e34b8 SHA512 14ad06864e4d307d6a7f996da49313d335ed9039c1c34c3b73c589d9064ccf3053cfe0a04e58094293a3532a5c80afd9f546aa6f90cae0acc78dd515fcf02e2f
MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 310972d02dd4..daf3d433b221 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index a848522bdc61..b0a5370d9d36 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,5 +1,5 @@
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
EBUILD PyQt-builder-1.15.0.ebuild 923 BLAKE2B 0fcee7204d91d03dbf502495e201745e196e63c5b299d7f6c42144d3e615d5509e55dc59cc94ecb379b067e432ff750510a811a4202453131db42ed3c618aa41 SHA512 5f6a85a01ea2d14c033e51098e911fe03f3d48d90925dcf03b892cbd9b98e00ca2a356e0866451a86c4c8e90d0931a59e2137346eeabfc9df942edc918f15f89
-EBUILD PyQt-builder-1.15.1.ebuild 928 BLAKE2B 76f2e09f2cb05f20011e925de1ca7728d8a9a411d47d108ebd30cfdb5eb523428016a79d3e885608b7b420af6803516dd166ada69653a18093d3276a052d7084 SHA512 4f6058ff45486d8bf25bb586c7d44f8fe9fb32e792e443a58216345308dca0894e9d2f240edf52234644ef1a5b894f92b5a4f4d992e287530e93651e76b8f698
+EBUILD PyQt-builder-1.15.1.ebuild 923 BLAKE2B 0fcee7204d91d03dbf502495e201745e196e63c5b299d7f6c42144d3e615d5509e55dc59cc94ecb379b067e432ff750510a811a4202453131db42ed3c618aa41 SHA512 5f6a85a01ea2d14c033e51098e911fe03f3d48d90925dcf03b892cbd9b98e00ca2a356e0866451a86c4c8e90d0931a59e2137346eeabfc9df942edc918f15f89
MISC metadata.xml 666 BLAKE2B 2602886cadc8244466e26c92178552ac1f618ace1dcd6eca9ced2c3e0f7a7777c435f842f1581d93ea7642dbcc278a4aa59a84305f5a825f39edb736e7d29f69 SHA512 42746ac242170047e0a44389c8d2e8eb5be60fbff1f5f1908802e5c3a04a0c740fe338c9b3049fc03bdb45a4182b388aad9b89a573e87d440a9a833443a1470c
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/arrow/Manifest b/dev-python/arrow/Manifest
index 8952a63e41ac..37d395638fb3 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,3 +1,3 @@
DIST arrow-1.2.3.tar.gz 127552 BLAKE2B 35f5b694d819d80913b5938e4af71f413fd3944636c1e89a79e868c03cb423f75692c1f0e8d85dba21e640591f8cd0404cdc6d77dd59956490d268fb4c9fdc7b SHA512 e90276f50bf8521570cc2cdbf011ff376e0d5bada0576bbfc76f6c63730c13f7eba1d978cc3a481e7c7356b0dce7c554f19cbf3ef03b280c5515be72d2c7d177
-EBUILD arrow-1.2.3.ebuild 811 BLAKE2B 53d4799616ae6682ed222ccbabcfba1c27d7a65fb4186753c757e962932d8cac04b9aaead874c0e7570aa496bb42804dc45f5544f1a3ccdd9e11efce44fe72b5 SHA512 1d76fcd539d9c8b0063cbe9e194ba6e61b22a2e499474e9551476644b5a5b2a642d731a12726e18af14c572053e618ddd938f04181776ff0eabde37561497ff5
+EBUILD arrow-1.2.3.ebuild 824 BLAKE2B c0a5630f775553c19eb721c0f3db0a77ee42b7882403165c7145bf02fabc7e806354962b4344075919232282804298aaea4241b74632247666a93c3dbc878b03 SHA512 442d0f4e91300d94bda10656a126afdae072f0dfa6d8da76ad21953bec7bc16808d85948e9559ad13645c67e6ebe6a895bd7b6f0732655d1b1423cb9d60a5ef6
MISC metadata.xml 387 BLAKE2B e07417bbea7b9b1a8b850dda631d1e626e013a6cac793893deafec648003970a6240833af5ecc3a9b19aff3ea38e26e684a7a151f1138ed9d8597b567d3ca960 SHA512 ea9a24239141a4338c7d3291e2be9dff5d36f33f91ec3fefb62c7fd054b0c7a80ce66b6916f045aa3eaf69cc4f2f3d116a525958fb0f6185b98a10660bc08e50
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/attrs/Manifest b/dev-python/attrs/Manifest
index 45a9a47d042c..b6ea3f19d3de 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,3 +1,3 @@
DIST attrs-23.1.0.tar.gz 212878 BLAKE2B e562c22e7afdf50a9cf8deafc221d0438b8f3fb6b379c6eeb7f9e5ef182b69d5aa9bb886f4b7f69818ba2f1e9bf2ffa2831571a61c3521ab1c56f9c199b411a2 SHA512 1fff41da90668601b29412f71b4419dd9ffb9f2a8e54ce2199198557729167d6d7574954dc998818caba0d6bc378ab2ce068541df9c1c0d4ab1b071758d4a38a
-EBUILD attrs-23.1.0.ebuild 917 BLAKE2B 780ec542b5a7b5af53c569633bec1fa56b4829d5d84c3d3214696e1cd09a7605e5241d1077468df7e2df9a6ea108a73882beb81e0ccfa71f9956edb2bfcca83c SHA512 ec0c9cf1e11c752bcf59d7cb2b9565a741e97ccd8eb5b4c1b5845b85794b5ddcb5c55e7bd8ea0f357eb6a4144c02679e2f32b15a545701f520c37a6560ffb657
+EBUILD attrs-23.1.0.ebuild 930 BLAKE2B 7ef113790e9eba27e62ac4892ebf85a7ecc369a0c815ee235d6e79a50b7232128963688b2c61314261adfb615ee4a03afec84f3abef386c3881c56c4627e0221 SHA512 96d8fc4b1ae420b133aabbb395f152844ce223c3e6378c4ed8ada14667a573aeeb8dcf1af3a98509b15197db21fecc3a4bb2717d3c809d780e74681a919848f2
MISC metadata.xml 586 BLAKE2B d54794200f471af72d635c0cda12d773ff78f1083a9a6d2b0785b203789b2432b10ee7332f5abcd8f8dda952e10e4f981d51bbbfc4a6d461524570b3c5168f18 SHA512 b1161bb1ad04faea3ca915847d739287bc8bf9695608e49344ac6c9c4c16bb6818313a79b036df0cddde1da2d84740cf2d0b7d0c23d6cf3f22315046a3732f78
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/Manifest b/dev-python/cffi/Manifest
index 042c9b3dd17b..1b96d15199cf 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -5,5 +5,5 @@ AUX cffi-1.15.1-python3.11-tests.patch 3023 BLAKE2B e25bd9d22b81187b0eab65073930
DIST cffi-1.15.1-drop-deprecated-py.patch.xz 31244 BLAKE2B 7c8a6ca1166335fbd385de35ebb636f21049a4dd9c52171ec58da08a61dc64c271b4afa2d69bf8b877a8c9747dfae6a8529615bbed69f5a8ab30ba5fc99c61f4 SHA512 9aba4b172b070a1a1719de2c35667abe4c7b27208b8ca3ecbf90bf168ed694f4524154e69fada5ff6f141a94b8a438db16239ba353fa9914b318b77e41dfd920
DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
EBUILD cffi-1.15.1-r2.ebuild 1938 BLAKE2B 3ab689552ebe47e7631b3ed254cd2bc55d2a9836cb228e5a49c894f5d84ac52a37de06ab82b6172aa323025cf72f6126445eba39b210f511240943bec521a60e SHA512 6cd316d2b76c0940b339f6236e2e1f4592b0935668c6b0193ab40bd3a90f239f555a20b54fd15b0f2e9c8a98396f664741f5ea4077db283e6465ef61fb1b8cc6
-EBUILD cffi-1.15.1-r3.ebuild 2094 BLAKE2B ff42db7f5073783909f3a64b8c2a8f6da2537228ef9e7b2e80eacc22de105a734d2e076d829616222ade04356c76bbee0676818ec8e9029d0e76f5427a9a3156 SHA512 3532ccc33484fe6723dba408e59c3dbfa61291bda3e2bb0609a53fe82cd37e732c7906296790f3bb35649365a50cef52865f6df1d84c8e6e66a1db42940eea8b
+EBUILD cffi-1.15.1-r3.ebuild 2086 BLAKE2B 9451333f77d9dc309da92b2430dda2e562a5052d53fa1c8c391d1ae3fe98213197fc436ad121cf7951ae96cf19fd0de2c41ff8090dc338f9a78aeecac3e4b0cd SHA512 2192a6623e2cdec4316a5998689d91e6ddf0a6d2265ef2ec89b9901cdb9444fd34b490cfe4a7287181755d0afdd1c9ade40b1b184eb077c24b4113c4fbccabec
MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
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 032b009fb42a..f86148f1c680 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -3,7 +3,7 @@ DIST cfn-lint-0.77.6.tar.gz 3554363 BLAKE2B abd496cdb72e1032c92a6489da12a4ffb4f8
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
-EBUILD cfn-lint-0.77.10.ebuild 2013 BLAKE2B 3cbbb5b1e9f9717a84876064211232df223d4cf58699d2a585dfbb6169337e4f903994d729a25a3249c19c473e59cca6aae6901e8397353aecae9f79395e2bed SHA512 032f30d7105fd8d5d69c634d56dc4c87dacaf3c98d86b1cbe1fe860fbed3c4b5e51f63e717953d41009e0c92c1564d284306bd602f1de7ef91401abbb8de38d1
+EBUILD cfn-lint-0.77.10.ebuild 2011 BLAKE2B 2210656075867edb6ed077388c105d77a553e2cca3255ed2284626ccf8c0d6261d8c4790f372e339d0f87c8fd508597784f42dc7ea017844561a0a4b22b8b141 SHA512 bea23a3817a02f4668209a7abb843b2b7bd904d20621fbe7dd49bbe2b87b301e27e7be3a9e83ba59e352f96020f01a9a36d09368e0ded7264dc1d00507c5fa9f
EBUILD cfn-lint-0.77.6.ebuild 2011 BLAKE2B 2210656075867edb6ed077388c105d77a553e2cca3255ed2284626ccf8c0d6261d8c4790f372e339d0f87c8fd508597784f42dc7ea017844561a0a4b22b8b141 SHA512 bea23a3817a02f4668209a7abb843b2b7bd904d20621fbe7dd49bbe2b87b301e27e7be3a9e83ba59e352f96020f01a9a36d09368e0ded7264dc1d00507c5fa9f
EBUILD cfn-lint-0.77.7.ebuild 2013 BLAKE2B 3cbbb5b1e9f9717a84876064211232df223d4cf58699d2a585dfbb6169337e4f903994d729a25a3249c19c473e59cca6aae6901e8397353aecae9f79395e2bed SHA512 032f30d7105fd8d5d69c634d56dc4c87dacaf3c98d86b1cbe1fe860fbed3c4b5e51f63e717953d41009e0c92c1564d284306bd602f1de7ef91401abbb8de38d1
EBUILD cfn-lint-0.77.8.ebuild 2013 BLAKE2B 3cbbb5b1e9f9717a84876064211232df223d4cf58699d2a585dfbb6169337e4f903994d729a25a3249c19c473e59cca6aae6901e8397353aecae9f79395e2bed SHA512 032f30d7105fd8d5d69c634d56dc4c87dacaf3c98d86b1cbe1fe860fbed3c4b5e51f63e717953d41009e0c92c1564d284306bd602f1de7ef91401abbb8de38d1
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/cryptography/Manifest b/dev-python/cryptography/Manifest
index fdc28c4d330c..516a9c6333ea 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -102,5 +102,5 @@ DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295
DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3
DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
EBUILD cryptography-40.0.2-r1.ebuild 3962 BLAKE2B 134a9626216560b7ec1084025ed92aae23eebd9ea4f258a7519f09612fa2cb56ae4918e700867f5fe7e19f566482fde60617d523c3609e819e3088ee3aba70db SHA512 0753f95df3832fb2d4ec3ce87dff313347cd5c643c346d3e6e750f42715d88b1b2111fac840c0ba1a4b53f472347a492d3a7047ca5688b318a29709394140cb7
-EBUILD cryptography-41.0.1.ebuild 3208 BLAKE2B 926a6291f219617b5ff625af03acc3344f801d41a1042910b6bd13202eaf08fbbda513d6ce4cdb693072ac54009d716d2c9089a9ee03cbb912fce5a83cfc233f SHA512 a00c0af94cbafe10dc2bdb11ec9ede0de50fe9cd2af5583b42b67b299af9790c58656d55cdbf954f060a1d9c799f2de04d2b4cf173067a04b9a8971e2d789e08
+EBUILD cryptography-41.0.1.ebuild 3205 BLAKE2B f0441dd27f97f20bb12f9d20705962b7564a06f5ce9aae7156415d44b984f4d9b4fb66879f1f3abbb032aaa01f3406d63af722fd9c8b0540b03ab54928b4ece6 SHA512 5b3dfe884a7710ac7717cb49e2969b79b87067679e5b199ab947079e58a1732e5ddeb3de7f5a92b6de7be87aea745ff3d8b6442e66a3bcd5b650de453ae7effe
MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-41.0.1.ebuild b/dev-python/cryptography/cryptography-41.0.1.ebuild
index 410b883f05d9..b302e47e0cfb 100644
--- a/dev-python/cryptography/cryptography-41.0.1.ebuild
+++ b/dev-python/cryptography/cryptography-41.0.1.ebuild
@@ -87,7 +87,7 @@ LICENSE+="
Unicode-DFS-2016
"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
RDEPEND="
>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 07fe0e91c7df..23c351f7961f 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,3 +1,5 @@
DIST denonavr-0.11.2.tar.gz 178495 BLAKE2B 7ee308a071f3e325849b67aa901d9999a31c566ce7fc7a0c5c71bb53d9bcd5effd4bf54dc0b4301f4403d01bca83af15ef603c0229b182ab1c1b2801ae934e61 SHA512 70ac865e20d6a71c51007e6b135b873492707bff1497616d44fbcf30ab8e3c172d93df08cfc23bebca929cb965d764d6d105d2ed4a0a5fc30d19732b66a88820
+DIST denonavr-0.11.3.tar.gz 179597 BLAKE2B 139cda38958e320d72f11ef25e94db67346b7e9f253cbbf60a0cc5f5e2e42846f070a57cfb1596cb648d1d70a62983d8f5fe6b91aec5b95501c049c1c65b7141 SHA512 a361ac3dd6385ad7c042f6cb7bd2092c39da75c167277347d199ab9de3a1ef9fad84e41428cfa02058c680c905965214e42780fa4d4fb1f4a1116102284fe571
EBUILD denonavr-0.11.2.ebuild 957 BLAKE2B 8543387d51461eab89b41a982228a922397b7f0720827cb517a3f306d4177bf4edc7a21dea34614f7326c4ecadea954c38315a8957b5d852698bd0fbde3e2380 SHA512 e5208268e7ec2f8106458831cefc731c3cc2948330fc44596aefac72e89f30373677e9bb51f0cd0e5c7e26069e96c262b272c72c6637e4a36c6686f44bfc093a
+EBUILD denonavr-0.11.3.ebuild 958 BLAKE2B 477fdac771877d819d8c4233c31740f58b39f899a1c525215fa8f55f251cc17fe9a300640faeb717ad0499e5d6934b131cc4c038ea8397e762fe44f877d8826a SHA512 a45c945211e5dd9ac9773f830bc315db1cb9e1e636dbc4ffdf438d4b0313b7769d87ae769a16162f143dc415e559e6819a7a7dc5f96f07f84fe4c6d7c0e80443
MISC metadata.xml 538 BLAKE2B 7f0ea063a1ebe7cfbab11a8e92b803606c6454ea9bf871bc804f048a58b35e0ab66eafbee64d8d4328e4e3cd5361a810527813c48aba212950f263da2b4454cf SHA512 3531537b37f09f4b0d27d124d1bc698d8b8eeb410a0f3504f315a8002a8443a886959706e437359796623f3462b3d12d89ad677fbde73ee6081c61ed01663ad4
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/Manifest b/dev-python/deprecation/Manifest
index e46308ff1016..0a8ef8fb3f07 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,4 +1,4 @@
DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
-EBUILD deprecation-2.1.0-r1.ebuild 753 BLAKE2B 485f524e431f6795fd1b19f0940b738b1b25c4fa111ebdc4c3d29df23bc1b0dcb3ad94c1eebb4eb0e53c933250e71276b7278e8fea13c0aadffc151e4d4361a6 SHA512 f4d5094639e08bb3b8ac6c43d9b728c1d9805a770faa953a8923d702b4818d2d2e128a23e3ec1a8bcc536d9d81f7d96febf26c2f7f852e36e91c125619505feb
+EBUILD deprecation-2.1.0-r1.ebuild 745 BLAKE2B 39a4c15f74062097ce6053aa15d41ef14a4e36627b4eb42e95adce392b378518ba068d12fe1c471bc1948b082ee52ec9e849a0c619d01ff336220079ea8a185e SHA512 cd8e2cff40560708746fc49dc2752b255a80ea5603d73eaa056e155e7802f5ced1d88632d030ba0fe36d212f3802ca1a4a26ed3d8b648a0b0eaab5853477a7d5
EBUILD deprecation-2.1.0.ebuild 625 BLAKE2B b0e0c102f97e3db5efc39013c60975363bb450bfc18acc73ef764398791997a9384b659294287528716d5f0228d9398d7db4b76be65494635d47e6cecb5c8e76 SHA512 69f0598da8209c2bfb503eb6222bd6487a10277c82557fe2b2ab3c92f6c0683681657508e1ea58fff638bddde0fdfb2e54e97a11f06b7b7302cab48a33296da0
MISC metadata.xml 566 BLAKE2B 5fab2937b6a3086ed28187e08d54df149979ad9fd6c89d4f633f041c03d1d728a58a1e384427b430e34eb497c099e164048217340d445958ea9901f7dc79c23d SHA512 b20327bd7416f7476959ae3fbb2d6ba6cc210ef0c702735322bb540bde7776d777fa4e84b2ec468d649d4ad424ee1a5f9c4b6ec2a8c798d8582ca60715e85dcb
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/docker/Manifest b/dev-python/docker/Manifest
index 02c51de25feb..1990f0df52a1 100644
--- a/dev-python/docker/Manifest
+++ b/dev-python/docker/Manifest
@@ -1,5 +1,5 @@
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
EBUILD docker-6.1.2.ebuild 1226 BLAKE2B 99c8eb2a1cf05e3238b2491ec767b1cf733c5ade0b01635b30545240ec30e939c14d3f141855d795da76fe4553141c8c0bd4255df639f07a7362ed491929843a SHA512 872e589e6acc51d3e0e07054c0c9e9a578e8b0e836b0a9c24f5433111aba71e806705331decb9624242945788a7bbbe0e2d9c8761675cb3ffd32076eb9c9cee0
-EBUILD docker-6.1.3.ebuild 1230 BLAKE2B b37d26ca44802b10e78d1c2b73f570f6182f1661e651c9cfbc3cc93e7cdef3d5b67608b9d499c9859a91555f8a43dc4c325fdfd5b1dd23a81e3ab51247260a9a SHA512 8e49d2728ccafda3354bbb0716b95be69d2415754c251ac4362ae8c2c0af3039a0885ea95fc1ad4f9f66803322e2b3a9ce340d2c22ac35ce14ae68e8e49f1205
+EBUILD docker-6.1.3.ebuild 1227 BLAKE2B fb084dc9cb38326ef8bd0de211821bef1e7b1f082215ede9aa89f52a6a12f7a8a6517d2a33c5186f35ccd25cf5689e9b94e545490656192834f1297585bca062 SHA512 affe3174accdb2219421d732270893065c5c90db123dcdb2143fa10bfce06e221b8ccc2dbcff83a77efac2013b1fed6b119b544d3bb930df5fbbcd4e25df925d
MISC metadata.xml 432 BLAKE2B d57abab67aa69fa94d65ad06263fd9aa748e9c918d51750b613b6a22fffbd3642c8b1e01ebf521edff10d082c9e41329b3234b981283e3ca8bb07ddee7f97dd5 SHA512 b7d9c322623a2e68902def06d10d8f2a3c18d231a36383b52f80001ef2a2161633a66950afd7ad60f07e5d666d15d1fab738e46fce42ab221ad2e1e0b2fb600a
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/eradicate/Manifest b/dev-python/eradicate/Manifest
index 3390f671a026..5f7ae6a7238e 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,5 +1,5 @@
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
EBUILD eradicate-2.2.0.ebuild 606 BLAKE2B 62e39087c7053946c328b806515062b10ee7722f26491cdea300cec86561bbe7bc7a494ab4c7a9df8994535e6b13fc2656ad916b90af33f9fdf5b43f04c0d3fa SHA512 c4286fe21412c92f9256156a5136a47537cbdb1455d320924d2a18bc952d8927796f156a7d6b8dc3f08a991216436b245aec0e484e5588943a12c8ad44d80b50
-EBUILD eradicate-2.3.0.ebuild 614 BLAKE2B 782b0c554d999500b14c6389cb31b881c2fd23f04ab7481fdf9a71ebcb52e512ccca897bfc61efa80f31b5117b7ce81b1420fb8193c7510a787806fd06cd784a SHA512 4c06ce4dd53669cfeb9b86b8eb58d9b7758bd8ef2ccbbba2ca7a8080b11ec8a7cdd8df2c56870edff7730d87aa1c2a0eb9e01644dbd1b5865ced36cb023b6cd3
+EBUILD eradicate-2.3.0.ebuild 606 BLAKE2B 62e39087c7053946c328b806515062b10ee7722f26491cdea300cec86561bbe7bc7a494ab4c7a9df8994535e6b13fc2656ad916b90af33f9fdf5b43f04c0d3fa SHA512 c4286fe21412c92f9256156a5136a47537cbdb1455d320924d2a18bc952d8927796f156a7d6b8dc3f08a991216436b245aec0e484e5588943a12c8ad44d80b50
MISC metadata.xml 507 BLAKE2B ac5f63b7a9d06ea05182687e98e13c3d0af1152da772dc1918e49d1e635cf737115c1d8a74c81471cebcbeffe0f73fd6ef54bfda7eb1fcebf616752fd30a7389 SHA512 43c491522eec1dc75f227a60af4f65186616559ac79bb1d4479b430e6acf58f123ece47eab36f26ff9182d609addd82f9069a51c9f75346618f5272e63c170d2
diff --git a/dev-python/eradicate/eradicate-2.3.0.ebuild b/dev-python/eradicate/eradicate-2.3.0.ebuild
index 0ee0a07f33fc..8f44d95d91c4 100644
--- a/dev-python/eradicate/eradicate-2.3.0.ebuild
+++ b/dev-python/eradicate/eradicate-2.3.0.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
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/filelock/Manifest b/dev-python/filelock/Manifest
index 77d8fdb6ce53..d8facc15d887 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -3,5 +3,5 @@ DIST filelock-3.12.1.tar.gz 12445 BLAKE2B 7f4a115e6b50976935fee917ca7ebcba13129a
DIST filelock-3.12.2.tar.gz 12441 BLAKE2B a54eb7841bd037caf537144829818ab25acf7b5a916c6fc2a296a937f36a36b7846cce3b35e751041ccc1dfc5c5c4be1b6031a261927c152657f968bb465915b SHA512 0753743338c4937f57176ef2291f44a919d949c7b3aa73e3210572d670949a60a9ad3efaaaeff198704e1308c169807655bb90d399c1158e4f5c9aae4adcd486
EBUILD filelock-3.12.0.ebuild 683 BLAKE2B f0e85c259ec8b176b44fe2347055a84a4871a6ee42f1ca1a117a1316f7e4e7e2e86baf1070bceefc7ec14a82cae0149de57645e40103f9dcba13fc53e3718389 SHA512 b281ace5c7094b407fa528d99635cac7dbc40776ea4fa671dabc3084857abc8e53507a529352a489b0f039a72bc8d6929ffddc69bbb036e4185ad3f49a5abac3
EBUILD filelock-3.12.1.ebuild 692 BLAKE2B ec0ce29a36299a31009ffcf0e1f0888016c94b1477c1c71e4ec1b0f70f03c49cb669fd3d5bcd9c9d796b532217c3e416cc4459f74f2b15db9ad1c4584bf5e9dc SHA512 c6c41cb482de22c55ec5d8aeff5022de19254b3f60cae996e7adf7b009d72461c6c7ef9e81360eec3f763d6d1af2d4de27d2660fc04dff7137e3a3e7c497c22c
-EBUILD filelock-3.12.2.ebuild 692 BLAKE2B ec0ce29a36299a31009ffcf0e1f0888016c94b1477c1c71e4ec1b0f70f03c49cb669fd3d5bcd9c9d796b532217c3e416cc4459f74f2b15db9ad1c4584bf5e9dc SHA512 c6c41cb482de22c55ec5d8aeff5022de19254b3f60cae996e7adf7b009d72461c6c7ef9e81360eec3f763d6d1af2d4de27d2660fc04dff7137e3a3e7c497c22c
+EBUILD filelock-3.12.2.ebuild 684 BLAKE2B 4973e9b4006bcf815b56383307016af2ea9c751777311a9a44847fc48d1906cd0846c6fc1404ef85845c1b96f57c2d12bd630e9545ef99fb865bdd73431f1be2 SHA512 e565303bfbf924e9a601fd251eee43b93447dbc61182b3fad16d045c603d27c74ab9aa9f6ccfc6ee26175fbfd5d6d140772c35d1932b8e4af4ba9df15b3ae446
MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
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/Manifest b/dev-python/fqdn/Manifest
index 054e10f6ec64..2f8874502f71 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,3 +1,3 @@
DIST fqdn-1.5.1.tar.gz 18334 BLAKE2B 24dfd88a8176e67209350fe20e446cfee848c392795cde09725526a52af0a9adc6908a4eb6d5dd3ad6f8a11546acb6b82a7b2ad591997010dfdd0a1d235f57ae SHA512 d9d7d1bb8798c63973534bf45fb9bc0ab57b1600c6597212129debb97a908140401f5477f33b83ea273e3f9a2a852072110245a09596ab9a58a10be8043c57fc
-EBUILD fqdn-1.5.1-r2.ebuild 639 BLAKE2B 2159feccaa73a1e00e489d05df55051efceb9676780171d2ae38cb6dcbfe9594f6e2c7f884ee55b7aab7c4013338ab7ebba4c2d2c57017dcb14acd7948ada815 SHA512 aece62fd997d80c4816cf3816780a0d0ec43033167e89d819d6e644bf7a9cb2065f56b354dcc6e78728225a78d09a567b69607cdebbe84eeb3fb7fcb3e7da93a
+EBUILD fqdn-1.5.1-r2.ebuild 652 BLAKE2B 913a2a0cf8ed519183400b185e8f299106bc770140c58103b3301ff5374eb75c559d74c87821de9778cd241a1c21cced5c663c182c7930794c1413ada97ea002 SHA512 3d7dc5be93402e99a05d305649063830c6f9433bc3652d8b560035ae7239bc7aea6498e00fb402714a7b0daa15a1f2b68265c7805f5fe9001b0d5adec05d068c
MISC metadata.xml 649 BLAKE2B aa89a7d8a014ec20e1f5a3b305bc3a87a7a74fe56f1541fb8bb7301d9c1af638108a1fa67c5bf1ab518d7343f768fa6462dfb76b646e44981bf1ff974147a20d SHA512 867ce1191e1067f098682866fc38afd59373646d90ccf68943ed83737048f822dc2690facc27f3f9933e3de28874d1fbc7b340dcbf09c6ae02a6a5ea40ab5597
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 bbe98504dad7..2aa18efc85a5 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1,3 +1,5 @@
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
EBUILD fritzconnection-1.12.0.ebuild 987 BLAKE2B d5c072aff514a0289c58409de6d07f463ed45770313a973f8d7bcbf9ed20ede39065014275412d7866b4fb505fa967221a866ebd8116053aea3801c0444fbec7 SHA512 c95c3d57494f42433d8d7ac3da6d7a8f56184161f0ba497857e157fdf15b5fd21793c18ceb4dcb1aed9bbdf0c3a1e53c4f0172eeb7aeecfa5bab09f68216ec9c
+EBUILD fritzconnection-1.12.2.ebuild 987 BLAKE2B d5c072aff514a0289c58409de6d07f463ed45770313a973f8d7bcbf9ed20ede39065014275412d7866b4fb505fa967221a866ebd8116053aea3801c0444fbec7 SHA512 c95c3d57494f42433d8d7ac3da6d7a8f56184161f0ba497857e157fdf15b5fd21793c18ceb4dcb1aed9bbdf0c3a1e53c4f0172eeb7aeecfa5bab09f68216ec9c
MISC metadata.xml 469 BLAKE2B f180fca33d0ab2fc81dc87fd39db87cf8c8ff51777062968a3ace592c9ac63af311273fda2db88c6772204ae24c21b4f195d1b7bacbb3c23f677dc7e8e309f1d SHA512 9ab24725dc0bb5b0e40ce79520d19c0348b08c7d779b53064111aa53fefefadc164b6140310df0a367d460d2fbb46345bdb2b7b6a9cf1beba3bbab1f7d7e2697
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/Manifest b/dev-python/h5py/Manifest
index 8ab2406b9b1b..8be9cef713a7 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -2,5 +2,5 @@ AUX h5py-3.8.0-cython3.patch 734 BLAKE2B 1e34e6830a8967b4ec5cd34634f2496351c9ac5
DIST h5py-3.8.0.tar.gz 400774 BLAKE2B 2e48991225170fbb728fa55a68aea795db42c7eae605d123a24a59a8730220ddc98e88dfbff60220ce8c6952ca7fc0c3e33d472acae09864a29bfe11d90fcca1 SHA512 13397f66a9fc735e1143eb9e3dd584280e955adf49de467bf56c1a98952903720480ab8d505921b7e22c16453498625ad93421a64e520f15ea3566472849a8fd
DIST h5py-3.9.0.tar.gz 402856 BLAKE2B e2c617c492c2fba751fa546292232b78e1cec4bc75fb50a7c59cdb4a34bc927134d4604d3d9b24f880235cfb356636e66907b8026107547905a77ed9732ccc26 SHA512 f87cb36ba874e86b179776031c3345ad83bc7b5eff2f3ee54acb6b0997cc7925c17dc478957103ab6bb07d8aaa8593af1d51c3547021a205e9d01c0e36d833a9
EBUILD h5py-3.8.0.ebuild 1508 BLAKE2B ab012e74d0b380b8ee985f7b2bdc83db70de6503082553ecf6387a47b05d4a665bf1542a291644499e4a80ee248292ce2b43c7041edf5d8aa6aa1146919cddc2 SHA512 1fd5a62fa507f1eaea3a153ef452320f42e59323f832524c3dce6f567e283fd9c6c5e6f844ee2292741bf73871d593e8e341174e0c25df51df673f399ab73ab0
-EBUILD h5py-3.9.0.ebuild 1469 BLAKE2B 2b24a1d6680935d9ecdcb2e83d01f0da6fb142d3436014a9829d6766c36c69d62081e5a7a19109d125b3578f34a3bd456c8a92627a928447947602c919fc72e7 SHA512 4989fbf952114dd001cca205cc9c1441c051662231e7991f5790c41e9b4f21416e2b2a12cc68851fe11fa3bd9e640f22c1f55a7bbb0bc34f3517fb65590b0061
+EBUILD h5py-3.9.0.ebuild 1482 BLAKE2B c9b41e0d2079dd4ce093709c7704a75ed90d22577319c03a7ce1f41665bfd2438349d158523e6ff155c0a175000d4bf42e485410ec5fd0a04f1e2ffa8bce4438 SHA512 412597c887681d48881cc692e3ca80497e8b07c335ce319711e87d9f9c3f6fea1c07ee41dd179086b571c7502e868a6faa798a9214afa869fa966f98aad9eafe
MISC metadata.xml 1069 BLAKE2B 0f3ef8e7af7f4bb493824427a238588c019c04c28fe8a4b9c0b9af1c986158eb3dae3b7d7937713cc4c87374ef80686603ccdbae2baff5b1150d814ab108d973 SHA512 47a6074e383cc922234ebb9f67aaa5863421eaeb2003444587bb8499b3bf845da93ac8d8d267717bea01300691df10f67c9389248fbe228afe07c17fba3a64f3
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/Manifest b/dev-python/hatch-fancy-pypi-readme/Manifest
index 461215fb20b8..39ec72508660 100644
--- a/dev-python/hatch-fancy-pypi-readme/Manifest
+++ b/dev-python/hatch-fancy-pypi-readme/Manifest
@@ -1,3 +1,3 @@
DIST hatch-fancy-pypi-readme-23.1.0.gh.tar.gz 27878 BLAKE2B 934e7e1b8000feb554014dd3594724943173f1b5d78d1072e5612dde744d3cea925e49e46e0eddff7408211439c9f9efc24c488e6ce73fe9955bb5bf5d851b6d SHA512 a26b8205877815292c7c65380f3fff43a3222ec5044556a29fb0b570f0822b548f8f4403cb6a800044671692806b257ecee5f9ec0f3efb597e9a5780a8885424
-EBUILD hatch-fancy-pypi-readme-23.1.0.ebuild 846 BLAKE2B 065f8b6a264f6ac5db1abd000c596ca620a07fc4dd6e2052e3cf4405076df6241f80a28245de62ab5143a59c946a7f03094ac133111afa1edada82f1d344a7f3 SHA512 bd41b807fd89793488edd0e4b0aeaeffd4621a4ab5150fb65d05c5481409d3c84d157593e5304418ac9cc2f29bafed510e6e562485d5b357b6a429314298d9c9
+EBUILD hatch-fancy-pypi-readme-23.1.0.ebuild 859 BLAKE2B b1eaee8bdb59eb3dca6172b5c5f17daada83df3da5785f8e50e16a4074cc6e7a0d7558c227f5d7d371e6dd3e4c819b037cbfb6f85bb21a88483e5f6a9614d814 SHA512 7b5f61c445fa1fb40b497a2355dd188e5b04289658f462db9c17446962ef14e49ae13e99b0e67d366043fc79e2b189e6133c6e14b5428fec76812f17e2d8092f
MISC metadata.xml 420 BLAKE2B 03750f71022641e5305e12e60a55fb614deac90677d655989df62c3b57009aba9f91881c7380a3efb6ada27b43036f446d5ebe26a2ae17678c87f681fab360a4 SHA512 54e85d5b2e8dd4faf2eac232d7f79848a6a6b365829cf58f186211de1473a9023a3f7e8defc49f788e89afc4f0a0b55996101ce45a8e76579b5a61ff76970c0f
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/Manifest b/dev-python/hatch-vcs/Manifest
index c39bbea6e5ac..1cf521a9e184 100644
--- a/dev-python/hatch-vcs/Manifest
+++ b/dev-python/hatch-vcs/Manifest
@@ -1,4 +1,4 @@
AUX hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch 1217 BLAKE2B f0baf6b717b9cf5653b4b9bce4020d1b5d23cd03b382b1c00c75d78841434070cc8d5d27859b359e2ce32fb0d55b6c290e15702c981bb40fbc5f4a37e1b0b3b3 SHA512 b448e70a7058d88a8617fea38959e43257d28ac0c0e6753df229c974304f8c656349186d0cffd8e6693b3224717326f2fcf3e8476c6b70e8054e7c96e7745a1f
DIST hatch-vcs-0.3.0.gh.tar.gz 10049 BLAKE2B 69f49e205b4e42b46a246cc2403d8e7bbd2b8f83a360f1100ba98ecf7308d445e265749bd1f5fa7cca84104436e2643fd3f95292f2dba3dc48584a0df5136136 SHA512 ce22937aae8130a485ab154378f6c58c1720d66d277349a95ccfb58fd748deb69cd17d34ec3a12f3201f9e348e5d5b1c6b977432e614bb42d0e3065ec5f7f9c6
-EBUILD hatch-vcs-0.3.0.ebuild 788 BLAKE2B 1039478cc71dd1f35e16671fe88ea301fe1fe8786ab25a20a8973d5001d25f0675d168cd3a1087cb9dc7e7d54dda9fb63144f7b81241dfbeea2dbb7c2e425db3 SHA512 916029bc27bd189d8485f41e396cd3538170ab683e98548b4c59a3aa6938b9635f9b2a0e205103131fb1a6a3577715a126513a09a21f69f091721a432d813bb9
+EBUILD hatch-vcs-0.3.0.ebuild 801 BLAKE2B 23409ee07d904c59a2500ebf2549249afa8cc3af34cfc1df4462da92793450bed04b552e216b08262f249f337fb7361b86cdf3c92b2a7ab79e7f37c74a2a7b62 SHA512 2eab7c8937e39b4b1b267f5ff465bc0f0f9daebe5ecc59a03827719830bc952ff7cdf9fc97b4caf2e55b6d5b1e9ece7192ec8ae471d447628b0b699202be2422
MISC metadata.xml 369 BLAKE2B e834e5959ef7719c9ed9d751a8c5e56792fbd553e7fe0ae484a0f1da9c09e97fe262ccf319a773782207fd6a95b16662425f1b348090545b81a5391e70066ec3 SHA512 27b508fa717ff058f09f527c4ae504e131860229e073888b4b746621e1a877ef0c74f1336bdcc097969f9610f68d5e17ad1188efeb0ec4ff733097c4e86b027a
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/idna/Manifest b/dev-python/idna/Manifest
index f59557f9e749..74140d00a118 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,3 +1,3 @@
DIST idna-3.4.tar.gz 183077 BLAKE2B dd6c94104e17b441a7a63aec4e28f1969278996964c402865da8ad1040878539f798956e26532281cc44934544fd6fa33407949caf4a34fa2b48d7aafbb8fb5e SHA512 4060a9304c9bac04efdd0b97ec8f5aeb7e17417e767bf51c5dfc26605edad25ab67456cf6f6a3c5a9f32b8247e46f6343edfd8a6ffbcd6d1075c71e66d089d6a
-EBUILD idna-3.4.ebuild 624 BLAKE2B a61f8b2b0487992bf8fbe3ed2831d72cb4a243a38b42bf9755687f519eae86a33219104b1633b6031ac7a9d11c4d232ddeb1a193e426824ff03541cd3f186d3e SHA512 edc24767657639e750908b489b2eb0ae1e6490b9fa157fcfbdb4c208e0a9ffe1beaec9cb88517cbace2777b5f2f067f7c81b9a615050bea918ff933010a202f7
+EBUILD idna-3.4.ebuild 637 BLAKE2B b9b28c18d716d4e0ec78e9a3fb7f5f0f5560dce0f4c244bb5acfe5309348fb9f6eea82b3f128d79a0582e75342d416c90c7d2c01fdf64282f7ec925771de47ce SHA512 0a3f1167f6931e7a860ec0679c5310121ef7ae2f993b78879b7ca3b8557fb687573b23aa1f4291a3b3458bc7c182602012bb68be6463bd463200f22797db54a2
MISC metadata.xml 393 BLAKE2B b3d4476896bbd50dbf61021bb6ffd653b72ca62b58c034aeba5119189fce3ee331cd44aa95ef8e680a4ef5f82206cf8b0ca1b902d73b56931b509c10c2a18685 SHA512 bf8a9a9b4e0a7cb67b6d541291e5de201a8ba9e32addcc6be0b60fd2035485775a7862f0def6bca3ec0e24155170fbeb08f3d24f9c517fbb9bd2223d25904a3a
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 f92ec7e4b523..506bbd3fb34f 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -2,5 +2,5 @@ AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc
DIST ipython-8.13.2.tar.gz 5467542 BLAKE2B dd924954c93eadc844e75cbfe95627f84120a120a7f69a2bd767c8506fe95ddac912ec9e55cad9ed1149369aec699e0e159f02b7a69ea4ec041e4af6677355ee SHA512 43bbc1669dffad690ee34c0455ca8ea66d30d6249d5c743c7cc100c0a218408761bce9cb798333bf7e7b0c03507009bcb8e1550bcd5be71680f30f822f9376bd
DIST ipython-8.14.0.tar.gz 5470735 BLAKE2B 9789b49b771e69439f957ff85d81f40e6511f4440e2372cac881c708503a5ce1c22e9f1fac45828ee723d1bd9b9ee4684c475d08ed96ed98396faf1400b802af SHA512 94fe14fd914fa81fdb8e370cf0fe7bfb4286be1972b4499ed96e9bf7d018e89f586f3386269e1dafc4a2bc279df7980635bd748799639d6020f52c1cc8af6702
EBUILD ipython-8.13.2.ebuild 4403 BLAKE2B a2cef3d2a7b7ac6f56ee860e3a14360c88bad85108d10a9c962585394421fce3b18269658458b93ef9f80910f852e76500752a08ea4cce7853a912f071c75e45 SHA512 385c885d67512f3dd90333e463fbf39ce9f97417b68314278901513ec700c7034f1aa0fd8a75ffa68d69ebbf33c52965896115f6007f23054995b282b1df53f5
-EBUILD ipython-8.14.0.ebuild 4412 BLAKE2B 4dff4d9eaf7e6946b36dcf0a8cedd55e0279f1970e9b40692c966e92d60b2ee360bcf428c8689503f74960691b1b83f62e11f28e0dbb61c8ac65220405a70b0c SHA512 626b834d26b7af1894388f7ecce124415583dac8aa1a95a3bfe554fd79b34e6b12cf818d2c5aa8ced3b496364699e407f4556afd753c1af8327eb8b9cec6eadd
+EBUILD ipython-8.14.0.ebuild 4404 BLAKE2B 73393b07aa5cc45c8a036c3a198337b834b956ae05dd5f3ae02ea98b8a7b4009df44eafdaa89ef3557e284cb612d256791f2738235dec2698d5d22f5244b3a2b SHA512 712863ab295e6ce3afe2634043de5c9114815cca58356e2beee3dbfc90d1a0750bd81e25eaeba2e15705c0a4070356bdf88a0e8caa2dab2a467b9fecc848b72e
MISC metadata.xml 2802 BLAKE2B 2fb6773ad4ef10d531f978e3ed40f6d99cf1586ec6d7cf2bf7e60fd5d640d082a0946651e0a066993320ffeaace3426066ca24c325926b62125ae91816707128 SHA512 965c3e36e05475d9454af8219b84e080d4c83d775f8a7e20a4951a82246d672c46fd3cb1fff5f8664d0ce8e8fcb846de6f15abc4575db3a6b7d87209194bcecc
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 39b3e8302380..9672531c48f4 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,5 +1,5 @@
DIST iso8601-1.1.0.tar.gz 12836 BLAKE2B 7860d52002008a76c1d28ae94abe5100c3ea434f8e19dcb677dfc84366e898d2d277d88e6591d663579281c4ee668e77db96fd586edbe8b027433844462071e9 SHA512 f3f9621863abcbcde467d38416391cd8c98f59b7b863845b670e11060f0f81bcf4979fadc51c19eb55a5fe44ee1af922976b11cc97bf7b2dc090a485ad9979ac
DIST iso8601-2.0.0.tar.gz 6497 BLAKE2B 6c25a267e35afe1c0d879fd4be5f3c6e47750b4faf70f9238767e8ad901fb2da9b823dab9a3f3e26ccec843a4f993a331f6f7c616f98fd1520a5e4d16268060a SHA512 786bd2604cedeba8bfaa3ca0077057540fc898d9f942627958955406705f104c2109f20c84dfc79674178dfaf4bd0936b4e7759024c7f4b8ed130e40bbfc3c07
EBUILD iso8601-1.1.0.ebuild 666 BLAKE2B 29651c24a27033d8dbc181a35b1fce444c010bbec6fd7783e2d626a9dda9420e3f1a21db030b74268bef21bd16ad48249f191358eb318581f694f0f09e537b26 SHA512 c82b6a1952ec36ab7ec559033a0069deef2b48511b525e89881c741d5f336b75a9d1f2979ada544c045d6b9ea19a04604ec0cd87d0ba8e75aabbe6354148466d
-EBUILD iso8601-2.0.0.ebuild 674 BLAKE2B a49c9302a445c5f0daa686d05855156387c6fb43ba6b49ed3aae02434142cc1f4023cca372b56d8fb6d529feee981d9d5b77eab74cad758f8801fdafb3930e82 SHA512 c5c03b16c9c15b277945ecade2901c15492fbdbb6a56fd5e566c3c488c1f57f576835bc24dffd49849a26f8a3c199d9bf11549d9548e5bb290a8d6d9a3dd8c3b
+EBUILD iso8601-2.0.0.ebuild 666 BLAKE2B 29651c24a27033d8dbc181a35b1fce444c010bbec6fd7783e2d626a9dda9420e3f1a21db030b74268bef21bd16ad48249f191358eb318581f694f0f09e537b26 SHA512 c82b6a1952ec36ab7ec559033a0069deef2b48511b525e89881c741d5f336b75a9d1f2979ada544c045d6b9ea19a04604ec0cd87d0ba8e75aabbe6354148466d
MISC metadata.xml 395 BLAKE2B 5333ae06825218414b6d4dcd4b340a4592be494df7ccb94e12a4eae5b19554c1bd79acc859bcde3647c12888501e8a2bb59dad3796cda8d83dbb57ff8800c975 SHA512 fbfde32b4ac97150ac24ece6f1238bf9a11d0dee53353bbc6b08269e8dd87c3fc833f37af5b2d5939d394c738a0f175949affb0873e62c2523d9667256a3a6ae
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/Manifest b/dev-python/isoduration/Manifest
index 5a323a9ee21e..56096c433799 100644
--- a/dev-python/isoduration/Manifest
+++ b/dev-python/isoduration/Manifest
@@ -1,3 +1,3 @@
DIST isoduration-20.11.0.gh.tar.gz 15909 BLAKE2B fb5c3c383aa000c4650490b701fc091c740e45cf782aa929824e3f3e5601d4de82a68a9430f450b42da3658105c87cb293a98b94c77fdf03a1702e6d103a257a SHA512 9b3dd5cc540bba35a73aab01bf1f0274871b93b03ff72f8cc63fa0d2ec43e1f54deb95bad2323aa4cb8066b1b5401f426175792c062cf46449c087601dbe0420
-EBUILD isoduration-20.11.0-r1.ebuild 815 BLAKE2B 01677c0b96793925fd4493052eb30cec72a366018543dc3a96dbba2d50bd3e78f2b53e91560801e9064f1f8aa8979e6352aa9d642885ce9be159ae9b3efd10a4 SHA512 3ed027985fd234159fa8904a355f9ff84473bb599cd75cfc99f7ec38d46b1f1098e12d81a00efc9419948e9088897831f7125b4396269aaaef184a38ce495578
+EBUILD isoduration-20.11.0-r1.ebuild 828 BLAKE2B 40b20c8ed00096ac0f8c2830998a335cb6b81b4aa2ad943bfa769e922c86af59ba83fb5e132dd8e66d3e298dd3f9605010ba496aca1243c7354482b5de39458a SHA512 d63732f385751fe473a6327c64f213f1a1efb58e2567f79439392010bf2eb1cd0f5c6fb439325c348e4035265e8d3a3ebec95cd9b5a0895de69189f7f8fae3ba
MISC metadata.xml 398 BLAKE2B 85871d69b3b16257b3a62cbdb3c00a56bbff15dd62d11ec1bed8071fb802d4063f4b4a31e27f47470a76c200b2da5d0c8cc8e1996a2297ce5e23bceb9ad0b5fe SHA512 884dbc5a230ea3c07a62407d5d5c0c1d4a1be0f2339067d3340b90606ad3e3fbb773c5e55668eebf5a9f1381c3033b0687219d301e9dff402fff5e031cbc3e98
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/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 6cd1fc5f9845..bf3983eb83d7 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,5 +1,5 @@
DIST jsonpointer-2.3.tar.gz 9295 BLAKE2B 8a33c8ce21721b6c402a44d3d1572a767e3b7485fa1dd80baf98120c9822412841cc21e3bc2d6b7e058793ab4ade5993712c689631cb4a1237afc1d7f36e6bdf SHA512 e04da474a5ec376d1cd2c764c2d7a11ac296450df199449994cb1dedf02a49df3ae3a4e75b2963370dba1da166464602b849a79609f7a98d8246dab0b342c819
DIST jsonpointer-2.4.tar.gz 9254 BLAKE2B 423a4ef71cd1029fe2c473940794a041df4c3422b8292d80290be7f11ac0e6b123d3074cb6f66a3d860274bdf5b0cd0716d24c9ee50b65e06139375dc93c84ad SHA512 41cc0f8b525bec4b18801aeaec1b2432c5f6475dd3f2bc0fb363cf6ceaac5c64e7993c72130a40c64427218a1eac352e93464137fe17427b9f8a34ae09699f4e
EBUILD jsonpointer-2.3.ebuild 623 BLAKE2B b61300a995a6b3d14b21a131d54a24d7109e63ef93758316ce34442da17d2bd6839f68e405ee3960302225e2ede16d2c1af8382ffca42abebdd87b7dfeddab3a SHA512 2b3bdfeee207e8011f03238527dc5893d3fb9985eb53bb3701de77b37fd06b96c21253c5a2d1e4df0dbf6b5a47a0843de623f7e4fed77bfc125012739a04d254
-EBUILD jsonpointer-2.4.ebuild 642 BLAKE2B 9604c01d8c1d7dd35b76d31ac7aa62505456a3c22dac56f463f14885e49cbd72435a7cdac557852423c2df3d60fb18c92403950119944a27310908ef06c18258 SHA512 8797e13d9c134b886893f818aff48313a6cd9babeef3c0611bddec7089f8e22d0ddc8ef80e974eeb99eb258fddede005e190b39814ba0aea1c6194742260c30d
+EBUILD jsonpointer-2.4.ebuild 655 BLAKE2B 716890b0b162196e10929e5af09a2ad110273d1aac382515f16dfd748f34ecbe6884a83cc6364c4d9a90266d16c51955e42bd769f391d472184337f2ba875813 SHA512 3692a59a0734606ae609bfd4cbcb6755b01522481853e36bc5462f244eb6b3910b4c8dc1e89e3064dd9a5c09e2103c4d1929008719339ba50ef79f8df5d60610
MISC metadata.xml 728 BLAKE2B f14151531af31af82ca130caa61b9c9af6cded41678899d5413f076d7fb6da93e2c4aad3ff27e66f64ba56b8ccc70c065763157312438f32ccf2573766ee160d SHA512 6b19c6b90a5d151d4837d8be641b52ffc4e7eb3be956760d1cffbb2af03258c5a2b81a9074daee9b667fcb5df7223836130729cd5ea4130d2b7f3c7415e62569
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-specifications/Manifest b/dev-python/jsonschema-specifications/Manifest
index bbfc1442a460..3a62658651d0 100644
--- a/dev-python/jsonschema-specifications/Manifest
+++ b/dev-python/jsonschema-specifications/Manifest
@@ -1,5 +1,5 @@
DIST jsonschema_specifications-2023.5.2.tar.gz 12581 BLAKE2B 74029c066e3c620126ed0ed7e70a9b63c017aeab827b0187f8c8c5964c2e1ef68a83489f4646d79653c38fcec45bc001189fc09295ac1f569ed288f2dc469459 SHA512 222a70e3c1673c6f3d27f5d6561d4ba192c61a8a6f86e726939d1e29843eeca82de306a889540ab352a5c2332cf30d810db956aa5094f2a6bc6607b7169513fd
DIST jsonschema_specifications-2023.6.1.tar.gz 12645 BLAKE2B 9dea1acae9e53a9f8ff93dd54d5df3bb1dd960036dfcc4dcc0c6287ae816c0ca60c139b35aa14901e2e9f61dca339cf9d84a5c5e8f91a62a40696db9daa1a099 SHA512 b7a0d7fdc642e08cf3515dfae6d8cbb14e4d40c3b1fe3cb6c87ee11c47a9d6ede33b28d9fe6f3d4f0ff1807469a015cd8fcacff9575a356a74b462af9681aa6c
EBUILD jsonschema-specifications-2023.5.2.ebuild 618 BLAKE2B 1e07cc9b380f661c3e6254eef681188984768c097f0a7e3336e2cac2b348ae206ec92d2534764850b91117d4cdb078f392599baff7c31214b8c6e73264a20de7 SHA512 5d96c71d00debce415811193c7acf144659236926fc1ea65a6ca655642ed709de873353de0362335f651d05af5e07dd157589fcbe9dc703463abb94f2f1b2b9d
-EBUILD jsonschema-specifications-2023.6.1.ebuild 625 BLAKE2B 5d5c0784716cea24403020171f1b653bd03fbbc5b3ce9ebae7a69e53873d914860cc7010c5ccbae9f578df99b555e7e6858d40129075a606c99d1a7e743bbc00 SHA512 2374551a8f16e10eee19665492939550d6ddfe58a201bfc1f1d3b6729e376f02d069d0d58516916aebcaedecc9948d8602103517bf8d99bd8a3d666481a655d3
+EBUILD jsonschema-specifications-2023.6.1.ebuild 635 BLAKE2B 7fc15ddc9004a8b33ed771f59ed6ce1174e6abf169e80f7fcdefac363e73f8d9e8b1faa8d60adbecc999c195a47dbbcf553e915ea0a76dc5c537f2d146cdd102 SHA512 4a45cce71f4cc894a08f0f52e4174a211753b8be81836692f0c8b2c845bb19bd4da469f05285c6a3cd08d0b9d97f641c2872d5ea32407e91a5ec482be6ec1fe8
MISC metadata.xml 414 BLAKE2B bc0046f51a008fe67f4937f8e9eb2663c868a41fed9371301575f74fb10c38f10b21a380d865981b317189f8c25e3ef6fe18423a169cda92b1d2b1a14dab8948 SHA512 e50f0eed8995fce7e207cb5c15106f3980ebb9c3d9d0042d33c4843be231f90aa652e59e1f83335f336d9b906a38252a229c1562f25142604048497608d29794
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/Manifest b/dev-python/jsonschema/Manifest
index e2a748ca6cf0..9a677c1ff241 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,5 +1,5 @@
DIST jsonschema-4.17.3.tar.gz 297785 BLAKE2B a0383bf5612ae50e94c95dbc1774d796b62c74a7aae3056a40edb7e042ad07fd7885e61d86220120a906a4017afe30d8ee8edbbf0cf01a6dec1f212984ff1c1e SHA512 626fc913c37d2e49e4b47c9e058aab4a96c1dc50c35d8def0b2ea0ca464dc25e3318d4fde4927c11ca38068743cd81779d5189464b821407ac1de1788bad30e2
DIST jsonschema-4.18.0.tar.gz 315551 BLAKE2B 0f885362b6c1af6385be88770b1f332f38e270ea48c81d2ab6ab37503b007bf2d7a3419c9d435e919fea7c6f6d4b3d1c84a5fd4f196237507c9803473a879f4d SHA512 83eee5a752f14475b32405a916790f033eaeb4cc4b69625abb4915972e5832878a0aa2c51c5c782169bfef5537f3072bd41682e2752380435f7de1162e66f4c1
-EBUILD jsonschema-4.17.3.ebuild 1454 BLAKE2B 8198631b39ca6e2235f31496bb3b522ee4d2984ab8a3bce49a568d672e41fdb7547a3348d215755fdfb0959ae8c5764c760d191c50635f02a1ba0e5e8d0ec4ee SHA512 f596d452b70c84a8fcd21fb7d6b7c054f7c7e93211360a82eb90943289fbfc7f8c6e9bcc914a911a37694af0def939b432fc5a837fb990360667809cec4e1160
-EBUILD jsonschema-4.18.0.ebuild 1493 BLAKE2B 218fb2faff1cce6f1fd51d55facf8223c17c9482126abb4033e0afe823273bcacfedc0e10b7ae8a9c429a345cb03a3476d9a67445604188b4ab4899eeba65072 SHA512 8d18e969f72b7f1c5c74a3d6a73839c11f32f6a36785339521c796e133057da10d0ca7f6f12e60f8fad561e2e0f72ace04b293bc7c6fe229984a97a0aa17880f
+EBUILD jsonschema-4.17.3.ebuild 1467 BLAKE2B a21cdeb7dfbbeb94802e41a7988958e28c6c5f3a85d939e2ccad8b2a6a26c2b4cb38c2954032f6cc9a6f5f04ac54a852ee8f64af57f60e5753131dbb37363754 SHA512 22b0aa92757c0022d1efc3b3acef19cbb65df556d87c16457907d1d6e743fbde7746b1a4fda2ec559123fba569496046101f410cd156c2f9199674f12250b67f
+EBUILD jsonschema-4.18.0.ebuild 1503 BLAKE2B da918dae202ea1cbe9e4607087b2d216cf84deaf3664c0d8acc2db7475886e2676069fa869c2715d145eee4f7bb29bc9baf1ae560017d7c0784454598d7e313b SHA512 d208381494e5fde17243c9502975ea1be4e72e6fb91f19213c4d10f80e48b8145d165a2d22af34b0bd19f2d21d8fc012bdc57b3564c2df7d20b5f6ad40f69fc7
MISC metadata.xml 705 BLAKE2B 731159cc340e6cbb15fe5a8d374188c8df685e8f8294d19af54ca3d209beb8c273b6e901b6b7fe75401324b8512ffb7f1870aefa8d4a139d1e3b84147d993af6 SHA512 1069fb33b2cf47d3dfd5e825b23ba1efa7d764d0d23aa009db522d04bc08362f5ca646411ec405cd33152a65ea8de2ea90d3dd6d4d4bf1a947ae7943e9d4c727
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/Manifest b/dev-python/kaptan/Manifest
index d83e5d6dec07..3ad6b78b6538 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,4 +1,4 @@
DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
EBUILD kaptan-0.5.12-r2.ebuild 422 BLAKE2B 8648042a5fbbc638e5d901fb2c44820a50c1e0bd59e61a4078573f25b3993fbde173c7872872c33b74484b80737117da786c9ae4e24f5f1f6f297a60998fefc2 SHA512 3834bc889999189df67f65e00eeef7af5e0b8aa486d7663394950dec74dd383a06ebfef9e799fa1f82dc344beeb5878849214b6afa4928b38963bd800d4ccf27
-EBUILD kaptan-0.5.12-r4.ebuild 598 BLAKE2B 2a86ad459fa18c5afe90b524427e0186ec418e1676c718f0fba335549d741220312cae5b37208a64c24d89cfe86f9b93a8b7cae0d07c27a2c7f5f8a19fbf7188 SHA512 81aab08d5424154783dfeaee4d25df7f64fe76e8aa55d0b2831a07913a9a7739096979347f17f8f06a94b7d075b1398cbe6c12e727365632f8a4f08126468e8e
+EBUILD kaptan-0.5.12-r4.ebuild 596 BLAKE2B bb6f0e71afa9001e839cfcdfa8b8452f1438d38ade7b82d0ef9387cbe0ecf7a7a8cb56fe6cfb8353816245d79457a6086eb5d9e3dce1bff5c009667bfeec3e2a SHA512 4fc377502915e2793cdcde5ef94d0b90e3178ee5f70c5ac0514dbecbddfc506bbf838ecf2e248155587b47e7bd4f4af42970dd61db8a56c9183ce4214885892b
MISC metadata.xml 471 BLAKE2B b82e958c2a8c137af25e3a3fc7f34b35d4d2423ceb6faa63adcfc5f578d0fa2550c1f6ed0256600af03fb697992e735ce3f1315ca18215aeb173bd26aa0a4be9 SHA512 41876de2e76c8f2f5e87b714bb7a36eb5d07435750851fb285df30430a48a3b0b4267a30cef0ca96e7abd0a0025b9247b11973e1c2f156a45d90ce9a2cc59a8f
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/Manifest b/dev-python/lark/Manifest
index 45081f320d43..7b00a526ea64 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,3 +1,3 @@
DIST lark-1.1.5.tar.gz 246737 BLAKE2B 2111bb6c2f6eaa05b803daf11f0f55641c9b3943a97f943fd27b5dd33f8b511e3b0fc4fb335edbb3926ad19da6cb2696b7f87003b7def068cae1d805b3feb8d9 SHA512 8103e050745c83c99b077667aa8b1d4dfad28f5554d2381534b3518d8d3e8adb70f0304fdc7e1c762d3ea26089181d9632dea155b6cd97237078b89330a6711e
-EBUILD lark-1.1.5.ebuild 963 BLAKE2B ec316346a7d72a2d10c470ea844957ac2c8594857ee9a660cd44c999bdd62790cad14e7dae965584ce3dd6548729b57d9d0bbc979ab38b0cba744e8dfacf325b SHA512 3b8ad9d44d0514fba1089646e9074e324b5044621cd8ee7f12bfca742ade82dc39d8da857bc6aadc6fa2730901923abc736bd32d73770f342b083684d59d2784
+EBUILD lark-1.1.5.ebuild 976 BLAKE2B 27eadd92cd8da5f9fd086223ab7d3fcc217a456e4bc7bc2004cf60596ec41d4a8fab38a1784e68418e56fc9881f3e51650317704344a391d9148435469bffe9a SHA512 3a7416443f30db7aed7c1f7cba9d83c29179b93b230ae1310acbe61c7c349d65e12739e3d8193ea13911eb7a7a4d28611133df244b0a7085ae4f8f28ac53bf50
MISC metadata.xml 388 BLAKE2B 705a273d593a97c10e06cf04bf146864ff3a5d955f30d0094ab6869fd12e6033612e361e55b9e934f052ab29de7beef928293a377d0f1abb917f9715e111cdd6 SHA512 76a47597d5a6f2a71907701dc53837b1fb175be2b2fb0e70a03dacd17974f4dbaf3caa56f5e4be07c6847245c313bc3911ae949c689056082edda7993405cc32
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/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index 24a363937f2f..c6c24052cab7 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,5 +1,5 @@
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
EBUILD mdit-py-plugins-0.3.5.ebuild 750 BLAKE2B c73456e500006d38b7a2bcd2c1b124363bcbca2dc5d2bd43240b1284e0bee4bc8e9fda4544a836c7121b299a914dd9744ccc515358021f63048ffbbe3606a4a1 SHA512 b5365f6aeb93e6bd3b5391c4e7f9a9cfdbfbfa172da0ecef12955859f0921fd84dc3a5f12126d52304b7787e99806e1ef7857b4f6cadf8ad23b2ce2c57291176
-EBUILD mdit-py-plugins-0.4.0.ebuild 761 BLAKE2B e0bcede0975c1b36f301138ae65cf91caba35039688cb8a397c3a527bcaf6be83367952f027164e27fecaec80bd85d27dec69bd82d29d6a9e828c2efe7209cc9 SHA512 e56fc4441391c48f3e22e7b93dcfb48ab4205496b4f545ce7f34db47b5f70b18447328e8bc96e431d0cb34d5be6cc685a580583f7859e02627666427df48aa5b
+EBUILD mdit-py-plugins-0.4.0.ebuild 753 BLAKE2B db25c97e00103a69201d53d3effb1cca7b7a100ad704d327ca201e41fce10f999ce705e8c3c859b90f94e7a6eba0ec7ac659b8e130be76a8350b581119700aff SHA512 11f9f1b0c1cc054598c6051da032ca79d10c4a65235f64f2552463b2fe9adde3fe1a1cbb19e5fe771e347660edfb4b70fac31c260835f48f8e5146a9e09b5476
MISC metadata.xml 414 BLAKE2B b7b6cfc3dff5ca097543d0541b066c466669ea3d9193e10530e97f6992053bedb67badf78023b14893d779a1580eb3bb385d51affc5a0927d76f89ddeed1be24 SHA512 564918fba45aa79a7a05d532691fe15aaa61a0e16e6004d57875720a26fc13548d37793fbab83479d0fc8c70764b3f919430a9bd698c03c85bf9103b56355166
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 003dca88d462..60f128c0e4ad 100644
--- a/dev-python/mergedeep/Manifest
+++ b/dev-python/mergedeep/Manifest
@@ -1,5 +1,5 @@
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
-EBUILD mergedeep-1.3.4-r1.ebuild 591 BLAKE2B ad2f6878db4bf068bd1102146885a6a736003d35c6f04f28a316d0017f5e1805502e4456d5502df9167f1bcb9f2742a5eb9c0a28a895175ecd2856cde65913a8 SHA512 2d3c353d6380f58ccd20bfdde3f97d78eff8777549885b9c6ac2289648c648df2d8c747f6e3f0a68659edad5e228335bd4d5d19a0422b30bc82b668140a01e31
+EBUILD mergedeep-1.3.4-r1.ebuild 589 BLAKE2B 446a4d06be5d848959eb924a4f5b9cde85589452702f995a91c2e63a2f2609d15348b6d42705eeae47831e8032a351bd51647b52307c667446151cf3a7338b09 SHA512 f99df793a4a397bf6403c7a604d583c6e589fdb2c47dfe66351f30a1762d15659bfb59c5a1411f58d0497288614a3271fac70fcb19ddd94429e0b47bde394f05
EBUILD mergedeep-1.3.4.ebuild 542 BLAKE2B bff6538d20d1a8e86b29efee1a2b57149fcc0db9d8ccdffbf4c3b3e13a9cffe7d1e6f113708d841f34c608d2c6e60c26660671905f9673ee7a6bceb539843dcc SHA512 ce4d2c6408f9def439d719ccb698a206b5cea4c57bbf89366b88a06b9136e3b0c9bc171f21a97c45906ba6b8cbc4ed8c1a300e1705ec5fececbb21c712b1cf87
MISC metadata.xml 413 BLAKE2B e71e80d2c461b4e06c5423d8a62aeba828d15e74546208daaeddde8cdacb2d29410f7ec2c6502886af026d94e829da42a9ebdfb3db84ba3a3f20576afe46a8df SHA512 a7959c7245826060b771e422e1272ee8dcf1f2c8fdca7e1648d87908249a772b5509cddadf70053b0a109d91f6357fbb88b4fd89e71c588b0400444e2d3bba5e
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/moto/Manifest b/dev-python/moto/Manifest
index 909d6cb11bbd..aadb8e9d9d1e 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -7,7 +7,7 @@ DIST moto-4.1.8.tar.gz 3520127 BLAKE2B 623d97dbec357227ea401ac98f694eaaa129fcb47
DIST moto-4.1.9.tar.gz 3537033 BLAKE2B fda091585fd331ff68127290426bb1f5418b118b9d60711ca54bcf57b1ff4375320bb3f3ae79321d105e815d856183b7f3c012f20c07f357831fb8260dcbd9f1 SHA512 1ce3aa3549b6320a8493f7018ccdc630f94cd324791e91c2ce28a994dff8da37058c47c84f480dfcad870ef63a0e1d35712348b120c112696b8d9cbce66186a9
EBUILD moto-4.1.10.ebuild 5240 BLAKE2B 317ff43cc57e60de11ddd9b3edd39ee68a4fe1baeff511fcdb5d2430bc8a76d7bee8f82564e3c444752fecf263ac77b95314062f9ed5895a8daca8f00da67511 SHA512 a7582f382f25b2529ab79f27c9874e5c9b46161bbea16729ec50e87c31c4b623bc2aba33a45cda6e2ce27b35ec945a6fc0f042e38b76fc1de63cc7bffea3fa30
EBUILD moto-4.1.11.ebuild 4248 BLAKE2B 230dd3baf21ff4bf2abbdaf43def8a585997a56af2f709008aa0c6b7ae1d45a0d1b5d375d6b5e110826e645bf3c67d8f8009108cdcedd4af4c1c1b1f0d8b23f9 SHA512 f616e811f8b6680b51382673f68b27c7423a9f8b6f69d64084346d5aa7cc0575abf5597246a5ca4819978d615d8f8174a313d78c5552e3fc76fce5032b5a18e4
-EBUILD moto-4.1.12.ebuild 4248 BLAKE2B 230dd3baf21ff4bf2abbdaf43def8a585997a56af2f709008aa0c6b7ae1d45a0d1b5d375d6b5e110826e645bf3c67d8f8009108cdcedd4af4c1c1b1f0d8b23f9 SHA512 f616e811f8b6680b51382673f68b27c7423a9f8b6f69d64084346d5aa7cc0575abf5597246a5ca4819978d615d8f8174a313d78c5552e3fc76fce5032b5a18e4
+EBUILD moto-4.1.12.ebuild 4247 BLAKE2B 4aa77bc7d49fd047b038eb3fbcd51ef00e8c87577f6990f4cac0ee1c139070b7d68b24827e5fe9a02a2ea89456e267a769bbfca62eed7877e755850414177377 SHA512 4a68c35572bebe7a81cbbb4e87f3bf37b80dca4fc07386745a431551c56d64a736eecb3f18359ecec41fa732071749796992ddc8db7d6b2e93420de69c21808f
EBUILD moto-4.1.6.ebuild 4649 BLAKE2B fd9d2ffcedb9293d7bf28db6ce038d195a927d4a619123f0653106ab5bfdcd78e2293680f8a2074910ffe230895bc1a9e2e840e919bb003182bed9180d8748b8 SHA512 5a89a32abc9ea6657e6d537b869cee712f808df331e8b5e286f7b57c1664c8ab29fd3996b7119275bf83d0179930210c117109f4d17b1a5eec4b7aed4f5d814d
EBUILD moto-4.1.7.ebuild 4651 BLAKE2B 021fffe6498724bc3d1898f43fa00ab796624791ae6566fe1c1f866bd505515fda1a181b5622e766df80af1b54f78d7e499a3d9193cd949272f5bfc442feb4fa SHA512 1ce2c694b2bcea2da375a0ad2d427e00fe59342da87ef630d5fc77441385a17253ef25c5fd2940584c0d433894edc0b477cd3025d4e913bdca8049bbb7ba5044
EBUILD moto-4.1.8.ebuild 4750 BLAKE2B 60ccc43db711e3e00966b3a0390839e3d973abea103636bfac30b35365a648fe3431a205aa6840b63253dc07dd7125cb20d20385b913aed2339bb10e545ef86a SHA512 0bbfea191ba3b29f96d678e972f82ae03438a3781d7240c3d0d8ff41b2ffa10ea1b7270ae86e0803ae593b7f25bc9fb054ae637c3f7b93df897e19ea88299600
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 557d610d14ba..4999142ae092 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -2,6 +2,6 @@ DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb8
DIST munch-3.0.0.tar.gz 19276 BLAKE2B df7b8ee8ff807c2a1ca61974d70379623411db2229d176b890949aa3318f7b2ec1e108a340e55445751c46da24deb0f749d66fb69f9e10e92a04a01c766a73c6 SHA512 d08ac1b19badf0fb17f2dc81e53ab7492e49da225d8fa890fa9227df9d4e2bce395c7d7a8000f635529c1fb2a7eccd4eef10370b76e95b960955985b38003baf
DIST munch-4.0.0.tar.gz 19089 BLAKE2B 17aba6f5ab3e2e532a9deb8623ef10aa569231e5457b96acacd7c11117db47afa82409f9bf8aa384a8207c23d4af1140dca6db27c73df05658b8ad3997ad071a SHA512 7beeee4d3fd084ac929e796cd62af097c2602a3ec06405f79b562bc6d14577350adbbe02848253c62f0938e706b9056799bfd5b9c2bdff6e559b3903b8cdca5c
EBUILD munch-2.5.0-r2.ebuild 664 BLAKE2B dbba9c68bfe1d452c898a8b6f590f50fe9c75610c0a1d5124d57ae797dc5a797d44618534a725165e39601076ab12a88428d21dcaaa7c3db08234deb06ddfc96 SHA512 89ae6ed8ef58fc95766c252362e305f428a5f1953f98df9c5a982e1f92c896dac4ada7882c8f20bb429920c309eeb5a1232e219f458e808c64b7964b2e9cd873
-EBUILD munch-3.0.0.ebuild 673 BLAKE2B 71c93d764b116d5460ad39b2ba17ec7695371add97580517de01e71533d0dea1ee4670e70b6b04b2f0f209f17f0a40e172914a24fdaaec623056dba51069978d SHA512 54252e2bd3472c42f5b7c022bb1a8fe09759eb5641762642bbbb04a854014c50316e36e9cfb66878396832b5c04add2841b230c094857013b21652ecab7a39d8
+EBUILD munch-3.0.0.ebuild 665 BLAKE2B fc7b4a40472378e44739df38c4949ffcf15d3c7c36bff51b82f1d113361a67005304821e19df09590c7335d4714e8d1646c69af27268cba26ae62fb54937f668 SHA512 dcae443d8066f23a5f695220c0dd31134148899dc44a50f402aee5feecd3a27adfc657b2f89acb9ca76be2319c6b0637b6cb5ffe30a569f89895c2415f480083
EBUILD munch-4.0.0.ebuild 627 BLAKE2B 6fa2e802ac095972e84881ee2bbacaee5a738fb7487e0e4091a97fb79242ae339014f2c36468737c40805faefc79ef9661b2dd87936f0f0ec64c88633d5729da SHA512 aa40eb29ffb852c9bc3bbf02bb95ca8ca95e73d9a70b8b9331f5a707ea05bcc2a25eb29514c4ab0cd8cf394e5ddaf1d80f95fa4352a39bc6776c2cfab16f643f
MISC metadata.xml 401 BLAKE2B ab900d598b463036c2f6d7cb6a5b1abcc25e5739d3fb953741abae620ee8ac845077870dacf433211c5a4d14972114f8d16b94a86514be5de7667a2ab32b1f45 SHA512 f3334ff207272f39f44dad54f2d173218b2192675e04dd076cc16b461a656e146f3ba5b73e53ef8c115c5c3f32f40664f6191c31aa20fec5bcedb61186fed4bf
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 288c9f386dce..edf92ff10176 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -2,5 +2,5 @@ AUX nbformat-5.7.1-no-node.patch 719 BLAKE2B d9a30c5cc917f6056e73a90f2300d15aa57
DIST nbformat-5.8.0.tar.gz 140655 BLAKE2B e45b6fcc45fa01ceed49fba0b3a3fd749df6692e355156845cf69fd9d2e176332c61c89b5474ffa89d96da4d4453b668150e96ac266cddd254efdcb1a3b742a1 SHA512 f000db59701eec2fed8adba6c1b521bdfaf942bcd0dba2d8d6d79a7d28b078f4a29df05ca3f393c1651f3ddc6b3690f536928d6fff5937982cc52dd013bc6498
DIST nbformat-5.9.0.tar.gz 140980 BLAKE2B e967ac0972dd2a5749694900002f9ada4171b5219249c3b6aa600fba97121aae0334516838c86b175064b0975a298fa9a1614dd2a458dd5d66ba832187731bd4 SHA512 c409feb3b6ae9b89b86d1c5e77a23a368776ccf9e62d606e2bb689927eca4d73c79a22e3f5e9e2beda78c201dc7485114e762872b305278c23c8129c7c65449b
EBUILD nbformat-5.8.0.ebuild 1072 BLAKE2B 66edd69158d6524217cc6b242fbe5dec4587939dc6ae1feffabd8477731fdad8c29d091a89783eac4c122d8e54154177490a9b8437e2b4a9e5103ec976f88c99 SHA512 8b72f7976b8c620474d6e34bd654fd2e164ad0a09eaadb5335aeb6f2aec9f623af9ee19d790e1165d43e87429b92151d64c71412862dbe978d11bae6307bfb5a
-EBUILD nbformat-5.9.0.ebuild 1081 BLAKE2B 4547b6936f9cfc6001753bc3b36ba711e2a2524d7ffac36173566420fe7673dd1b13910f292b3faa1f962980c22f90785003a3a4b0dbadddccb675e571cf48e1 SHA512 e45bdad4952cbb18ce6a3db997ae5dd9d326803cb1bd56fd7ffca4e8c4962bfd9f007c22562c144f689ff483292549ea296b5f9d24225f0c93f77eae6fa6608b
+EBUILD nbformat-5.9.0.ebuild 1073 BLAKE2B 33a97654ac558a650a0ab7905ab9702818c53a899dce4887a2707a54267ed74b629a0e325ff3ff7a0545afc173bf4939be0f186eb5467132c6755b64cdeb5f05 SHA512 4313493aa06e1d4c81b606878bf14f6758f929fe133bc2286eedf01141e148871434094d99ab3a075e2fbcbb72cc587c7071b762fa078b89d38595db183cc9d5
MISC metadata.xml 780 BLAKE2B d44b94d8d10d01e2b8f465b6a0351308e7c219295f34713ea2f26f0cc1c9ee4c156bae3a33977a8adc0bd2cef177d468a5221d0d7a5bce946bcd3aa1a1ff0623 SHA512 0d15f8e0ef1d3f675cfabd0a9d4db7a8844be4ae1c9ff06825bc9a0771ef7e2430d1ff66a3ded9ee64df42ab4277c3eba65ed256d6a672cad20154272a0a2c96
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 e0247479e407..84d5cafb3fb4 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,5 +1,5 @@
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
EBUILD nodeenv-1.7.0.ebuild 558 BLAKE2B 55f811c7864c95dba0cbccb43ffb22907656370f496ffde9fec82404c022d8dcc94c95e7481c94d6b2205104a8632b66f178afc5e9701c94717520e6fe72b9cc SHA512 d293d75ef0b0be370e249f54bfba015863134d498abbe9b530666454824541f48471d2b596eb04ba7e102810f1a3333bb24f09bf37dc749e75a52b071bfb82d1
-EBUILD nodeenv-1.8.0.ebuild 693 BLAKE2B e7389fe869ee90a34fdf1d5b724512ba3f6c1038f128ab421d3ae7d6392ece40fb9d25cee7ff60e8b644cc5e0310047e66a47583fc8bdf1f04a8514f9af9910b SHA512 71728f7104a1cdf64056fa06fd0211c04cd868a4ff33ae76bf67cfc174ca60fe11c49838d7a576ad180c8509c38e5e6ac42a2c33de818b4f85b9154fd1be9dca
+EBUILD nodeenv-1.8.0.ebuild 691 BLAKE2B c71dc40dd443c529e7efebe2eff34191189945ae97db5a1f73c96cd5cfc7ad71649b5241d0967c2f7737b26a3d13a93c94623da2901265f0bcd9d9f1efeda5eb SHA512 21236288f9553f99337f353232045d5491154a1b772b78a39bf3bb75b6cc75baa709f640d6fd5e73e425405a84f1607392aefb8573189381692699154e15d250
MISC metadata.xml 378 BLAKE2B 7dfad28224587f9df7781a7b1d8837b6c386b40fe20da3fe4b1cd4dcdc417a55ce5da03870907e44f6aa64e1d1160dda43848dac097ef881615688c511ce9a4d SHA512 06d76ecd3a1077b3bd37d37783ff37b4f58ad2e7fbb5294a0594ff748e5f64498567e4d1814a89ed0136ecf17a335a0f8a1627af2185144b4d929b25a8eaa2d3
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 05f320d003f5..97329f314f2d 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -14,7 +14,7 @@ EBUILD numpy-1.24.0.ebuild 4196 BLAKE2B a7359b00b007339381f458502457b2d2f9f07daf
EBUILD numpy-1.24.2.ebuild 4366 BLAKE2B a7a396b29efaf6a07bd68f76e0cae0d069f530a4d4d915b89cf5a47a42a4e9cf29215089f0a8f819fd24961280fe83f103f28b6be90758eb78f3f408ab5eb23b SHA512 b1186214bf08642b6ca267d0a84ec03c8f4b6256e728eb17d789eb34a43760bf87ea18696ef30b12494bff23a3b8b6f1980085c900c5341c8d43b8da468549f5
EBUILD numpy-1.24.3-r1.ebuild 4628 BLAKE2B f6562a9a62262c0b78105ae9033537c65ee06ba79df7fb8e7ad6ecde01c7393dfc5e13234446e1642aaa3b05b1c8e9af4c7b6854a3c3a5f85931b259fb82d574 SHA512 ace98f02994fd18fb67e2879c2bcbe6fba39ed16cc3ee43acb75f50755175b4c6dfe6d72a21eb28a86e5ec2638f07ba6506d38a89b4b3155c41ba1827459f951
EBUILD numpy-1.24.3.ebuild 4581 BLAKE2B bf5f6eebf4a61a9d6c78c1e203db03e29f53064df3edabb2e2b1a0dc44abd5a13003d1d6d85e29eac3f44a5dfaeaf690be6f014896b0eed5fb1bb47a76b56916 SHA512 8900cb724bfeb570c812f073ce4b53c5242c342183d160950cedff2ae7159638f717a8006aed7f9f451e8bb3bd48830c975b0494aebe69e0f3189340f03df22a
-EBUILD numpy-1.24.4-r1.ebuild 5143 BLAKE2B 97c445ff3e3707ca421994f7fa35b8502023ab7b6ec5fc567a2cc6b29478f67b9d3a9703bc817b36c97d0d4abbe1cf34437959dee5345041fd148348b58729eb SHA512 c5d0862c089a7503f9e1db587c2269bdc23e58085db0fdc5515e22d74c26011e80919628178f332e896b60664136053e5cdd7cb63ab8d981f78580716f14ab45
+EBUILD numpy-1.24.4-r1.ebuild 5156 BLAKE2B 25bec383fd68bee81b0652f5f1845b2e598db5f3b9923c3e9d0d00e6d93fb9430e6845c673cce1c0a29791966acf1933db6d9074b8385c1cded6becfdb361a8c SHA512 9396face806a2c17952c2bc0802acc54f0c5c29bc9cc1a3265f60b0d72cc5094c2c6f9065e02bc4d6bb051f9201f6d1f4a74c936843fb4148811bcf6420a2765
EBUILD numpy-1.24.4.ebuild 4628 BLAKE2B f6562a9a62262c0b78105ae9033537c65ee06ba79df7fb8e7ad6ecde01c7393dfc5e13234446e1642aaa3b05b1c8e9af4c7b6854a3c3a5f85931b259fb82d574 SHA512 ace98f02994fd18fb67e2879c2bcbe6fba39ed16cc3ee43acb75f50755175b4c6dfe6d72a21eb28a86e5ec2638f07ba6506d38a89b4b3155c41ba1827459f951
EBUILD numpy-1.25.0-r2.ebuild 3970 BLAKE2B 1c389a3487d90170531396cdd2c84891280724d33771e5c7e49c5eeb15bae338d1becc232f76d7183a880b633a0da6119b301e320a6f37f9a8adf5376c20115c SHA512 f3a6ec2f32237913c0ed18d829b6495dfc609824a4c89b436b67b3d4313d8fc10510f25b44741e265340dc447e696fed8d2339158c84b81259bd22a79f7240f6
EBUILD numpy-1.25.1.ebuild 3914 BLAKE2B 530b9c7f2ac9286fd5b721908f366a2bf7db7cd9bb028676cec437c0042e5f8f67d88ffe6558585d12bc7c820ae65a63b3877539884e471345639b6fd789b767 SHA512 8eb46aaa93e28c058096b9eb0f9d157978f71848f0aa82b99670cb77477673bc803285b2a8173d097929a3b28e044cf299a3a5b7c37f203a7fb0c92089d5d4ca
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/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index cc21e3641ef8..80f351825d90 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,5 +1,7 @@
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
EBUILD openapi-schema-validator-0.4.4.ebuild 735 BLAKE2B b44d989a36ecb1a999a95e9ba92fd86f734a2747d7f54888dfb12a76a1f056e25f12055f114d574ee3d7d05c79383dc934d98eeae9529af018afe4c41077892f SHA512 bff32e9144e33b9ca29dca235a3d49590b45e3aa7df0043c0c8422d361d611f8bcf7c599355ca2daa0a459bafbb9969c9072e981bc5a71447b2aa1c894fe7a24
EBUILD openapi-schema-validator-0.5.0.ebuild 737 BLAKE2B bf1970331c18d002527ac037188e0c7eace752ab6ac82c02c2a513a6d5c593d90f7dbe76da5d6a4c233528ece2f511c6363c832704c414b2b82826e373360ca4 SHA512 c8fddf96938b61af53fb182b29698380d0e48cabe69c4a682da3a5b4ac7a0b1e84accb897bb9f6bc3ee7f0480502260b233efd1016416020e1a517b4ae8edd9d
+EBUILD openapi-schema-validator-0.6.0.ebuild 785 BLAKE2B 0713e344f58b023b98a64b8f01154a7e17ac10c9ff449d052f99b4a94aff13f30878926982a121323868944d8836c96d6865c84ba846e29ecb0cd52a029123c4 SHA512 96018badf8f1e43a16c89b1f2fb8c812f9db94d80136f28573b36e12d8d18033a0305ae86875fb916a6bfb85c0b64e88e052f06d3b584d28b716d546b6e743e9
MISC metadata.xml 409 BLAKE2B 601169266922e87a4fddde77d3528759d1f8470f28b865733ef6be57551f01675c9d5d694cfe9e7823dc9b360b9354c0bb74fb57a962e4f7155775e26b9fe3d7 SHA512 e4a29fd3c48b7b317b52354a64c7906f2ae87b1ebab275ec992bbfee421d677ea23a3310b1f9de44b75bf131738a308ce2a6d28712ea493b21c9760b43efe569
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/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 9a948b1d05ac..497dee05e6d9 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,5 +1,5 @@
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
EBUILD pallets-sphinx-themes-2.1.0.ebuild 681 BLAKE2B b1b4074c1457a94017eafaf14e0fe31c3d4a8fcc5e8f9676e48518de8dabc62730a6e9a83933a5f49734aeba2945d8cf6af8ffd49845bf637742d294660e3a04 SHA512 634e45dffff7f739aa74abd19296014534e2ff8576a476a5355ccdbee80dc2c8cc08bd5659df551780ee8b407f81584c6e27691f72a65f88a7406998ac19c978
-EBUILD pallets-sphinx-themes-2.1.1.ebuild 690 BLAKE2B d53d7f3ed92017746e6e4664c35b7aaa397b56e3a3c71721d4e1ebeed3952c7d58772bbfa4525c0210d90ca924737572ee486b8c96d2911d977d252f99690604 SHA512 b15764756580ebab0614581ae868d0683f001821755ce3d5e890de8fc79ae8ff79ea0e619d17aed8a33936d9a020c010a277659022922309b25c7f5aca8e1964
+EBUILD pallets-sphinx-themes-2.1.1.ebuild 682 BLAKE2B c61b22e4ef57226334812b0a3a93e8e9742c3ab9a5c3081152416c639c6da777c40aa2a075711cad3aee79ea6fcf223d0d33dad1009b9700a4cbd1a234eb7026 SHA512 fb743fc11fc268e03d07027da3e6678f79f89dffe1cfcbe9784cc8efd0a42073874df181a607430adc1e8f007ea8889694e58cf1d6848a2e44c39bc9b430cfca
MISC metadata.xml 418 BLAKE2B dd644619949598d5675c600fbc5c740dc9882042bd04c8ead4b81de2ebc2f3a3e88d79d1e4cbd710b953cae7b116b1cb09012af913914db5a652a1ba2b5f4970 SHA512 537261ae9194a004752e90e3b4972763f9e22c27d18a7655f4ca4005d2999402b46ca7408d0811e44d3b0a12cb6cac506508c89ae5edd245f15bda13da91f216
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 b6b21501d74d..ef08c8f317f8 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -5,5 +5,5 @@ DIST python-phonenumbers-8.13.15.gh.tar.gz 4912960 BLAKE2B aef5c2524f2ae122bc0b3
EBUILD phonenumbers-8.13.11.ebuild 808 BLAKE2B 68bf5867fe33d7bf194dd170c9cb30dac10bc0886d9656936d691e046fc72025e8205214b14c350e95720de49876f376ee1a17965e3ae2f2aff592536a60af38 SHA512 720fe4917947d28d3c32a4ac9fb41d0c9be99bb213b9ed45e9dfff277d65a693cbe2b711f54856e7874254a742bca4ec7571c400eabbeb77f31a1af64bd93673
EBUILD phonenumbers-8.13.13.ebuild 811 BLAKE2B 1d4dcc2dbe737922778bc641cc10c251ede9bc5326991c779ab1276a593e25d1063d89ceed33180eecfd4eab02aae129134795b79a753a3a41985b2450223a7c SHA512 f6a3c534c716e062039636dc3fe79b871ffefc567716d186346bc0655c0064c473c072e029142e0c4a9fea9f5fa833baea1aee2fa3a95af9a3a73e58cd8f3f83
EBUILD phonenumbers-8.13.14.ebuild 811 BLAKE2B 1d4dcc2dbe737922778bc641cc10c251ede9bc5326991c779ab1276a593e25d1063d89ceed33180eecfd4eab02aae129134795b79a753a3a41985b2450223a7c SHA512 f6a3c534c716e062039636dc3fe79b871ffefc567716d186346bc0655c0064c473c072e029142e0c4a9fea9f5fa833baea1aee2fa3a95af9a3a73e58cd8f3f83
-EBUILD phonenumbers-8.13.15.ebuild 811 BLAKE2B 1d4dcc2dbe737922778bc641cc10c251ede9bc5326991c779ab1276a593e25d1063d89ceed33180eecfd4eab02aae129134795b79a753a3a41985b2450223a7c SHA512 f6a3c534c716e062039636dc3fe79b871ffefc567716d186346bc0655c0064c473c072e029142e0c4a9fea9f5fa833baea1aee2fa3a95af9a3a73e58cd8f3f83
+EBUILD phonenumbers-8.13.15.ebuild 809 BLAKE2B e59c62d710c7262c365ed17e7b172d76703eb3c6afd5c4b750d0dabbc1195986267977a25ac25e28d50893934b90fd770b56480d1662ddb10820911176faaf2e SHA512 aef6d7b0baf851b79a4c61048469e911cafd2565367da489edf68083e6612fb5e9b05c5f957a9cdc0d1a05205cd7ddc3a73bd2e922417f07e8a5e4c9cba4ea9e
MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
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/Manifest b/dev-python/pkgconfig/Manifest
index e56d65ac3492..e8e1910f5b64 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,3 +1,3 @@
DIST pkgconfig-1.5.5.gh.tar.gz 7331 BLAKE2B ef93a712198c1da5a38aec59f52d325b3d7cb25deef799bb006ba1f1d16b673b21d8c837475839e659f62eea9571a50476e38d3c8f95551fb5512a61a155334d SHA512 dfdd0a6ba0d9f37b6d504dc9bea8b19b18a3431ae54bb5fe061911bd1c6a20452f30ea66f67acc6c13c06123247036de7442bba3a7b0eb1af4ebb62d84df64f5
-EBUILD pkgconfig-1.5.5-r1.ebuild 596 BLAKE2B 11d8e4e40ee344fd257dca421600497d7398d6897253ff1fdc689b1936314898a530d30ee5fccfb398fabdb2181b5ab736ce5078146d022b6d0d44dd70c97264 SHA512 d5e2a5fcd666c9f830ec716a3105eb7da03a05056d267d7b54bf9b1cb843ec4b1254656880af5666499581dc7b9e891782455634cace5b9da439b56ab981e112
+EBUILD pkgconfig-1.5.5-r1.ebuild 609 BLAKE2B f390931ebdb58aaa03e309b378ffda6fb55681700ff7daf830399ef814fc68a5d769ff1a0f8d1fdceba570f6b18304b8f824a84d5695ec272461c4ebf11850de SHA512 2da34a07b8cd085032c92dc6be63cc183f4c3eaf689d24eee58bb08a9c9a65e13c6e46b8383fc8cc5f95ddde0706eb05c7271d865243c69b09f440bc5193d363
MISC metadata.xml 405 BLAKE2B 39706ac7fdc7a7ef4102b4868e79a831fffaa835daaeed133859cdb909a547167dbb06d3e2fad6bc776b1600268de62ae46660762876a72b2d0e48e2d250b831 SHA512 eb03e07a4a7b97f45087191073235f7de40899381df5457d6d62367088d8c984c051d1a7ef6e403088c3fde429324f117e932c86fee37246649015a3c38a118b
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/Manifest b/dev-python/poetry-core/Manifest
index 747772fee663..59609da27ad4 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,4 +1,4 @@
AUX poetry-core-1.6.1-pypy3.patch 2127 BLAKE2B 65a7c7540c70502467cc5019e47cb9eef492d69efc8f27e513d5fea6ccaaf1dcb09a30e724e9b539adc4d9dc84d7aac8d9642855916a68ddf8242db7b69d4030 SHA512 8e18dba351b1b2babee0bb40d3c4f22136c78cfb11b45e6113d04596b313a0616dae17afe5326aaced776b35aedaeaf0b9b0cd09463028ecd936b1937899a049
DIST poetry-core-1.6.1.gh.tar.gz 477291 BLAKE2B 4e1bd77302005d344693fe7a08b0c55e8a9ea0aad3112915a18950e40cc51116740b9eff5ae851b1d7280454716e3a86b1d8d37d85749f64fcef3bc726eeaf83 SHA512 53db0e4f4d5bc6ed2b201cd88a84e07dc6421e910292b8b5efb0dcce1af6e8c62836458a6409aac0394b5063b7c4a6be93784b0bce8592d74f61800f54916706
-EBUILD poetry-core-1.6.1.ebuild 1967 BLAKE2B 1e4b951874a76e0568faf268f603c207706a8c22042fb9de0b28c075387e997ff4e1c9f5da20fb352604032049e96112e80911cf309a832485f5e81d811ffd0f SHA512 e0b993b70302e4684bc099123a2f83dfb3ea998e4cf1c96698c061cd167c1f80a6fd21f32da9171de309c162e0d1f8daff595d2c8ac89df2db3154ba37ca30d1
+EBUILD poetry-core-1.6.1.ebuild 1980 BLAKE2B b1cea95a643036f7c5590a1a6576be6b654412caf4cfd9e617be7e046e28f57b36ceeb3a41a3eb6f12af8b58c8f9eba0cf8e1c7df479136daf0e883d12331d98 SHA512 e0d7370d6805484cb372c2b5a65967239c8037b874f4b75bcdd2f7666ba11e5ab5b9b239741375456858f108dfdf973a6aa14abccae0a28b264ecabddf2a4a99
MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
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/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 1d18fe2336e9..915f0abf97ff 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,5 +1,5 @@
DIST pygraphviz-1.10.zip 120582 BLAKE2B 965b84ec6951c364084ddde4f0594ad7c14eb7e884062ad4f24042b6298b9caf10b3aa33eecfe8154c87c4bfd8d3651acc586129b019aef8b809130d69c03f82 SHA512 571c35f7a8013d5f128fcfbbd68372c8660560847afa0648737eae6d305a9283b69dce23a1b1aeb808bd4eac9c9cefa72b1d358fbc47b724a0b70997ea3f6d84
DIST pygraphviz-1.11.zip 120803 BLAKE2B 004312750bcb9fab5c39af2c1de6c452489d9a2deea8211e6bb7cd722e9043070644b61c78047b01d649d41194441d82ffe2dde9fb17b6d9233bd0acee539c7e SHA512 3914d29fb214e1f7d59c7849e1e63e783902acd262912eccffbf6a67f8cbf6f540b9f2e84c9e7b4f0d90fae27f451a701a3b75a4dcb15b8a81bed463b34e2ef2
EBUILD pygraphviz-1.10.ebuild 1021 BLAKE2B 27f307b8bc0dff1207240e2071fbc6ab57ba9b7b1c3a74256e0f1791122c070bef05aed3b942ef27d056a2ab792ae0dda61ba8f2c95c240f940ddaca691c3190 SHA512 f431dfbf98c56ac55070b24c14887b1cdd8baf6e976637d32ac3d4cd67b81b3c11887226a8c53fe8473320d6aa6a4722bef87e483ece5ccdcbc9f9c75cb9a9ab
-EBUILD pygraphviz-1.11.ebuild 1025 BLAKE2B d7335cb73010069f3b52a68500a313fed1e72e7bbfd0add9d4be8636aa1eee5dea135fc2c9cff37be264a8205905230bd244c1fe686c80061fc99f21afeb8579 SHA512 ca4e5e503abdd970f92b84af6b031b659bc3f632b050693929b6084fe44cdc74fef3593a78ff02a5f5ea144918fa1a7a426901bcfdab7750cf4a1eace336805e
+EBUILD pygraphviz-1.11.ebuild 1023 BLAKE2B c68daf0cd48220e05358eee07506cd5fff7b65d8a6c6333691595703457d95eec9e368b34389e6fe974de0814ede88de1a7eba0c0ef6fa7dc55b12449f9af2c8 SHA512 d0b7ed893eb1b3c2b01fa4e9740b4e596912d0743a0a518ef843e7d6cbed0a406bab6137ae14f8aeaa6fecfc69a65b368b57bc351d3989c9d8496a05425b377c
MISC metadata.xml 682 BLAKE2B 50dc3c55cac525fce3a396c94bdb48eb6e2c0b43636ae53c8ddbce2c9d3f82d8a080d881d4e6ac61ee71f88779c560d38fba3e10424fcd30af0dc80f979df081 SHA512 87e124765948529b7444fb1ad1ae655e18478ca46631a11a6613b289e2ac39600cdc00cc7af82b40694fb1e90c0ccad98be2fb457c5d7f74d5b087a6b3319aff
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 767f76239d0c..5dd2108cea2e 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,5 @@
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
EBUILD pylast-5.1.0.ebuild 771 BLAKE2B 69ccf9aa7ebcdc57e167274ab552c53b2930f80e0783412bfb0b497fe0326f9ba93965c59a72f03e7a2500936122291d1d70497836795f2c0a20bb380bdb5875 SHA512 b95563f1bafcff740281ae2a7c498af8a1acfe0c2a28b7806ec253400ce0a001d6389f4875466c229163aaeb7c890723b4e08e834a4168cb2728cc688e9f57b6
-EBUILD pylast-5.2.0.ebuild 650 BLAKE2B 830a75f85917c7b5cffbfb180b679d0bcb47089f3763da7e9624af5d9bda966757eb446fe579fb629a2fb8ddb948fdd228c829b6c377e17fad337f242b8a0b23 SHA512 4ac9b7fcbf1f5b3d83df0d00cbc8e175955dad024ed7067bf6abd84fa227b986985727d571a3a7fa9e7079a0b64b31020edc4f547e70ab21b931ce96313e92ba
+EBUILD pylast-5.2.0.ebuild 644 BLAKE2B fa51dee453a792d391ccd8b036edc77928ff3438c4c24125ca61a7fe4ddb6c204e4cd8191e31211866e405b423f4e82c9a4fca60347ea35421b53a8bf2c7409b SHA512 f923464a19b681fe4ddbf06cee1f98343711b0216e459a3a8ab44cb8b6d97558039b206b644289562baa6f8a896322f7b83ae8833bf74c5e0b828bf5cc208cea
MISC metadata.xml 907 BLAKE2B a4a6aee5b2e805d27d001b7c51dfb2a26b935c38380e85027059b02e75057fc02f9ad311fd21326f6f16e7528a15c0577aae31f695f8a74ac42d274c10e7ca17 SHA512 1d0b7327a4e9a24940cff7a27b64bf5a27d5e2a1391d31a99d3473fccd54e534722ba826a64bcfc5f0da7a505241e617d23aa1f7490218f1d39af4cd3aa29357
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/Manifest b/dev-python/pyopenssl/Manifest
index f3977c3a8f7b..8d7ed14d0305 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,5 @@
DIST pyOpenSSL-23.1.1.tar.gz 183402 BLAKE2B c0339203bb1794da67a0c2fe2e20b5736b3e0628d01b13805e3c30771d60fe07df22a7c090260cf1fad80abb1e566e2efd1e8e184a142e335189fa3bd885e7ac SHA512 581f907ac9acf71c3340bbd413ecf161dafeac1cb406649c683fc770f8bcfcc1630a977defa9b3ee218631959ed14ea62d0a02cdf74af9fdce5ddec34ad1e1ea
DIST pyOpenSSL-23.2.0.tar.gz 185132 BLAKE2B 06330623bf5934b89cf88dee508c2c4bdd170f805a111f082624b2f8c59fd56e48d5954ef7d9f98768e88aaabaa9e04594ea717784a86401e6e64433e699c9b8 SHA512 a467801bf94959a067d9d3551b47d17d4798bf0b87d253d41a89cac9cdb1731a967a98bda3e83ab8a560ed5fdc0a17f34604f3c6e0f6789bc4c920bc49f520c9
EBUILD pyopenssl-23.1.1.ebuild 1503 BLAKE2B d08468e434c4582333216706721fd1633a7e2f0f7ccede2c293f2bc61fc8039c7f989939a3dc98ddd7e2ab89722003f98e701be349f8f324f57e4fb4dbfd2d94 SHA512 53126599e9081f2af2123fe1efc825de218be65b6461ea0c817f492b520cd754f0a9fbde1608e474318f1c6e1e4ea001188d1ab96596d5ac476105939bd08f82
-EBUILD pyopenssl-23.2.0.ebuild 1510 BLAKE2B b32f6bd9a52acbd89d05ee902ca985556e98ce826788e53dc242298657f0d773872801ea35f61cc9703489cf0baad39ca2ed1a74d83e1dc9072e0d75607edb68 SHA512 479e49f08f1c6ce8905c3da221d6eb48dd97d36f021254caca81e73cabaf9d1d1a4e9cddcd978c87f5006cbfa2be9e9212643d5cc763aa962ffb8748d494ca6e
+EBUILD pyopenssl-23.2.0.ebuild 1505 BLAKE2B d1e064e6aa24a1ead03b97185346383dcdc992d9a1c5d883ab0c2e96fc49aff8e7ac1a9aa2b87bc8b2d3c1a6839cfc387dcde973d719d53dcec3f2117125abb3 SHA512 b6e6e1c690d49508540669ab51c82ddd4c10ec9a4f3e8dde14b5c682b4f9c6e6d27fe19b4e8ba8daf7eed2e0b4e56c5826c2ef13212a3cce7f410283ff0c866a
MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
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/pyproject-api/Manifest b/dev-python/pyproject-api/Manifest
index cfd8ef1c3d01..e23c888853b7 100644
--- a/dev-python/pyproject-api/Manifest
+++ b/dev-python/pyproject-api/Manifest
@@ -3,5 +3,5 @@ DIST pyproject_api-1.5.2.tar.gz 21926 BLAKE2B 337fa749273273e0d4c761876ac1b9ec25
DIST pyproject_api-1.5.3.tar.gz 22128 BLAKE2B 0004682932717db0926e0e080ee78a9b24a9fc0025769e0cbe300bcf0ed50ddbabb52c257e2860718f87707072701ba2912e0fbf32b5481bd2993fb2b304e7c7 SHA512 719c4a9d747d8b5fbf3ac86c5f828c9fe10592a5dd71f68ffe308a8b73036de6777e32ddbcbaa7a45dcb23d0963555abab3e0fc4ddfc5eaac864b8892a1b67b8
EBUILD pyproject-api-1.5.1.ebuild 985 BLAKE2B 3b235a0314648a3476517867904108de45abf42a13c5234370f3c3702240615270518a5b45f26bbc65f4455c7298d567b0110736ef80a7905fb1b617698aab5f SHA512 e48785c79bc3080d9fcc43650adae1fe29c4338a7163a61c673e8997f8fbac1f4000986314644f8f586ee99baafbd486d4bbd452ba1cf50425a708eb8b3305c7
EBUILD pyproject-api-1.5.2.ebuild 990 BLAKE2B fc7eb993df5178afa9ed4282adba13e6d2f06e2ce8e587838701a4947f6e117da9591cb6129baf2d9231bcbbc013539cdd9b58423007b955c837066926b35ef4 SHA512 71246b64fabfc1dc149979330a3c6685b450413b32a06eda42e12f86251c9a12ce4b030ec08f0f9c7a4057f7fc1f8f64de0e2207cc037c1448eb158efd143e73
-EBUILD pyproject-api-1.5.3.ebuild 990 BLAKE2B fc7eb993df5178afa9ed4282adba13e6d2f06e2ce8e587838701a4947f6e117da9591cb6129baf2d9231bcbbc013539cdd9b58423007b955c837066926b35ef4 SHA512 71246b64fabfc1dc149979330a3c6685b450413b32a06eda42e12f86251c9a12ce4b030ec08f0f9c7a4057f7fc1f8f64de0e2207cc037c1448eb158efd143e73
+EBUILD pyproject-api-1.5.3.ebuild 983 BLAKE2B 2c6014ddcadba2a107e96319558027d24ab2e32518c8ab54116f1a4a3247f0602e06004ce1986a62576ba688875a601cf7e3a9f01ce5d1811912385101e43431 SHA512 336fbc7a34c39bdb73fd1cbbfe7157fc520cec80084390c6fb4edcaa5f550ac8bb96ce158b34a0091d07e4918fee43ad660a1d8ccd127aa16d062e0237cd0718
MISC metadata.xml 378 BLAKE2B f7bb92a50d3be540f9ef686045a6950a6bd26679df183dcce4af9ddd4f203090023309ad4e5e43a9f769ed40ef6269f64fb628ed0acfef9fe9fc36b9f67704b7 SHA512 f3840464571b9893548e778d5eef88c64b614ec8994b1ff1348aed1795cce740b2a32b46df1e654e0a9072e8e059214ca1487421fb1316b4160a1bff4202d475
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 fe7714dfe077..dc66efedb102 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,5 +1,5 @@
DIST pyroute2-0.7.8.tar.gz 418102 BLAKE2B 67485b52e579a4d73877ff62c772a2145896900ae86effea54b0a93c42eaef782548a9b74eb777f885be227a880afc6f7664464e71fd45e0862f317aea2c908e SHA512 0d4824dd21dda5efe19bc953265e75f07f8813a45e703e90fa0bae0765fd88205255b219b4ec1e0e4f399ce2a055e351fd98ae8c7ca14bda7312c3cfdef724e2
DIST pyroute2-0.7.9.tar.gz 418877 BLAKE2B 0585af297a58d53ba8698f706e50860eba39ab3334e5d2de9b94d15485399f4429da234e0bc22695097fb90782d482283da304af9bd471749039741cde294734 SHA512 23fea1206a1b6345d05e338449414f3757021ec5cc739aed16cc390e48c62f42f6246838942dc1e3015462aba2ac8051936aad4ce6e76d57ff956046396ecd91
EBUILD pyroute2-0.7.8.ebuild 624 BLAKE2B 741dc502d791d5e86576159a63fede51c390ac5914bcd5ff605ac0501ffeb2091707a27de792ddb1d028350977a2c95860ab4d5fcd9b0300a4879b1490f0b231 SHA512 4eca4f646458b4362b277c50a0e1cc40796fc28d84046414174a7273ec61f050031f76f96e4c2aa449c2477a0b7954f58b7685bca949a74563dd8e3920f46d81
-EBUILD pyroute2-0.7.9.ebuild 626 BLAKE2B 9ecb49e9668d5668e0c5cc20437a574f80c9f506a67bdcd33d413794fce84159921fb97a40c5607a2078b0a419a8570c0f7a0499f6ed9af234e0cc5b03e9a48e SHA512 b8d83c90c9ef2dd56c23b275eeda53f3fce98812462a494ff38fb4d535aa84a7e39a729e0f4371d876bc1b508101b16e29c9683944e401475cc43a73b4ea0a82
+EBUILD pyroute2-0.7.9.ebuild 624 BLAKE2B 741dc502d791d5e86576159a63fede51c390ac5914bcd5ff605ac0501ffeb2091707a27de792ddb1d028350977a2c95860ab4d5fcd9b0300a4879b1490f0b231 SHA512 4eca4f646458b4362b277c50a0e1cc40796fc28d84046414174a7273ec61f050031f76f96e4c2aa449c2477a0b7954f58b7685bca949a74563dd8e3920f46d81
MISC metadata.xml 547 BLAKE2B 1d256c8d9bb8cc039853ff12c15d7c2747822ff95e3ae7f3e7c1600498c7b886a341a03327992e3a7933592eba0094eec6fba519b0d9f2b2f0ece57eb515ea4a SHA512 e845b3e319e9d60b1dcbf9ab66681b886b0c517a5a72288aaf9ccb97d5018dc3b01b8d921b8a9fcd3538cec96e9a7e1c452a704c8c422ef6e6fa6069a7ae56ef
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/Manifest b/dev-python/pyrsistent/Manifest
index 15ce5843dc60..d2688f4357a7 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,3 @@
DIST pyrsistent-0.19.3.tar.gz 102640 BLAKE2B 60c5ef9d3f26c4529d05804df13453c75b6ff70e12fbbbbe22312686da929766fc903b18ca77d626192e1f3fc9fbdfdbbbd4eef102f1504b38feeeedf00450d5 SHA512 6bb70b6fd65b5cd9f961a3199c2d90725aaa66fb869e4eba2143735e2f3a7e4ecdc782b3498acc2d92e263c3bed14cec8cc77324f4ebd08c300ba6735db5ecf7
-EBUILD pyrsistent-0.19.3.ebuild 635 BLAKE2B 25f6a19467143590ec37ffca4393e8ccd73d496e1453102e7ca2e543a462e0e9eb4dc77c2cca709db275dad976f82b12e10f3a9ca88df9d5f7e459bf130619dd SHA512 65bbfb7410a9f4d310d3e7b052566cbe26f073879295bb26858db8e34ae37bac4861b3dff2ccc9a0ead0a0c6fdfa2e971d262ef5c44f5e1ffd4cd4d2823df2a5
+EBUILD pyrsistent-0.19.3.ebuild 648 BLAKE2B 23475a7b1cd1a362ab3d5b472d98940e58d7242f862e6f0590e38d0384fd851def8b81c3e9eccf1744af13dd99215181a05404b06260db37daefb28fc3cd42ab SHA512 c977c02fcbd640d69561219219daaa9d83d5c3a4a1fdd0ec0218d20d8285c154f020061517f3655c9e5b30f12a5d0ffecf898d50008dadec2b0a0ee5f4483122
MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
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 adff0254f729..f0b8eef4eec0 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,5 +1,5 @@
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
EBUILD pytest-check-2.1.4.ebuild 618 BLAKE2B 66cae1ba11a7f10d0808cd69954e11f769c9a9f68e4538ad0d45da67577472718d4e4c4bb4a0e8476d5a4912f486782d9c90da15a5632cc1e1d1bc256447bd14 SHA512 b79e1f2bb340f65bcddc7a0d4d20709a909794e34a91fcf7116bd5c8bb0a8a0193a140e5a97eba83705e9f39f72b0ccae335f1bc59999795e78702e61bc719fb
-EBUILD pytest-check-2.1.5.ebuild 606 BLAKE2B a2d4a2892f9cf858ccac8137c057012119ae49aed1860a24ff8531f30556d2a11eed387f92ed2f1e4e93073d47ce07252ecb1d75c93de8b9d48d319857939d27 SHA512 116297080bf34962d3f51cd64476aa779fec7484447655fe787aac4f6a710cdcfdb565ba27fef2e53d7307fc039df4e94176ddcee90399787ed18d5a719e7459
+EBUILD pytest-check-2.1.5.ebuild 599 BLAKE2B 67cfe8c00b830c12ceb844d8d55925a001a1d748f9ba82967796507c0e91e78aa6d384411abe819920b6cd081b4726eed4e858fc2aae8ce42c1e7f6cfd53b301 SHA512 2b4ba1c718e43b73a29229540bc7976ecf74760372aac9465331f52aba0f8ad8583955581c1423009ed2c0782914078cfa4568f54ea66c6e629e69373a6450b6
MISC metadata.xml 509 BLAKE2B 85ec27b195520ffaf65e8f9a0fe166f0ba07aa22bb8981d558f96d2d89cb00441478eacc47a482bf2243d26b015ff42a1058c2e90a58d7cfbb20bc521b5722f5 SHA512 8d9082c66dde73cd751e3b42fc08ddd3c1815f6a7882d1b659972e5fff64506de79265df97161d63f05e3106c818b0155c2c3e21c861a44d330ff57506bd64a3
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-mock/Manifest b/dev-python/pytest-mock/Manifest
index 405c53387129..de7dab60742f 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,5 +1,5 @@
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
EBUILD pytest-mock-3.10.0.ebuild 1405 BLAKE2B ac69d8f543c28b210973247745f49d9625f090968cdc0fd95cc0d8f76b2022ee88821e7e2db855800286a81636ac030ba6b9e37a1387c46e3decefb4952c8e5c SHA512 e5e84e317d86e6437e039a3e495c563b504ec93c1739622d8ca292969c6a0942e036fc1f40d6cfdadfe4c5236f959230a032d98bb6e6f445fe44796166045185
-EBUILD pytest-mock-3.11.1.ebuild 1243 BLAKE2B fb567b31625e3346e23791c20630ca1d95c7deb795d30575c68e990bef2af8a82f3cc953b447efad681a5e7f1a0c9197478ae31eab76da0b50fe156cfd66e197 SHA512 ffcb06e96ccc9bc7056ea9d051f3e0e821ac30f2516a696d7514286cb67ca464c4cef946af0136bcc66557bb3e0201bb38f00ab60ed16ce42f690db9a63769b6
+EBUILD pytest-mock-3.11.1.ebuild 1235 BLAKE2B 86631d6db534c3f1387249cab08f14907b3bde25b80c12569d016cb56f3154db7b214f5bd95f88f4af15d82cb29c9ae36cb6c2d57ac4bfdbb8e36a0bb2c93496 SHA512 e467081ebfc9673a5dcf9ccfd9f1a96a8b5df6f82a7e8499c980376c5e2b781f8398877068dc97f00da2387185756bf2ab1aaeea3a979545abb512c5001fb263
MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
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/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index eca8d9b536f0..2c46b2281a36 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,5 +1,5 @@
AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
AUX python-dateutil-2.8.2-system-tzdata.patch 3495 BLAKE2B b3d5ca203731932044f16bcde48f8f981f6907ce8a9319423d41eb0baf62331d472c1a5dd72ec3ac1f059296423adaea18bd4ea6d660add56cfd73ea86f26bf2 SHA512 44d2f3f9f0c04401cb545dc0a757b682eb3a9a66e63cf64121e75243cebdfa53945c6ae9bf197cb6b754c9732e9407fc9384aa45b2d7181740bb1ae23af718fe
DIST python-dateutil-2.8.2.tar.gz 357324 BLAKE2B 060f97280b63ed70e6d83fa5696af6dc3c729cdf5bc48c7a90e3e59eb0cc0360e5205536685550330d64ecc9b6e40ca12888409d6819dd136b17a67add2ec4e8 SHA512 6538858e4a3e2d1de1bf25b6d8b25e3a8d20bf60fb85e32d07ac491c90ce193e268bb5641371b8a79fb0f033a184bac9896b3bc643c1aca9ee9c6478286ac20c
-EBUILD python-dateutil-2.8.2-r1.ebuild 1118 BLAKE2B 62405354f3ee0d262c4a9fd2ea780470b585504bd015bf480050cf6d0118155414885b194357f9668a7b09001d94caffff7a810dd92029e50d3d111adea291d5 SHA512 7c498ee880195a5d0a44e9bea088739d667dd136db4cb9c28fb5b0fa3794f99844d528783a4a5e0fe123ea397de5b6f32c5c5a6c6fd5b4cb8e482e4da874d8d9
+EBUILD python-dateutil-2.8.2-r1.ebuild 1131 BLAKE2B 92f694c73d52b86e5ff2004949b6a7793a3a32700130eaf90962b20d4277333f751aa14cc5c9804fca95fa4b68401df4444ce72f59fdda5127afe9d268c8c492 SHA512 eecb7473247860723fa774e041ea3958037b5818c866550e0de253083e92eff71c8573609aa108ee710112b078ab0490a234d245cc4cf00f10112be819e9c949
MISC metadata.xml 629 BLAKE2B 214855770bf1b160328f6a862bc1e3fd2d0e27a36c8ad240d494e8d8a54e5be4bac6abb7c2b94b1d8cccd7cc1026a100c8cc092203de3fd4c4173139d4722385 SHA512 ae326caea99b731c8ba2a162b2ea7e9441381777c9be8dd021caf12e04d2ec068215f61bbe2dd1baa6d4710defcd2dbc4ec5ee8b15f1c1817aaba1f8c841eda5
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/Manifest b/dev-python/python-lsp-jsonrpc/Manifest
index ac21f53b11f2..7bda02097dc7 100644
--- a/dev-python/python-lsp-jsonrpc/Manifest
+++ b/dev-python/python-lsp-jsonrpc/Manifest
@@ -1,4 +1,5 @@
AUX python-lsp-jsonrpc-1.0.0-fix-test-with-ujson-3-and-up.patch 342 BLAKE2B aafe30896b88531102ff79900d845a24a506ff8d0649699311e77f9ba6742f591500e2cb83a2e5aff3118a1174819b2745a8f9ca6919af8b84d379422c7e06b7 SHA512 baaa0105df9906d451a9870c7f0ca5980c6b667b7d8c4fb4f57a0fb3bfbd3f2b7502cfeea7f2abb041c2dcb344f6f5ef69822d82daed3de1ebe4564c812c7430
DIST python-lsp-jsonrpc-1.0.0.tar.gz 10011 BLAKE2B 671490d439f10eebf2d05f221adad25be6f881f4a0f4fa975d4574937a951d4d0bc51264a9ec67d3ef5d112b6e025b551685d3e3c2b959c4a6bcef92d46c5ff3 SHA512 447835fc6c3810f486d80f85295089c021b792843bdf88d461c021b8b04407d8f7e6a99c07351a23658a5dff46eb475bc64e51bdec029787cd33330b54d4dfec
+EBUILD python-lsp-jsonrpc-1.0.0-r1.ebuild 774 BLAKE2B eeb4a1618a60b061d70791b628710038718f99d1b2fcff348924d561d93ec27ba2ccdc1fdecdc1ab97253a8bc76881c59e2c298a5baf27347c3f5be2e92058b5 SHA512 2788b9f8a5ed9e644ca64b76d2a91ada2efd8df55b899f5c87a96344e35beb620cf5363bce13b0722b56c510f3c5995062c86047f7ab3161ef37c07ca52f51bd
EBUILD python-lsp-jsonrpc-1.0.0.ebuild 741 BLAKE2B 03454ef44ad56ecea266471ea2d70159ec8d4faf78a02089eac663f415d946a7014954e73d4bb65b056304e27665dde317b9b0c5a00f305dce995b75ed597c1b SHA512 21ec7cf35e3bf786cd9c662b05dfa107bbb7d09f0a90d48cc92ff4fb4913634133ec126108fce41e69d8cf8e3cf6659ccedfdc21a3aa0ab081cec56b64383bee
MISC metadata.xml 465 BLAKE2B c1c85dc7e2694420f8fcb80c4de578d159fa124b3cf7388d66220b6425ca6a11bad88b3ed91f5272f81a2604dd68009e4076a5d800585a2e4e6f9c448eb25a8e SHA512 16456c751af90b7169978398771635459406029275332d569304f9369ecd0ee5b4cb1e269c9a22c5b636d72e6c5f685f55e5f6b73a62b730c2b8c8734ba971bd
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/Manifest b/dev-python/python-mimeparse/Manifest
index 269d19cb5525..d7284cff9ef5 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,4 +1,4 @@
DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
EBUILD python-mimeparse-1.6.0-r3.ebuild 565 BLAKE2B 799d5d494df739b9fbf0af7dacfa358e60390aec2a96a71c2395aacdc71575c4b27f229104968ea8952fe0daa58628fe7c882911a63f7b9214d3f9b03a796bb3 SHA512 3cb1a782eacce5908a12f8eb096cdca927e707af938e6a6f2a394021a826c1bcc5ce6833b02f2282ca1b3d3388ab1848a69e58cf9be2bd368268d83319eb3a86
-EBUILD python-mimeparse-1.6.0-r4.ebuild 656 BLAKE2B 02439fd688a7d513aaf26ba55ff899b99d6d79f5909be84240f9a644d1c0d4b635eddda70a568c858aa81ccdc85a1ff0c62281f9733658501fe4f73a989daaae SHA512 8a2f3a2ca10e80e0e1b6bc60a11d80d4826ea8577f100ff243bc1cb87b5428125daeebdd32d6ad1eddee1e33346a3a67c0499c63aa71307c8f74e1e211a09964
+EBUILD python-mimeparse-1.6.0-r4.ebuild 648 BLAKE2B b8379e4733e1f1577d2cf440a16c153f639840678d4fff4f40ac7d2305549fef84656cbce6d5f97970ee1c86959b4ac88ece61dff5c3083ae0b785576f05533a SHA512 8f28f46546966a97cc04c8e9f2963f61903334afec2ae98abeb06c55ab97d693897189d8438d5bf83c705c62186a171ba2a050f1e5a753d28cb7f51ef939acf4
MISC metadata.xml 422 BLAKE2B 83de811254521c0ba086160057d59ed1c49ae1258f78bd7c05acc8e2e0de86f3ce571f689df5a6c1247c6cbf99fde496eea2ac14d9133fd81493c6ac0c8bf28b SHA512 d14e037ea668ef4e6fadc15417ac5b74253b7b22385594965be785f5610e0071af0b74dfd80a5cf2386bfa01919955afff50dff1fd75853de7db7ed013b2e235
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 87397e1a2996..c58168f02b03 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -5,5 +5,5 @@ DIST python-utils-3.7.0.tar.gz 29654 BLAKE2B ff306a2ee3e84585081f504ad50f1172946
EBUILD python-utils-3.5.2.ebuild 735 BLAKE2B ca117316e18466936ee0d891a6346400643c9373dad660ad3f784efeaf911d5c76b0e46cd9c623dbfc26f1e0d6e1efd8213029f0d06bb25b8c08ec096abdc8bc SHA512 2a99a45b265d022b36be2a13106f5209c9c72eb479c09a2511a39179c17a351cbfd3f812b132c2435572026463e4d73af9b9a4c06179e171e7016f74b5e058fe
EBUILD python-utils-3.6.0.ebuild 797 BLAKE2B 996f0ec85918e36871ed7ac55d4ee2cbe4503373933fa1f43979cd9f10695615d5dc2fd7d5be424c93f113ce582f070901a299ba42d76f474c4b6203974051f4 SHA512 1bb7be4642ecd961b3eece5c03358482bd5cc0eb533c2110d79cd85199a65f78449e776cce79df83a89719cdf005929ac44fe3978560545ebb41d7779e94d01b
EBUILD python-utils-3.6.1.ebuild 797 BLAKE2B 996f0ec85918e36871ed7ac55d4ee2cbe4503373933fa1f43979cd9f10695615d5dc2fd7d5be424c93f113ce582f070901a299ba42d76f474c4b6203974051f4 SHA512 1bb7be4642ecd961b3eece5c03358482bd5cc0eb533c2110d79cd85199a65f78449e776cce79df83a89719cdf005929ac44fe3978560545ebb41d7779e94d01b
-EBUILD python-utils-3.7.0.ebuild 797 BLAKE2B 996f0ec85918e36871ed7ac55d4ee2cbe4503373933fa1f43979cd9f10695615d5dc2fd7d5be424c93f113ce582f070901a299ba42d76f474c4b6203974051f4 SHA512 1bb7be4642ecd961b3eece5c03358482bd5cc0eb533c2110d79cd85199a65f78449e776cce79df83a89719cdf005929ac44fe3978560545ebb41d7779e94d01b
+EBUILD python-utils-3.7.0.ebuild 796 BLAKE2B 549f5e60deb9aecd27631760aef92f7557bca7d6bc993df4d31c376b34f2b42aab53687cb74de54678495727b27e02240d2a30d207be17218529eccec4a2681b SHA512 6316b3829329aa10cb10811930b64f7e3b447ea67593964a4e83a02f42e176a9481762ef051686f97a480d74ce74f559759714bbf4517d100b784140c6d251ea
MISC metadata.xml 398 BLAKE2B 40018dd39311868fe5b37b6e03d6f6115427b84ca4cf4643b227dec910a193b547384c6cac4a97ed0f06a81c453c12ae57612e279e44a8a671b7f36a3ebc3128 SHA512 aaed2dfc1a9802d6d6d2d28d13fd478e0cee7c422992cde7994c4408690baba6c9e99ed77a55b0d3c5d966bb18cbc76c579b50f9d388a84ae204137b33c81a92
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/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index c5c4d2ab5050..9283793ed911 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -3,5 +3,5 @@ DIST readthedocs-sphinx-ext-2.2.1.tar.gz 12644 BLAKE2B eb7b5f8d91dcf9f413cabe790
DIST readthedocs-sphinx-ext-2.2.2.tar.gz 12106 BLAKE2B 4b9785c6b36ea66a7910d544b3acde9accc676e18b6c1e37b9285f6e095371bd7baf19b912b604596e92c89ad935c37263b2c977c66265e7697f18d399fd3006 SHA512 333e2068a92287821991e4e96b397e0d2b62f5080b65aff8f31b8828a7e930b038fb5ee176e20622e1a78c966c5d4cf84dfead832f4cbe1e68f2b0a0260009f7
EBUILD readthedocs-sphinx-ext-2.2.0.ebuild 798 BLAKE2B e63515c00c2ee8920d732571c92353bc550bde7fcd97fcd5c0c5841b94343413d028048eb4c5e7cbf5de28ae6c1d896fed7735a643d00f2761c507aa3b05c5ca SHA512 aef8bf55e83ea93e73f1b93cccda9beba0c433190171a6376ac5bc84ed4c4e261f2687e9c8193f057dc827790d891da9c128cc39091009b3fe3ddb82a0eb7ddb
EBUILD readthedocs-sphinx-ext-2.2.1.ebuild 806 BLAKE2B 7f4383ae68f896e9775b0f50ea91c42fc193ac7fc404854598d218ab6b090aa699f6d07b46577efd93ef7802e6d555ce51d77235519ff2dc9737cca0a166d44e SHA512 843a28adc1be402521d10afd9f0cdefefb36e1f484e2729aec6c078f4b738063707cd084f0aeda3b772365120a4332bccdd5ae9c172bd919019222c119655093
-EBUILD readthedocs-sphinx-ext-2.2.2.ebuild 806 BLAKE2B 7f4383ae68f896e9775b0f50ea91c42fc193ac7fc404854598d218ab6b090aa699f6d07b46577efd93ef7802e6d555ce51d77235519ff2dc9737cca0a166d44e SHA512 843a28adc1be402521d10afd9f0cdefefb36e1f484e2729aec6c078f4b738063707cd084f0aeda3b772365120a4332bccdd5ae9c172bd919019222c119655093
+EBUILD readthedocs-sphinx-ext-2.2.2.ebuild 798 BLAKE2B e63515c00c2ee8920d732571c92353bc550bde7fcd97fcd5c0c5841b94343413d028048eb4c5e7cbf5de28ae6c1d896fed7735a643d00f2761c507aa3b05c5ca SHA512 aef8bf55e83ea93e73f1b93cccda9beba0c433190171a6376ac5bc84ed4c4e261f2687e9c8193f057dc827790d891da9c128cc39091009b3fe3ddb82a0eb7ddb
MISC metadata.xml 424 BLAKE2B 2aa51699a12054e082cac4af9797ed81f3b9725cf8e91782736264584613b0181edf6d6207a4278b313781ce1140b33893d3504682ae8ebdc96ce13e4c7c64b5 SHA512 3df29949e8a74f2907bcdb7aa75fd2846b0a69c1ade03f2db64177cea45834f531a1d290fd0e562c29391b248d5b1a8bd1992d1f57ce5ec4c46b55a8c43e6a81
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/Manifest b/dev-python/referencing/Manifest
index c4eb1f695442..7e822fc55d43 100644
--- a/dev-python/referencing/Manifest
+++ b/dev-python/referencing/Manifest
@@ -2,5 +2,5 @@ DIST referencing-0.29.0.tar.gz 34963 BLAKE2B 88fa71124eeb8dd83b62e4f42299acaa55a
DIST referencing-0.29.1.tar.gz 35024 BLAKE2B 459e0ae857e8fd47075c264abff09fb7eec329dfa9a374e88123f5b6317ccc829c671be9ca2d6e687ae6ec39e3f632b01d982cf62be8c552a62a9a7cf92fd56a SHA512 a5991eea73bd0d3bccfdda60f6b56bb9856abd60d3f70d7952da38693c086b1ba7ff72b67bbec641ac1b88e2512d648243796587f1cc69c00a33ff73a84994f4
DIST referencing-suite-f6fa54deec2ba3ae7326e6c292b2d7c4c20e9eb4.gh.tar.gz 18311 BLAKE2B 69f6a3059842f6ff3438760240126a2033d5287ba6daaff5f9d72e7eee8eb8ac3c72fb0be92c5daf33bf06a54621332c7042e6c8cf11ddbd328e347c9315e224 SHA512 9a7a9c9f8f75391a1589751a83ba5c8153ac41de20ecb2f02fc230ec94b313619bdcf58c5aab580f7825555df68a6d5626b77a92b958b77ebf1fdc16a0b87dd0
EBUILD referencing-0.29.0.ebuild 998 BLAKE2B cef22d0b37736a5c6760936b51e865f88a1603006a32d7398715e6de1e48009cefa8928d40caf85823c7bc3df0263d2c1b5b9428c9b539cd77c37b14c20b1fa2 SHA512 552de0188ffb5006753a7eb282c56883d271b7b7251dfa74fc864eeda701e36d85a9b5b9fcb12408c6b4c334d7076108d22ee4e76cdf2af081b0d201191e0f37
-EBUILD referencing-0.29.1.ebuild 1005 BLAKE2B 4ce96a26e1c41db9738e08e20772d70ec23f93beef98b620b2d028aa76803befc72207987b2474d890838f8c8c937cff1a9e1c63134212b9d61485d7a6ecac23 SHA512 a14cb042603eb38363a9db972c20824a09dd4f5e68fed4f014542b4f2085a91920e2be9ae6f6ca384e658a7b7cf570ad802b08cf88a370e156058c65aca33513
+EBUILD referencing-0.29.1.ebuild 1015 BLAKE2B deec6df52d191df18390b3aa59060cc26b06296c9e226a3fbae8af96f3a74b0ce9c1cd59802203995ea21e7e15d6c3f8f3e4bf651406a8dd1ec16a4797bc92fa SHA512 7e8a0b9fb9c884133ccb6a4fadc9a212e36231c01d6f2b06a83beb466f0622882844b0e8781dfd32861891b517a8ac10a6b2a5706bfd07eed8c8c4cae9aa3941
MISC metadata.xml 408 BLAKE2B c91390d4742f1bf907ddcc7ba538bdba92c86cc4fadd812dd08161b88b0b8a2e255ace51c83b80256726378b264eb479de0d1cc76a539da72fdf559fc71f60ae SHA512 e54b9a8cd4967343ca43eb6998c57b6248739e8777aa75cf27fdd5027a4656ea4a6f0d8c1928dbc4ed9d9bedbc64d769c88e4cbacc99832f68176191b0d467da
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/Manifest b/dev-python/regex/Manifest
index 3dda48857407..30305fce0a66 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -3,5 +3,5 @@ AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fb
DIST regex-2023.5.5.tar.gz 392085 BLAKE2B 1eb63c85abcf37b83e2d8f03a18ea9ae0f80aed2d8d29b0141e5064ab30067d9146d9ec440b3bc043dfb569a8216349b67354c7b7b3c4faf6f447f4b910128dc SHA512 e182e0f42989fb2d9dfe8a9c3f66b08156e0617fe8b7924c16fc39d70c2dcd2c0f45f70f433256666ad93067fb66f574c9dae02ec3fb102716f941ddf87b45e8
DIST regex-2023.6.3.tar.gz 392247 BLAKE2B c7735e19df80e919fd577723c54f6761698adf014dd4e936cda6a1ed745f26f083abd59ed2a772a70e16bec742f8d29a1e76a726b28e1395265c9941ff4e7b99 SHA512 092f316621a0237425a6e8124b289f4156256424b28cb36c590b8d89d731cfa363a97051199b16ede6520e12e99659497f230338a6f913587f578ededdedc408
EBUILD regex-2023.5.5.ebuild 856 BLAKE2B 5746fc9b564a4fc4b89a7623d725ede2a9cc8d471d837847a84d1cbec70d62ac5bb9c472005f3e22e391a1995e379932bf982636e1ffded508682581f8e2e569 SHA512 c782333df1dcbe636be8f0520822cdcfa5a768a63289d9ef9c7d1450fa190142ded7b3d231f5737a1de9fe07f41880e7f4f1e74886099d35c323cc8b1cc77263
-EBUILD regex-2023.6.3.ebuild 857 BLAKE2B 6c1222b573ba7827fbe7966a246ce9d008140b4668d79e665bfbe1a5acc9d1cd904cf45e60d90530382ae4306e47eaab5a37558e65bbaad5b4e51e7dd2eaa803 SHA512 8f270ddc0cd9974ed039a1b794340768717d1ecdffebe5c60d8edae315323598b3ff3353986da7ca1d27d4fbb3ebe467d964b5d7fdbca63b43ce9c62ef70111d
+EBUILD regex-2023.6.3.ebuild 870 BLAKE2B 55152e34c8be38601c250e1239e118292c6405a3601c2feafa9884a1213686b98a4fe69d37616bdbae735722653af0bb1274d2a571565c79c9cd8185643cb66b SHA512 b5ed36559b7eb7b0ea3ce17819d2f6b8c842e3aa23298db8af81e915ea9b8a52214cd617b3cce78908c7623ee9e6176fd1052043fa4c6bcb559d97cbcde6b834
MISC metadata.xml 448 BLAKE2B ce92d069195d11c558d338d4f21cc9bb48e50f21a44aacee610f88283aeae0319b9a31b987fc1b6206832f7b251bb1f64b0d9bccd3eefd6c54953192911eb5e9 SHA512 a9b18af0c107005e8a9e0e7bc4e1dd44891faa9a5234365ddc39ecac2e3dc197c58b31087b4d97d94b48644be7c984d773e50ddb03063c6c95b1f94884483dfc
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 f9bc5a7c4e15..bb7be94cc92c 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,5 @@
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
EBUILD requests-mock-1.10.0-r1.ebuild 1541 BLAKE2B 5f16a4d98051e21ec100e532f1fb7f2bc8e5dfb592f46becb967270fac4bd79a40b58759f4d1fd72ea4057d8f172f8cdd3ba65bdc8ddc2d30d561f8434255dea SHA512 6afa6268db5f51f4af702b5fe8af33cb8481b7ab16c97a78bacb003ec59361f5add503c8bd1f65daded43c7c1abcf69c32d26cb92b53b13e4471f9abc382282d
-EBUILD requests-mock-1.11.0.ebuild 1351 BLAKE2B 62f85ba4448a5ebcda33b0ae62dabd4fc4493fb51c604bd25846e4c4ea5ee479a0ad6d29c349ae7f949e7fc7d54ed057296c752adb25a16414d19ebb94170463 SHA512 a82ce2158bb359a5beeba72ce16161b7dea25ba180fc626a821ef50d230fc002fc0906fcb9056efa6d15ae29300fdaca34fa02fab9aea66b9e3e2e2914b4cc11
+EBUILD requests-mock-1.11.0.ebuild 1348 BLAKE2B 276974dd0388eee5f42988ecab54d198bce5e2ac79d57bea95bc8467ddee27d72e3f48c962ec886d9b342bd4ab1b79d068d85119637f3a7cd75a756158ff3302 SHA512 33346222400a09c954fb8a20409af093cdd2f1271fb20b85778e2b7c2cb0f43b799670c8d0987cc33ecf4b85dce7ee9a82dec07b9481a0b27d77bee85a000d39
MISC metadata.xml 479 BLAKE2B ddd64d016f85e6960f2d8a10d53591c6ffa5c0f61ebc4074f5867a03c0d8f533468351b87cb10e662391aa3d8fdd61b07bcf607c1d5b07a13fe85cf600def424 SHA512 341437e0fb7b532b7845d000e0647ed9858efe1336e8b6f57f55f677483eae4985ac0f54016da09d22d007895f3450a5e1fa6cf5d20fa715f74466a4cdf43cfa
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/Manifest b/dev-python/rfc3339-validator/Manifest
index e8914ae1ef54..c5f3d95ba460 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,3 +1,3 @@
DIST rfc3339-validator-0.1.4.tar.gz 7451 BLAKE2B f8216b2eb08cc7cd755a2a57dc6fa93da9aa664cc49f7e34c551d07eb61e57dc865de4a3e86ed2dfbf5a38ff99c149868762a3807e916c884b12fba7e98c3ced SHA512 ed593b31c4984cdbc313e42dc0432173eaa649712e29627ab462dfa262efb30cee97b74f589d3d211c2193623fac3baca560a52a7a3f718071a63482e06c4203
-EBUILD rfc3339-validator-0.1.4-r1.ebuild 780 BLAKE2B 2e27de03cc559e99a280389db133ddb292b2756f5ba58de9bca8f7e03a9e7d0be81f6a0c03be96e20337db1cfca84c0954a717166374c90c844799de386803da SHA512 26ddd3670e44d518e74b2b6105772375cc9f5d7efec3afd3ad44f62d53e985f3c5b7b04f7b9dca4424ca1bb61779afd7eac0e24be907af4eb5de043dd24b37d5
+EBUILD rfc3339-validator-0.1.4-r1.ebuild 793 BLAKE2B 2f1a461f14966622f4efa89df7d1999f13c9fa81fb4b9429289fc0f559754dd9d3d51fc2dfe0670a39833cdcdc8aac5e072f9ce10a44f853764eebf61f0360c6 SHA512 689e96a127e5440fc1ed2825e3e3dda38bb5f98447b9ea258c56efb6ebb8477d1c65616071a0d7522ee3fd62c969e7689059317d661686ef5505673d6226b2cb
MISC metadata.xml 411 BLAKE2B 9a256d99c97dbd11b05ffbc08351064fa12c64ef2df3e3903cd2193aff1a4cea6e70800d9f76a7fbb0ac4badfe93fd1392b950713db296cdc8339de6f023c58c SHA512 bae3f998329addf682d44d9709cb2261cfab68437191596d00b0c97d38ff7d17a99c0c545fd2205e118137e5795bdbad58c339fedd6cfce0578578637755a336
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/Manifest b/dev-python/rfc3986-validator/Manifest
index 8b5a9c075115..2b21acb90d35 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1-r1.ebuild 796 BLAKE2B 9f044759f6c447ac1dbf75f9542684c498b7a55dfb7b527dc733b8d394e698d82e189e4edbcf1479ffcb4c589a8be38c6cf6d1b44fc4912a6f6c8b56b2940f9f SHA512 43378b2e724bbe468c6583384899bb3d47daa3eca857c9ab7c39c9342a2bb868223dbb4631fe9b6323d171ff8f38eb7a0c85473c84450752577b743873c9eaec
+EBUILD rfc3986-validator-0.1.1-r1.ebuild 809 BLAKE2B a9c4b5b887e7715a36ab45ce7eb1d4f33a0567f2b57c314c8ed46c4c6fa7b991f352116fc6b53c3df703dc2d8a4b231707e524e1826f82c6e5b95705238d432e SHA512 e1b9841ecd0c7177fd3435043c45ad55c82c86e3ccb0c17eefee526843a6f280280738d7301121adea452cc729a48b47b7ae4f156eb01bc8666707cd2f59557e
MISC metadata.xml 400 BLAKE2B 7ed04a3d74a354977cd63c1b835de7ae1c051f96171925eec55e221ef2d3d2a0f0bfd44f40107b04abe5e6025435213be849f4b9a72fb2077bbcdae36a3067c6 SHA512 357323ee0a4be15a9e18c539e6c75eb03224822b7190c37ac658aca46da1b162b1f5afe03337c656a0335f830bc0e5463dc1bb7316f91d2265dbe1baa72b15aa
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/Manifest b/dev-python/rfc3987/Manifest
index dafe726f13b9..d46d25245367 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.8-r2.ebuild 676 BLAKE2B 33e9c21f208f55935fd31ed08ad976d8b5db71ff4f687ec827b29a4eb477c91d44e3ac13e7f373d22b2940bbdc73328595609d3b012a9c672123e990f93a2b8f SHA512 a2fcdcf0bf361c2f3e27ea1498c83daaf6fee70bebd3a0f717c8c09446c035fe77a15354d1f67a2fdc875be86e460716cbea8bfe83f8794bb1446fb313ba3122
+EBUILD rfc3987-1.3.8-r2.ebuild 689 BLAKE2B 23710f0f6cc67f65d287cca680714399464500d4c94d898f9908e62435eabb8a0e979052423c1fd3e22dc2ba39905aa9b7a1dc6b8734b5c696d26c3e78b6697e SHA512 66116eee200c2e8762cafc4866abad6068a603b8ae056e101854eaa72877afb529902c090599ef4b9370800497a7e7636827693a1842df757b8d1b1165de8f6c
MISC metadata.xml 597 BLAKE2B 796fe6381e796647534e66a64c8fd3e97f9fadc5370bd2b7959680779ded356af4c58fe669a6965e511fcce229201e533f865e410df8ce4387e2495eb9bb6ed2 SHA512 a593defe0dacf43cf27d758a2963b32e8f29999c0e07682e99378e7a472d0b81d7bebef0fd6d561f705b79d0eabe43e341a30bb376ab6ba399e770287a7b8a42
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 09763d5ba467..0bd5fb3048c0 100644
--- a/dev-python/rpds-py/Manifest
+++ b/dev-python/rpds-py/Manifest
@@ -44,6 +44,6 @@ DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54e
DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
EBUILD rpds-py-0.7.1.ebuild 1487 BLAKE2B 71b1afe6034b8f4dfdd006e37d442755414fbb119ee28386eb244e921d44a589d4a7a4b7ab50940ba32f45969de420a7898b9230c750b4f805eff8cf99fe2144 SHA512 eeb42095685407fe32f5964b4ccf8385a6af897aec831f2eb753f14a89258edef3fa27c709be0ed951496c9b97c0d9bbe145ea06e3b796b6ca48100e324ef194
-EBUILD rpds-py-0.8.10.ebuild 1494 BLAKE2B 81456c656767c15a2f352a5ee8ffbb3d0aa96fb56fdc6415ad1edd25b7ecd2cdcbd85e5d915807ce73b0469088b759db3483e75e0047a081439eeca9516eda3f SHA512 41acb84fd72149dbdac0ff4eb5c2ad709ea728dafc8355d61a3051cb8a16be3313c1a2cb56a12f9d704c82a68cbe591ab3245e5fc3e0e60d6772492709ec7964
+EBUILD rpds-py-0.8.10.ebuild 1504 BLAKE2B 9e1dd4ef68c3e33038e40c72658adb70e27e0e0343373d185aa859eaeb69f307e5b829b4bd8862f0694b8243694a4743a0d93cdfb4002cdafc913158eeedb6fa SHA512 b0a790132971778052b631ae7054e7610481862a5cc1f34aa7110594dfe4276833284294b39666cc7c5b35b559c09c32a5b5fe7aba42898de4aade235bd636a4
EBUILD rpds-py-0.8.8.ebuild 1494 BLAKE2B 81456c656767c15a2f352a5ee8ffbb3d0aa96fb56fdc6415ad1edd25b7ecd2cdcbd85e5d915807ce73b0469088b759db3483e75e0047a081439eeca9516eda3f SHA512 41acb84fd72149dbdac0ff4eb5c2ad709ea728dafc8355d61a3051cb8a16be3313c1a2cb56a12f9d704c82a68cbe591ab3245e5fc3e0e60d6772492709ec7964
MISC metadata.xml 364 BLAKE2B 33dc27885605ddf91618cb855a4039c3d978dda6ef80fc1ccbf810d354ad9a8eac78ae5854a3897de0058d63b79ae5075c47f7111150237390f863aa6be67d19 SHA512 5757331989615512c24c0a9276a525a9e5d718ab474f22ff9e81d93568b0be5c95265898ce16442dafcbc3d9a76c83407d1bd460190ba04ace9b45259d19019c
diff --git a/dev-python/rpds-py/rpds-py-0.8.10.ebuild b/dev-python/rpds-py/rpds-py-0.8.10.ebuild
index 01f2ae1eebca..5aa215f1d27a 100644
--- a/dev-python/rpds-py/rpds-py-0.8.10.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.8.10.ebuild
@@ -64,7 +64,7 @@ LICENSE+="
Unicode-DFS-2016
"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
BDEPEND="
test? (
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index dc3e7ef3600f..8e0b9c4932a7 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -2,6 +2,6 @@ DIST selenium-4.10.0.tar.gz 6465647 BLAKE2B ce6bb410753d922fb40f9613ad7a552c91a1
DIST selenium-4.9.1.tar.gz 6341857 BLAKE2B dd6461e096a15170c37b3e95f2f492da5bc16d1b2bcdc3e0528f5f27219529a850a5f01363f91d829ca05700fde800d55c5e43d758d566e48faba494610a25d4 SHA512 e9ff93c0dfb8f561bbfd2b31e555c7e815bba677b8391296e696ced7ce63daa12e169bd2ce5e02c0fb1499a028a7d674f6202e512082993b5a59bddab5011a3c
DIST selenium-selenium-4.10.0.gh.tar.gz 89775386 BLAKE2B a20416826ae85b13f2312799b5fef1d079e142330a23b06d5b1cb2f3ec98e3c26e483e65bb99027e7b18eae80f13e74347afdc88c8facfc268220bbd93d8107a SHA512 bd8a0ac5e976119b8bff8a0b570479ece666369f0aef3806d173e956639c9df591047d0d333bb6ea5bdad740d84c5ee454d9749e0ebc502c5700a96bb146e182
DIST selenium-selenium-4.9.1.gh.tar.gz 90261099 BLAKE2B 4ef22ed67881036b3b20642bf6288a9afd518364f0271843b9d4ebcc2ccdfe3f259d5f6e7e52c375ff94e65f533810d3b51059433890277f440d23e50c5b1acf SHA512 fac1b0c50b6983fce7d2e5b40347dde05ca8b2907a9a6e06905f521d3bc9a05f61eed3bc07b91b0163958580a67605500d3e928aeed73b44b34a4b2a7ebeaca3
-EBUILD selenium-4.10.0.ebuild 1643 BLAKE2B e0188564e9a43ca83dc741c4314ad7f877f819ee8b522bd1ccc657a25bd6723deedce6b1fa13155a3f263d6f7a80cc270e0f7d1a19f2d954b016bc7d626dce58 SHA512 e497a98ecb729e01f0ed2949ee22ad008c11747a602a97e436191c824f55162c061ef46424a29299ca05da2aa1bd28bcdd12b40d612c667f38a7a2f0cbc4b6ef
+EBUILD selenium-4.10.0.ebuild 1637 BLAKE2B a9488c098bb4925f29317862a04c45ea3628940ebda5f5c2c829091b88cc7540ae063f05503e4a6ffd58c233eac0c818e791a121c091da84e93e0aa5aa931d72 SHA512 b0b3b016c2e50bca1b0efa7f31d9373e2724dfcbb92b3e1b90acb71b20bd053261f3d789fff52eccef45412b2ce981d18d30ee782764ff828cb564395b23a70d
EBUILD selenium-4.9.1-r1.ebuild 1635 BLAKE2B 7666ec83e57b0cad4db587e80e90e135e0066eabc30cb30a60ded72a4f2f30f8e1a769eeb6bc7da730b62636763f418049a090591ec944272cd64ae40851740c SHA512 f44801de6c2d701fe9f9dd987d0c0efb193dd8f486164723eb4ac8c0addcd9a4cb68f488c2c516c36600d5f31176d6fe5be662d344f23e1fd6f3bd59e0eebf83
MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
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 bdf77847bd61..a329062687c7 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -6,7 +6,7 @@ DIST sentry-python-1.27.0.gh.tar.gz 375579 BLAKE2B ad6de41078c76a1fe99c415d4eaf3
DIST sentry-python-1.27.1.gh.tar.gz 376598 BLAKE2B 4ad5986af5e252cf501523fcafdaa7ada4870aae0252227907d86ce3e886b58f7154f4407cb6ae22473044589c9c2639c7de8ca92dea1a7a7835c51c28b44bb6 SHA512 1408c06b3b8a8ef0c888f26a4591d45b63fda51853e52f2ea8921e4983d0a7b05b053c6bf17d55fc59667e5b4b4ca953419303774101fa58ef6f37428d600c90
EBUILD sentry-sdk-1.24.0.ebuild 4021 BLAKE2B 07d4ea094f752fcdd6994e23fed20af1f92305b1202071ffc5a4783364f1683dc92c0a58f9f08244da6023f698f8d31ec646f6b8ad779aa04a5e6d9ca4b0127a SHA512 e5cdf622d6108146f7b087c0c15dd0e1d37f648becd16761ac05e714b2625f457e2ffd974057b63e55107ce53a300eff2deb88b693fe8e4d99c1b179d623d3f8
EBUILD sentry-sdk-1.25.1.ebuild 4126 BLAKE2B ae20509f123b6ee17fb14a3b6b14b5b5ef93ee717e99e0b333a51ff0643a827a66f1a93175ea9c6d952114155558d5b6b6c37d0f3acd0ca34d4a6ae8555410f9 SHA512 c91d44d84e777eb6968890e216693c41d83bde3f12d56b924d05c9568f7bab21fbd3566b28318d914d1ccd9708819de80f27a3467564a2ce0e78d36d61ede5f5
-EBUILD sentry-sdk-1.26.0.ebuild 4170 BLAKE2B b9ab88af5992582b939280c483bfdc2ac2c2a72f14fa398023ba94700d2be4e6c23734850430fdd5ba77ffeeeb913bd492d84b0ff0a1ecd6bb5ce3b72a76b93c SHA512 314e5bb7acdd79b8ad8d119aa7e96aeb14e06d2d95073efc97a1dc471123632300479d79d261f8f34a13cffa3266f34cabaca7e0d31b6915e4f0b6f74c5e4f00
+EBUILD sentry-sdk-1.26.0.ebuild 4166 BLAKE2B 7e72178c20ab82082c4f59f9f407f8b217064457449967bfeec95725e9cf85d173abadc094cbd4c5a91858dd90645d701aad8273a8d0a6148d65b1711fb9a62a SHA512 2d208dbcb9e0f6c0e5f3c259e8a3737a5090ff0b4324c78d6c2b94b7824946096325cc1e5cb28b3e79700992a5190755a0843801e0dbbe88bbde3a84853e0b9e
EBUILD sentry-sdk-1.27.0.ebuild 4170 BLAKE2B b9ab88af5992582b939280c483bfdc2ac2c2a72f14fa398023ba94700d2be4e6c23734850430fdd5ba77ffeeeb913bd492d84b0ff0a1ecd6bb5ce3b72a76b93c SHA512 314e5bb7acdd79b8ad8d119aa7e96aeb14e06d2d95073efc97a1dc471123632300479d79d261f8f34a13cffa3266f34cabaca7e0d31b6915e4f0b6f74c5e4f00
EBUILD sentry-sdk-1.27.1.ebuild 4170 BLAKE2B b9ab88af5992582b939280c483bfdc2ac2c2a72f14fa398023ba94700d2be4e6c23734850430fdd5ba77ffeeeb913bd492d84b0ff0a1ecd6bb5ce3b72a76b93c SHA512 314e5bb7acdd79b8ad8d119aa7e96aeb14e06d2d95073efc97a1dc471123632300479d79d261f8f34a13cffa3266f34cabaca7e0d31b6915e4f0b6f74c5e4f00
MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
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/six/Manifest b/dev-python/six/Manifest
index ae13dabfa9aa..b85cb3034b71 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,3 +1,3 @@
DIST six-1.16.0.tar.gz 34041 BLAKE2B 764f8da9a0d89e95af002c79c2b19e852fdec9a6819655c57be019b48bd65a5f7909473e71887e6080073f381f983c077487591d4e44297542cf6b9a29ba42b8 SHA512 076fe31c8f03b0b52ff44346759c7dc8317da0972403b84dfe5898179f55acdba6c78827e0f8a53ff20afe8b76432c6fe0d655a75c24259d9acbaa4d9e8015c0
-EBUILD six-1.16.0-r1.ebuild 758 BLAKE2B 867faa4fc78ab9a1334dc8f7974da7a521dd2c448cd3ab5785c7cdc8eb30e427906af45137bea25ac77f426b7312bed3a96903fb5d1603d83e75882443209f0f SHA512 0dcd289d468cbfbcf4893ba667a9f80a43676ca5f8c33d3de9df9b721d477fd0246c12d03f9076a2deccd22c4c6ba30f82e6e2a8bd8a6cf0edbc35b7a41094cc
+EBUILD six-1.16.0-r1.ebuild 771 BLAKE2B b0df1c73cd382d370693bfb9fd385a70f241c60ab1e7953198d96f60812bdd7dccd5746fe444403c3a462c11e454246b69882d18c2f9607cc2d33f68c0e46352 SHA512 afa2b9a38b57d83ee1ee93af70a18fad2e7a5a4ec6b9346d27834390facdb3982517d6ab0b8acc5f014faf401328b24deb338a7df41f20df67c169253af97170
MISC metadata.xml 397 BLAKE2B ec6bbdf426ea83004d6c5eae83e650c6d601d639a51a08e58e9bc7d187877bbec9cb89f05f7b44ad521a2cc4f82269503cbd5f882c8e67d96a9018500803f931 SHA512 13d061df717192e9de816f03d7386218d8a760665d2d6ff2187da9152d0a7d7085df96cecbf47d76f9099b0eea8640506fce924d52e1f16300a6bcb06a2406b8
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/Manifest b/dev-python/smmap/Manifest
index 9662cb0516da..a53ac7d70d5c 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,4 +1,4 @@
DIST smmap-5.0.0.tar.gz 22437 BLAKE2B 2ff55ff412b10fe6c431df5f1589deb9f6f1c3277ee1ac651513e302d31b4f7ff986bfc548c5fefd66775f0eb7aef11dd8f2821f0e50a2e76d9bfcfaa9c047bd SHA512 03ae478bc83d02416f57bb3f6afc9c80bcb2d4249f3169390ac139b88be94258463dee7744fdf0fd54a7cfe109795a110c43f2b81ffd8546601de274667d353d
-EBUILD smmap-5.0.0-r1.ebuild 544 BLAKE2B 2c890bdc1354f8d4d8249b9f18c149262f96d1a76c989388ef9fb7a1e1879713ca025ed732dc699ef24921f9d6918c163f441aef6e4ea52f30375a874fc50b96 SHA512 237848e7b403af163e32e89dd8dd57b8038db5aeea36563bb25081d5d1a6c81eae49f7930f4869c4febfa6ca15dd7e7029a9f6b9b51d8fec6db314a67f29b198
+EBUILD smmap-5.0.0-r1.ebuild 536 BLAKE2B 48adb414ce3b53e65f5d898801d550b9ac2cfeed235ffab2b8657cc67e2925fc4690b1fcc683811216d0f05fc723512e2d51f5be6151c6ba78580f6a3addb2c9 SHA512 bde6578938befe3cdbbe1c0cb7263db9966b6ddc18adae83c5d99d62db1b4b2da0760576ad567d8119c0ea4b969c9f72de041d96e4908e581d2b2e1821039ffd
EBUILD smmap-5.0.0.ebuild 503 BLAKE2B 92a63562a23934befc9057b029ac1df4b161a8c9504690d44146c900452e5da55635df5a052c625b6b0a568ce8cbb9f972e6b74326e0a68fd60ee6e1e03ec684 SHA512 86d20fae27852f91d9b8ae9afba3920f90c478283c9931063eec84cad6ac550284bb64f81ee0d99f7f03ab45517bb00dbf39ea3894200108f340586274128a78
MISC metadata.xml 412 BLAKE2B d2178c6214bed671ee1ed50e3d2f098f8091af04f475867685a618df09f91d4340a28557d050ddc0849eea20e16662dccf62d015d565e1ed560e7c3144fbe0cb SHA512 57cfbc2aff045b2b9da66046c29d33523f0ba708861d98cf7c87e3363673dfa9b3d26bbddf794664faaf12c6efb38eb937299158199ab0fc989841cf5e4707fc
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/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index 2e8319fd662a..fe92cd2038f6 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1,3 +1,5 @@
+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
+EBUILD sphinx-multiversion-0.2.4-r1.ebuild 582 BLAKE2B 2e52f510484a26048618934c9482b44588a86f1910120d2035c052cd66943626eb60fe912255b61ca851f38e419c370cd9959c5c5032d3cc3fa06df88d5cffff SHA512 ada4cddcbaefa79550eaa858e0671b82dceb321447c4df358890be941f23feea0cf9276bc0af8e5ff1a489df91672f727ee6c956fd293efc5eef9e4faf9efbe9
EBUILD sphinx-multiversion-0.2.4.ebuild 545 BLAKE2B 291f6cfefeb15fcee34e4f036e1735e8b2d427c42c326ae21d6c49700e06ffe2eb95287f1d06583e6360d58643dc9c28133b9b5aa451aeefbe94129baafa435b SHA512 9cd656291ffdfde2ea4788904f5fb3b0e716f56d75d46612c7de04b8fc25f32508cd23b18a712645a04d72b2be76d4646519392ca49e7c1cbc0421eee047487f
-MISC metadata.xml 365 BLAKE2B 49bd3da2d3e2d6413a8eecb440510dc86b3aee984800b9063fe0e2c0a33602c8ce01c1b3c837db76513d5c3677c34483704f73df93c84e76491f701173505612 SHA512 5b2495e893f30fc18b77e9bd66e0db8c9934972c378a98812cb0af3244eac2088f2dc7f079160cb9f879ee3afaecac207d6e1a3524bdcd1f2ea24aaf8bd8558c
+MISC metadata.xml 433 BLAKE2B 17fb2ce903fca66b01a99041c879fb8e98b9323f2500405b583f5574db1aae3970a0978b701af6794881c33f06e5752b681c05b2c7f83e150841bf1d5b53da30 SHA512 e1a7ecfeac8d065966c9ddf6b7edbceb0d062b2596a6901faf85a5fdf4518067982f292a0eafe96fff3131da941ba9ca8c5443c7e5605e1dd1891b191db9213f
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 ecdea7b9fdd6..7c5133b037a2 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,3 +1,5 @@
+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
+EBUILD sphinx-panels-0.6.0-r1.ebuild 724 BLAKE2B f89a1b26f5642ab9bd1213638ed779bf9d8c544c5e265a83f916f553eabb4de0b4e3079aba11c32e61d3066edfe4a487993e0a197480fc47f586642643241f6a SHA512 276b28fc12285b8e5fd4871f0ec89c28cc8810b9b2ebc0403e01b2a922dac5337fca951c821d25d25352a5e355abc467298cb7831b2c7a29dbd55a6b4598f714
EBUILD sphinx-panels-0.6.0.ebuild 687 BLAKE2B 7e9296167084f3bb5a3ed8d0c123d9b515256b4195c26197b52afe60ffdc570495f9f3590ef13ddf5b11f7bdc777ce9db4cbdae255b4d660237565b74d4eb3b1 SHA512 e1b21c852bb88c68c7e4d3c7e1e4391c060dd899923310435b8276ec9b8e013e4bca7862cca2b2f7089f7f6dcb0ce4352134b4962c872ac5f58dcaa941e63699
-MISC metadata.xml 460 BLAKE2B 31c2437bd8621aed4feddc195b1c3e4462fdc07efdec108999ae5470c386cc048f513bc8805245f1dc73deefd241831c5daccf20a2f670afb0bcc1e107970a46 SHA512 c03140b7cf4bcb90e2c03cffac71ced33a4958406a93aecd031d33730de386dfd76129a8ed280757b28f935ef9cb18e8a54b891146ec83761cb4b23f27d009bf
+MISC metadata.xml 529 BLAKE2B 2f0bec5e5370efe7b98dccbe428e55649617ab2456c93d42e8340ae1dd412e5f2cfbd0036c3e864366a6865f7baf631975ba88054cdb558f21bc98b4d69bad54 SHA512 37fb3f14ef72b9deee418215483a033e595012db61d96663fb36bba70357713cd300a9b6a157c9585f996eab5c0946bf29474de19704ebe74c9a40d3c8ac7911
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 dd86ba62d4f7..59f2e701b637 100644
--- a/dev-python/sphinx-pytest/Manifest
+++ b/dev-python/sphinx-pytest/Manifest
@@ -1,5 +1,5 @@
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
EBUILD sphinx-pytest-0.0.5.ebuild 697 BLAKE2B d21f91547fea5e84062c31cfba53479d1080e9b7ef872feb6f3883c4b31aacec8e466ff544996b0a058a3d51cb7db4a545b21a13d912411a0edac7e8224001f1 SHA512 c99e1bb45572f9035d1a4d89467994e274e7f1f25a29f889ea6c5af804426ad1394e21469f4f25f8eae374b1efaeeda93eddda6ab701dcc5385ed8f94bfa48fd
-EBUILD sphinx-pytest-0.1.1.ebuild 718 BLAKE2B 01b1ee30d50cf8c5152340fadd593bf7f6f3e42db2b5ebb3471968e70db69ddb05e090767116c8060b1356d1a5d2dc9c7bb31f6ec0448071e5bbfee090f6c4a0 SHA512 472dd1f4cf2e4b54a5d72117c567a17cdb9dac30440c5a0a11e0383afd52154f9ff30686081f7688380d970ca3080ea4aa8fb011cabaf1d75131af00ee4fda97
+EBUILD sphinx-pytest-0.1.1.ebuild 710 BLAKE2B 0cc0bd2488dc987400b1574c911bd606cb67e0c0c2d0aa74900cc6851c2b60d0057e3109ec9852000e98f5f93d7f2b077b6a1eee1f9bf56f08143861e540c6b8 SHA512 84d87f22fa83181878ab463192239c79bfcba13f140ba499a61fb77bc9916a145393ca68cba6b94770b141f4f01e4b4a60889c7f49e230bf3022e209ab37de5b
MISC metadata.xml 413 BLAKE2B 688b027b22ac7d6ee04627c8ad7134d5993892e4b0f63739d432abb76291c32ac7cf8ad5ee8c53c22a6f6a0f29082c9781fdba0290f2015a603b6d8be85df285 SHA512 3b9967e4e96a723af552df502c0f57633ecc1669348f11f005ce451d212ec9e1ad3e2d3d75ddf5da4445c7196ad337a1ffb65d0aa1393ca932d4adb04329e118
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 810b8fb183ba..98b3e83ef763 100644
--- a/dev-python/sphinx-rtd-theme/Manifest
+++ b/dev-python/sphinx-rtd-theme/Manifest
@@ -3,5 +3,5 @@ DIST sphinx_rtd_theme-1.2.1.tar.gz 2784128 BLAKE2B c5aed3beb6ade90a27690a8c33c8e
DIST sphinx_rtd_theme-1.2.2.tar.gz 2784122 BLAKE2B af738c99a2406daa0372171a34c78ee14e955fee589ba49811ea50fd2cdeeee431367fde4d6a34d9e4f532d1ed6d079b1cebf4bb390b573fb5fe9cfc8f02b838 SHA512 44272272ce14387c1252ec40325ff8f9b40da6e37206333a8e0831cdce76c45efe58cf28f08132188d2799527a40e4ead881e8577776a123921b1cd908dd17fe
EBUILD sphinx-rtd-theme-1.2.0.ebuild 1059 BLAKE2B 6bf396e0a8fade30452fc323a747e67795f92164fc69e9a6fb6054937a6b5c979cdb8f2561e263a88ee1ddfb9d78e166f6785ca1569b079f4a8744b4d8e64904 SHA512 88c3e0905bfd7912e3ef4e145cd7b06c0e3721bd970878e2edca19c77f93d5168b42799ef0ff4e9d6816655c0e3e9e6976e53a843a4de14f9edc5b4f3cfdf0bc
EBUILD sphinx-rtd-theme-1.2.1.ebuild 1068 BLAKE2B 08abfbb0d8eeaf250c209912f0ebbf613a699a8cd7a052600a2e9d2ab0a6e2a8699d6e9eae3b1d34543a2b748e9c1efefcc350f4a19f56d00ba65503a579a43b SHA512 d0af1a29bd3243f70d27656140a92d0a1e544f7cb4e4fad5158b975b090a4e9309ea31c27ca4e28cb6e4e7cfd72581e20204b2cc97d488efc436768f5ab5bc6d
-EBUILD sphinx-rtd-theme-1.2.2-r1.ebuild 968 BLAKE2B ad3a2a64740b072bf73ffcda0e27e35759b83d35158d585f31020e4fc336f189c2feb2ab2ebcf7adf57a3595f2c2fa71b4ab8e2417420388286b4dcb42523219 SHA512 3dec89fdbab5a1bb4f172b5f4874790dd5ce755b1de4386d38b342388cda32c9091cd8b491db78b4a034d53003b5c0236a46adb80a336509be33b93b5c120d3a
+EBUILD sphinx-rtd-theme-1.2.2-r1.ebuild 960 BLAKE2B 47ebfe2afa37e7d0f5ea30e01ae1bbcaf8aa405ac98ef766244ac1133872e24f97fea8e23841d7970bddcdbe8356722e2567c12af414a16c2be2551a30c80953 SHA512 f7237793df488599b4f7beb0edcb76ce580294e0b927b66aa973648958d0df910a1a54422892dd38d3b87312008104d6816444a721602a5b363339608dd166f5
MISC metadata.xml 412 BLAKE2B bed5105c13db0478a4b6129d634b8028b80cfb4e7969705ed0a693286d7f1645608ba6e6066cd3219c267c097bc1bd7d1ee13531d91d8cb4fdf6a5f107ef2252 SHA512 a0e7ce66d5f68145471452e49c173aaddcb502c9ba35af543240e5fbe9b24c0bd94ecf5782d5d81c23b3e63b80cf0cab4e39d279fb635f17275702e9a56bd5bc
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/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 31d33e3cea92..c017c2c5b96a 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,4 +1,4 @@
DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
EBUILD sphinxcontrib-jsmath-1.0.1-r2.ebuild 961 BLAKE2B 6f74737904141838729763a85e3da2b7e20c5549f427fe325ecacc4ea5c52b3d67cab6c9c3ff0f208007cd16c4ea9dd8319e849edbc3bd862a0a7eacdff50eb4 SHA512 397a2ec827764f3c914065a7bbc5fdc3a8d6102d64138977ef295f270d48a3290f9fc087db03b639989d9a2dc0004fb95688ea83f7f951e5651e8a239a5bce95
-EBUILD sphinxcontrib-jsmath-1.0.1-r3.ebuild 1213 BLAKE2B 7e470eb2b69c246c8765709c65c48d4b28d220cf5b6af7feef46d751f967b3c2f98e5fcdfea0a37f015068bb6cd7adb45fb21613aa394d7ff9a27f50e61bb6c5 SHA512 9cef7ad308f4c8475eb12ddcf78d1c2997e3eb2ef5006dda7e289e794cd7e6c308dc93bbca18d76061ba1c63daf735a6d653eb31d50f04f04000b0ca3d66faa2
+EBUILD sphinxcontrib-jsmath-1.0.1-r3.ebuild 1205 BLAKE2B 4cef3549792a89b8d5aaa03a629e05e5e5191a1a9964c5833fcff4432f86e2f288aedf1eaa998ec8352199bdb16e6f90cba993cca8b2872739e1a55da7d3defa SHA512 138c577c5cd6de2ba8253e96d3512dfeb6a506ebdb2bd11f6dc420215b8789b83be1df9ccd80df25c47f005e23cd99a03982b79accb93d8eb279e72a3d952526
MISC metadata.xml 419 BLAKE2B 7b22df905fbf04eb026a37a8bcf2512508558a000793354a80fd7cb06bcacbb032291c24b1edd40cf884248bb761f9e9638b5ff55c6d59aa406777dfe2361214 SHA512 3fec9aaa8e570dfb8c4559dee30b71bdc479d5ac18431fcf85d1fd415adce54b8f2783ced3a5392a08ed083570622e500bf489c7b168f65a395248aa2c235629
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/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index da165caa9d06..65e11cccf9e5 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,4 +1,4 @@
DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
EBUILD sphinxcontrib-qthelp-1.0.3-r1.ebuild 942 BLAKE2B 7fe5defdccf16789c38613a85de23610c48bec9403cb52fcec532830ff985f96ef84544329c618d2855bf2347942deab77c38880f43e90364bff4e0f54a8958f SHA512 60787a0bfd77dd80c55fc6bc2fa8c9b2a348bf8b12faf52e0347447df78fe3800cabb508fc722fb3b83e2c3b8d4412dd15506c81ec6270d1877484a506219dc9
-EBUILD sphinxcontrib-qthelp-1.0.3-r2.ebuild 1194 BLAKE2B 4d75c4db99d096a020c60587f40c56d4fa37d93b1b5dd23c4631ec6fb7c85575d0f3f7c7ba40af7b30f6a4cf25284f73514b5b709f40c307dd947d4f40ac659c SHA512 1c65a6915caec78abedd42efd7c6c246943a54588f4b4bbf9250c9b7dc687d13b557b705eb1a0024db1f6afb9591cbe6377cb5f1446eb80b5349d53db9daaf68
+EBUILD sphinxcontrib-qthelp-1.0.3-r2.ebuild 1186 BLAKE2B e0b9c0906b007e6f2a7b99d3c193d5df8a24bebf058c299431cbde0a35fc956b7157f35b5696135f0b539014c8e376a745040ba6b07a8d6575df10fcad2848be SHA512 b3451baa09869e9717f72fa4fa8fd72f2eba9c069ae5d10aa6ef7559d28f8bd3a864d3c837ab1f70d141522282e8b6fdc49ab2b5344ac611b16d900303fed399
MISC metadata.xml 419 BLAKE2B 5a559b50428f6425568dfbae01bce3ada0905cbea24542e75122f1f3fce9e04cec6861f4d662515c7efa8c15a5b2347a83af5a2ea38326c069f9253436e7199e SHA512 559911ed37cd63368b2783fd6d65aa9b5fecc7b58422978f9d86b32eb8f50275f6b52a910ea4c73ef2ef3d081373862eff8a8e0e4098bd83c6b1cf4f06cd1af0
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/Manifest b/dev-python/sphinxcontrib-trio/Manifest
index a1a4cd9ac635..1b9708bf3bb8 100644
--- a/dev-python/sphinxcontrib-trio/Manifest
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -1,3 +1,4 @@
DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
+EBUILD sphinxcontrib-trio-1.1.2-r1.ebuild 1102 BLAKE2B 0e25184655ac988fdf0f56069bb7fdc582a2004c4512b921e3f1e001510b9c35f7aacb6d7f37112089968c3a592134910a451c10bad8b005ded31ce888cbbd19 SHA512 a9c992fd784debc5ce14a96c1a2fbc8ba8fae1d7e6eac79f6b269cf77000c68a04cf8b1529660dfd49cfbbed23c2418d6a99da6ab1ea79027059304dd05e1a05
EBUILD sphinxcontrib-trio-1.1.2.ebuild 983 BLAKE2B d2be6677eecea0219121f32516c1de3579c00f76e559b094ed6ac270ada4af6d11f3ba7153a8ac7df9ced02dcf976bfe5049b7eb1df3ad8294228301a99feef1 SHA512 613e07c9f22bf65186de66d7db766e0d6d8f69809d474572a74c1da9516a86a7de609b7a305ec24c0942361d32e10564d512660798a89d1a40c8c7839cbcdc60
MISC metadata.xml 1118 BLAKE2B f86bb065d9a5073e419a2c34c88412f0340de6e444afc26ee316a05b962699dd744a790758e2409d3d0b32378d865f66d8d7e8392fdd4523b393566caf67e65a SHA512 a16c4e89c6be00a81c3278f8c8ebe6cd75d1b1cba1e8c9f9d1aa4d2bd318073687556adf91f44c1cd39c2e26a179153b1bbee501101fe26d154f1d69a1a2d376
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 3913b386db43..7d58d053482f 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,5 +1,5 @@
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
EBUILD starlette-0.27.0.ebuild 1232 BLAKE2B 41db12df9552ef1991cee94dfa8f6658927eadee12507fe3eada40b40f09d1b4d60f170b835fbdc7a25f0be74f98e1c61d5f95c42e876d17af1e3090c6ebce13 SHA512 4d80662a2de4b94f81dce6174ebc667f34dcd5cff0c6dbad908300677ee3b8d794110e56fd56eac42c6cff6ed33cc7d878725f47ceb752822175ec8c944c6559
-EBUILD starlette-0.28.0.ebuild 1240 BLAKE2B 9876c1e1da4f1363eee51f5de6051ac9786dcf179e6035d0f44718fc6f8cc99cfd940d197eb043c5b1bf9863ce6e0e3df0cbd3b07dfabb2b66892a1c84cc44e0 SHA512 95cae36008c48eb58f041263d005f35525e01eb501e3df76fe2ac5dee75a6f2abb0ddc60e45db8286bd663275e63ea2e29026fddb2d6dccf851ce6d3b6c03b39
+EBUILD starlette-0.28.0.ebuild 1232 BLAKE2B 41db12df9552ef1991cee94dfa8f6658927eadee12507fe3eada40b40f09d1b4d60f170b835fbdc7a25f0be74f98e1c61d5f95c42e876d17af1e3090c6ebce13 SHA512 4d80662a2de4b94f81dce6174ebc667f34dcd5cff0c6dbad908300677ee3b8d794110e56fd56eac42c6cff6ed33cc7d878725f47ceb752822175ec8c944c6559
MISC metadata.xml 371 BLAKE2B 0ccaa4659e63162b565359a1cae05764bea66d708a5f4af1a4716ba9ba23faa39ab4f5a806c0a9783f3f42282ee9b98e22a92f2b308b8dfe97bbf9c770a8add1 SHA512 0fc326941861260becd4129c8a351e89ba0f98f9a3ce9b5d50812f0eaf667743ab0d403889aa1b0a2d9fcedbe0212ba879d165ec8edd115686d4768e6b1326ca
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 a899e088eba8..bfd0f92382ba 100644
--- a/dev-python/stdio-mgr/Manifest
+++ b/dev-python/stdio-mgr/Manifest
@@ -1,5 +1,5 @@
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
-EBUILD stdio-mgr-1.0.1-r1.ebuild 892 BLAKE2B d6a513b425efc7d2caf5341f4e98280aba10cb93d8898953002b3f64b6ca1e658e4d423f147b6af7980a3acbe3148c79bacfe17874b6d4000d1b055dfadac3b4 SHA512 92b19542759f7ed4bbe8dbe94332afcbf69de19da41d8871e8add08344109f08f72dff1c99f807e99a7e0e8d9c7bab890662abaa875000b67d9da8f513751ffc
+EBUILD stdio-mgr-1.0.1-r1.ebuild 885 BLAKE2B a390ca953c8bbb1c966e0eeb75ce25a6dbecb8ba65dbd2304c217661cdca848df7b245820d3a64b8b92249dfe950f9e49ff982dc2e8f1fba0d8a1ee277ce8d9d SHA512 682b581a618c8e614e0d16e17ddc83d76c841c8a81ccaf0254373130bb75c6232290c5033dd54e98630a62ca0c3b2b61164f63c50a747bc3b1621c294af6ef86
EBUILD stdio-mgr-1.0.1.ebuild 837 BLAKE2B cbb6199b3be9a73aeb79fdbf6fadb441a18f406c8f2f19267486c3f1eb5f4f57b3346f6445bf333ab93527ca61d325b1785f085df3e4b2dcd5ed0939b829198d SHA512 dd11b9539964f7658f0188a3257cf7257c78949a5c8f70efd2ae7bdd7ad682a63a0698023ff69a98970ba932cc110bfb30d7e93f83d7db92b607478aa81723b6
MISC metadata.xml 843 BLAKE2B 28d7e9188dfbf2da64435abcf5fc87d7440ca4b676f74da1d50f2038bc1ca786619f40476c967bf96904acb00f8be4ddc353b5884826d86cb33308ee1660022b SHA512 e0e914175cb2f69f9c11afe26b74178f16bf10d37bc35ee67ce55e9f3347e485a89db3af81ef5c0cba4daee8c167a0daaa7c927261d718007b09c2f9d8a35306
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/stevedore/Manifest b/dev-python/stevedore/Manifest
index e992df9e2e2b..ffd5ee906a59 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,5 @@
DIST stevedore-5.0.0.tar.gz 513970 BLAKE2B e1135a281c88633daed4ec41a5bb66c3bf2ed2275a3502fbc90b6ba09ac55693e5c98a0af49d948adf141812e195dfdb6a293021405abdba962c05ff506a1879 SHA512 4041172deba14b8e33cb48d8b629810e66a52e1676a989417c1b896930e980e0057efbf8f9b6b9c4c82ffce02b132b8e6c5f7a5b02e49d7c7c242ab4a20bac02
DIST stevedore-5.1.0.tar.gz 514100 BLAKE2B f12e0eaa0c3d4bfa334a89ced740277bd2979e7ff48c7bc36bd85d801d0d2dd92f2f8cf7ef29b8fb61a5361a655c6a5303ad6f6aa2666fb57ebcee209ac0c344 SHA512 d7ad920961c9f4055cb145c84578f09f0af93eadf82f60bd7903dfc909cc2cdb64159d9b9b1469eb04569705f4208b667ded5aab17e97bba5dd7310263f449de
EBUILD stevedore-5.0.0.ebuild 1106 BLAKE2B de4bfbb9928ddd8517cd795032769f437fad560bf5b6448bade8f00a3193ec07d754db8255eaa34d4f25804b88ef12edc1ef6f1b0c07844f5872e7d6d53557aa SHA512 21042774ef2009a773a9a9a412b0ef85a61f22c10cff8561ff5c5971cd0b31f8fda19a7dace2b333e2adf5c3379217a83b404175eadaa828fb4a20b2d8667e1f
-EBUILD stevedore-5.1.0.ebuild 1111 BLAKE2B 5ae501f0d32c85a90e1f53d11c6c2fad0d0f65aa6873a0ebb27b187b13bb392f817c817ad0ef8914642a15fb6d661efffb3c28b526c970d5c7a21fc39518dc40 SHA512 7d2e7418d210502d5688402cdb04acfc558276a1dea1f3d6100cd11cc69feb7060ceba907c6c693c0a8562ef8a498e091735bb2982ae4361b3490f5153f194e9
+EBUILD stevedore-5.1.0.ebuild 1107 BLAKE2B de75148eecf9d9af1fa88e873ecb7158b0873191fbfb42687630ddfb2d18add0d0627e64c2b9259110ea26abf2f7e68395df8979eecb1a6bc3bdfb36427e3fdc SHA512 9f8ac994d41bfbed5a666ae871667af47400ae4a8927674e24d0f6beb2678f5f43bb21bc7eb4bb4be4874f119478e27b66bf188d809cfe0c90b3c3b803b729e5
MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
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/Manifest b/dev-python/strict-rfc3339/Manifest
index 8548357c0577..7266607a5d88 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,3 +1,3 @@
DIST strict-rfc3339-version-0.7.tar.gz 18756 BLAKE2B 45a38c5eef2b74225408e9a0de9e484cce24778eaf830d9cf052a26df4964c761d8349a71c892c5b4b5129f98802a9aae10b1e9205156bbc4eb6c8f5df7bfb88 SHA512 5db598b33680d60eab8c49dde9d831ece9632811c89552c7ccd9ac7cbc0f603bde5aa14434a388abe669181e643bc2fe97f3c48b08c88863f88e95f17d958bd1
-EBUILD strict-rfc3339-0.7-r2.ebuild 716 BLAKE2B 732bcacdfee2daeacd621d5652c7829eaf5071aca2a1b299fe704028ecad545499f3009e15448ce16429b690cef0808277e1fa2a10db9791311f934fdc55d695 SHA512 9a70762e8f7cc3d4b287159e6006ccd8be958c3afe9830e9c41ae2e37c98ce87ee55651647df6badc1e9b35c6a124b380fed91e1a4004122fb7dce7568a3de5b
+EBUILD strict-rfc3339-0.7-r2.ebuild 729 BLAKE2B 386a6b190f6cf5fc53ffa03050037ca85adee93255e17551db924be69ce302bd474799f79f2ef86b52e581b30580f6bfdd11778d4921f8fd3c932f01cb30a72c SHA512 28ebfdd8efbc7088e1440cab05b7a99f65042eec37b7cbdcd6fbce3d15ab2a547c371aa8547accdbc78e61129192ea8aa57109dec6e14c8bbc73c4cfdbb41120
MISC metadata.xml 410 BLAKE2B 760715fe5ebffe439033a07a00ddfd45b22a705ea07b8eb9083530b6c057c4548e28cdd8fddece6cd7309d3b068e254d4130fe7ba98a16cfc0aafd49356692f2 SHA512 2bc46b0aba422c3e767a6b0a8c0acff358ccfc82d8ae2ca2b18e302080aa0a1ebb9ba48c39bebf1634436c020607acbebd81c8b648cbcc5e8f0fbddd90dcb6a1
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 0343a0e8fb13..54014fd45012 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -3,5 +3,5 @@ DIST tavern-2.1.0.gh.tar.gz 209527 BLAKE2B 86023c19b5293a16f00f7f7e72e44e6ddfc51
DIST tavern-2.2.0.gh.tar.gz 213603 BLAKE2B 3a192424817d641da7428e27d49c553f9554fb740c9b0cde0d8e693fc204deb15d6f08f8bb60d961278f26b9f7c17bffb68cc7136cc9cc496eb74dd845ec5158 SHA512 731e479f3fe69cdaa28e391512207edde1084f3844da9c77ee7c917096422a009a4beeed9c135b773550c181f698d41ac83b013b111535e527f90569e16a00b4
EBUILD tavern-2.0.7.ebuild 1230 BLAKE2B c1d00e514ec89ccc6d64b1ed50d51ff1826f5bf6241d35df0d38f75ac0dea4621aec5d5692159dafd3429b0416a2df70d8a7a276dc0e67ab856cc50795b439dd SHA512 261e75f5f9eaae685c46f7e01302b621d00761c8f3f74bde2725ca6afbbee6a8308455a469547678bd039af14adf2acf8af0269a79d89cf5457dca2b5f1b6f71
EBUILD tavern-2.1.0.ebuild 1232 BLAKE2B 8870f0b3c1a02ccf3488ffaf9bcac743be651a7c1c7b14efa4ec688972470cfd53ad61b6a19aa91d2cc2ebe2a6d79f801a03e4a55fee0cd4353ef3b0df4f30b2 SHA512 a4f6802393ab8fd71a1c096b431c6fe7e1ba71b24fdf36c9f7a035748dfbabb22170e7dbd22f5e509fff11a8783c00118184a973c85244bddaf291031f3b1972
-EBUILD tavern-2.2.0.ebuild 1232 BLAKE2B 8870f0b3c1a02ccf3488ffaf9bcac743be651a7c1c7b14efa4ec688972470cfd53ad61b6a19aa91d2cc2ebe2a6d79f801a03e4a55fee0cd4353ef3b0df4f30b2 SHA512 a4f6802393ab8fd71a1c096b431c6fe7e1ba71b24fdf36c9f7a035748dfbabb22170e7dbd22f5e509fff11a8783c00118184a973c85244bddaf291031f3b1972
+EBUILD tavern-2.2.0.ebuild 1231 BLAKE2B a5da480efa34287756f67a26b3a6abb6ad96f86f9855b423501d5e694f627a6d04fed7efdf4d3817d67d75825a6b93387b98dc7c5b1565aefa2c1421a721b422 SHA512 7a5bc4781f3874e6dc9a5c78f1af25dba5960545d0e178ccbfed0958ba4b228954993b16064a3a6704f494fef1a650c2d458bf2f24afa45c6f695dc9165c7973
MISC metadata.xml 722 BLAKE2B 0ed7dd19f49aae7940de52b0df249979458b3950422e1089886929499d7a92d16a3a6e101b52313569900af6aec4e26388ae6d0673d5b1acef1e1615ed87d34a SHA512 3c30524ee5129700db664b5dab8635463ee17d4a45295583d79755c1f5b1dbba9ac611fcec3e9584028bfe96cf913f4f4b9d8da67a0e8ff6cde1ebedbf57c15a
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 92c97e81bfbe..29ca34ab1b1c 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,5 +1,5 @@
DIST tempest-34.2.0.tar.gz 1141098 BLAKE2B 60d09fc0de49e63213bf23cc223cec92b53f887ff5677fd80cefac441166ef777bc8b96682847697702af26d8481192a2fe19ddbe42cd3b991cc0f16ed09176d SHA512 22cf6e5b6d60398a7a1698ad0bad02d8d16ffd815f573fb526becb9d1be64151bc6b33fb6b8b03f9c52f18565ca06cad1bf9725f2cff2c6116c88f85439b5d7e
DIST tempest-35.0.0.tar.gz 1144022 BLAKE2B dd333ac1271ef51171ff7d06931138a6de5872a86e2ed49c4d94b37431f6f94092069eef6700e453ab6e5fc04f004f5bd040af64ea98531bf56eba5edc9394b3 SHA512 c8986e13c821c8861f0b9c1b37c71a1017cd6de480a5efdcc646b51d1c7032a236f98735d0f77240fc9ec9eb711638a12f7a4a8d67e99c76bc1f6b561c39c61d
EBUILD tempest-34.2.0.ebuild 2196 BLAKE2B 3cecc6aa4d890879813eb5d205c32a157ce4419fba6a136b141b7479ba5589d7b2b3ea45112b462754a79dc27665e21be32c82cbd940026b127881d5bdc5723a SHA512 dafd6586cec20fdf6c91011b1cfcff774bbbb85c221529c82dda8341b637ec81ba63f79fcc1e053148502d003caf09b99a33dde861c6b717056c44b1c7967c73
-EBUILD tempest-35.0.0.ebuild 2200 BLAKE2B ebea9980ad84079924e644bda703f8023e7c370d0ab05c3a21a7c8a6b5dab1ac7df0eb366570a647a129b0d6ddf4514c69f4510d48d85edb4b6af30e7c915509 SHA512 0fdbf6bc101fd47ed8f03abe0feac84cbacad60dbf2f83e71bca277219a8cb4c97161a827ea86b6f657b9e0caf057cdd09e1b3184c102ef07680340ced9d48ba
+EBUILD tempest-35.0.0.ebuild 2197 BLAKE2B 20d0164a60796d674ab0423312c1bebba20ece88d00871c9203b4b8ec9cb99b416b3c3c0d94c4e8d148177c3ef59576d09939806597cbfa2483b6b752d1d7666 SHA512 bb24e09d42f53569928cdae5496a885af369c68e3b1b01fe01cf201a98ee39a92a7fe343700258e9b9ccdfc72be9f588bf47872441a05feb80cd30490719f275
MISC metadata.xml 442 BLAKE2B 30b474d10a59f53672390e029ffaf894cfe52862af42814ca09500372d4c94afc596177100b9ba69cfd12965e98809de363527d9db345c3b4cf499eaab0375f9 SHA512 d84466ecac31486c92a6c5f87089616b65a1f3cbe9447c3382021af57bec3964a80d4d4421783560528e80e70afb4f4ba604bf2a4e23ac7fcbd873ef3d789859
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/Manifest b/dev-python/testresources/Manifest
index 64b70a317024..bac626a18a59 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,5 +1,5 @@
AUX testresources-2.0.1-py312-tests.patch 1627 BLAKE2B 516abb3270532c89408a64b757d491a5bf53aa56182b440dd87b3a5fc71aff7173a561c3522f06356d05df67daf05a21bd667cdd5c90d8020cf9f7b2271ad526 SHA512 f67ab39646704067ba2fc8075e100faad2adbb41369177a6c82c6de9a5a9027233e226f9ebeb85929350d9a68312413d32bb2ece0261876662d9163be73901ce
DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
EBUILD testresources-2.0.1-r2.ebuild 962 BLAKE2B a935cb64e2e4794823fdd06143c49b5929d504eef6a8902c738a38c30dd1a1d75f78aa1116c82639236a4a0173ec2b6ed9c592531b68708228fd93e02eeb9d3b SHA512 93611fd7c50a62bcba7cb11adaf4f601ecef0417f13787654036f0b5ccc24fd8ef9cc623810480797316275b7c11fc5a351782205281b4e4a72a8fdc868d8a55
-EBUILD testresources-2.0.1-r3.ebuild 856 BLAKE2B bc76ee0044d27a6da4cbf84b80c0766c634c1420b8b00ceb3989abaddf05d6d11f54fc37d61be061796421ca13a6dd5be90c46da5b8928a2aa36176abbce9fa0 SHA512 941e1938b3dbc2326f6af36289e695b387572f396105db309a420ff1e26783c4d7007c9b554cd9dbc8e68ba3d497f7b1583e9328a1cf6a9a29e3bfaf02313634
+EBUILD testresources-2.0.1-r3.ebuild 848 BLAKE2B 26674569bcc58291d4ccbef7596f0958799215d11a338a9ee7fc206a530909b915b3de0ee3af028ecf247469d24ca458660f1a75e51ecffb71dbd65d162c2758 SHA512 a30d63356116ceb461a9211ec89d28316ff16a312778ffee4becaa725c815eb7f8358b2714c1748fb22da26d72f87abc758f0a094ec9f50f9f9613e8b3bcb791
MISC metadata.xml 1031 BLAKE2B d0eaaaa67bda4c97d6a02a3bb78dd6fe148362dd896262525b7ebe1a314ac56969b30ea0d14d49232f767c5bc7ef836cfed7d6625eb609beade614d720b9d560 SHA512 5ce52d0d37fd23da71539958d0948417d3b804f38745a2b94c4530120cdab175ae7c25dbc7f2c7a02792e0b89e8ea1c1c99d2942caaa22f04e54046f5ebf80ec
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/Manifest b/dev-python/testtools/Manifest
index 25ea5ab07ba0..d75331cb3394 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
DIST testtools-2.6.0.tar.gz 237864 BLAKE2B 1540c3b6d0f98adccf69e281778cf5ce685cf5b63102f0ee260bc6d1a8cedef0f57a81506e13b705a452f22dd75858da08a7f577b39279b2ae05643b4e96338e SHA512 309893693b2ae63ff75395bf543bd42caa9aee3b1208ce5921d893b3635012f6aa8ed5e797b4d130d83e1b530778e87b91e57b901e8351f86d44f3289d54d04b
-EBUILD testtools-2.6.0-r1.ebuild 1277 BLAKE2B 221bfcb324d6eaaf61b631f9cf2fbb0c21eb4e678edbe4322b2e34e798e5152b07bfab33165e77a72ec592ddf49faa293015642f96da57a2d91eb11000491bec SHA512 58f06e038523a36a13a5e50274afed10acdf0dcb12326618c29309a005ef0dd50c0ede160501ff263d9e3a859e7791287ac2a091d1b41b2423eb7f49df02e616
+EBUILD testtools-2.6.0-r1.ebuild 1269 BLAKE2B abd28e1b7026dd11d4be94887dc2bbcf67a394b963c3b0e6e40afa2e295b11f88cf011e0363eecd0ba4aefffc3690ec50eeae3e5a92998dadc26ff0766a4f489 SHA512 533ef7990de7db15659820bf4db5cd6ee63f876605a47538c24adfed8095864cb29b3d4f4119eb82b831d5628579ed51b53c944ed1a16ca311cf9df2a9e084c3
EBUILD testtools-2.6.0.ebuild 1311 BLAKE2B 0f00fe31d7fe100df195994f61c703d9abed9913e0bccd9c500762abaf6b4611b2ffa6d1bfe8d5cd65090bbd608cb3bf037f783fc5ec13871794b287faf92ba7 SHA512 c0544b9b9003ad56009f511654a3573e64caedab2d519786e17a95e971b315f56193e4c441f5a31222f5c51f89edea86451d3f95d8aaeb9adb9421dd4127db21
MISC metadata.xml 580 BLAKE2B 5068f4abc80612e7a92fb65865612d93cc4d4803a9cda3555cee34eab48da20f6fb22734b09adeaa068cff135d592b5fbd607157a60052a68e127750f6082b24 SHA512 5807608ef5c6d3fa1a86c715c59afb7c4f3913f69739a0c4ea9b6cf85976077280da6ce019ec4fda6dd6bd490379ee0570d5c98f9d719c0cdaf60a550e01e555
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/three-merge/Manifest b/dev-python/three-merge/Manifest
index be77e45b1b9d..6173bd284e0d 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,5 +1,5 @@
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
-EBUILD three-merge-0.1.1-r1.ebuild 719 BLAKE2B 23a66a99c5562c6611f3b0be19913a2731b2e784ba5e0e45d9080dff532df66d1d4cb93f37475610242c1062a04311c8ca52804f8ba45ac9d0b4345b913c075a SHA512 9e311d2752366bbbc7e990c312d2e0b709b3dbb3b1e61191b80c38fbf9f149c2f9cf8fc29ffb9ce47892dfe9806d7f609d66df4ac31b555c337d473b2839fcf9
+EBUILD three-merge-0.1.1-r1.ebuild 717 BLAKE2B 744d16d2a52c7185d8690ed0ada7ad4649b70d840bc24f40204cf2b1c6d9109967aece55915affadc63654595148a6ddccbbd7c2a1e6ff06a26123307caee0b7 SHA512 a124c6d4b296bebab25e226f4eb3d5e9e0b2513674410227285da369a20d62f0ee0b2e85ecd90a80c43fb7e4afa6a6b8f137d7ea67a1217eaa36f962b14c135e
EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 68fd8f149bf57cb795d81d89a710d64841ddd059becdc45945629265806e45fa4e29994ff2a2173ec3ffad755ae914ad81919e352585b6d62f9e8410a2524564 SHA512 85fbbe82aabd5eb4d9af6ee96107b9f320b7f9821f6dd591425ccc3ba3207b01ffd2f6bfe92769fdf8682731bc395571774860b94e544cf2c0246a3c0b4599ff
MISC metadata.xml 432 BLAKE2B 85741fa3b4c10a6a3ebea91bfc5f91d82377e48e77553b72aa1c15bd42865f8c77e8f267b713ea3b3a0240c10ceb54dfe59f8e112735feac2f33fc9d7d141757 SHA512 af883c75dc04ad12092166db8b97c0028ee662abe6ca1bafffa478843616cc9033725ae3b6f696e82c8dfd323a1889ff9ccb3dab0637d2fa8e1cfddf1341a531
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/time-machine/Manifest b/dev-python/time-machine/Manifest
index 2f3773be17a0..8b0842c87b55 100644
--- a/dev-python/time-machine/Manifest
+++ b/dev-python/time-machine/Manifest
@@ -1,5 +1,5 @@
DIST time-machine-2.10.0.gh.tar.gz 28770 BLAKE2B ba4ff7dd2559530e86e38d23600209f2e860a1541c9ef5536d07092678018c210ec5e0c63bc615e81b62e8179324953d023ba247c501aa94e16beb0345cacf8f SHA512 4a3120432cb6aacb1e022415094a4fb204d2f1b39c378307a0de34505d470982d81e1d2d940d0b9745c3edcd563ff55f9ab1d602bd1dea720a474fee5fa1e4af
DIST time-machine-2.9.0.gh.tar.gz 28043 BLAKE2B 9a9a521c94b72a7464853661da791b6f57f5155ddc62ffceeb82f808903f4c337e6bf48fe8300bb4f9f5673fd175fd85038a4e80a39e8f3e096c12c27ee790ec SHA512 ecc780a72d279b49d026a8f3f89210cb4c90e02c5a517c08eadbabcb65216a24c603ace39afd76ea1e6ccdef589d5997581d0db7477bb28fe4d1e0510daf17a0
-EBUILD time-machine-2.10.0.ebuild 674 BLAKE2B 6d36190a66f13da17b9c8b755275ccba14bda8558fc5b5d7f57f5cf33fd64a21b75f564097a7e47122009748530746c1384c084d157d5a68033f1a2d2b93e66e SHA512 e399d9c6b9af06b6fd67760c0046be313d43c031195fc45c1e782448da35fb0004861d84e116d17ac37caabc34b0b4a0bc8d81ef1c3a0aa1a423a2aaca4ad2b8
+EBUILD time-machine-2.10.0.ebuild 668 BLAKE2B a15d2443c63f00aeadb972a831da614fccfe770f8b5c05684aac8ec9a8320aed3465a6eff4f7fbf5a2cefb2b8c1ca2c19bdf13611d555b6b5306236f158125a6 SHA512 47b68b9e1ad36a0fb02aed79acdb6958fb9e64c41e7f772f25cc3a588f950c61f5561cb4348284dfe7197c66c5286a382d0a7f50a813645da60afcd4ef995c0c
EBUILD time-machine-2.9.0.ebuild 666 BLAKE2B 31b2cc19c14d0a6265e9f232e3473912a9597530acd7ec92df6d768eb96c85d1aa404212ad0b3a8a16a96006f4db94bdf70ec532f1dd3ae49ec0540b2b52b2a9 SHA512 f39aadc323edc83a608048cf5557846ce4b5f45d30f8188e19d086715dfd9bec5c9d5f3fe229b5e3882a0fc2dca0870e50bcc158417f0078a2d32cb6749281ed
MISC metadata.xml 379 BLAKE2B 98883d810d13745555166c9901f0ac15bd1ace4754e67ddb090983d97808a8362f61d91e82e7c903920cf42037c3df2655b211caaff904fb3ac4d2494ebf2fd3 SHA512 74d7de420c0bc5c03a3524bfe9b888fec8e5ec353d89b8a8e5d5d2dbd736ef8d34c45f026fe493dfe87ebcc7754c30d9b3ef7fda1abea91cbf9599bdeb4ed3c9
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 84a112a7da57..5e686a30dc09 100644
--- a/dev-python/tiny-proxy/Manifest
+++ b/dev-python/tiny-proxy/Manifest
@@ -1,5 +1,5 @@
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
EBUILD tiny-proxy-0.1.1.ebuild 976 BLAKE2B 2587ec119d2d722414a17f98b504b24f61e7c8ddc25a006f02612e0903be47a3dd7e278f24b4daaf1f5123b5d72cfe5fe2441f003d8cbfdd6e2898de033d9e0a SHA512 546dfecdb6b8c8f140299778464d743b64699a5cbafc5d2dec63054f6c99dde0ed0e7246e13d90f7e84157c7f9b3aff946b707a8c34653f5f40cb29241a3b587
-EBUILD tiny-proxy-0.2.0.ebuild 985 BLAKE2B 918b3ec829466bf7b69b661ec9df0d0f8813c05a2c147452a1969e51cd025ae0687f0e12d46f9a029a948002db6959deccbaabde6058d705ea9d63bb38b829c8 SHA512 0b955a7f1b3494288a16e296bba7fbbe90bed072a207499277e6d44290814eaf9d1ceff7604f37551d383217aa1c4612069fab6ce9e58e1473bdf5ff50079b4e
+EBUILD tiny-proxy-0.2.0.ebuild 977 BLAKE2B 4e42d49ba07c073946efd66ff9ec20cf9b5cf2de5956a7a61b3c43126aabc6445ced47546e807e60aaed5df94ad145beb0b5d37aa0b47d58447b420735022fb6 SHA512 f5ece7d842e367f5e60bed2fa3df687419c0710422b941f8ca3e6ecacf4dae26ff2d48466d4914c0ac158315f1911c8735404f859e2c9706da016f1019b7abd0
MISC metadata.xml 398 BLAKE2B 0a9e806f68be7be9aba302538ed91e6e1079fad058c5759377f6ee7f044ca30ccc166ba17f885b94812e202e722f20fc71a3bb7a7a53f2e56753c93f9751f80d SHA512 02fc556e42d27fc680260bd185794d90b7c94378e325f4e136fad00f4fb83ac7b33b3bc68d3d9d13b669346f006e84d7c0be429880a603c8e4238e9f0b973e4f
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/Manifest b/dev-python/tornado/Manifest
index 31534471bb21..24ab3225991a 100644
--- a/dev-python/tornado/Manifest
+++ b/dev-python/tornado/Manifest
@@ -1,6 +1,6 @@
AUX tornado-6.3.2-ignore-deprecationwarning.patch 656 BLAKE2B a64b3b5f021f4e1939c69f20fe93ef61eb64666b083773c1fa189af03d0964b8832a97d49ce18924f9e1202f26bb85b76d182f2baaa8265d0e1a2decbd12efef SHA512 5cd0258db519ec2a02a9988160a345c94ffb2abae92a78fb8e9d3eb6017bac8ecb86f4ef0e3eedb5ea561344213850e2b342a1f6517c909a3c6a0224606f2afd
AUX tornado-6.3.2-test-timeout-increase.patch 521 BLAKE2B 9d3b5d8a380178f84146e7909a6557c28c48df775abb96afadbe4a06a7b565d5c32f39359060fd45028120c8952238f95fca3348e225096784e806864cfd2b7a SHA512 00a964cd75224195e8de77bc7137c087c6f4128734a9c55505ef4d88d512deb0325df56e3da4c8fefac10915613e1dc244c9107123a22bc9f124fa515fae9f4a
DIST tornado-6.3.2.tar.gz 508776 BLAKE2B 10cea881365ab72290ac9bc240dc7fa4e77511be1aa9d005e84fff1c494888d204935f5bf5101d102cc6e8f0995d41c0cc257e372d740f2aa47dc904032c434d SHA512 cd4be43672dcf0814536ad1b2b1dde045f25494a9f70facf0dbae5d3a71b112d0dbca235916948982922975d0d4c58efff880c0b432db382f58f25d65ef18c92
-EBUILD tornado-6.3.2-r1.ebuild 1848 BLAKE2B f56627af6eaee0678d61dfef1132ce5e3af1ea8dbf6a61d08fd41a6c7577bb3424b42a8c73fe607c4704c629566b1ed92ab1ce566f0be49480c09cf811ecc85f SHA512 308571e7de81cc4bc9cfe854f0ed92dc9262f7b5db12d1c646690c80a302479808a0a6829bd707b217f22a8cc06262ad7d22596cdab95a7412f673f2612cbdfd
+EBUILD tornado-6.3.2-r1.ebuild 1842 BLAKE2B 2c28de1fac7c23d8ad3b3e89be21270ac21140a2001d71f10abacc4f4a478e5a891da24a81c7bddb8319d99b694988023e4545d36ea4cf589abf664c155a07c6 SHA512 91432bfa0d01b9b461864ebf5996bd767429acf1f26aece002e858e3885a3b3edd961734e7eb258918d807b3282f02588e634b5325a716b2ecaa27fda8a393ee
EBUILD tornado-6.3.2.ebuild 1626 BLAKE2B e07c18f1cd4368633cbad79c075c3e42b6863e694529dddfa2978ff5357bb170b66f36acea196b68e1538bc02261b42ee6e291787e4b39f63330a9a400ed1f91 SHA512 65c1d9dfce9575efec188da4ca231835cc0dc17885b997e9b216e556225c03e9f3886c7a1dc03ea87c872f47d7145fa02ddcae89d263d9cdbe006cf2e543ddc1
MISC metadata.xml 381 BLAKE2B 96d5942b11b6364eeac2248f6e92a9e7a54094ba2b6e9ef966be4143e1fa01fa0c417027d33a71c51bb094b905b9ff79e05107e1a9debb4b1ef932ba11fd8565 SHA512 cd4db13e0c6a9cf8b3c788c53dc5ecd0dce2cf783e7b2d67dba71299d1c6a3d1dd2c2a76c0d69816ab0da4ca23f831613323c55864fd858690c605da5426bf60
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 f45d32f4ad41..b240e5303fc6 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,5 +1,5 @@
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
EBUILD towncrier-22.12.0.ebuild 1063 BLAKE2B 2ecea094218efc1af0d823641cb179e458275a90e8a1e2fed90c756043624666c8cb819700497c2e2c8d2dbaad11f0dca7fd372f6e431687f1d31b43c5b4974e SHA512 383de227f9c88ed062d20f96a0aa6a533418c33c7432e8988259968a64f41abe15b19e0e68ba761ea39a4ed8fc7835091274c3813b24cbd73c95ee3a1308b0a9
-EBUILD towncrier-23.6.0.ebuild 1070 BLAKE2B 7a610ef2681dea23a3a10841e61c055585b1d2f823ff5178b370fa163081133840eb3fb0eec2fcb47bf34552a4ae95dbe6c39953b5c0b649950de60ad437bbf3 SHA512 4dadbb562495709c6f805f5f2d00cd88910b03dd4ee3c5d410555aa784042f172752a41d573dc56e7886e2b29fd9e4dc4a6f73d112556dc41cbab16a6b8bb3c3
+EBUILD towncrier-23.6.0.ebuild 1062 BLAKE2B f487be2ca86c20b21ad1106521cc90e1a32af88ba8711f184d961b178e0080212d039834018e9e1d0030ea54168a8d16feeb4262ee4b1fa6bf98dfeb17109fac SHA512 b967d3ebf61921c946ed4053a7d7c7ddda38465ba51d36aae9311803a2dd15cf7ed9d835fac1c090c2e6a7e3e73b7655e2afc0076d499ed40bee71699765b61d
MISC metadata.xml 394 BLAKE2B 52e7e94b46ca173b3bcb91b6a5733304c367783f45fb60beaf775a35cfbd3e1f3a7558de3c79fa96681b684998c9a9d51ba064839824f8e35ff7d86e32dcd477 SHA512 23aa7a3a20c418e6a6b06502cfc2c6a8c8a0556118a6c4a995ea3c95e49c6ef31ec8daf6ad66e69471f1e7eaba1607b8bd0a0950c70efdd735d2141be852fee3
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 da7b4f750f13..f7256e477dbe 100644
--- a/dev-python/trio-websocket/Manifest
+++ b/dev-python/trio-websocket/Manifest
@@ -1,5 +1,5 @@
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
EBUILD trio-websocket-0.10.2.ebuild 934 BLAKE2B de954f549d169fded6a13cfb4fc79d8746d0e058778abdf01e4c0789dc5350a1b2f8a5e8f073c63474010370c3208aece7102322268ac4349babe7448edde2d1 SHA512 4f399d19a768a48314c730f43e4b6f66044c4f7d9ab7bb797c24f84a566f603b67f841e49fbfd084f347064a0c99e7496081560402db96ca41ba6f8ade6c85e1
-EBUILD trio-websocket-0.10.3.ebuild 942 BLAKE2B 47d1353bf066816c4c5e33e634b3ab7e4af8d608289e3ee287d2eaca6476e2b79a839179401006c03a691b9a0a6e88b8be7293112aefa4a4aba19c184db7d175 SHA512 68e19643a467b4d9395348eccef5b5b801c6d8031635fa17e8d50d6768247bdcc3137874082d66068ca69f6b6cc173e11ce3d779a3de9a20345357f1813004a4
+EBUILD trio-websocket-0.10.3.ebuild 935 BLAKE2B be4068f88e0612b5c7cd142b9fb58cbd27b0c7ea6183dbbf0cbfd86334a10b704f416683768d7c130f03454cda9eae502333edb367235848e8bb0897decc677e SHA512 45bb676c00f682b1eb4d6fc2990187cdb232be92c6547eb836e6f4aa28e12306d8947b98320cb1574fcdb567fcf662c85c4dee1af332614ac9207287e4e9f787
MISC metadata.xml 409 BLAKE2B 68c9d1ab2984909315d2ec3f91f2703cc0941911fb049c35614c2cdc935e55f0f2440f6624aab4838f0d7d07e3e5717d19c7138660e82f8a3cb237e610a974e1 SHA512 c9d5e6f956b40d03d0a062ded846c507e783c55404a76b75141004df7d43e6a8bf5810480b4286a6bdf2d48c30aad51261e48581abb8799c107b924cd8131170
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 3017c080bff6..a0925d93a0c7 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -2,6 +2,6 @@ DIST trio-0.22.0.gh.tar.gz 517482 BLAKE2B ab1fcb22d8f0ed9c8de831a9384b55ab433811
DIST trio-0.22.1.gh.tar.gz 536365 BLAKE2B a2b8b672de5ffed99cb2d93888414526749a836dcb4a5101f6de9358c2e231fec56bd7fd80ff2300489931f8b516265ff0881bbde8721c09eed6f48eabcf2f8c SHA512 28f3248627dcfa06333ec41f17b7419f1192dd0f041ae56f78582a2a781875805e55981a62a1dc2dba191460a67d03e89f0497bb98ef265a37842aae93488be1
DIST trio-93c1d96a535cca565e1b1ba552cb9c4798b3f852.gh.tar.gz 528405 BLAKE2B b6db1413259c7aa4aa9055eb8d0d810ca7866e312ed81395c7bd2d69cad56dec9cd1422513ee4018077eca0a3b55b4fe74178d4af3599e8ba8b7ad124d820066 SHA512 e5bdc6f918cac8d8eed5d459cfed368336eec301890bd6b579bdf3b2bca7d78246b5b06fb6259fadba0fef45b782e8b03c85884b96d8a961056f7720cd28b944
EBUILD trio-0.22.0-r1.ebuild 1981 BLAKE2B 2e5162f1bdfc90f7cca02210e461d99fde2c74e371f6002d2170f1ac13e6d399a4029ca486c5600e046f8d250ffb230b2075054780c33b87ffc41e988c33ac2b SHA512 a9e5e9a5f9b7bbe176eb369c296e8ec446f3addb53701f8f3c3d06463ee2a939a6c0434c0774ace874b054185baf6286f30d53bc90630d534f5ac74a42a59ada
-EBUILD trio-0.22.0_p20230530-r1.ebuild 2255 BLAKE2B 155ba5f7fb13c10879ae8dc43dc8e3e5665737e6f1c89bad510f51687aed4e7bd78f058d1da18535042c03200198a9af093191fc20141d366020a4182769f009 SHA512 edf9662872df16a2e70897fc3bbf9314e6acff704e91f19c549a6c7bf5150150eca202a04792b4978da26e16354c0462cfb4907e4acb40a22b71167889512e1c
+EBUILD trio-0.22.0_p20230530-r1.ebuild 2248 BLAKE2B 01fe6423535fd559f2d524396111628f8cf872920023c97f5af0dc398d479a75183dc2ae55bc0ab828a762c5d6d2a75521c2c8d93f865d92aa6734b69ca18d38 SHA512 3389cff4d5084a1333ba4f53b77cb366d208d65edc119fd0ec5dea49316a56bd4453ecd7af5725e1d8a39fbc7f43a2abfe8ab591338b13fcef8d290d1980fd9f
EBUILD trio-0.22.1.ebuild 1983 BLAKE2B 5898d39421bbf07bf8644d46fbc9cb0e1a73b8ff748021c4bf52f278153ab58356e13fb1877578ac7be7a9071fcd3eeaded9d7ec6db9bdb74f54076030667ba0 SHA512 58efaa5a4d591b757b2c3accbf7bf69c921c1e57fc556d2b58669e4a37d63ddb137b53d83eb14768b713c91cb06f1e5ca0fa11356d5c134d6efe0b398d7c4f5a
MISC metadata.xml 2060 BLAKE2B bb6ddfddfb3c19038e5982227a8c5f9999b93868c343a9a5bf7af5963006b5b719ef960f65b91747dfddf19544134db9e1a2d65e94192c079c64c303cdc8997a SHA512 4b86e7cccddc200d5616550e309ad46587f900ed13c38196e874e5110974b856d65e18745b8b7b42858cb672940ba280b0c2ea54d33f9b5bf32a375fa1232088
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/Manifest b/dev-python/uri_template/Manifest
index ccadb68db5da..0b57c9403430 100644
--- a/dev-python/uri_template/Manifest
+++ b/dev-python/uri_template/Manifest
@@ -1,5 +1,5 @@
DIST uri-template-v1.3.0.tar.bz2 17076 BLAKE2B e8d6c1c35190beab4b2b51cf82dacd6e7bf51397abb142f89f975ce4e7c3067dd9c59895127446deafd84420b63ef62c1484c29037dd9e3833e0d0d55950dcc4 SHA512 654eb700de68a5b992b910e1ff0a038ed699453f021d1eb844d71ddebb32e3ffb77851b5704879bf3eb894eaca33477a0173223a5d9df6a06e33fdc27f6b0f5c
DIST uri_template-v1.2.0.tar.gz 18284 BLAKE2B cf857ccd8496111f61fb95af020514f1c484e5c3ff19829f28bc2dc112887fe276dac68aa21e0d092d42a22319e8d6ac8aff95c734aadd8417c56f57b0076256 SHA512 81b046bbc2dc4d5c0b40a76f13713c10e69d803e3d9da13ab69cc6d40569ef0a39c786a6637a66651a5c3d3e68807f923ad48a7feaf898ae3ca6fd03c0e68c37
EBUILD uri_template-1.2.0-r1.ebuild 841 BLAKE2B 6a0658aa45201ce5cc34f9fd6b420d73738d9c6a11075cd695489d4eb814d355a48e179e3577921ba76551ac4d3b087d58d947964ac502ef0161bc71e7fa580b SHA512 f4c6889cf0a82a6463cfdfc37aebacce066d426c5d4ffaa05b16aa7dca1d18a400b8ddac702df623390aeeb899d10404e371da9b8251562c26880482c1f083fb
-EBUILD uri_template-1.3.0.ebuild 863 BLAKE2B f8eb1fb98f9533f3360214ab6f3839390b99361c70b34892f294b61bc69a6637d11a781a4d8f71954a90f44150350dffe621cac6a3e5747ef5887a4d2bf75865 SHA512 ad7ab214d09c3f1d28240c0d946d92608fb83132761e8b54639eb5704956705b3a030acbd9e0d13d4f1ff2a8a6c93f9e51f1a2d7c71e4e2b053b1208d66750dd
+EBUILD uri_template-1.3.0.ebuild 876 BLAKE2B fcf9509964374f226a84f2609c87d6d468a00815323c511575d3b0b7603dc92b9a8fc226c06742d8c93c9c7efb54237ee82c6d0fccc61f5562a35e69eec1212e SHA512 ee9ceb829fd48147af98b639b5140229947e73c69d1f7737a33ac8b4532d66a0636fa80ff4fcb193a9d322000d4c56d9065f2c86b55f333e82b7ad40e485afb0
MISC metadata.xml 340 BLAKE2B fa3cfe1b2c6ef81f0ac969adda1ef8acc343c72f401c558a85450c992d38f22dca596aecd65de5328a855763379876c55f9d4bd0d2c69c771521e8fe11f43f85 SHA512 8c740d7dd56ecb9fc6a0a06a478878028058c67de06a68ad49f181b08982793874ae571ba5c1ba8f519f988c41588275e5ebbf6c0ea8de992ac1ee82d9effd5d
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 702dbfd9cbff..ae57348bd1e6 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -5,5 +5,5 @@ DIST virtualenv-20.23.1.tar.gz 6619074 BLAKE2B 0b35a1439b7e2a9eba9c676457a39d22c
EBUILD virtualenv-20.21.0.ebuild 4761 BLAKE2B 75819c09d97c7f43d32d2840c67d2a42c71b1218e19dbf327f2cb9c9fb705376384de1b4d071302f3d65b16ed5d0dab9fe4504eb68b07dad8446be8240806244 SHA512 ecdb0b5b5073eff31b43a3fc6879d2df6650dc788b6a82d7e15316b394aba08d2c44ea8f66f0481c3086b4702e2eb7438ed86aaa0b9b780a1355d7a9b15bcf4e
EBUILD virtualenv-20.22.0.ebuild 4870 BLAKE2B 3a6f9f09df74fd47b99ea6b2bab948a6f6d79d8dd052a06c0aa8c4b989dbc24aee5dae8b5b39402370696e800c1724e0e0c1f6e5851823ec2c0fb78df8de494b SHA512 1b3c774ad805c5791bb5baf1a6a6809fb523d5bc519c20ce534cbb2d6c6cefb063641938d6fc99e6cb66c3bc95e1ce24f33588eedcb3578e6380c18444d53364
EBUILD virtualenv-20.23.0.ebuild 5011 BLAKE2B 09fb27b2ba739808b1d13f2f903938d8b81a923739e662d4dedc9b689310cbf29f876a47079b9b5967a9e2b14090c399526cf70ad3bf2d0895d6b3359d92fb48 SHA512 587c41a7ae0e16a1d3d25d84a8672af41f04d6541fc1227692efb5873bac8f2c9717ced8caff36316ee9efcbd46b1678cc18e9259c8a7c54eb6ed40573c790e1
-EBUILD virtualenv-20.23.1.ebuild 4998 BLAKE2B b9faffbea79c9f18e6d1c7ac83ec2867ec52a7eabc0d3f90fe6692b15ecab463ee05b52a11dc1988b44127e6522f8e0152d3f71651dc22880f9cd8d457fe97cc SHA512 e2e4d6a7f03858abb5f3edd5794a5f2904f94ec23f09477b1ba7a6b0479be25b8357f7832e4fd11b2d5652a3aefd867e9ef41575f3858a36a8beebc745e944f9
+EBUILD virtualenv-20.23.1.ebuild 4990 BLAKE2B c6eac8211853b2bcfc7ebd22aa815b65caf5adb4353bfbd0bb6e8263bbbe405b82d35d52fa1b6a7967c887d107773baf119313f74cb1f4bac251ec6ae782562d SHA512 f31084312aec5196d1287723b04b19b549b74e8e7a7b4ea78dec68f4a5f90d44c6d0b44782fa571c73ef508a45699aebaffc99c7866db2ca001dafb1dec31b2e
MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.23.1.ebuild b/dev-python/virtualenv/virtualenv-20.23.1.ebuild
index 959d901aeb8a..44c5bc622e17 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 ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
RDEPEND="
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index 069cbd0c3d29..181dbffa255b 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,3 +1,3 @@
DIST webcolors-1.13.tar.gz 41152 BLAKE2B 0a510a7fe10db42af226da465437017b36ffe11382d31b588ee1c53c5d810b9b1bc95c5f8ccaa4a351956368fe7ee74fbac68c880927a83c1d9155937e0c198d SHA512 074aaf135ac6b0025b88b731d1d6dfa4c539b4fff7195658cc58a4326bb9f0449a231685d312b4a1ec48ca535a838bfa5c680787fe0e61473a2a092c448937d0
-EBUILD webcolors-1.13.ebuild 583 BLAKE2B b14bf3b2734b4d71117dc3d32d390439ee942b39703739a83798656d934031868352483f53fe029d24b1c6da048b9c202c4bf4f8a464e91cc6c50ab0564b2ddc SHA512 a1518ce593788893c39369f937a6a508a035f6969f7a77bc6f6913da0fe167fc56daffeb0259d231f36fa8057d26c79ce80bcf9e122e50457704329247ac24e3
+EBUILD webcolors-1.13.ebuild 596 BLAKE2B 3df01fc44e537cba13380d78161a06c458564868452ba2f625a5ae53671e3037f48847fa5e518a7086d00932a4a8a73aa76bf973077b68971cbf0be0c7e3d3c9 SHA512 9af6f6e931cb88184a9558e0dda6fe26dcc4c8af6ebf26f2527e3a920af3be961fa53037ef5b4c498bad07272e43df88e35ea8ef64ddab32bd9b016556fc570f
MISC metadata.xml 398 BLAKE2B 051ecee1b66000baa637f8cb769dd94753c64b97aa3b7bc0bfab424a2a3f311f6831e36e01c7a8ec752dc0f92c25fc9a3a23482347bc34a4d92641f1295b7fca SHA512 b2e6a3d0f210e11a2b28c50444b0e4aa573eb47bd59c8a3b21f570fc02da1d1f95dae7c79400673214fb82ff98108e29e071276b1314f2d40f78813513e0d83d
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 d603ebd3ced5..cc73530ae780 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -7,5 +7,5 @@ EBUILD websocket-client-1.5.1.ebuild 788 BLAKE2B 4448d1da394ee13ad1bf3f813e7263a
EBUILD websocket-client-1.5.2.ebuild 797 BLAKE2B 51f87d9823f7bc4253193fd671efec6b554b3537604cc41d1b22a78ff1d41f81a7e0e8628515cb367dcf9cd8b1ff1fe4453be51ba0e7179918e3557b918bf9aa SHA512 71e19e260b647784cf2bff64da09d5cbc7bf54441276c3ec95d5f08af6c59696a27874aa6bc073f06ba19dc70feab8e0e8a71561141c17c9b83a625d8659ae4c
EBUILD websocket-client-1.5.3.ebuild 797 BLAKE2B 51f87d9823f7bc4253193fd671efec6b554b3537604cc41d1b22a78ff1d41f81a7e0e8628515cb367dcf9cd8b1ff1fe4453be51ba0e7179918e3557b918bf9aa SHA512 71e19e260b647784cf2bff64da09d5cbc7bf54441276c3ec95d5f08af6c59696a27874aa6bc073f06ba19dc70feab8e0e8a71561141c17c9b83a625d8659ae4c
EBUILD websocket-client-1.6.0.ebuild 797 BLAKE2B 51f87d9823f7bc4253193fd671efec6b554b3537604cc41d1b22a78ff1d41f81a7e0e8628515cb367dcf9cd8b1ff1fe4453be51ba0e7179918e3557b918bf9aa SHA512 71e19e260b647784cf2bff64da09d5cbc7bf54441276c3ec95d5f08af6c59696a27874aa6bc073f06ba19dc70feab8e0e8a71561141c17c9b83a625d8659ae4c
-EBUILD websocket-client-1.6.1.ebuild 797 BLAKE2B 51f87d9823f7bc4253193fd671efec6b554b3537604cc41d1b22a78ff1d41f81a7e0e8628515cb367dcf9cd8b1ff1fe4453be51ba0e7179918e3557b918bf9aa SHA512 71e19e260b647784cf2bff64da09d5cbc7bf54441276c3ec95d5f08af6c59696a27874aa6bc073f06ba19dc70feab8e0e8a71561141c17c9b83a625d8659ae4c
+EBUILD websocket-client-1.6.1.ebuild 789 BLAKE2B 259d55e55d770593c07a5ba2268d420897cc3a113d86c9755d583e7dca210a611c8602c8ec39107829f056f28b9105037ffa528cf83033d72fbae153d7cce180 SHA512 b56e3801d253fa50a17346ac939c0c8f54e73171b37e46e2ba890014c1431a9ae8ca4f3f0e33f4a0adb72a0d7ea98c232cf1ea4f2f1bc74b2d5e3fd2505de267
MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
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/Manifest b/dev-python/werkzeug/Manifest
index f7909f967524..16443e891c15 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -4,5 +4,5 @@ DIST werkzeug-2.3.5.gh.tar.gz 833927 BLAKE2B f9d2a81b0b1336265094df26d8b1fd17a47
DIST werkzeug-2.3.6.gh.tar.gz 833832 BLAKE2B 8bf2598ee2ff63a4515357802749f952ba68a484e52f9a488efc3e49ad54e9764334d14a7b57584c1dd610f5e7922023d6ac08d8b3cc433c4789554205e43294 SHA512 a7563eeb70b465580a136ae4e4e51afcd14d0760deedac619d469a5be85eb500fec456056371921317511c986f4f4453d1f86e408378e6062b6aa40b8365ca8f
EBUILD werkzeug-2.3.4-r1.ebuild 1768 BLAKE2B 0ff8d994ff47a5fbb44556656c1e320d0145c1edb35614320502b65a9a3ad44ff896696d27784a777b9e92f8d39655f3044ab04ec319a45320a51fbbba0dfdac SHA512 14be7cdeb0697d9a8aad107da9d503be4c52978b225b78000d6cd0eea61ddb708831166ce45283cdc4598018553e316d19c3474b5574fab1a8f1cc678f658b7b
EBUILD werkzeug-2.3.5.ebuild 1678 BLAKE2B 81cec7e390cd96fcd46bae9835776d598705949aea4c987f6ad5e5b1a5f40ef26eaae1426aba2a003f1012e2aed897898904ad8f5a8ac8ad92f583a8ead1e7aa SHA512 79f7a37df49632c6c068a4d489dc2c9fedf4447f7eae3cd77970eb014e99c55aab2afde8968ad17c49fee5b0c43880cc20edd3d186f284a3c9d89bca318d1cdf
-EBUILD werkzeug-2.3.6.ebuild 1678 BLAKE2B 81cec7e390cd96fcd46bae9835776d598705949aea4c987f6ad5e5b1a5f40ef26eaae1426aba2a003f1012e2aed897898904ad8f5a8ac8ad92f583a8ead1e7aa SHA512 79f7a37df49632c6c068a4d489dc2c9fedf4447f7eae3cd77970eb014e99c55aab2afde8968ad17c49fee5b0c43880cc20edd3d186f284a3c9d89bca318d1cdf
+EBUILD werkzeug-2.3.6.ebuild 1673 BLAKE2B a5d3c4ec8ca100c574c7629e40556a241080168206d75887c9f95c6239c8794cf7244764ed6c763c98a89a0f07f8702a3eb0bac15db2a69ca184b22ef26448c7 SHA512 65a3cd2691a78765e250813476504fb2841a402d58962f2ee010b968a23d08f7a8e5cc1965d0d0fce4fecf53e7bd717b39a1d55980aeed9db4a6cbbd68567dbd
MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.3.6.ebuild b/dev-python/werkzeug/werkzeug-2.3.6.ebuild
index 510a6ca0d800..87044d6afb0b 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-qt/Manifest.gz b/dev-qt/Manifest.gz
index e2546fbd444d..6e0e1460d151 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
Binary files differ
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 01c9dbc5d25c..5bf2b819d5d7 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD assistant-5.15.10.ebuild 1308 BLAKE2B be0c02b5f2049c90f86f483b7c02e2c72921845fda5404645affe6929375abd43480b141f5c5756cf3d7ba551a7eca8f5b25b55f5117d02ef2c9bcc04414d327 SHA512 8eb82d0e9659f4e5c98a78f1776ec993d074496e61f99e39ee3291d8fa7d1d73d71f91287ff6a302b331511ba9552845c0ad610ebfddd1ae0aeebdc0b2f53e34
+EBUILD assistant-5.15.10.ebuild 1304 BLAKE2B a8346fafdd8d94ad7da1f46ef1ba63bdff287c9a50b3fce4cb1eeeecb810b7e1117323bb503c83f54e7237f1d920d9d43f9e5ec4cde95e9403be0e1e3da69080 SHA512 b11a0b125b33f8760db75d31f65a46d7928502eda6bee6cd9a4b6518386fa753612a0a673d685a30ff87d1c8fc0b6ff37b99c33f47de48a7afdebfecdea5c5f3
EBUILD assistant-5.15.9.ebuild 1304 BLAKE2B a8346fafdd8d94ad7da1f46ef1ba63bdff287c9a50b3fce4cb1eeeecb810b7e1117323bb503c83f54e7237f1d920d9d43f9e5ec4cde95e9403be0e1e3da69080 SHA512 b11a0b125b33f8760db75d31f65a46d7928502eda6bee6cd9a4b6518386fa753612a0a673d685a30ff87d1c8fc0b6ff37b99c33f47de48a7afdebfecdea5c5f3
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/designer/Manifest
index 3fda636b8e41..eb94a8b219d5 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD designer-5.15.10.ebuild 1328 BLAKE2B edb9beed9af5b95662d596e9f64ac199044c423702d58e88524f07fd83c2f2736c4a3ecd0fe9f0fb7bf8b6e63c96882719a0d7e9e2d4d22e2b9a626e7bb87654 SHA512 231e33af41e2ef2b4776771ead4add7adf062859559b8061b86a2a19284dc030747f8eb0ad213e46ad754cf9da11da476a7090080bf761583f6b0e1652afa3c9
+EBUILD designer-5.15.10.ebuild 1324 BLAKE2B 4eed5cdfce37f673e72baa0f41eb233cbd93f18adf660be83853413151ae28884104aa1f54cf80267b54ed5542aebe7a927eb7ccdfba9f6bf8a2342c93caeea9 SHA512 1d0dd989e66955f1bfb4bd1100691243a51b69f938d0f1165ade6c646ea27831a3d81b38f180dc51babc879d99531fecf772e1cfac7fe70a5351900f19b12f3c
EBUILD designer-5.15.9.ebuild 1322 BLAKE2B c91457e4c5f542c5d3e4599d4d0c51de785541ec4418adecb5611dde64a5eea71987e6f559c22291e134568f5b4b1d1c762e6e0c6773bb3863ba028ed86e9531 SHA512 f139c7cf3d6a97c41e96a4a0ec961627940d2a43b5a889672dfd1d6936a065b5f0f39ffd7e8e319b95a795ede6bb774e307feba9212763cfbf2aa087b43d8682
MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
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/Manifest b/dev-qt/linguist-tools/Manifest
index 90c83b352431..996b84b45c7d 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD linguist-tools-5.15.10.ebuild 728 BLAKE2B 713284b0968978dce4b45f6e2ec630df227df5e065cd784f47d0641f9bee2dffa72e6245ef9d9f20f5ad9450b01d9994400a93a1418c9c6fb71e5598f069a0ad SHA512 a03cb8677d2677ce178bd2442df63af0ed8ac2b6e0b94a0d8d91f846f61807aadd90fc5e2655b68e89d9add2ca6b9068426501fc5028e59d576cef178a81f15a
+EBUILD linguist-tools-5.15.10.ebuild 724 BLAKE2B e0160ae40ed1d9cd6e8655103a911f88557609dea09a5aa62f4747785ac8af16341326b530ceaafc0b81e78657a17cb19b465a3761839e73214390246a9386af SHA512 656838ec9c748c02607267d3767ea168fd55d165a75c1227a38587c08e58c5b60e67fafd7d916db464f47c43b190386928f468382594e5d11dd755b76c277582
EBUILD linguist-tools-5.15.9.ebuild 722 BLAKE2B cf53532a6adf8836728f9ae0ce4c592107042f4079cec0af41987e944f69c2a0c096531ab4c2e1002c56a73577db27442e76192fc538849164236909769a8f25 SHA512 1e6ca9494ed3b86c9001cd5611c60d1801f9fce7a42a1f621b8d8270f0d67a2927973678fba6ac12ce8a8311cd36bc425d679516582117d9eda9e6e84795048e
MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
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/Manifest b/dev-qt/linguist/Manifest
index fe18727f7656..eea5b48524b4 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD linguist-5.15.10.ebuild 1108 BLAKE2B c1f8d43f7a80150f8f86e0533c1558059a9cf5e61b9535638aba199096fce9d960c6dfd19cf03b5502b1f7158e60200d761c14739b63be4fe3228d2ea3bc337d SHA512 8e59f83367c86c33da9f09e4195860d0879b6e6ee6e9c4d9e065225d1a55538ced0f952cac2d33a9bd9f40a836ff118aa3676e2188d21a63b1a56eca7277d60d
+EBUILD linguist-5.15.10.ebuild 1104 BLAKE2B 9bfca39b022b73027a2da3ab1d4dbab4794e73a98e0167ba4e0ac84c71df32e0b0e19c7376401dd753f5dbf8096e96120960c4299e1a2d5aed1176ec6e4b1468 SHA512 7b4556d5fbbb9fb8563aa1f28ba4a4d52aabe9b3662f16fcc3cd863e6839e77c187be96fa870cf0be059d4f475218c44d2c01b39245d27fb8a90732889d3b419
EBUILD linguist-5.15.9.ebuild 1104 BLAKE2B 9bfca39b022b73027a2da3ab1d4dbab4794e73a98e0167ba4e0ac84c71df32e0b0e19c7376401dd753f5dbf8096e96120960c4299e1a2d5aed1176ec6e4b1468 SHA512 7b4556d5fbbb9fb8563aa1f28ba4a4d52aabe9b3662f16fcc3cd863e6839e77c187be96fa870cf0be059d4f475218c44d2c01b39245d27fb8a90732889d3b419
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/pixeltool/Manifest
index afd427c4f80f..f7ed8aeff0dc 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD pixeltool-5.15.10.ebuild 599 BLAKE2B be66b782463581b37f18b455558082a23762beb9eedd8099ce50ccd2027ca0b88f083654316fdb76cb0a0f7f385ac8342501517fcd9e36fd840d220441578475 SHA512 aa0e099363aeb7cd9af99b8cdaeac43ffa2f356a2189e008abf010930ebbc5b6d71d538feedc0ccb696832c81afc2a7551c71fc651ccfe49031e5bc1b8859d37
+EBUILD pixeltool-5.15.10.ebuild 595 BLAKE2B a174492684a223813005021ce331bd499e734dacb768227b04e927d8c93e8f6193cb07cf516332c5d785733ea716cdaa5b546214de01794a55e0e6fe90861004 SHA512 9908b6ca3522f57ef598c11c6cfd1870ed61c6c16115504f5aed4d950191a67d6cb941f160a527ec5e54683ace2fd3ba928a66be1029fd3359717b585c73869e
EBUILD pixeltool-5.15.9.ebuild 595 BLAKE2B a174492684a223813005021ce331bd499e734dacb768227b04e927d8c93e8f6193cb07cf516332c5d785733ea716cdaa5b546214de01794a55e0e6fe90861004 SHA512 9908b6ca3522f57ef598c11c6cfd1870ed61c6c16115504f5aed4d950191a67d6cb941f160a527ec5e54683ace2fd3ba928a66be1029fd3359717b585c73869e
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qdbus/Manifest
index 7e4833d6c57d..14ba5c2ee476 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD qdbus-5.15.10.ebuild 636 BLAKE2B 960e3a175e252fb558f09f5aeb413ce176fa9ca4fd4a2e4d568b410e03c5b65c7a10fb00bb7c47a561edb6f63a802693d5157dbfa75b9e0415610831799bc8d8 SHA512 1cc03bf7a7e441861db48272e94460027aeb3f24d40cb095c56ef9e81ca90b2d6b498cfc19cec8c5835f012838574b7cc776843062c0898c7969d3c84c9fce60
+EBUILD qdbus-5.15.10.ebuild 632 BLAKE2B 32b00529f8b2d68f403c2a56e36b2ce993daa417ce00278bf2dbe549872cf3c155dfd1a6651261fd438d07e407c7868a6137e0af5f6fdd3f928585615cfcd33a SHA512 703ddbd46370d38b320e6d82d57f01229ec417af75b7de1fe62916a3f2e7ff5336cd5dd5d1a007b85d44a82603043a6b36982bcbaa55229a83d37585fb79d49b
EBUILD qdbus-5.15.9.ebuild 631 BLAKE2B 649206d6647fd0162af4d9b540489918d0cfaf18832e581f473f70b692d4de1b63cc5e00962bec1fcd72543282c004206562cd72b5a3e717466e5d84baaf8d8f SHA512 390f0a5dbd4b2ae8831633cb490f3aa57e6d39467e57673e306d44c12a9fd951263007aaca856e97c729eee8ea698e61eed5497430564bc613a832c81801987f
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qdbusviewer/Manifest
index 8c667e2a5295..3c9dcb0b49d2 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD qdbusviewer-5.15.10.ebuild 1083 BLAKE2B 686ea9ee430b2945088115e16b1eb391d6c61f4a24b353805ca9e1e425ad667e10929116f784e61c6c5b38a93a7c8458f5299b65782df9c4abf72deedce841df SHA512 ac67aa63c72e3661cc05876624af578e3a6fa423841b6e51fc516dcc5822ec28d8ec23628c8160c43bc9a66bdd859c9a5865af0a8744186f636b1c61f83ff5a0
+EBUILD qdbusviewer-5.15.10.ebuild 1079 BLAKE2B 107f58b45cbafd223f56eb30c16f862c22be9ad8ea6a945461c164137e72cb1c1c440335d7a59fec2cdaba6a4d5e5302aae62a45945db155d4798e0c8734ded6 SHA512 fa547968df29ad8eb9682755b641111e2cdaf3117fa3855b26c6fe0e00f0b26db3d6680239b40cb89d20373cea082325261effa6801b623dbd5e26f341a162ac
EBUILD qdbusviewer-5.15.9.ebuild 1079 BLAKE2B 107f58b45cbafd223f56eb30c16f862c22be9ad8ea6a945461c164137e72cb1c1c440335d7a59fec2cdaba6a4d5e5302aae62a45945db155d4798e0c8734ded6 SHA512 fa547968df29ad8eb9682755b641111e2cdaf3117fa3855b26c6fe0e00f0b26db3d6680239b40cb89d20373cea082325261effa6801b623dbd5e26f341a162ac
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qdoc/Manifest
index 9ceb8c02cc69..1a47dc4884b8 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD qdoc-5.15.10.ebuild 751 BLAKE2B f53020cb1644effd65473d0fdc59af2ba60ba7b4ef20c38fe876293bb4ef345bfd229c99103832872c0db19f9c7d941a542fcb5a3db6a064b182f1f1a12d3f56 SHA512 bfe4ec3609fa74c040f6276f1d387b13d06a48665f0bdd16db55e37fa0f47ed1e6f41320901b047d2915b83ac9bf0102e9598fd18bfc0b1f03b10366782c7d25
+EBUILD qdoc-5.15.10.ebuild 748 BLAKE2B 5f8798b77e988053d6023d0df650f933ad602499c17cb840dde2666c072304c6e409590d78a4a3f72d1f821c3a5b6e91da45719aaba0f95d54d94c072a2ba365 SHA512 601bc7a39829cd176495bb80a0aeed42a6d9ead6bd6bf6aba14a4fe056989d5e9785162688df6c1a582fcb224d6b4c452efa2b2950b77106335140c86301649a
EBUILD qdoc-5.15.9.ebuild 838 BLAKE2B a28186636b1f45d5c5ed659fa747f48e1fb8f6704badbb82f1c200f6b468bd7f671e8e71d80b113ac18d96cbae1afc7dc45bf10ff485c5dfaef4ee922349574a SHA512 918320b63fc1845bb182c9bce78162771253be7b3f6752152535f3086a1b67ff6bc48b1d4b06a378092f3e9acd7f14d19c6eeddae28222d30f0bb8a33c9a5416
MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.10.ebuild b/dev-qt/qdoc/qdoc-5.15.10.ebuild
index c84b2d272c02..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"
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index d06e5c4489f1..d6b785cdbccf 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,7 @@
DIST qt3d-everywhere-opensource-src-5.15.10.tar.xz 118262456 BLAKE2B eff3ffd0b305e005019ae59c7214f2df12509ce3fe6cde38dc315b8a3062364c714e5b7e3d33fbaa2c7a71ae19077149bbd7e13d49757044c497337ff2c16035 SHA512 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f
DIST qt3d-everywhere-opensource-src-5.15.9.tar.xz 118313120 BLAKE2B db810daf18491eedd3cc545481c3dda387469171bce2b599cf96152ca0322d0dd51ee6382fb4d87266eb2c580babb6b018de3edb8c8e5c0561c6144733ef85b6 SHA512 4c88af3855c22ab6dd17fca835eabc0facec446e254b329f76b7c61002bc4b47e7029aba6336e47b89c30c2dd50090e925042af8199f1fbb1f65558784cdc9ce
DIST qt3d-everywhere-src-6.5.1.tar.xz 161708832 BLAKE2B b10a61591132d0ad5c6de5a7032ec8a397ff670c0f79376ee6d37dfd9377717912c554fa79637e13f0efe03ef3c003b70424a215cc7bf0f66675a20f05f2293f SHA512 a5b3e4431c8924eb75cd23a806d05334aa9bca884bcbc0973359fb4c79370774fde26ca485826b1aa861362d65b51aafca93a909aed265a59cc0e60d9aceabb3
-EBUILD qt3d-5.15.10.ebuild 951 BLAKE2B 499d97190be2fa679283d40ddf1698f3ad7311294806a0c02664997dcebd58bb421c6913a6c11b4c7cabf48832ef3076a8539c5a8e75b063c31282d4d0783f2f SHA512 8ed97fa61130b1816afddfab13c7ebfd10955d979067d409407a169d2b4b953d9b186de8f8c59d180e07917a4df62602aaf84bfdc4e7f1f6be5fd811bd811e6a
+EBUILD qt3d-5.15.10.ebuild 948 BLAKE2B aefde923b2946495d82760f4a446bb53d21bde558cd2ae500afeb92b7435aa24ebcdb0fdadb4e54bf198e679bdc72bf5303417c77c9bbec99c68eea1d387b56b SHA512 3750f03d8d4937fdc1407325016835ba8885679e8cc3100b537102091fcd6c59cd0db120f7b4db8199c8ce00ad65107634539f41d11d9edc25be9728be2111be
EBUILD qt3d-5.15.9.ebuild 948 BLAKE2B aefde923b2946495d82760f4a446bb53d21bde558cd2ae500afeb92b7435aa24ebcdb0fdadb4e54bf198e679bdc72bf5303417c77c9bbec99c68eea1d387b56b SHA512 3750f03d8d4937fdc1407325016835ba8885679e8cc3100b537102091fcd6c59cd0db120f7b4db8199c8ce00ad65107634539f41d11d9edc25be9728be2111be
EBUILD qt3d-6.5.1.ebuild 958 BLAKE2B e00d4c63841c4f72bcf862f7dd5a68e17b565f0fdfe8acf774942de897c2c2bb857d5de67809d81db013f74d01dcbc2a0dba67b8d7ec8c247400de6529228761 SHA512 e9381edca0e4ea61c424704b2a2fa4f16a8c31d71c40e6d302176159e180125f65702237ef440cb571ec8a12424eaf8e09ca7bd491e98d3e81596bc44fad4b5d
MISC metadata.xml 645 BLAKE2B 6534d1e6a8b8a5d8d41683988ce5001a1c92fe5eecae9fe1942c8a28985ff8a0c60318621f839ab4baa9c6738ce3dd0c4128280c6e1c5b3a8dcd86251a1e08eb SHA512 5f2b1e19665e5f9bda13f708f6f35321fbe6b8451e590a6e29275e23d6df4080d2ddb5bace49cdaeb1352117369b7e01404a64539e3d2edbda41420c95792a61
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/Manifest b/dev-qt/qtbluetooth/Manifest
index d858cdfee746..64f90728fb4f 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -2,6 +2,6 @@ DIST qtconnectivity-5.15.10-gentoo-kde-1.tar.xz 4080 BLAKE2B bade5c982cf755d9732
DIST qtconnectivity-5.15.9-gentoo-kde-1.tar.xz 6112 BLAKE2B 80071140573b9c8e9630ee6031abe9591e549ad97132b94ac95900beb48174793ae26b05361cc3d84b54c9552b62ffc8118306acd75e3ebf0f4069ce4edc275b SHA512 1588b05edbcb5e023df02832632fa941a639a0b1faed50395d115643c1f48b2227e7aa0b1c0cc32557a3c77ae12f51c1981e08088be9e8b5e79cac58c680d5d6
DIST qtconnectivity-everywhere-opensource-src-5.15.10.tar.xz 2828256 BLAKE2B aa1b2e7876cc263b3ebc307fac00e34a8112552b4e20de96796d1c7c6b0459ac65c71fd55dbc105aad6aab225ce66548ace18ed428be93d22f99589d386b6021 SHA512 3bc1c701f1e80794a410f0784c8955be42cb800c315d686da1a1e8429dbb72799bba2da59592f9edcd686c326df26fee4bf4e74b49feb96119e6aa29e982059f
DIST qtconnectivity-everywhere-opensource-src-5.15.9.tar.xz 2824968 BLAKE2B 78248c0f4fa978b6112d88bf89eda30fcf386a6602f71aeb694d8756583d382b01bfa400bcdb2d7b905bb7996eaac3fed036b64cb2779ddfdc8adf8e1fb79fb4 SHA512 e47621e95aa4ca8438787c4333fdaec6aef828372eb73029836256c03eb6c0faed41f89ab928d28cf1113ca53c8a94d69d07bd1dc06fa90272f0286244b49fde
-EBUILD qtbluetooth-5.15.10.ebuild 696 BLAKE2B 71afb971a8ca3e9173d7d1291c3ffcc10c35170577700df7208e90928cfebc27a0c9bafd34c4e2f50f1ea55d8ef3af6dfb5db16ada320163007ab067ad04082a SHA512 9898b708b07b3ad3d7b2a1fda2e58b170a109cbd3f9e78affcc24f4060b5f85b0ff6235f2d82259450084746050039c737bd295b38275a5f35fc60e47e8006f9
+EBUILD qtbluetooth-5.15.10.ebuild 693 BLAKE2B 2e62d3ae047c454fed5dae2f05f1beec00d6715947bf5ecd98f63309a9e1f8000a47767b29c7e5b3952aeba26fe7e98711d86b1209b45e91c1ed6a113830282f SHA512 390d0771cd10ca2f1615f0d3236c284b12ca24ff0cb42d7d2e3ccf03595db3b7bcc8f932fd9644ae9cadb87c7e5e013efa1b70af94c47e44c20eb792862db7a7
EBUILD qtbluetooth-5.15.9.ebuild 692 BLAKE2B 4af9aa0de9cf6e818b91455ad24bcf8ef43ba11fbd065296e913f03d3d2be710b60e5b3a70dde4bcbc9586ae89dae6eb834076d4efbfbfdc7b357bdc1f620e94 SHA512 51a05f1fe96bf9c26063748220eec461f46913359d998d4608908fab21eb272da9441c3bed99a40589461b7a1e27da9dcc5c3750cab2528afdfa949c7c858045
MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
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/Manifest b/dev-qt/qtcharts/Manifest
index 76dddf5a471e..4dc1fbfbd21b 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,7 +1,7 @@
DIST qtcharts-everywhere-opensource-src-5.15.10.tar.xz 4254496 BLAKE2B 9a163371a6360fb39f57d08e282f4bca79c4839ebbb105ebb37f32797d72faac73cdf832eb64cb4d76196447f5feb3089287e98f6979e0bd6b2fba5f7e0d28a7 SHA512 15c76bc6b987b2d89473972df9cd4826913bb0dd2dffdb06fc6dfdbdd1a5676508584d5f0982b06ab513e46cee12871f3eb0ed00f94fccf23ef807079be96961
DIST qtcharts-everywhere-opensource-src-5.15.9.tar.xz 4253692 BLAKE2B 9fdb2dbe9a38204e357073fbc1c72a0420ed922d44f41ff3cddc0fd1409ab002f5beed4991974bda0c3f2be868ce570fc2406efa7825c0d9ccb13eacf95f9a2c SHA512 b8b4390121780c4a562eaa563920a38637930a473e5b8e10fbb485c80c9a049825c73ff1c1786a869bc9603bb03d74b6d666064e6f98006edc5dba366c25f316
DIST qtcharts-everywhere-src-6.5.1.tar.xz 4583760 BLAKE2B 5c9e13a54ae301930b11d96ea19aad327103c240de7763252434fda162b050b12f7439d550614596fa65daaa3063b6e657dd73d683fddcad59c7889ce6457828 SHA512 fe48ce2f4c3ba57f7ab23e7e5c02bdc303f1902ffa5b786e07d62b63b29551a0a3653764ca55c6b57b52f77b7a71795801e2fb942df1d8ccd03f594c92e6f94f
-EBUILD qtcharts-5.15.10.ebuild 577 BLAKE2B bfdd143009f173a73df3e841a6f47c6a3986ecf290945ce6fd9c3cd868676f4733b71abc7043337faa0ae7f0c735dc79fc85b963e189dc60f7495536c8cf1634 SHA512 644ce7a4bdbcb4cbcb6ef254b9468054f49795ae011b8a3cf1b44de440704b53ec8e2c2efb5747d1db8cd4e4831b045488f127db47bcff0d9cf025191fdcbcb3
+EBUILD qtcharts-5.15.10.ebuild 573 BLAKE2B 3d151185732b6eb40739ba25421bb70a88b00f50385a5fb78d17ff53f7b3bb8606851e0a2944043e7528aa3d9725b05a10cfa7d172a182bb1c6273ed89ae15f6 SHA512 a277f95b0e4d289633d30e12c385a8b8d1393a5f95670e932d81ca46edc33cb139e419ba0787a52a5a8885ceb8ad57bb6887c62f55d76246944529e313947949
EBUILD qtcharts-5.15.9.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2
EBUILD qtcharts-6.5.1.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716
MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
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/Manifest b/dev-qt/qtconcurrent/Manifest
index 0a650d940d9e..dc6b81bd9df9 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtconcurrent-5.15.10.ebuild 473 BLAKE2B 34c99a24a434ff9460d6f110549a15e98557cd5a897c059356ef45534e11d0febbc697db81c336a30b1cf040dfacd4265c6531cbb776e3502a207f226b8f92c1 SHA512 6a5da45ec79a9cad24230606e009ea2933583752d01a4045c736c0591e11708467b7e7513bbedfd486c4aa85ba99b4d8aca1f7ebd7b18a70f46c80e96bc9a35a
+EBUILD qtconcurrent-5.15.10.ebuild 469 BLAKE2B f248aefb465c386295886b4d36bed981a0e4a48d45d07d1a32a173a56bfcf7fc5bb5d02e435d35bff84d3a9876cc449d79f8b3748435f7a5bbe5903d2d22e02d SHA512 6e2943816a76bc2178a7f802a94654e4edd02976e2f25bce993bc3e37cd6eb6ca5af0d0c7d8c757ed604d39524dcf83ba4141bae90960919b1e3eb8b220900b8
EBUILD qtconcurrent-5.15.9.ebuild 467 BLAKE2B e2ad04164432baa96b3a1853d2ee3b1960349d8908367953899d1cd0a05d0d8a49b5ce04eb319c736ef7db3d4f99baae425532be7df67375cee6fae9ef367b6b SHA512 c7b6b8dd95bb8a61627502b96783a885ab6d936fcb603657dce4b011b625615b8ad590b85dcac980d1de38f010737e88ed447eb5ec2f0ce51686b265df845157
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtcore/Manifest
index 8688bdf380a3..81c9c21ada50 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtcore-5.15.10.ebuild 2981 BLAKE2B e1f72fceb6dc340d9ea62310f497a59a6e553ca3dd2c5c2620855c3b9b0c90fdebc3742318085400db275e4e71e8cfd43fcb62d27280d09a5193cd292aedda65 SHA512 5a8502fdb37fe158f2e5293baab11294720c5f37e01ac0cdee757a2779683f9f94d8b2c5bd3d61696ae02c97c399946cbc7ffae23573cf36b0b5fc83198a0970
+EBUILD qtcore-5.15.10.ebuild 2977 BLAKE2B 464c025543820347abb23373d449e936b8131f9decccdfd822edccf5485cc2a1c5bf22cd020dc5d58e57cc0eb1db9fbf4301051731cc7a07ec2513eb828d449d SHA512 edae35e17db0cba72811afe548273a81df5f485ec50bd76c8c5ffa35bc3db383cb201d731b9e0e1836f901207620a5e2eca4b12646de145fd8f33b48e805a4fc
EBUILD qtcore-5.15.9.ebuild 2983 BLAKE2B c3b319f027895875da585b8e2900ee76c140d819bb50b767579c1a0dbe3409cd7b7e6d518bf52fe04aa505d88ab52869d4fbf767ef46dfbba5e43c673a95142c SHA512 0d5f9dd4e9f71b9a27143efa74d1044ebe8495aba4461a098a1ee2bc287efe8b0ebc102f239be0705b9c557065511f71cd267a7d9e31f69e422709aae87db8c8
MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
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/Manifest b/dev-qt/qtdatavis3d/Manifest
index 3cf135ecfba3..a255147bfde3 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,5 @@
DIST qtdatavis3d-everywhere-opensource-src-5.15.10.tar.xz 5193796 BLAKE2B a15ba1f0073dc465d124fb705afccc7cee3ea810aa82a9cc2e875474571678b39a494f11247386fd21116fbf32685455a546fd67e30099e810b0dfcb231f398f SHA512 414f4c86a55a9f2db745691f01f0d7ad6bbdddf56a04a280fd11f5b1bcd590ff34a8b35e178eaef15e1b1a1813cb148ac5bddfbb8fcb05de6ed5492666cccaf9
DIST qtdatavis3d-everywhere-opensource-src-5.15.9.tar.xz 5193380 BLAKE2B 69e05c5278ed7e2c87bbe916dfb623cf2fb4ee8a920d77d49e0454fd71b692bcb3185ea8c68ddc08cb56cc6f3aba61ddd45aedf483fdc00f4f86fc1be6358701 SHA512 154d7253c69c32a76b12200b25d6edaa0c671d5293abdcf09972c1525f366279a02fec7f9b6e73fb98d0d9919b3635cb3e9c32b54c43f056ecf06ba27b44459d
-EBUILD qtdatavis3d-5.15.10.ebuild 665 BLAKE2B fc2f1d6ba64ca1c061853ffbc70676d342b9581806e9594fc7cccd393a37b36fb5345684bb03533676cde247153b32d9642fa04f3dffc076cd57417cf2450e6d SHA512 323d19102acd08fae9621fd0458372fb6730d398069503276e8aa72ed7317c6fbb63fddf385bd42295a90dcc00f2ea9178947c30ef343df866947b5bd919d323
+EBUILD qtdatavis3d-5.15.10.ebuild 662 BLAKE2B 76170297a3c074f732a7dd3fe74d4ff573db9c9dd7a70a7b26321def960ad158fba8c27a0347ba42b5ab0c2db61b05d0a4e9a0ed652c505553cdf966a5cfcc8d SHA512 3060f027fb5596478bd52db4cd61c8a43bdd4b406f25005cea49afade61ab7112631c0f9a03684587368618b36b36f600f65fce01f3d853447c3215205887b60
EBUILD qtdatavis3d-5.15.9.ebuild 662 BLAKE2B 76170297a3c074f732a7dd3fe74d4ff573db9c9dd7a70a7b26321def960ad158fba8c27a0347ba42b5ab0c2db61b05d0a4e9a0ed652c505553cdf966a5cfcc8d SHA512 3060f027fb5596478bd52db4cd61c8a43bdd4b406f25005cea49afade61ab7112631c0f9a03684587368618b36b36f600f65fce01f3d853447c3215205887b60
MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
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/Manifest b/dev-qt/qtdbus/Manifest
index 368b30d1437c..2db8f764e3e4 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtdbus-5.15.10.ebuild 711 BLAKE2B 8f2b0db9f4623ad0d79c98f40e39e690add7ba07f523ddba2f5b13a7297f13386c8610ae365eea66d8c106069c4b4d6bb10f181bf87d115d7614df3e40fc54e8 SHA512 35bd8544f7af3a547090a7244ab4f330f9cbefcc0d8a16fdcd5b7f1f831da0a802f0fa3a181bd8cf3ef701c03a5e4ba7340ee96e3948f95c772c93232af01ee6
+EBUILD qtdbus-5.15.10.ebuild 707 BLAKE2B d367720f2205d1b9055dbab91edbd037820a3d7cf57bde04fd962be2b3b2fee15366fc718b43023ef20b1f0daf07788205db8c9d1ddfa2504a930355e29ff46c SHA512 98311470d9c8e990cecf0dce37f30b6de4624a9eee897c0e17d62f82acc374bc35c3ecd26b66f6ee718366f32caea5418373b43e84f6173c29da4566b2b7cabc
EBUILD qtdbus-5.15.9.ebuild 705 BLAKE2B 3bdddf199b6c94f2545ffca68fb92f599500ad9ea89e7653bf7f927260d37582465a5e65ef360692fb9dddf1e4b6ec8789bf46db73bf66bb18636e8fa95f5915 SHA512 3671eb35367921bf1ddc009c4821de77044b96fec2799f85fd26d7d1664fcdcd73ef29b97f9515d3f5d8dbafc8f241537bc497d466fb4110c1d72143f858a520
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtdeclarative/Manifest
index 3e0acb51b978..3de1c572249e 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -6,7 +6,7 @@ DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 425
DIST qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz 21587820 BLAKE2B 530ff86b43ae0cbc427d0b35c64fc9cb7aad62536686486344ef6a224b609ab2eed72fe5aa761e8bcbd920cc5f4329e44cdffa87afa17b0847b57b6a2ffa4c3b SHA512 ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7
DIST qtdeclarative-everywhere-src-6.5.1.tar.xz 35506504 BLAKE2B 8748a3c29d2bb7888fdb275fe663c39bb9c23e2e8afddbfb2aef11b1b315083da70bb180e10c9474cda4c8df5396d47b0b45b6620618753a455bf68cdc06044a SHA512 7ec840e42b1042263aa41c5d339cfa8a7921e3c5f217e710df0737b2c5c44b1e6c0fae155af934087f5a623d9370f30f83ec5691eb473e52b46486f4938173c7
EBUILD qtdeclarative-5.15.10-r1.ebuild 1543 BLAKE2B 4f4d321275787c9e01f85022e3687f2ecd6d96ab6dbd848aa7255d72b9644822bf669ff63d3c98f942e07d36cc6aab65e337a298f0ca5abb0a659843960424a6 SHA512 819e891879cb938d9f7753246a174524ba0dd721314d7c199f086db604f0f5a508a570bffcea0a4f07c75cf814320292279fe64b2f765cc217e919901b70315b
-EBUILD qtdeclarative-5.15.10-r2.ebuild 1543 BLAKE2B 2eb023c77766962ff9d3de9bab5fb5431101cb159f07620214c0bd372a9f524100eff523d9492ce63f27b13ce0cc89eaadc4cce2d93b0180d68ba175a28366e6 SHA512 5b31fb023d4e6d4d4b431f277b01c78f7e60328aa6687752b708f6763e9f79bd3405ebc36f991424b3f26e784ea50552b475b9dcf2ae4ff024daf7fa10d1cf47
+EBUILD qtdeclarative-5.15.10-r2.ebuild 1539 BLAKE2B 8bdc0f8c235f2b9e4ad10a2f95e171324be59c874769b9202ff3a73d72aae30f77bcfbd6ee56e732f36013571b733109d8fe7e01747f5f4ecd3f3003fae8d121 SHA512 f1fe14cd9da5face3a1e309b31a93dd3b889c029cd21cb392428567041942c880bd51f12bf6ec3dfef970605945b61b749b57d92f6299370e48aacb9e65371c8
EBUILD qtdeclarative-5.15.9.ebuild 1537 BLAKE2B 7a4c8c240e26b70bd7a7e60e4268cfbcb3f9f2b88091abda6be1ac39a3728072928ea53d93c044eae7c6981a2ac2936fa6e0af9ebd498e8bbe2e39bdf361b3b8 SHA512 24a254cb03164d73de0b377980ca36b85f21475f7abbdd67afe683a9b39be7d0558af0b18c9d7e809ec01ebe443c185c77939064b1b3d94a7733955e694e24a7
EBUILD qtdeclarative-6.5.1.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
MISC metadata.xml 744 BLAKE2B ef479ad28d7560fc3abd2e743e8994a6a843bc1a4d0644ac037a4fa481f71a6ee73fbf99073769d20fcb245e6432556bc00707d3ecec1fb709ae2622fc9c5e31 SHA512 27d3e595647800c62e1275f2b5bfae0f2644fce547175cd5f63c4907c2313298b988f5378761868d2761c3edf396cfcf4d0c733032026e7ea0a9bf7ba367ecda
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/Manifest b/dev-qt/qtdiag/Manifest
index 46f5d5009390..a113c1b2552e 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD qtdiag-5.15.10.ebuild 836 BLAKE2B 7e0262077fbf287b1b13bd60db33c33f7fb52b1e69398d914bfc7d769199bf5c40f6bd902287ab2db72295117b8000b0eda6cc69c1ae70e5549ebae810ecb27f SHA512 c65364c87e2e658a12bbb3b134ac253c2add21674445d315ac357e172d5d33298ce17013412c5e0041f548033473eb61532500617c9c62aa3a025fcde19dc090
+EBUILD qtdiag-5.15.10.ebuild 834 BLAKE2B f9fe490617bbfa844309eef0088b4885aa2d87893705c9f627bcb9b14f227a6eef2a9e2accd4fb6ba724e042cc5b5acf232fa1e910b8e6d5821ec39792103c88 SHA512 d890121782beebef37f72d8e92af82df360fdf539a8a1858364ec623661c45759a4ea8ee229dbc8a80e542ff5a1b364310649e050e4140673a40db1efb9248b6
EBUILD qtdiag-5.15.9.ebuild 834 BLAKE2B f9fe490617bbfa844309eef0088b4885aa2d87893705c9f627bcb9b14f227a6eef2a9e2accd4fb6ba724e042cc5b5acf232fa1e910b8e6d5821ec39792103c88 SHA512 d890121782beebef37f72d8e92af82df360fdf539a8a1858364ec623661c45759a4ea8ee229dbc8a80e542ff5a1b364310649e050e4140673a40db1efb9248b6
MISC metadata.xml 616 BLAKE2B c2e815f14a4c3967140cfeed9d4266b668217994cbdbc58300e3736b428f05449d83ae6ed746bb29debaaa1ab8371a37c054d03395be1f7b66e23c3209449a20 SHA512 8747ad7226372dc06c7e6b44afa0c5cf20a7fb877974c67bf4f599b6ffafff292f3c8a2a80243f6243dcc4c158034dc731451e3af9af8790a302c43ae83907fa
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/Manifest b/dev-qt/qtgamepad/Manifest
index 7fb9a23092ab..1427991a0201 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,5 +1,5 @@
DIST qtgamepad-everywhere-opensource-src-5.15.10.tar.xz 389844 BLAKE2B 4b492f74e45e98227a8e5ff59a7b1fe4299e8e9951231b2f2f8bf5d9fa9d9a99404261ec98ab073d621bf9c57b50e5137790d432cbe33ea2c451d839770d9897 SHA512 20f06a11b8e7057e11b2f061ba088f1721cf94a20bed21e52eb0d7c6e20cd8f74ae2d0fe47748466c4a3dd63f9843afc94f74fb3076849e80ad8e71017fb3605
DIST qtgamepad-everywhere-opensource-src-5.15.9.tar.xz 388984 BLAKE2B c6a8e57e3da04eddcb89765525345b8479c620a12bfafe66f8a50fa0ab7456e7be3bef827d508f9a405e249ea2fb141fab2a16645921db64972a4b81d9bee4fd SHA512 f6ee08fc3872b078fb64e63a074b0230674dd670cf087b864c16ec3ecdbf374374257eb18aeae1e8e2c16850fddb3f4fef99efc4ddd597ab66b2a9fc8158cb93
-EBUILD qtgamepad-5.15.10.ebuild 726 BLAKE2B 69deba4060912c72e449057230a3ab007a0771e65ed50d2cffc2a6891bd3c60200a9051857b1fc5d5579885a8d43e74345e3188a7aeae52db5e5826d058bdd34 SHA512 b854a11ad1f1694ff2e8ffa6ad59850be1567016f007f2798449a55aaf75952d6b8a223879f958b04d528dac871c37fbfb6b90e3e621ddc2c956d21bd6ba7b32
+EBUILD qtgamepad-5.15.10.ebuild 723 BLAKE2B 7745ad56d8a08e2bcb6a81b812d11c872b091aa98b89d3923eaa74cb974c33d21ef7831ef31886988d5e1bc4de74676ad0ea54259e2de27e342d595d01c9795a SHA512 39f9f29be82b74c10e1e06d69c30d29b9360bfb1b6af49981cf3eed567b50f5880444b8fb48c1e08c897ceca180e28890005b1a3258bc4f9abfa0959457d9ead
EBUILD qtgamepad-5.15.9.ebuild 723 BLAKE2B 7745ad56d8a08e2bcb6a81b812d11c872b091aa98b89d3923eaa74cb974c33d21ef7831ef31886988d5e1bc4de74676ad0ea54259e2de27e342d595d01c9795a SHA512 39f9f29be82b74c10e1e06d69c30d29b9360bfb1b6af49981cf3eed567b50f5880444b8fb48c1e08c897ceca180e28890005b1a3258bc4f9abfa0959457d9ead
MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432
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/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index a6ee5596ba29..c34211c0bef0 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,5 @@
DIST qtgraphicaleffects-everywhere-opensource-src-5.15.10.tar.xz 14045288 BLAKE2B 480c3bc5b7ffa80c594650333045c3ddd5b93807d50eb969b8ff10f3efff910c31f5534432c959232e60dbcffd85d665bd990349864cf2b0036f489d626ea594 SHA512 a7e1326c10bd3bbce0f5b3e664dc42e5573de7add44ac852417aba9170a4e21c173679a65ea4ed403782fa954652b896266611887664488a99d42a8b3c8f7504
DIST qtgraphicaleffects-everywhere-opensource-src-5.15.9.tar.xz 14043904 BLAKE2B 2bba25f17451db9722eb936fda7f3b2adebaecc5dec65d109514c0969c1b9e31421644dc1cdb8d5d4583a380c33ce8793f5ae1b4019850ba69fad4f88f7a1569 SHA512 ea9a9cf069ab5df82ac29842f093ef4b795ccd6a4bb7ca3c0ff538bfe2ed6473e24a7b8e7b9c28cf8ad7550b2314515567e5f53b7d913ae96593f0b2cdbad2b8
-EBUILD qtgraphicaleffects-5.15.10.ebuild 478 BLAKE2B 7874a195d3628557e8785b095436da32fc3e817fe0fc8a23ae13cd7312bc5f0da05c4869ba80d42ec3f9a19b246121b43c71959f663e9c7df9bf985a7f308fc2 SHA512 787f0e54af6c89b95401e4d1b554c10b85da02e41fa2704485d3372e7f37d3919f3fc3a551089569b386a7769a5fed5333f4c4171fe19640a6419fb4a5a63b8b
+EBUILD qtgraphicaleffects-5.15.10.ebuild 474 BLAKE2B 6cce27750bbaaeda93435435e5e3cf481ff6097866d4a6dc41a0af8ae29d4cc9d9fa97f7de306c2fa3cea8adc3263611b7cb005772a3211c744d2e6ae1de8e81 SHA512 6d21ea66382d2e13441198308d1c73df55a8dffcad1a060e1dfe407254c193b91610437b611d7643c58fa2132bc25e84d4fdd347d0ce5cff7f7dc8c7a2aa93d6
EBUILD qtgraphicaleffects-5.15.9.ebuild 473 BLAKE2B b0926014983109be4aa0be482cb09248ff582c836588774397a0e6c94b4d98c768b20744f649094b1f8c2f2dff19d19c76aa9482242747064e038389ed22c05b SHA512 8cfc850bc53f4e12d908f9e509a7175892aed0eca0ccb75d109d895a82f4610c3cb579a88236abc9e3594ea1555a6ba2f2a411c7c1f32320e326f2cba28d1093
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtgui/Manifest
index 850005a3a305..445ae91aca61 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -4,7 +4,7 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtgui-5.15.10.ebuild 3870 BLAKE2B 5d8026fa2ef1f3c4a474634547c279e8b83a2d52d9ace9a289550e3644ce00db1ac7dce687fa5a75121816a6306bb5b4e8aa46413bb177bb7e0ab1a7ea995821 SHA512 f8dc884fa23997487a083c5f215d2c287fb6c2fec5b494b8ab23e42a03abceeb0d705ecf74d3cb2e9d2fa2a3e354153f18c0c12e13d8c9a25c46db3e71c98879
+EBUILD qtgui-5.15.10.ebuild 3866 BLAKE2B 7be82bc1b6709e9d8dfda5daefde856797e1d5866599acc3271af4b7a7426df85db046e6372db51e239671356cdaa088ba7bc7d65ffba52556c7067c6798586f SHA512 16a0090339e635c48d48c88ebf5b550010fc5f1201f767430c74eb7393fe683b562dbfbf3943178be8ec4d81df0a4877c06e905118bae2bc0d93a886d78e46e0
EBUILD qtgui-5.15.9-r1.ebuild 3922 BLAKE2B eb7ea187c6ff3a99affa460cc96f0f8605231ef945bafadcd3ffefba5052e52e91a156b29ac3e420541278c812e9009ad97608f46e154187bda1ba4badc10abe SHA512 80af3d71d082629bd6cb63037fff6c5cb51710b53f5d86a3093268eb0f86c18964facaf12cc29e2f605b9072d2e410f0a3f2ed6dd0502b996315e63236609fd7
EBUILD qtgui-5.15.9.ebuild 3864 BLAKE2B f8a7f4a2ea9e992bbb61305f52c21a9ea835d7aca14bc970cfd65df21f348cede9b029e9b9cfcc452177a2a4bcf3a0330b2f7c3b249adf1fe910f6469a93148c SHA512 5b0e0e0371e2bbe33657b83f7503ff5b19511c98218a47c77fc040a4c8cf18773e32ce85c0b2d143581d64cae187bdbd56c7100c1fe4543fafe81ca29794f6ab
MISC metadata.xml 1332 BLAKE2B 9e3b90622029fb3c2345b61a3d5d5c55c9e364f2872cdcbd74d34c2af41a692e8e6e03396799c0ce2ec74d3b0dc3e86e755502217f25a18d6e822389ec8481b7 SHA512 1eb4740fcbdceed313e24e019424d08239539eede918f41964ab092d85ec9f78665a40922f92467eceaf1ac7632c0b12c5368884f7128b8b119550c3c87b5e67
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/Manifest b/dev-qt/qthelp/Manifest
index 872df9b3ba21..ac7b36bbcd81 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -3,6 +3,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD qthelp-5.15.10.ebuild 637 BLAKE2B dc6685de79427b47c3d66e1c43c6763c9ea9118f7ea2e5902f81b5b5e204ff8365b2d8c15c5f76de6c31ad32f2f5fd77cfd629cea6a606aa7cf56298c410794a SHA512 e59af1d058e0e64df726a8af2078ebac48b5a8f0801ff947a117e3614ca6a02a037486fafe570a3aecfefa946b855416a1ee4f9559a66604348e30f231beac42
+EBUILD qthelp-5.15.10.ebuild 633 BLAKE2B 986729dd4aabb015c13034b5f51810b82d7713ebfde3ca23b3c21ae2454ee86d6fef364074d7ef4700292924f08df2d4f30cb633062763cf89a59cf8a18990fb SHA512 cc8b667e8769266fdfe16ed6fdf44fa3f41542ca1723cfbeb176590f6dd45fb6dd23fd5e971fd442d5b42eda437346515ebed59580462a967902e9d11dd48f4e
EBUILD qthelp-5.15.9.ebuild 744 BLAKE2B 561bfdb33f642e247c8960643f2f609da5f527c187a53a11ce1ef742c5cfc62cf4ff84bb941f6bebf4ff0c62257379b1e534109a77890d2da08b80b19417a48e SHA512 e6995d54e4707aacd4c07980e624bc5b5a5c887ad2ec04fc2346aea5e24161b456d4c90e9420d85e0e05d79c9379eb9bb002fa5d42b22d8c2fcfa85cf7a4898e
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtimageformats/Manifest
index f6ab8a61decb..041d1a758fa1 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -3,7 +3,7 @@ DIST qtimageformats-5.15.9-gentoo-kde-1.tar.xz 6956 BLAKE2B 931db97a164533aa4717
DIST qtimageformats-everywhere-opensource-src-5.15.10.tar.xz 1845088 BLAKE2B ff704a5ea07173f2e6e9fe72f4e9ab11093a6cd80bedc56efeddc68ff4a53ac46bcd6d6871697f5dcaab537a6b3238aa5a61120090670a4ef529bc5173a44b81 SHA512 7373884e5f01da0aae6f7d4575ca953de3be6cd41d3d19aa29bb2a2e5998486407525f23122e8b13c26143e64aa95d4756c5381643e93f930472c9890e6561de
DIST qtimageformats-everywhere-opensource-src-5.15.9.tar.xz 1844504 BLAKE2B 013554caa2441461656b8a2eb153ea2b09412fb5ccb04189fa05e7ae4ce787843053dca24e9982c7939a1c1e48237740f33a9df7d993eb312a9aaad0b01b980b SHA512 9713c781200c8abb1a6f1a2dfb851fc38dcb2428ca3dbf29aa392d938671978804a67587bbbc5a5f75703cc754da4673dd9a4b567c9c03ed61d329889156c437
DIST qtimageformats-everywhere-src-6.5.1.tar.xz 1958432 BLAKE2B 6b7aadd9d8414ab2c767290c4964197230dd73aaa792763216538acc6323d39b4230dfe2c20a8b4988e93a64ed447c7a9bdc63168931c239ad23d266dce853b8 SHA512 41b82b829579d81e964212ecb6adf56a02fbe0293c33718c428977eb55df2008ea0af6214e051b5415fdfc828c532276be7b9cfb1523d8fc4dc07d4b337d49e3
-EBUILD qtimageformats-5.15.10.ebuild 702 BLAKE2B 886af5f9b38be2bc82f5e81f121fba46687807ab77b34809158b767e592177466350a0f9110011e7998961132f6da54ca1dda0fabfda12ae0fea71b1d73137ae SHA512 3be583ce27469d7b5e5a21f75f05bf3e1acbc27bac6c12d86dfcb1fecd6046a0c6f2acf6b9b99e5a6092feeb400b598c4bf0ad1adebe789ee1b80350d5bdce3a
+EBUILD qtimageformats-5.15.10.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
EBUILD qtimageformats-5.15.9.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
EBUILD qtimageformats-6.5.1.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtlocation/Manifest
index 0b6ca90ef523..851644be6a69 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -5,7 +5,7 @@ DIST qtlocation-everywhere-opensource-src-5.15.9.tar.xz 6552244 BLAKE2B 5091aef5
DIST qtlocation-everywhere-src-6.5.1.tar.xz 3032784 BLAKE2B 78f2254e56d97dcbe380832dade72a0dc47a9f829764b6c4d584acf00b0b64f9ff37135b01fcc34a5efef8f9b5877c511395de69138030c47eb077f5d18346a0 SHA512 31190ca57feb4ed8b72d5bb5896a81da56632f873609470e760b390a3839f84bf8f6771c6acfcccec6781c694642b85ea34b0c7321528df5a0529af3d2bc5ad1
DIST qtlocation-mapboxgl-5.15.10-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb
DIST qtlocation-mapboxgl-5.15.9-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb
-EBUILD qtlocation-5.15.10.ebuild 1549 BLAKE2B a0bf64dcc0b9374e048a76a0632d184733b1a3e09f64719a60655088fc1be792d79e4065af23d2bb35431411fbe98c0ba1c6d54a8d68c5e992f9f534be619e57 SHA512 8812a2f0019d8ff87ff1a2275ebcbe2e3ea26668065e5aa363ead39d3e05eb398b265c740119b9cf0693a0ab30859426c5efdd0fbb7f465d5bf71cab0f7129db
+EBUILD qtlocation-5.15.10.ebuild 1545 BLAKE2B 79fc1320ee06704922092c6981f37d926cb5b3f69264a0f587bc6e07e7b006f10fe0ec6876f13645550450676f04426f32d9dd937a3a93756b99733743a9d447 SHA512 80f7d659fc4580dfcd670759632cc487b805db817ae6f2c65e3aa628ef360261db36b60e3df0ade879d55e93ea85bcebc6fe803b873deee995885b793655a78b
EBUILD qtlocation-5.15.9.ebuild 1648 BLAKE2B 3eef58b8008cca5aa3ef1d3e8149d8e55d498905f26bbc3d8d1f1b677fbced9b2b31b93ce9874a7f7acc9a4356146fe7d1b78b1d04ccb96f183f08ac879056d2 SHA512 e68ed2e2d6ccc2507334bb7749f484362cf654dd823cfcb6d85f1c3eda02572bcfddb3524f4c0806b9647b37e69252d783c5bd0d71016ef9428dfff7d4da8546
EBUILD qtlocation-6.5.1-r1.ebuild 433 BLAKE2B b70a66d0ad3fd02696537c32677077786d0f528a7676af4a3e68afca659c64436b398f046d2a88ab513bb1ef4eecde08beb26a6f2cd3a5063f72b0f8fda26489 SHA512 f742f4ee5f73d0a5fcde8bf993c7e09495f852b0b62f2f5fa0925df31a69088c2712518542a06374373a5c3e91098c5f44ec2d0585354effddd44d736a81cdea
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.10.ebuild
index 419c78914928..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
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 28a42b1bece8..66de9bde9a65 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -3,7 +3,7 @@ DIST qtmultimedia-5.15.9-gentoo-kde-1.tar.xz 2428 BLAKE2B a6dc23222583f309acad52
DIST qtmultimedia-everywhere-opensource-src-5.15.10.tar.xz 3832156 BLAKE2B 88c01c685294085fdde9f00e2e2ea0952311cef910ee037bd6ee204cf7e00bc25a6aeecbdd70e4822bfe4de40cb6b991a8f4a72bfd74872110d43154aefce0b3 SHA512 a322dba0daced00cf0a7fcd21b7f55c281dec107b7976792406ecc7658c94ea1a40c81c7cbdc0987f1be32cafd2458993c92db87fcbfdc7ba1243d2e0047896e
DIST qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz 3831184 BLAKE2B de436efbb5ad8228514e96bf59d65fcbc1afa5b07e6bc5df8eb9a7859c2b1e97b83c23cc0566961faafc6774e40dcdee0cbb21cbbb40ea570458d1b166e05fc1 SHA512 f167e7910c19a55858a4b8e53c293908ef50e8a299b5dc6a346c2c877b4f65aa6da17807ec3f297530515b4558c74e97d54d6013c27400c1c4964c7c4dbef6cd
DIST qtmultimedia-everywhere-src-6.5.1.tar.xz 6290204 BLAKE2B 3ae21e2d0c50c4d8d99e3d0e2a15405a04c1f0f2d8bef204975185828aada27008a8b03756652b4700afe1b189e391e113c11e2283a39200652a211dc4e0c39b SHA512 2085d223869b627a2e5590a08081eb23ca34f8122c6492867db4596d5414e9c3eeca9338cf1745638ee60f0c559cbaa73aaab14c40785accf60a0d7e177fb937
-EBUILD qtmultimedia-5.15.10.ebuild 1517 BLAKE2B bb2846f49174f61a2cb28ac6b70476ef993ec92bfb94b2e3f148ae2ffd6c1a754f9b98ad699b841c5c76dfffeb6f2c3f4622243833a335ff7f8275becd508a4c SHA512 53b307da7a92508dbe6cd361c34a87646e733678d9e95a0dbe226f7c5aa297e77d5d36ad97b6fd8b53badc3d8f8824bad416e17deb2a0e647e41d47277784b17
+EBUILD qtmultimedia-5.15.10.ebuild 1513 BLAKE2B 7fa1693c860354ec3ea45e4df5eb099d01568debe16366719ea9b274928f5b8d2c32ce7dab586e6572b9a5ded3f06fc58196a96163cf01f780b9531b835507bf SHA512 99e3f39dc2c5f770da17e5bd88ace75f913b2b3f69c4a15d59a9f26f7d7183b58cd9a052cf54f86fe21141b7097951421e39c22abb2cd275fc0e37ea3a244c03
EBUILD qtmultimedia-5.15.9.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
EBUILD qtmultimedia-6.5.1-r1.ebuild 1304 BLAKE2B 8d4ebb427a8c00d86b49d6d93f07ef0f0e0431540e471c50e9e741d4f5d8cff40daf4c0a5234b0deb2401a19dc272bbe9e3816a7f964046a5ec2851ae8d6bf0f SHA512 c999d2bef01cf7f01d720128eec4d73366d92c157fbcf365f07f975f633b90fc61e4ac5dfd3e3ac1d568e8736e565fc92d7b8921a15d29cc95dd4ef8e0f21716
MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
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/Manifest b/dev-qt/qtnetwork/Manifest
index 97bbadc936a6..105f15383892 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -8,7 +8,7 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtnetwork-5.15.10-r2.ebuild 1255 BLAKE2B 66159533d27577432a763456fedb282388030e351e163f7bc2baa82661eb81dbc447acbff044a33dd07c3e4db3b40d955a63a43822cfca876c9a64308e35d57c SHA512 c0a2862585626a78337cb06aa3f859e6b2020b449f6740ce86b5e21022016f952cc5d2cc876b07cda42369c54feadce674703b608c71fd2e232152d6fd437e3f
+EBUILD qtnetwork-5.15.10-r2.ebuild 1251 BLAKE2B 8adb3838b1730401ae8533444c204f0f0dbd79ce9a0607cce7402fd045cc01477b1be686f0b7197f87f24a6fb2c72dcccee16f4c2d0492dadd9eb2b75864de04 SHA512 1d7de13843743511a4b8b2d6d99e73f51c62d4fb33e03cb829ce750b5afd3ea39b771e034f161c3cfb0744d1f82ca9545f8a279b37cb525ec72b1dbd43cf50b0
EBUILD qtnetwork-5.15.10.ebuild 1607 BLAKE2B 8c336a9117dd3289b8cc2c91fc6cce82cb9072612b65c5f5df79e402f1b765f20d9ada4e208f0143fe7e40c1f8c830837586104429244706135f02fa11facd63 SHA512 2f0f7f0bb1570e6e4501a29dd0fd6a96d1d44c2e01a354a78364f93a3cdcb7e47262f5f065fc629d3037306dfd8170fe552d677d894f1a507ff71aca47c41d4a
EBUILD qtnetwork-5.15.9-r2.ebuild 1771 BLAKE2B f4f979099e47e355ccfae3074652019678e1a96ea0d69432c5b2d387d3e6b6558eff3694fdc955d1b63fe68e05d822e366357d73f1a142bc9f3fad3801244ddb SHA512 4d9178f57bbb24b204bac584af37ea2d3c6fd9296ba0e685e54ef9a8df153138c57ca6c5e0fd08ae9f9fbee8d5505cadfe6e9f7b99c1071a6f8afba390c04fc6
EBUILD qtnetwork-5.15.9-r3.ebuild 1813 BLAKE2B 512e960cb5f65727e2c7de6b9e3bd151a72e71cc0f8b9c339a58c31a4a828cec2995f3cf206b4352004e31d49457fe120e85dfa9a2832f1bbea85ad427bf1cff SHA512 1cf46c222b8724838c28829905aed765a9906c9247aa842e710f906f33fb76df173bc456db38ee38ab36ee10b4bc0053783a8e644736c77f9eca387511ce2295
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/Manifest b/dev-qt/qtnetworkauth/Manifest
index f5d53546cf37..27db91ee2b17 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,7 +1,7 @@
DIST qtnetworkauth-everywhere-opensource-src-5.15.10.tar.xz 144780 BLAKE2B 81a26919bef970538dbaa4f8bb219b694e190cae2cb2e156fdd0af3997fd5b86facb0d4841a92161703c78deb675f76a8950889c9a2c08156f2ce34b4ec88bef SHA512 bfdda139223d183767e50fb95309dee7cd85c42fa09a00246a38987bf1570d84a137fb3fc71119416cc45126f21f6964f430b031e5acd4447caf30d0aac3bc2a
DIST qtnetworkauth-everywhere-opensource-src-5.15.9.tar.xz 143792 BLAKE2B 0d977ef6dace8958bfe976262b9de5709a3819ac56fd29e26fe4bfd87a2b89e5a0860042c897798e657cf9a3ceb6bb42ae742021b07902105b4a4e4ba33df312 SHA512 9857f0e368e0c2bb4dfa772653a17cd34754e95ae64414f70ca78c1ec3a38ac850c462db9aa5fee4ee9143cd2fe0a5485fc0948cc3459a4842e221ab08356356
DIST qtnetworkauth-everywhere-src-6.5.1.tar.xz 150892 BLAKE2B 1654de2db82102845d845592d78e3690bc4d3eb9d7d9c80a7d34ee47e69a003f8450d78e6a580517a066d90add4a6f846db3e3ee5e666e9bb5cc3ecc208be4ac SHA512 04ddad0dd13ccef59790d9f0db394752076b0663a76c049a0a987e4841b5ad72fa053cbbb998cae9120481f683c5a488bb0b980fc3f6801b83078ac423a7079d
-EBUILD qtnetworkauth-5.15.10.ebuild 405 BLAKE2B 66ec3a7ab549fb34024d398cac325a31508ce9570d7aa5e87bb12412de47e1c428a8bf3e74389ae5b93edc33fbd424e041626faf84798de3fadc0c915e65ed3f SHA512 cb252af2baf22df69c502e304e5f0c0754df3a6f781166a7cfc5728a05c81aeac9ce06a18c14efd4891ce575607b239de84c17cee7f4b86e33cc8dc8c8e562f9
+EBUILD qtnetworkauth-5.15.10.ebuild 402 BLAKE2B f6aada3fab2a9a22353930bcc8c96fd46806ccc46792a9bf770a812245a9b246722101f40c0ac9a8b3fe115a94f38c4d32e988cd23f0f28133ea08e858b95414 SHA512 63a5ddf86500089e2f7fa44ebb585a11bf257222a9a9b96fa8985b5acb56301a8680f04ec0ee4cee0bd9dcd3761031da704f71bd18dfe7c88aeb9fcc308d222b
EBUILD qtnetworkauth-5.15.9.ebuild 402 BLAKE2B f6aada3fab2a9a22353930bcc8c96fd46806ccc46792a9bf770a812245a9b246722101f40c0ac9a8b3fe115a94f38c4d32e988cd23f0f28133ea08e858b95414 SHA512 63a5ddf86500089e2f7fa44ebb585a11bf257222a9a9b96fa8985b5acb56301a8680f04ec0ee4cee0bd9dcd3761031da704f71bd18dfe7c88aeb9fcc308d222b
EBUILD qtnetworkauth-6.5.1.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtopengl/Manifest
index 40961932d96f..7940de154505 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtopengl-5.15.10.ebuild 687 BLAKE2B 048039298934db8038ff0b19c26b0130a3e2606c674ff0da3a16320fd3e1287025227140b79dfe3f4399b6559e51e752f8d1a95d08849347a2b8676aae7fefb8 SHA512 9985782a7f8cc1e56286a497a5b974df47b9c831b72dafd41e8686d6a72d866522f77ca7ba7c8a900917e52330884d8374777dc7e44aa4c1311e24550861753c
+EBUILD qtopengl-5.15.10.ebuild 683 BLAKE2B 26e347b1cf9dbf11bf8af5a9b3f0c66235276144cc123f85d217e11cdde128563837a5c843d55a8d8e9aca13fb10c81c05d7f997c03575a2addfcc89a83a3a3d SHA512 33367da15b8bb62a96411dd13b973411b9a90c041e614857c3c39c8d6a62fdf8f9443cc4df9fa6b084a21bf5c4144a765a393bcf0b7d12e86e1e2cbd98967de6
EBUILD qtopengl-5.15.9.ebuild 681 BLAKE2B 38ff1848a7e3775d35d4ffe8258599fdb65ed8a66b15dd561c52bd3364b0aee62f5f67b02f68132305ae4e432835888db27282d8e26f03c7d46914e63286bf23 SHA512 b3cc280f0d5f5e1bff84a992615f5ed12640208e664158aff322362ab38876c7077fc574fc9ea032f4648767467466dee2e3448688d20a525ebc90e929a9ab5f
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtpaths/Manifest
index 70ba38c14b7b..a3ae4167fbab 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -2,6 +2,6 @@ DIST qttools-5.15.10-gentoo-kde-1.tar.xz 3188 BLAKE2B bc9b411398dc225f16a654d025
DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df530073f051945b8922dea8a5e43d8337bf442d7e7e148aaa68912a9df481fed0617e3568cd80a2e07359afc1b5228d08ca0d6cb SHA512 9781fbc9f10e389d0094a756ac63679bd4fd24e6809e486669a0236c2f8e0fe1285985a936867f47d309162b57c886d48fb5075445e1a51de20a2916b09a8a89
DIST qttools-everywhere-opensource-src-5.15.10.tar.xz 8899372 BLAKE2B c49cfc36640f68743f7c21f06ac87221b3e8b92a2fa096c54cf539bc4eb80a99decfb6f0fde53b1c5334612bf5d8641465f350143470429c505b6dc7f597bcf0 SHA512 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1
DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
-EBUILD qtpaths-5.15.10.ebuild 520 BLAKE2B c352e2c6f17bd754dfe0c4d42026c1ce55d5daf294a97e4746d509d63b1e773cbf297f2b84cc561c4de2a5c7d10a1d8b395600bcc391a212ec8c54af0e64fcbe SHA512 54a4ad52deba8e5077262454a03e871c2fa065ffcda13fc6161284026f2fff53258dd08e63971391f40ed2e0639d483f203dd3d622d6e620765183d3ed54ed33
+EBUILD qtpaths-5.15.10.ebuild 516 BLAKE2B d3775ac921e330ba1184b690c45d4d296b45cb8448524439747c73f5f78cbda6899ae7698484521aac342b1d723e084c5e4d2ca050ecafe110a1e6432d1f2039 SHA512 dbe6f138b7ad7bfc1093a68439ccb3fedb42121ef891e7b3a5d6a77803cdf050db34839029a3575597376848dea005e1784a7437a60c3a94be7b97d0eefec544
EBUILD qtpaths-5.15.9.ebuild 515 BLAKE2B d380c0ccdc0e96c559ecdb1c1a10d32452f474622cd7f7ae21def1aac4ee99c8f6b3b59dbab8cb717a29d02261cb6849b3cfcdfdc8fd6bf339a48a5a3be7784a SHA512 2043e0f07b18d984c15bfb29a47fa194e9b1a969a9ffffa144bedd592f218fba93263c1396bb447072371fb0a0b83e007a9569fbb05fb93cdcdc205233c68406
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtpositioning/Manifest
index e618fc3d16bb..ac77770cc08c 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,7 @@
DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4
DIST qtlocation-everywhere-opensource-src-5.15.9.tar.xz 6552244 BLAKE2B 5091aef5706313660dd6fe5d831d0a9b8b6160739c1cce115e6a42a0b2ff3020ff0cd51a99bff9d24ccd29952b259fd1953bd5691ae4c3b2cbb8f31d3e9107f8 SHA512 37517c304240921c600e2aad19baff0efbb5e01c5cc78e5370fb4b084f2a6ba4da94d39ddcbcd33a5f0af37f017d39bb775a40cda195e16697aa70c9d17b6bcf
DIST qtpositioning-everywhere-src-6.5.1.tar.xz 1455492 BLAKE2B cab4f2f7d08a72ef5de8e3bc668b5949df3bb2a3f200bbe5382b49a21f1e8cc6855b4d8fc51881d56babe3c5212bfabc56f8670832f581e9d900e506b4b8f3d6 SHA512 67006663299b14a85a4a7cab2a03ec39f3b938c0f2f09520e3869509bedd24a2053e6f964bcca4d02df71c21d184b253f46cf1dd59e9da5c22cefbd1910ca305
-EBUILD qtpositioning-5.15.10.ebuild 883 BLAKE2B 90ef1ac608f323608b937c3505d228a6de7a846961f20d89b4464db6d1fe1d05fb71f7de786fd76052359f2304b1d57a395394da1d2de43d917dfc76a7531da3 SHA512 d055928e802d66508b9b147508b556cd3a5fdb1e2b75c5bd449a7436edcc04bee4eb24d7dcd7fae38f951b9ddbb3af41244b6be669774486cbf6f2317d950c12
+EBUILD qtpositioning-5.15.10.ebuild 879 BLAKE2B 321d8a50c62133dbdb9051fb87b390d02372697b6ee089e48873ecf0efd003fad99f730b216cc9ce21f005821225c7f169a6501f4b52ce4b5c3a08e1211bc0eb SHA512 8de4f6db11598e8d93cda029af052e283d8f1e4fcaf502eaa7c922e2d9d4049ed8f989934cc63143d7345e16303fbbf18e37c2ee328fc7cea26737bcb35bccca
EBUILD qtpositioning-5.15.9.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
EBUILD qtpositioning-6.5.1.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
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/Manifest b/dev-qt/qtprintsupport/Manifest
index 050c1d5e3f61..eeed11db59d1 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtprintsupport-5.15.10.ebuild 827 BLAKE2B b54e54fe0d9426c0664c3f9004770dcd5d5a49e5db30b4daff8e39bb67b69db888215e2774432d91c8ab6d2b9aee322ed77dab88ca2ce13d61ccb308cd22ecb6 SHA512 486f6939f01c3a1033c9c11356615a4df2d5f8cc290a803619681df2b4c8bccff628066abd4547556843c8e4ef5bf52651a5c161fc1aee8e685dbaf046d74c69
+EBUILD qtprintsupport-5.15.10.ebuild 823 BLAKE2B 105244828851cb2b1492a5429e69be46a57bfd8522e4ef33e5fa93cd6775baf9da6921fa98c1a7ba4111b147f3f009fc747688d0f67eedebc44e2d99e4dc901b SHA512 eaabcf2c89e04985f4718003c1ec12ecc3be9e968843556ea4500f8cce69111f56c392a064b85a0ff869c7a3799e480b1132f7eb6e72ef1a91f3efa23a1f5512
EBUILD qtprintsupport-5.15.9.ebuild 821 BLAKE2B 2a6c1c5ba9ed3195e60d87d97907ac493e248025442d9f19d0d393b67bb75630127d2f03e48d5ec70a3952cdb2ebdb6e6c831720a77e056d6718f1a97e7af261 SHA512 90fd858e040d7f5876ff2ed64436275d03903f282e8f41416ff6caff1b20fa2785f76bfdc563f8dde0047bb21d68354b9509ca512739ec15f8b0856e5a40dce9
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtquickcontrols/Manifest
index 6848bbc3458b..d81e2d7bd9de 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,5 @@
DIST qtquickcontrols-everywhere-opensource-src-5.15.10.tar.xz 5984520 BLAKE2B d872e315eef10dd0105be778f9fedf130ffb881d6ef0968abf0061e547c06ef5fdd39d4307773ea3c272abd544d19adc875d285e25b70956cb489192c6b91cb2 SHA512 fe7faf770adad9820ae897b5822b5dcba095dfc267411dd92d0b46daf7f84f87b3d9f2f9f90a90c030b09dcdc30549647f3f42039ac09e9207b5c1462116ed10
DIST qtquickcontrols-everywhere-opensource-src-5.15.9.tar.xz 5983564 BLAKE2B b32abf18cc58c9096d7578ab6dc3f71105ccd99901590f35f1311d179ec2200c5d24577c7e8b5103002451695b26707cda69fceb181d3dd3fd2d9f6719ef8bf7 SHA512 62c732414aa3660ae6c702a533e3ed090a293a6ecfc0bcc75b54d3dc9e0ecb657002e3f840107a07a1d749938148c0e63cd9f1021831f6c44ab133f9780b9c88
-EBUILD qtquickcontrols-5.15.10.ebuild 777 BLAKE2B 83f399f11ca3f896d16a2398a4cfb20d51964eb461fb87f23c311da9a5b9ad9f3b9e51b97c22fd063370b645c509316ccd5f30c4bbaf220ba35d34f7d967ca23 SHA512 68cc120d33debf9498a48c3813cce57afd2d9c696b157cdb1e299502f7b5ab771a0cd0e42ac0eb96532170f9e9432b3f2a5cc35ad21a9b37cfa9cb5514818ff4
+EBUILD qtquickcontrols-5.15.10.ebuild 773 BLAKE2B 3bc55f0a88b21d7174f91afc4a88f88af0559a1f86152c0976b51faf6a4b60b803b2994413c640fdf641f1c74be6c5bf82be716e9708fc748ff0d51496f8c75a SHA512 e9ae89761163e879f7b0fbb763dfeb8c6e65becb3b0ac61695c22ed77c2d9b9687b16ad1cda419dd72a852eca2c792ad42bd54394f19330126de5f0d00d8bf6e
EBUILD qtquickcontrols-5.15.9.ebuild 772 BLAKE2B 1d54d2adfb72539c4d2898390588bc75348b048144d05a659f052fc5a3206b01df79016c6bd141f9b3e684b81c1fd96e5f081dbd61732583eedcac12f49eb09a SHA512 569773cc8039061e538c937051507fe9a96a73bd2b56bfa7aea006be150204304ac31210628740cc8725cc85b0ea71dfe0d856a350e391351f61aef1325549cd
MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
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/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 31af63057927..633b1fd6313b 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -2,6 +2,6 @@ DIST qtquickcontrols2-5.15.10-gentoo-kde-1.tar.xz 8924 BLAKE2B 2783586a53c93c48a
DIST qtquickcontrols2-5.15.9-gentoo-kde-1.tar.xz 7368 BLAKE2B 0e31c70332c19f55aa0370d64b5f8abe07f3fc63b3063ab2c40a46b6e3a22c45dcec0f8a6a36d5485fd7bfbb8be949ba33754967231fb2c54a354c3d1522aa37 SHA512 01b01fb30453c7f6e02d8995e609b85725018ab22e24afb2a2e8ac0266906166e4fde3fb004e193e93938589a817d5363dfd020ed097a0e19b41cd7f71dff516
DIST qtquickcontrols2-everywhere-opensource-src-5.15.10.tar.xz 8293436 BLAKE2B 274af0397a0f6f3608eff51cf4e8eedb8a3e64e41d5187e5052ca2bd25c32ad448db3a8e830c9478d9fd27e929693dbb9cd55fd5abeed769cac4c68029cd8b8e SHA512 87e1590223c36b1191f4d976cab946c7d688228032a4a32e699a87ee844d64ed60f93c3c0c148374f4ac6ca619bbf583492cb9b57823b15dd0b9811ca270f390
DIST qtquickcontrols2-everywhere-opensource-src-5.15.9.tar.xz 8291756 BLAKE2B b48aa868e472bd2b397be5ec4d8018cde477a3ba42a1b98b01a23c12076003a8cc9966d876e4495cb7f83ffc4604dd44ec2ac4f34482d0a15f55c689063b6c68 SHA512 f77a59cb6704438bc7b81f816454dad56bebdf4ce7f015c21a05b09f0c508525750a0cf232da8d7428464aa68de9a2bcbd000906fa781aff1e60e8ee5d70802e
-EBUILD qtquickcontrols2-5.15.10.ebuild 659 BLAKE2B d4cffa97da27ffc022bd24909afb4b80532c681568fb76b8600ea42b643ac07b5d4300324f1e89619de44654bd980cd4e97580149e3e0905d15deb8bac9e60ce SHA512 0cadee44940bec4e43bee711bea190b130c009a106992b3fd569cb234ac43673da0d121118d65c30a426c582f72ff0a2f0637bc63d832d924f2651719fb087a4
+EBUILD qtquickcontrols2-5.15.10.ebuild 656 BLAKE2B d340d7dd1d33423edc225f091606502d6fe19010376e23e2ae8a0af2dd3fe86409fade53b51b2e7cf0b35effa3983bccbae50f5512e6ce5c2e168bd80800a6bc SHA512 c90a27549714a059b1012808921aaf224282bf2a15c585b55971dfdc85f1754102300d55e0de73dd74ce55be292e83f321f277b2bdf59915f47acfac3468759a
EBUILD qtquickcontrols2-5.15.9.ebuild 656 BLAKE2B d340d7dd1d33423edc225f091606502d6fe19010376e23e2ae8a0af2dd3fe86409fade53b51b2e7cf0b35effa3983bccbae50f5512e6ce5c2e168bd80800a6bc SHA512 c90a27549714a059b1012808921aaf224282bf2a15c585b55971dfdc85f1754102300d55e0de73dd74ce55be292e83f321f277b2bdf59915f47acfac3468759a
MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
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/Manifest b/dev-qt/qtscript/Manifest
index 1b539986d5a7..0b95eaf12568 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,5 @@
DIST qtscript-everywhere-opensource-src-5.15.10.tar.xz 2666052 BLAKE2B 58844771d25d7b8b5318337aa6a68ca3089f4524a8051edc35f556950ee48bde17106ba1c8635341734549db460a63c3c89622c6f01023d596e8ae5c68c99d4d SHA512 3748cc8c90c2f96a21e6b0c8ffacca11d023e37091f6f5a05608f7f787f81619a7aac5c8074360486e28033a28601c1d347e499bc387a36f50c4cec2be30e782
DIST qtscript-everywhere-opensource-src-5.15.9.tar.xz 2666040 BLAKE2B 5303481d431dc5850b728654d96758f161afa6f6cdd2c9ab40f226e8e998c6d83fee298fb0f9ea67669b9218a845eaf2f25546dc9c0da0dbda14ebd03a0a23b6 SHA512 83a69b3f428fe8322c4ff5bf96736f8e76c0825b06742ef000c22bd0c71598c648b03481f40d86d5233d74096b34c5158a576731a06f12e01b680fd42e31c602
-EBUILD qtscript-5.15.10.ebuild 690 BLAKE2B 5e2396c8c45131685a278fe5f696f96c9a175d1f238ce8a98b2d2e0ceb07b86f3af33c17c41bb77d862802aba3e1a784d910c70db8ce224d422a51a677fc34d5 SHA512 9840837db0de89a4ba7c159dbbcf622b7cdb63aaf75192fd777bca66476e6a819bf3dc503ab6b5db45970f2dc65e754012226b84596a59d333e31e59ebf5b5aa
+EBUILD qtscript-5.15.10.ebuild 686 BLAKE2B 53fe4da69118704c12a6dc648e9314c85ff1ea3004cff08ef58ebac9c90bc1ab06b1414054f53c038302714ee3d619aff382a4c098981c630c6feb95dacd2f8e SHA512 73aa24c0a6b5bea5508b0a14b0e4cc50463110626d605dcbb5bdd6071c611b69b6832cad0170acc90111837ff570ddd865d46b2f89344a426924c934cd01d8a8
EBUILD qtscript-5.15.9.ebuild 685 BLAKE2B 8fce470e213da03bb8cd26bc2b8039467119d93249a3b63cfbd0b76c5115a7a64b10e6cf84e10e51431b5a6a9881e02547c44ca18b1d9e945761a3a2c541751b SHA512 b5002b066d0a77a68cbd5ab31944d1065a65634fcc9845efd2c41e9e85f9887abdebd8e5d288db24ab262b176e86b2832e24d8843b264c505b3edf0e99b57c41
MISC metadata.xml 583 BLAKE2B 5389c382561f060259c9eb626a98fa6d1861a33cffb3ca62899cfb6f1b020d6841314edd05c4fd0e5f05593f6015af8826f1d087078754a3dd31ae72be7da4aa SHA512 f8d07eb515db1b455670371655c572aac73653a2d1af68d8a226ecfeaf77b62737114a66bc41375cf7f32d575df792a685298487a90c650b6c6dfb4a7c113181
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/Manifest b/dev-qt/qtscxml/Manifest
index 3b4852caa81e..83e10fea8ca6 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,7 +1,7 @@
DIST qtscxml-everywhere-opensource-src-5.15.10.tar.xz 437404 BLAKE2B e36e866e4c02722f88499cc92bf27d2401f2b89d19fed83915803f6c8a367007fc386df250d11ecd92e5c80713924dd9992608769dbb0a42071f0d928317d935 SHA512 93e2df05da176802a0439ba752f52d1c84d291a2addf9492aaab2099f06efb32d896edd0660711bb2e0b67f7a9ea2c4d31b4ec3366f6230140d3de0056478923
DIST qtscxml-everywhere-opensource-src-5.15.9.tar.xz 436620 BLAKE2B 4471906e193e71c2cf16165a6925f2fa802d057afcb2690b0e9558c4fa98445282660346364800357e37f1146e077a3b10043fba3bd934bee34d8b801c74214e SHA512 f6c6bdcb651055fd3a9b18fae1860f0d72afe83a08b387cb1393d0b1966eaaf1d8ce4530e6faa3a4e4a18d97a8e36937303b99e29d7dba17b6bcda61a5eb9872
DIST qtscxml-everywhere-src-6.5.1.tar.xz 1164020 BLAKE2B c0d5dc1f98cca202923343085097ba0d81ce3b4f0706254792f8e6f60709796f7dad0db9352aaf5d5f9283d5e231d3b927bdc9317d9b7130a19c194efed0bc6a SHA512 5be0c7fc913880500e360860a9b1f50dc868b4e4b02c6e774578221754a88ece44d90d80ea85aa74b23cc3790a20f1e2b00b7d395612143d42e7c63708ed9dd7
-EBUILD qtscxml-5.15.10.ebuild 401 BLAKE2B 87591f5da76f07a876c1ad04167370975ac04b601fa40d897973ae65b6c8e2bae77a7b9b615cd205dcfeec711c333518c00a06ffc03ac917500b0a9cdcfd13dd SHA512 87b0c0984149eafdf5d14e83ec9a36fcd717f625cbb6e4596eec409feba9e7acd1db609ef19f831adf61cd8358dfcb8ae7c4520cca919ad080a7004f2594e7b4
+EBUILD qtscxml-5.15.10.ebuild 398 BLAKE2B 27b0f98657fad702cb2b14ad1c69bc80b9c42e5680ed3ba2db0e79bb9884c0f7e4960c3c4bea26a6e5577476030b52c172f327cb6b6ecd9ec72ec6b5d306725d SHA512 62f3dd6a55d8f8dc8af4d1e0f7ded88f8efd3fe1ada7a7f585bdd488c3599f160a9efbc52a014cb5016e11a13856dfabbc236cb4257bae8bbb18137bc02e22ce
EBUILD qtscxml-5.15.9.ebuild 398 BLAKE2B 27b0f98657fad702cb2b14ad1c69bc80b9c42e5680ed3ba2db0e79bb9884c0f7e4960c3c4bea26a6e5577476030b52c172f327cb6b6ecd9ec72ec6b5d306725d SHA512 62f3dd6a55d8f8dc8af4d1e0f7ded88f8efd3fe1ada7a7f585bdd488c3599f160a9efbc52a014cb5016e11a13856dfabbc236cb4257bae8bbb18137bc02e22ce
EBUILD qtscxml-6.5.1.ebuild 397 BLAKE2B a479e813b27792c70211b5a8c20f473a0dc2517fce50394e233f78de410ee0c42dfb1bf6b4ba966d680516ef3777a2f3859a310d5c121c8a25d8b44c8a9aef30 SHA512 f52bb5c201d5d24944cec6a7385ce8fc5290e6f78f6d13fa652222678295d48ae5fbd24b8222f5add4ccab195b8902fbbbbe53bbf71be56a1f1b76b5ba98dc12
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtsensors/Manifest
index fe68239c7870..c07e67aefc03 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,5 @@
DIST qtsensors-everywhere-opensource-src-5.15.10.tar.xz 2059812 BLAKE2B 80fb3587ebd50ac28ed3d15f1e6888f10d250253be0a7e176d37ae355f124d98ae8eeff63cfd4ff0c1785c994a48a043f83102689f3a5e644806dd90ded0ded5 SHA512 9950b0f8b90727a051299c5b7e7852819c165bcdb1cbe2f8bd7386768175c387ab838918e7d6f1dcf2a7d6d32bb1559dfda225c57e8b9b5b4ffeac5f3db432ac
DIST qtsensors-everywhere-opensource-src-5.15.9.tar.xz 2058448 BLAKE2B 81dfea81186b4ea77e469f6c4f351aca55134d794267fdb2f9c3a31e622208b3eeb99bff53ef5832ca18fab449044734629e782969b3b44e2087f9f5ccddb8f7 SHA512 beba10a61e6d9f31dc9f24826b4a01b48fa656d424a97164c59d7be9a9e063f1b0820f95c157651ca0cac60d6f9aa188b90a122be565bcb488e7f0e42887140d
-EBUILD qtsensors-5.15.10.ebuild 571 BLAKE2B 0adef7f3406f1e6920a8a6ba5d9baf929ff2d9b04cabb381bdf65d90ca91e952fdda2d297d6241b39ec7a1a9802328ccfb67080f90cb886707002553986e0a88 SHA512 f8dfca2f4b296ac24d8db59a8cafa5f1189a0867bbd94c4c99ffa16b0b4a2f1920a34a0e4817aa871ea23d7861cf7d33b0a3f706fb4b23194b94a8744e6d7089
+EBUILD qtsensors-5.15.10.ebuild 567 BLAKE2B 37c6ffc83900292329aa32f226b7a3424b9f5513fa0d7646ff085ccd6ecd1b1ae52fe42552aecff697a40a6c232c80fe3131d0db08fb2a83b6bf2903e63a929e SHA512 b4bf468e7581cbf27e09ec345f943bfaa0cb397aa37e9335d7bdb1ed61f7597ba3d510fb8337511ab54f235bbaeeebd867173fece302474baa05fa66d0b4283b
EBUILD qtsensors-5.15.9.ebuild 566 BLAKE2B e798853d8e80272c044a99cec1afc8bb006ce73552d642d7b9852a55b3e018875fdf8bcdcef2a001ecbfbafd0cc2e36350d41bf93bce93e35b7a5e081a607ed8 SHA512 1927fa1e7693842aa7c08e604bc3033bdfabf28411ca6d748ac8a26f432187f14b8c10dc9a5a51b631b71d7f81048c893d700110fcb2888da02268b4529e7e4c
MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
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/Manifest b/dev-qt/qtserialport/Manifest
index 5f3bf6d03361..b81545a181ca 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,7 @@
DIST qtserialport-everywhere-opensource-src-5.15.10.tar.xz 324256 BLAKE2B 7d5492648854877b42a4a058ee2e1205f67d2ad949041d62f800f0fde701e02b7651efa16dcfa43d0396675009ebdc9362fd74eccec06f079847b7ffff0efd24 SHA512 59face48cce750fb02c112dbef9c997a5b61d84cf8085a0f8c59c3bb5c93d7110de9c9830f26f3ed61fffb2c23eb8a42d5683211abaa6e5147cf87643469a45e
DIST qtserialport-everywhere-opensource-src-5.15.9.tar.xz 323496 BLAKE2B e471854a2aac5143f7b6aa5ad452ed5c38dc7e021decee920b71fcc9f9b574af89a89c166a737e604f6778024cceb822acc19b82ab1ea07cb34d687b7d0280a6 SHA512 e22d20a0b20d0dc8c6bce3dcf1137b2cce28e370df9d0250f2a777dd73153d0156b0c6cfe88bc4257cdc209fbf640c8a06fada147d40ee638deb716148812da3
DIST qtserialport-everywhere-src-6.5.1.tar.xz 279664 BLAKE2B 5c3990cd08a40cd7db5fb81eaba7b0344c5fe8efc373007510cd241cdebb2d92044a97c3dfebf267b17f7b3d7f1f7ff17e2333d994735cea499d46000f6ae9d0 SHA512 2a85f98d6eca51896a8e32bb531326c8479fde8d09ef2936ba1acb2bbfcf565ccdbffde29fee3b685709b8e1aa3a77437515607f280b483937c417dd15d55793
-EBUILD qtserialport-5.15.10.ebuild 571 BLAKE2B f5e8301be7b25d83551a87edd27a19469ebaf6365948f92d6ef4ae881c652f84b739926c1a67586ed22dd0f3cbf50ce76a20afb8689b8e1171e3ac87ec274516 SHA512 00c824738bded1e1929d8735741bb1ce514d8d23f30a5bfc8e29b45a1cd81bfd7d063af13e6a96d338637913b77d5da86bd908b3debbc3acd3915bdc4c082383
+EBUILD qtserialport-5.15.10.ebuild 567 BLAKE2B f61e5b32aa135bfb91047db505344445d6b43767a0d167b2a3e1d8bf2e5c5dbb1f83d1fa0527901cca7797f7dbda76f6d8deeba9c7be3110559a8590b792aa39 SHA512 a45ed7c5fdb21a5c4bab94ba0d30bb0edff959643b703ff7f8e2a89ac30c78b40c97bf1480144921e55ae694b7daa61638df519f33b46608b33287219afacd0a
EBUILD qtserialport-5.15.9.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df
EBUILD qtserialport-6.5.1.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtspeech/Manifest
index 93f6a4ebff3b..bf8fbe87ad01 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -2,6 +2,6 @@ DIST qtspeech-5.15.10-gentoo-kde-1.tar.xz 1044 BLAKE2B e555c475fa1824ffbe34c5a0e
DIST qtspeech-5.15.9-gentoo-kde-1.tar.xz 1040 BLAKE2B fee7bf8280a4b8ca6f9769a7f1387b73fdc796ee40f3f2c37bd1408b091c544fad15b76b02fd8df80b9b206b749eaba6eefb488b4656e1000f400570e669b754 SHA512 ec0014532cbe29d067ad35f240b1b3842b035b5e20026dae0994939f9f6a43d380663b258ef0f280b43e0f1f7b5f8cd56ae1047377f1e6ead355563a9b31173b
DIST qtspeech-everywhere-opensource-src-5.15.10.tar.xz 104944 BLAKE2B 7e664719d352cd29cb289f8b8f59d4595ffe343dca028a69030032030eb02c601b29492cea885bcab940264624b39042773bc70884512726abcd89dc27065b64 SHA512 b938c8baba11aa9a40a2ec5492df32c511164686aa2649d78023beccc8b23f1e0a77193672f7bc7d7f72aeb7b59fe30972683f5a4e22e1e39da9744ecd40201d
DIST qtspeech-everywhere-opensource-src-5.15.9.tar.xz 104024 BLAKE2B 76aa0f2c0e2093bae51cdfbdadbabe87719958bc730d11f7f160e2441ae9c3b6797c3b81a8c034068639fb1a56339b7122b52c0a4323d1b90778b1f39398baf3 SHA512 c614798cca4485d9880fe8bc19df563b29673f8fc111ce8129e8e1a8f1c8f769f76c9a7754e8cde43e7223ef7fed899bff9e91bcebe113281eb44f39aa7bfe4a
-EBUILD qtspeech-5.15.10.ebuild 735 BLAKE2B c68c53ed317de5794e33bd1d890d80b0fc91468e3d4534e5de9bf28991ec06b16243d6cb7223140c145cc0c2b5cae54a65a3b79de25ddb7f8a69994f05737bbd SHA512 99d2083f97d562da853eb51df9fed8b614d6da3693a66f3562f2af6c225d5592be6700b23360974ed3f0cba1d8774db0849ea76a53a98f2e93322a6ffbb8253f
+EBUILD qtspeech-5.15.10.ebuild 731 BLAKE2B 914de8ba46fd303fcc73e084e5e4e732979a359849c74bf78dfaab8780831c9f74701b709a76440321338173bc2120caa7906859c136a424cfb4f7a029d77ef7 SHA512 fc72beb8973da0ef209b54d3dd6f4784b6e8c4acfda81a78d446385a5c856c6234c2438d7367a4e371b3668b685aa267804fe2a9b2ea304d1045bb64b6c36a99
EBUILD qtspeech-5.15.9.ebuild 730 BLAKE2B 9ca79158cacdb395d0e845f8504a1846889bae0eb116af6255016b2b88f6ab30b5d511575e13561c3cc3941dc9bc3e8832472d90d1ac0471af2cc55bf64d5dde SHA512 4222158b97630d34ede62e8d0116834442fe72509ed0763fec33ce0306ba1689afec8e57ce732e140410e31a42bf6403c8ec6fc2dd3aefb8895058d8d3c44323
MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
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/Manifest b/dev-qt/qtsql/Manifest
index 8ea0f03a91c4..4790518ba53b 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtsql-5.15.10.ebuild 1266 BLAKE2B 4c68dae79ff92a13561461eae116ff6613a8e819beea359b15162bc550e10e775db16e87d2b2f23298bdbf49d2116c6897243fc187f3b5fac02539fe3b699656 SHA512 5771c23d011d067582fc2dd00a27a285e94c8d275eb212451eb90b0a360f30bd1d35da4095ebb258df918aa74589cb1f79076b182d7b4d9dc43e63fb2917101a
+EBUILD qtsql-5.15.10.ebuild 1262 BLAKE2B dbea807b01761f23fb24d124f8fed77345e3e2919a9438cdb1cccd105e270d744051d6b0fd0332d94c521c3e28c98505f02381ec2d64ebe0aca2ce3a392b8b03 SHA512 3c6a8a14101b515618ac1e97dbb7d3c6fe949a1f09adff4ce9f228a1089e215e110041b778017bad4a158911cafb23745ae030dbf504fcef309d2d35b594127e
EBUILD qtsql-5.15.9.ebuild 1260 BLAKE2B ab11a2826f1b72ed2f025844b610077093d8c58cf23424b151d996cbdd2f3e166323155f769c2f1d9de152a4b8c3a4e9679e14907e0480328af5424a78b7b0c1 SHA512 17d08dd34218396024ecd09540cb2ccdf2d92008b04a9143000f47f02aa56d0ca7652a3a431cfb43c5fda88c3305eca9580b749e5876532d077183463de0801c
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtsvg/Manifest
index 1460a85ab605..535ead3a0949 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -4,7 +4,7 @@ DIST qtsvg-5.15.9-gentoo-kde-1.tar.xz 4368 BLAKE2B d2758227d565d9043022e22d0eaa3
DIST qtsvg-everywhere-opensource-src-5.15.10.tar.xz 1889960 BLAKE2B 14ee7bbf0914e47d8fc39790ce597fca0085e6018d33878752e707a9ece567bb139bc2f1e689840d6641aa6db958240a4f97fab69e7200385ddb2ee53abc5f04 SHA512 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7
DIST qtsvg-everywhere-opensource-src-5.15.9.tar.xz 1889044 BLAKE2B 0163c88701d510ab99a1d0d91f98fced612e428fdb04573aba5e819cb7a713d283e1cae94f0e31a7016d14a1f61f202a417453f63768ebdfa185772abcf0cf71 SHA512 e091c059492662fad713d1f99bfa5e21a8f8e77e24b067d176a6e732b420a22e3777fa99a880c6f992a19b2e5b16c01f131da875d9e08e6a515108b468192fe5
DIST qtsvg-everywhere-src-6.5.1.tar.xz 1728900 BLAKE2B 9003463afefb97fea05dcac2b9a56f31c3e5a64a76e4a3b4b04bccfe73c691f48a4c8696aeda7359d113c6fd7c8ec7c0bc094d092f3db2338e0ca136792b7705 SHA512 4df0e02aa9b21091eb71a536befc52d8e7bd5f6d9fa757fcf0ac2f11e44d3f84b44d73551e44bd6a1045891bc9c0ed471820a94b8f014b3a82cccf32b10ac437
-EBUILD qtsvg-5.15.10.ebuild 502 BLAKE2B 3770fca4533790f99ba07a2cf16e41b785d6dcb7002dffcbaa4a731c0a2b0d7b18e47ab17e410503bb35f85053a6d4240e33b6b2a458b880cfbb7eb61abfe0ef SHA512 f9f7de8c4f720f7c5071806a20915ad342c4b4497d4ad691069468eb9d8bb9280254734369b0d9ba315039ca2b86a4226adfd98b1edac910d1201e7ca8751321
+EBUILD qtsvg-5.15.10.ebuild 498 BLAKE2B faf56508a36a5bf0176f367d822b26915b31c55b36955de2fcdf26b1bc3fad01da169fd6862b7fcedd3303cd0244b989e391672ce59e677a9da2d6c5b1f39f9d SHA512 1120baab2f212d20add4d418657de8635ab6b0965f73ef3ead13ebd190ffef694e6c2cdf29fba692c8f3debd3bcf4d41aa69057ab6e2aa7bbdfe0a24262172d2
EBUILD qtsvg-5.15.9-r1.ebuild 555 BLAKE2B a77052e1952834d345fe99c7a9d426e8a3379ed06eaef40984b7098415b2f248e3954fadc3aa8975346d5b6e0447d3b4df5b0b073b97d59da172f55c61dda67e SHA512 430c41c0c2ace6c30a98e6abada3ca7ab3d11a5d453542f87c9941e2d9f126ebb64fe0ff6eb49005e9114879e7bdb8d6711f7276152012b9deb5c2e27d1de7d4
EBUILD qtsvg-6.5.1.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qttest/Manifest
index 31949840de7a..8bf50e7d0f98 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qttest-5.15.10.ebuild 581 BLAKE2B 4efe54ddaeb04eb520ad505b5d63fdd1cc8d1bf3b544056f8de83e45c7d395996f4dce705e1ae992627436a08e4528dadb8728a49e12cf91317ddb61bd9767e2 SHA512 e07d81d3c85040bab2e2e9cb6db5412cdca3dcbcdc4d84658b1341a6f6a4617ab0b760111741a3163518f2ebfad2b347f9abcb41a7c6238dd8d8546185065bab
+EBUILD qttest-5.15.10.ebuild 577 BLAKE2B bb10ce0dfc890b74220c819644e9834654ef83b175e125a509069e9a163d92fa29f7204933f65d7eb620d6ed1d3d8bef55e36c9c6ce12f0a453c8c14e0f8dbe2 SHA512 65cfdd45292c1241ed16bed815b18979c0cd48efc845d26367c1b29027c6ff28037d8430eb1951c59ce3d31d7c23f3e22a5a433d77cc58010b677b5f9122a63b
EBUILD qttest-5.15.9.ebuild 575 BLAKE2B 4ad78b66a4202969b64b267105eaa1ed8a8485e1f4b506c0ef29e6034cfa096c21c9390bd4202064e75375f7a100856c0ac50ee6ef8e8def65826f3e4395b60b SHA512 61b2e64fbb2aab878415f433ece090af1be043ced5513f9e31d9827ecc77ddaf09767bb1fabadab4d70d51d3d16b2ba06dd7a019865aae00ee761a5210cc9eda
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qttranslations/Manifest
index 55a32ce6056f..a710eb72c745 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,5 @@
DIST qttranslations-everywhere-opensource-src-5.15.10.tar.xz 1635736 BLAKE2B c21f5fed04502622377bc1eaa11dab2d4e693ca7a882ced21920926fac74fc75b92d16a26c35133f1437cef51d1effbcaa292ef2a768e085f54b10774d47f8fd SHA512 94f22857cf9f14f13f774ee5632bfd0fc367ca5fb745cbfb3997fee8651961d9547f0a629afc54c35b2e4493244da9b94214777e20340c2b203c538bc1c84a22
DIST qttranslations-everywhere-opensource-src-5.15.9.tar.xz 1635128 BLAKE2B 79eb450dcc69c2321d2f8c53f32c648c2f7c51ee16377c8267012617ad9f0dd047a6b2df5661163192486ce008626d12a516b92ea401e45a1bb5703c0136aa8e SHA512 58168e68529bd84f363d5c46182be45f5ef143e44c6878326a2d05ada7b70adc812c8d024ca8650ac52a1e2d6dc22788b57d4f5527de7d8619d34ebbba71165b
-EBUILD qttranslations-5.15.10.ebuild 385 BLAKE2B 571da355134e61651d4593c20fdd61dfa578424fc05e4de5da0b0c433cdda8352f70d877f17aca1c2d861cf219ee8c8a0eafa44c03744b7c39cafff58b98309b SHA512 b9d33fbccdea7e2ff8b2ddf6bd12991184024dabbd9a6829285b75b35b4df2dc43b666f88432593a96a74538f07786caae61300c6b114dcfb468d31afa4a15a7
+EBUILD qttranslations-5.15.10.ebuild 381 BLAKE2B 641f4b0bc2257a3f4912fa90f5f2956dc288a714a04ac34e7acaa73b60660dabe54c2c839c620459b809249e21d632732c7d98087093dd87cbd6fd50bd543edf SHA512 8d534cf6ce6df23f0489e27a8b828b989477ced662ecfdc98952959be492a85bab8572d9a6cf539bc9e5911fdd5cf4c8cfe16967535be47cd7bc081c6ac45eca
EBUILD qttranslations-5.15.9.ebuild 379 BLAKE2B f7a1f63d58d4a09bdf92cf91f2ec0c546a8626cddc7bcc9d55c70eab8db038d3ae6912e0909f660099af7d4998e99353d0eda9d98da253f7021b8008c1d30b41 SHA512 bf741516c6b8ad79fac401a29befc1004926ce203460b0c5f261744c70db5bcc0047b9af8f36153668b1680fefcbd80f50840623d5379be43ce059e1373c4506
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 78f0583bfcd2..e5025ac9cf64 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,5 @@
DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.10.tar.xz 10958048 BLAKE2B 738a31b2c9e9f8ccaf34a794da92a659c570db614a6473a96e17eb42de31395602283a600e04d871603bad99be80474895364d3689f25cbae561ea9772a97140 SHA512 6d539af5e5a336f2bf4ac1e6006268e50b426f6bb174019f742847da86f8cd5c8eb2c5f353255b5d1bba9c9c7a7b035bcb12e0063be5b31e45741ea9bd478582
DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.9.tar.xz 10962880 BLAKE2B c365951bc2545719349f1a1253d1a2289385b857e3a7dce957761b3deb7458a9570b61b74710b302741321514e5b9031f9d6dca77c4b40bbb3e389069f1b9bbb SHA512 d9169a5d5b09d8854ce6b402a7333e8a561272aeb05ffb3a8055ea6e9a18b2d79ac404c85d57e4b78db0c6ef61352e2d7fddd8c510ff1cdaaa6665a9a20fd96e
-EBUILD qtvirtualkeyboard-5.15.10.ebuild 1218 BLAKE2B 4ccb206b72698bcaa1ea4bbf0182360c2f79b8acfad97353db31bee75a8dcdf22cefd8673f0c78f750863b5aa9f9a7c928414f7102537248bc752aa327efef11 SHA512 6c2a4c1bfe999a3fd2f1dac87a488c5eb7012b62449c2d2355ed6d003445d755e709d0ffb64c5571c667ae7f82d3999bca594646a9c34825f4bfc32d0eea1440
+EBUILD qtvirtualkeyboard-5.15.10.ebuild 1215 BLAKE2B 5efc9c8205dd9bb16aeee41108fabdb91b0c279e1dd4a6438f59db0396ceee80b567cf2d26eaba12f2ecbf4d864073aa2e2541e21296d6137587a530e93c014f SHA512 dc3502caa1b1a6170ea77f54d44133794ebd226b46ff0eca1735eece767c5b4f291084114c556eb8064fb040f1abe77fecfba70ad9e9526de09dee5c4de1a36e
EBUILD qtvirtualkeyboard-5.15.9.ebuild 1215 BLAKE2B 5efc9c8205dd9bb16aeee41108fabdb91b0c279e1dd4a6438f59db0396ceee80b567cf2d26eaba12f2ecbf4d864073aa2e2541e21296d6137587a530e93c014f SHA512 dc3502caa1b1a6170ea77f54d44133794ebd226b46ff0eca1735eece767c5b4f291084114c556eb8064fb040f1abe77fecfba70ad9e9526de09dee5c4de1a36e
MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
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/Manifest b/dev-qt/qtwayland/Manifest
index 69e4eed36397..1c7e22e9189f 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -5,7 +5,7 @@ DIST qtwayland-5.15.9-gentoo-kde-1.tar.xz 44312 BLAKE2B be255e0d292ce6555473d4ad
DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
DIST qtwayland-everywhere-opensource-src-5.15.9.tar.xz 567564 BLAKE2B c5a0d39cdd746e2aa6cd011ce04baa7f1f30e21c935877a684f07d5c2a0d3446e80569fa33c3fa0953b1bea86aefd64f80fda5164f3ee5648b74c2e0e8d369b9 SHA512 d108d63ceeb3b1a8905ad7f53a7271fca6a3506679d352b7290cdf8c00e1c180b6c561ee013a674002b89e23f58cfb7b909dfc5a8fdec6cece7e0a782be77978
DIST qtwayland-everywhere-src-6.5.1.tar.xz 1059936 BLAKE2B 5b54804df8106b0585fa44612c3d688b89aaea7bd49f2420e2a44472ced9ed51c2aba1d0baf2e4636a58937e7393e6d4b1ad8c7d937dfbf96e5a90bba5393cca SHA512 9074adfb5ea9cc18896dade6706ef5a863033130f23aa11e0a7b2ae6e4df2fb64b636815e2489debb1032919a8ad20d39813d40b3ba7a87cebd801c9fae0d4f0
-EBUILD qtwayland-5.15.10.ebuild 1263 BLAKE2B ae5977f657e7eb492f0325835863f4f4351382cf4830b83df74779b46a24040bb49bdc92ad9193364e043db3a43d701155bd33ccb7047aebfc49655087b5224f SHA512 4d1ed340102d7bbe99be8047e4c7035ea8557136095e8e0fc37cf669ad82c3c123f65108206e30b5da4685e7a6dc106fa15241688cc64eb06b8983b362a816f5
+EBUILD qtwayland-5.15.10.ebuild 1259 BLAKE2B 71c990cc2a1a1b0b537306bf57244e2d342710b02d4c3a1c808977d8b56afbdb95b73f26df5af3dff78e4c37f645cb3080ebca093321864e942e0bdc21c79adc SHA512 cfb3a18a7a6d7f95424437920f8b0bb4562a3a5c595a7e1de42d21af47eb34ada7761d6ff7fd4833b90b469fe8770284bc34f438a2de365facdc453508605d96
EBUILD qtwayland-5.15.9.ebuild 1098 BLAKE2B 32cb659241ca8c1a1ff731cddc0dc654b4fd6b1c42aa8038a8a37410da2b23a1893da1b49b1f7a21ab85769262bff739ab9df5ed19109f9e5456c2a52a577eb2 SHA512 def9ac79924d3359448ee55bf2bd2187236361b3bda8f4f27018079b6d3771b4a55deba28529e1776359228132571932a1f8eb34a2ea20f9ff27269f08a55724
EBUILD qtwayland-6.5.1-r1.ebuild 442 BLAKE2B 844f06e4063c17dd8b3e0a8835aeda220a0ade9d07213a42abbc38d37b3e1b6fa71423e07e2ef66d0628a9bb4afa9656c68dd9d7fb73b3e3a597e6d573f84587 SHA512 9f6235b34e56466eea51dd3513f53d0387d4a068a9f429ecb84f90f32f257967e2940e6d48a6029c6a2118915fd5592d14e73a6ef5aeac8e4429a6b2fc4ef8bf
MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
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/Manifest b/dev-qt/qtwaylandscanner/Manifest
index 45b7c85a3ed6..a412a5373063 100644
--- a/dev-qt/qtwaylandscanner/Manifest
+++ b/dev-qt/qtwaylandscanner/Manifest
@@ -1,5 +1,5 @@
DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
DIST qtwayland-everywhere-opensource-src-5.15.9.tar.xz 567564 BLAKE2B c5a0d39cdd746e2aa6cd011ce04baa7f1f30e21c935877a684f07d5c2a0d3446e80569fa33c3fa0953b1bea86aefd64f80fda5164f3ee5648b74c2e0e8d369b9 SHA512 d108d63ceeb3b1a8905ad7f53a7271fca6a3506679d352b7290cdf8c00e1c180b6c561ee013a674002b89e23f58cfb7b909dfc5a8fdec6cece7e0a782be77978
-EBUILD qtwaylandscanner-5.15.10.ebuild 507 BLAKE2B a927bb7769fbb158a6295343650777b03e857aae56079da6e6edcdc43fb03ed9d27345daa880b5263c88d6ed5122dff293f814219ce6b497cebb861720ed29c1 SHA512 67ef44cbd7d156b40eec596d70913a4db152de96eaec9e8996ea3a618e0a69d5358961f6c5c307d0b8ed23a110eb69a343fa08d419639c874067d0ea59f18ea8
+EBUILD qtwaylandscanner-5.15.10.ebuild 503 BLAKE2B 4d7250c4303b41caeba3700871edf4433a251360d4925337a7c836b7d7716fc6a73eb88f1a6af1b58197d8522b3a079754c9f83fe344040a079d1bf2df2ecea4 SHA512 6947f92a9cf9fa713ac07731474cff719d45c406d3b5a02cfe6beab85b7112d2d254e96fce9b1a976cfb212ca33b3000bd633a1807e987220eae1641e57985f4
EBUILD qtwaylandscanner-5.15.9.ebuild 501 BLAKE2B 35d756a902245e8169243b5784698968b8df3c7f6c4b56296cd7a740f0d79d34c4e821c65a002f1cb3086b73b71483e636e554227a4521e884bc8ab6b743b2bb SHA512 4f960ba2f7f569d8c02b7aaa1e0b75402b65bd68d23c9fe27ede4237d4c2dedb41cf635e1b2b05b40ae0feff912bdfcaf111c3aa951c55aa7216ed2ec168307f
MISC metadata.xml 352 BLAKE2B 7354be163c38b0299856f17a85621782e367e3186e0cece5d55a29d4848ba95a7d0ebc4e1614b9ffa3de21bad70c7c7ecc86fd81a0cb83038c619a1e763fc211 SHA512 cc03c3e78ee03f9be941ce1b54ee4ffa5655c933d2cd4c2bcc252a447632ed0587d41c4d07b9e1738aed5526b4f0b934342cb99d196ba3b0f49b762bf1de7c7b
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/Manifest b/dev-qt/qtwebchannel/Manifest
index 3aff3dbbcd54..0c46904a7820 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -3,7 +3,7 @@ DIST qtwebchannel-5.15.9-gentoo-kde-1.tar.xz 5804 BLAKE2B 9ac76ebfedc653130c19b5
DIST qtwebchannel-everywhere-opensource-src-5.15.10.tar.xz 211876 BLAKE2B fcc3a198a90826b2d16d3a9ed950b4e00d9a7645231c26af79f3271ad3dacb981f1c057ec95b9c3c71f2baf05e0b71a4fc4d5121cc3fc8ebe101cf21fc404d11 SHA512 ed8349820c623dd7abcd34244a2f05426667d6997a8952567c3cbe785bb2ea92f03dd931bb53f77b34faff16d04dd7d39e4165c75d7a9ebb4ae225d7582355bc
DIST qtwebchannel-everywhere-opensource-src-5.15.9.tar.xz 211032 BLAKE2B ea8f4c5900d7258fc365fa85b9a6477e717a631ea89e0ce3386820331db24345f2deab74e868c233f30a8a21fe9d82e6573be16a3eb3332d9852f0e6ae2860f2 SHA512 6b9c38c3d22708a14402282d4134475336cce2874887ece00316866cbc59714e395924cc9a449653ab050431c4ece5e0eb454ce2f4c13252bae7abd8fae93bb4
DIST qtwebchannel-everywhere-src-6.5.1.tar.xz 214404 BLAKE2B 37785146f6590dfde2b3af112b46025a6b5639554bcaf0302a9cad35cc2df28efc03ec91252eb9a01b20c0628f1d1637908f686b089f4b3f08d03ab8190b186f SHA512 a61a22b84f10f1ca5272e87de501f1c75f15a8f9a0aa5ff18d4df74a60bb8bec589289164863b6539cff4796c7c19a5ba126027e41107fccc43cf7523def1b0c
-EBUILD qtwebchannel-5.15.10.ebuild 604 BLAKE2B e4944d90ec4d51f8acf1eb078a672fe29d22fba1e57315a54d7feee7e6ff50735f35a7a0d980f79daf437d951d9c517622a0049feb3b4c9278596eabb3bfa946 SHA512 8839a17ab47c45b98b1bde6a5a78ac59ba04aa7682e1de336da58f46c8a41304290ce7f401b2df2921b335791f39f0c4df6d6a30d8742ad56a3684523f2e8a9f
+EBUILD qtwebchannel-5.15.10.ebuild 600 BLAKE2B 5cce3f1597f5e60da837b8e27effd93e928beaaadff3bb1274053c831a0998abceea4a5ec9b8a8bc3e044cc89b27278025fda8131d57b37a7e3854979f7a8344 SHA512 1db2d5bf9977d4b696fd24ce0f7bce27fbdecc6f5525c59784ffd83dce0b64d9f1ff333597db78650c749b1e426717c810657332c9a9979d406235a1ae2eb6ce
EBUILD qtwebchannel-5.15.9.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8
EBUILD qtwebchannel-6.5.1.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9
MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
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/Manifest b/dev-qt/qtwebengine/Manifest
index f031701fff9b..8f7a37df1261 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,7 +7,7 @@ DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a0
DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0 SHA512 61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1
DIST qtwebengine-everywhere-src-6.5.1.tar.xz 412377436 BLAKE2B 1ff179daf1433246b931558f52f1cf193eff4a1d646e6f6037a40fe85fa28cf944b7f361fd68cb01b1247680d376762c2c5317be125f5b24cc08e4bbfa6f0def SHA512 68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428
EBUILD qtwebengine-5.15.10_p20230505.ebuild 8424 BLAKE2B a0667ba2c8d182c83457cd68e938ffcecc71caf44dd5eaf6f87d76a566f73ea217be77b2c91441aae6d1cd7b3b45c08cab1dbaa4ed291a12f4589c6670dd44f1 SHA512 bc9018ddc4db7b3a21c8703b228dddae583474878241a661052bd21e6f415fc97c5f9d4a296af065d2619f9f2771d712db17b0f5f8bb79bba3078f654ae7dfc7
-EBUILD qtwebengine-5.15.10_p20230623.ebuild 8406 BLAKE2B f2a58e53ea6e698bbbd614dfdc45c3040d1570b07b18cd571b4732d3683f5b7dd25f2d6ddf38e9766e1a60339f080006945b2f834c6e058488b0cd6ff259d990 SHA512 ed19c1bfe9c036aa65623c21833a5f0fe298e518fd0ba9220e352736e31b9fce92cbf50a787bf634a3510a53da6ce6c0e208599bbab8b441ea60c4035683d719
+EBUILD qtwebengine-5.15.10_p20230623.ebuild 8404 BLAKE2B 0b82f31c53c3391042014b1e0f953169b74bb83221958717f645b585815388ae945343aa153f44c9754c2e4160a113d994156cfec77a4c3d683fceaf074f3920 SHA512 83ef513c0d3afe9e216ca477a30a96db233a67b70ca0570e15587f96cf525b06877f7e40115019b367e8166742ec2c5d527a750afa1445a9549f44b4158b392f
EBUILD qtwebengine-5.15.9_p20230505.ebuild 8404 BLAKE2B 0b82f31c53c3391042014b1e0f953169b74bb83221958717f645b585815388ae945343aa153f44c9754c2e4160a113d994156cfec77a4c3d683fceaf074f3920 SHA512 83ef513c0d3afe9e216ca477a30a96db233a67b70ca0570e15587f96cf525b06877f7e40115019b367e8166742ec2c5d527a750afa1445a9549f44b4158b392f
EBUILD qtwebengine-6.5.1.ebuild 7523 BLAKE2B 13dcff549ee7cc6277ad70db8fbdd6afb775e4b31db5adeceaa8a9e8d0c338fbcbd0374dc3d13ae9d287b921407ec41c631f09a8ef8516f158f917762a4a3396 SHA512 a612a406e55a1709269b897ea320374b5e43d7f9207bf05652c3bc0ac2a173a92463cd78a3c1c7ce3c0de21fc4513402292752dbd912274a35373936a4beb91f
MISC metadata.xml 1152 BLAKE2B 2975a3fabc6464a6207a6b1a9da943baa16bc9a3b77a987cffeb6ea7c8791c5d09171b74825e6f218612144d862de1f2865c60fb6c4c187a1c5f6940112117e9 SHA512 aa3ed598b19be8adceb5a9b90bbc5d5d2521aa1a742210f536d11cf0466204ac3dc373ccee5a9a6cf523827589d17022ca2b54c8e142e6bb3b2afcfc98fa242d
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/Manifest b/dev-qt/qtwebsockets/Manifest
index f6d2b8a2d419..c2ec7d705f4a 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -3,7 +3,7 @@ DIST qtwebsockets-5.15.9-gentoo-kde-1.tar.xz 1516 BLAKE2B 6b05a02276d3e3d2c327c5
DIST qtwebsockets-everywhere-opensource-src-5.15.10.tar.xz 261792 BLAKE2B 67461c8d87dfff155817489a30e1f0a100851523ead230600c3f6487d0006db78c5506af68d4b576dc89f445d52d97acbd8f83d179f2ecbf3b3bdde25c11d996 SHA512 b9a2593169f0ff8e3e77c178de689dacfed564b2100ae67194f3636bf6d2300be3531a01b7158b06657f4a2d2a32453a98b96c6ab13fb9d8094e7ceeb5fdcbe3
DIST qtwebsockets-everywhere-opensource-src-5.15.9.tar.xz 260972 BLAKE2B e485977b89a8311610ecafd3da119d9e5a5570034ec6c41bb16b8c412c71633b4669ee10afbd67af666166727b9fbc578d0023e74a1fd6e35e8b92e96f277760 SHA512 3e9b63656c16893a67d62f452c70decfca160ab192b3da2f25f3f72e513a58e3ec678ad05e618d1e48c05708f55d38ca02d4b1f3efdbea5e544f5cec16f6a5ac
DIST qtwebsockets-everywhere-src-6.5.1.tar.xz 460056 BLAKE2B 66c7f0b545ab88fceb61a1ec1211d255dca77c7678f4fc65d83a8bedc1d2b4590aaf1f93370637e73102179051c22eb6c67881da67ffe65da72287800f4b88f4 SHA512 cd11d6b50e60c5246cd6469a0bf4ce75afd3ab57c8e082a71c25d5a0662e1a23276e232106dd3e8893ce60ca86cc2ab6c213433fbb194efdf1a9be4ae53f2b4d
-EBUILD qtwebsockets-5.15.10.ebuild 583 BLAKE2B cdfa1bf484d7c20be7bb29ceb6ec79c456d34e2de00c610c20d46f85cf36032aaf4b1356c941f8d8869dc4ce4a0a94204fccb5f55bf9049e2fe1132ad27374a3 SHA512 fa62147710d6609d2b650859500f538937edf048d005f3d777b53e1a5361fa95267c558cd009cc209bad18fc2abc91f38be77cbdb5de37b4f05bda24766a6dfe
+EBUILD qtwebsockets-5.15.10.ebuild 579 BLAKE2B d56d90a6fbfa119470e7684c050c1c543b30f1949fe3091159034073c26f1bc05b5fddc95de69903d9550809c7eac846524330d2048dda1a425e88f669ee5ac1 SHA512 42725d19a3a0329e39077a9623af1fc6f334c27426412b51f04a2715bcb47f7b23779334848328ce967d6ba069db32706d97e145e8553fb8dfc22398d055713e
EBUILD qtwebsockets-5.15.9.ebuild 578 BLAKE2B c89a75bff2dc425ed95717e37c667136a5082535d19fd58b341e7da4b210224bf9142da7abbf24130abc4c4e36ee4e5f59eb32505c0be39cf22c8bbdaedd8261 SHA512 b5baa375f6484fd77203b7402fa3e1555a214e6cca44405b44eadf0e201e546026af97675dd01daf8513ddc6a575a4f30a4ed1ba23985cd200058e631d593369
EBUILD qtwebsockets-6.5.1.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
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/Manifest b/dev-qt/qtwebview/Manifest
index 1bbb26aed903..d7d5588b0fe0 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,5 @@
DIST qtwebview-everywhere-opensource-src-5.15.10.tar.xz 136584 BLAKE2B fa3ed8c85c0e3cd0212e524ae37572c1db017add77a8ec73712b746b6002ef88d11aceba879684dcbef91786b09e9d1696720215861d81bd25b8945ed6913ae6 SHA512 258e2146a74083b2a7e48f8875f601df8f6135cdd4bb7c35c3d8b61bec0e5937942e74c36e971565ced9c070e3f1303a3950b7f2a87b148e8abb516bd0ce7a25
DIST qtwebview-everywhere-opensource-src-5.15.9.tar.xz 135696 BLAKE2B 7cf2f1bb8b22290de47db742cd8016dc6fd08687aa6b9d18398452be6df24ac230d0698c7fa5f726895d80c7db91bafa74a666a9d2593e5896f97b238b9ec837 SHA512 15d9b7f446d5b579e596b8e7766fc24380d5f92547186a4de08708f40c1847e690c679312130518470a40a86baea686a38a2a0c237affd13bdc5302e3c313c6f
-EBUILD qtwebview-5.15.10.ebuild 478 BLAKE2B f3e9d3fdd38d4afb10ea5222ba1a6971309e4e21ebd869b0fb673004281bcb1ecf76180af5b84eb56f12b6bfe97cdf0bacc8268e336150e9c2ef54022bc399fe SHA512 d7dbc1cd37b57f41ebdc4aae94852ac65fd25f64a7d48ab51d96af4e43c19484258c5b9eb4fa3ccded8d507fb9f7e9586498238b0e4df6563b89dd23f0b1b98e
+EBUILD qtwebview-5.15.10.ebuild 476 BLAKE2B 139369c684385e33e519c20c26797f018a623fd58a50ef6e2638abf490f06c5317038b2994f0336f0a81d47a05b4c4da23c250e30c186ff2892910f9786d70a9 SHA512 86fc0dd4bf79a5a4572635d2a20ad0cff5746b18d36f9f10a0f430deb0730f456f4dd363516c261fcffcc422e1ac20b844ee201a3ead133069197ac9458b4d7c
EBUILD qtwebview-5.15.9.ebuild 476 BLAKE2B 139369c684385e33e519c20c26797f018a623fd58a50ef6e2638abf490f06c5317038b2994f0336f0a81d47a05b4c4da23c250e30c186ff2892910f9786d70a9 SHA512 86fc0dd4bf79a5a4572635d2a20ad0cff5746b18d36f9f10a0f430deb0730f456f4dd363516c261fcffcc422e1ac20b844ee201a3ead133069197ac9458b4d7c
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtwidgets/Manifest
index 9b5eb0a3ce0d..1ae94f836ebf 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtwidgets-5.15.10-r1.ebuild 1209 BLAKE2B 9beb6e1b10f328248c435930d2a7213e532d992af4e030af2e190699713dad4757d58b3ff10a24982b97b35abd8e77db71b84b50801148bae275e8d13650f318 SHA512 34834b2e88aee9f2c30a9cda226595e64065f3d175567d7f921a13a8b68b763ee89326cda93498adadd11c56066cfac948e4ba1ab4b16b0c2534a1629fd2be65
+EBUILD qtwidgets-5.15.10-r1.ebuild 1205 BLAKE2B d86a45bc13536299a92f3ddce056142a38617238ecb61374a1c11e495116777c249f049fdb24c59c6616e94703b4badc4033008a4733403a68e8242c0e89e67c SHA512 edb17cd8d73f171e4b3fd99a295150d1e42ba715fe3078f31d2b04acd92aa559ee8ab237a0c7df6bec605951866af97548133505b9d98860ec49c9aabefbff71
EBUILD qtwidgets-5.15.9.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d
MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
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/Manifest b/dev-qt/qtx11extras/Manifest
index dcbca8e53bf1..884fe4a24625 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,5 @@
DIST qtx11extras-everywhere-opensource-src-5.15.10.tar.xz 146920 BLAKE2B 2ac056db5c7b0f53095356c42b523ce5ff39afbe0bb8195821d9e7319b375c8daf244a39f18d2fde4baf6958e5e769ea0e425ff07de97918b720eaca033ef631 SHA512 460345ad1fc7812a5bc71c097eb31c37a94acaaf94a79cfbfe3317142b4c515832ce2bf46b9bfcc9c9f669587a76492fb172dd55bfc27ca1570780772438f8b7
DIST qtx11extras-everywhere-opensource-src-5.15.9.tar.xz 146036 BLAKE2B 416bd175cdf750d14f1864ee0c011ae0402c9b02e3dfcd762cba4236284f4aa289ff873eda4ce4e28f08c7b359a0349f9fd4fa6cd8f8c12178aeaf4bbe7192ac SHA512 695e23626f1d3b51fa4d20d0845be749581b0cdf3633598f457cfac4d790e3d52881f5e51e35a95d42f481a73ddc7d50a22d562c65a0bca2a9e586615ab6ec7b
-EBUILD qtx11extras-5.15.10.ebuild 465 BLAKE2B 18644fad729f7e5a032711b9ee7d00d7d888523bfbb7b9f14a88b36857cf3f548d5873b9fb0b65f5f98de321366efedf524475bf3afd2a0160fe186aa9d2965a SHA512 64e7b0a2d54f360cccaba22899d5a4d9b4c2b3243c286e12d849ace935de95d4bc2ec187919620404e880673800260620ef14446056b61fb3d9c679604193b26
+EBUILD qtx11extras-5.15.10.ebuild 461 BLAKE2B 16bdd13f6e8977796c7c423319db7036c703123d63cee856ad3fa310070c59d0bc3a1efdef831b1dd70d9e981c6f4235656ffbcf2467b7a172d13e9bb38477a3 SHA512 f9a28e33a68ef3ae48f973fbc5aa670099375aa05fb259c1c8951b894323efc250c2e0ea81bc795bb3eb9f26232dfe19971d10fa8ef990ee4421290d2cb88dab
EBUILD qtx11extras-5.15.9.ebuild 459 BLAKE2B f1e1f7e45d1d4b3e165855d11539dce6a0cb1c600328bc2630c2311b48075d81e3698b0b3fa44ebea06ff00fa52f7c337f8b54256b344bf2136a09268b6c16a4 SHA512 b06c033f629022a9309d809184905c8cd621c6c5d5e08b87ef5fa3eec4df26555ac8944dc067a61ba96d8a8865bfdd4b73bad0bd43eef71e53efb6a2c0d8c6dc
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtxml/Manifest
index de12b60d3118..a1c964e58d10 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c
DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-EBUILD qtxml-5.15.10.ebuild 531 BLAKE2B 95c7f04a94088f4759dac2d0aea974e84d7c73d48d7b6da8a70c029ad96ed9f0de61a8080f96d04e4645859d3fdaffe58a35780ab4b466384ce5fb4e8877e9a2 SHA512 5fb73143e20260e3c913f4a4183a9313ec3795f98da6f1ee11a2d532ea93b40c44e354da64118d45bc99372da128c0a2e9f5d8dc739f21b747e5163e71ec9eb5
+EBUILD qtxml-5.15.10.ebuild 527 BLAKE2B 08be9dd924bc1e44cb634447c2df1ed18666fb07dc37231e3cd933f2d7dccf322fe358129557f86e4592d912fcdc66cce5fa7732314363359c10a5f5ceef4b49 SHA512 2ad669d9b6f54737bfe4500ed6b023325c0ec73d99e5e5370e065eb8746597185b56ca2d36e16641dc578ad3d683644bab2e111761e8b6a63ec9db7e4c42573e
EBUILD qtxml-5.15.9.ebuild 525 BLAKE2B fbdd6a3735f16c73fd025e8f7fe610011fe8f4fc545ff2ef4e4d3f5f7d1785676eeba17e74bfee2212570d5f09718c4410ebdc0fca10f702c627b032c7b2dbf4 SHA512 e7688982c68d59f6a451df4a56d31bf7748a4f9df1acef67de670d9b3f8eb6ecd0844df99e51d77719144fcdf7ffe9a9ce4b068247756bbcffe45828d8deaea2
MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 44afadf3360f..eedf2d0f1e0f 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,5 @@
DIST qtxmlpatterns-everywhere-opensource-src-5.15.10.tar.xz 5195076 BLAKE2B c342d07265e8b5a8d8337e1f5df7dd8a2e465eaf1d2caba659372431c8984d4310b2d876121baa7f0148cfb1eb6b8534d4f51b8d7915ed6157f236b556d0f983 SHA512 308203fafdd572998563a30b3289002f848c05b6de5a18545dc06489f97aa197c32f37019880b068c152e678ff5254ebe33333b581572811111c45a5ccb4a243
DIST qtxmlpatterns-everywhere-opensource-src-5.15.9.tar.xz 5190900 BLAKE2B 54b13cf0662a11b145b98b0a90dfe52962994f8c5c59ce3f6d09c8654d92e7f0ff0bf4d335810220b896065acab4a28ab016d35fd125c67522a6c9b440291319 SHA512 60cdee139c04dbd2c381f65fcd579af0b2b6f40234870a782c8b7342c8d0caf92fef94acb959260e4ef615b2c60b5527cd44b8efa85f04ceb4a3659a47a0ee89
-EBUILD qtxmlpatterns-5.15.10.ebuild 814 BLAKE2B 4b1235607b99ffdef59eb1657a12461e34428a18a63a535cd77411cc528e7fe0d9b4cfeb4586cfc97a6daa1674f67e37c724d06779597cf6f246669bd4fca901 SHA512 cae90c6c34a508bf2e762d1f4fe2354878ec08f345e43015d906f2dab1d89e2bfe85ca0b746266d9d9e9f1208cb121f788966cc4bd6c28d48fc2494dcdee7c4b
+EBUILD qtxmlpatterns-5.15.10.ebuild 810 BLAKE2B 12838a5ac104c05812ed2ab5a01fee1d5fe1ea4acf2b954277cf733ce914477ffadb4a8abdf3c4afcf61b698336bf17d668d3182b4de1266080a0b85128b7a59 SHA512 3ac0c1d4bad51a450f0d41cfd478d2466d26dce9be2af7e655ad9badcdc5c8a20fceb9bc2cd5577c5f8d5eec7c91c7fdc76fc1c6e688134c4c2e3f0a8510be51
EBUILD qtxmlpatterns-5.15.9.ebuild 808 BLAKE2B ef039715c4b5ce13e0667c1674069fbf650aa588c756a663cec7e589366220f1d8fda1d357deba8b129e3a68f29b42598adbd1708a50d0cad533897090ee8caf SHA512 4697ce50c1ef059088d0448dfa78c1fe93e8a06363e232caa2b32fe49c36dcd014d2585145037ede28c442ece84e1ba6e8114272b509889c4d67116df7da2502
MISC metadata.xml 590 BLAKE2B 2f67cb5fc0572aa19ed1775ac6a1cf2de7aae77141a76f81ad00d9620c0ba4238c1058ed53bd6332f8862f24cb59f3f23984df84d062c295868f3914ad8efb8f SHA512 50bbcf3579ec5613429e2a7c613e41ccd79d04f0ed7bb2e5db1ae22868aea8922f0b3509bc4fe91ab7cbc9ad6b86bb536993638d3562d811203814e64e2ae22b
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 c1dc0a45cb47..3619b4a013a3 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
Binary files differ
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
index 4ddcaeb54992..445c747b66ec 100644
--- a/dev-ruby/sus/Manifest
+++ b/dev-ruby/sus/Manifest
@@ -1,12 +1,6 @@
-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
-EBUILD sus-0.15.2.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
-EBUILD sus-0.16.0.ebuild 835 BLAKE2B 2662afb4c07112b2782efad38e34e82fec9692db383b0d054d188ada82dfe57df1f3f110d6c0ef5a72f186bc24453e30d4b03e089b43e135ab623f191b1f5c59 SHA512 d925b9384705f276d88607117da89d7fe9f149a68478c18ff4d68d771f21e9b4ff10b6e8cb451e485dcc128c97ffc72cf64bb384366c415c9e06480e74be0c26
-EBUILD sus-0.18.0.ebuild 835 BLAKE2B 2662afb4c07112b2782efad38e34e82fec9692db383b0d054d188ada82dfe57df1f3f110d6c0ef5a72f186bc24453e30d4b03e089b43e135ab623f191b1f5c59 SHA512 d925b9384705f276d88607117da89d7fe9f149a68478c18ff4d68d771f21e9b4ff10b6e8cb451e485dcc128c97ffc72cf64bb384366c415c9e06480e74be0c26
EBUILD sus-0.20.3.ebuild 841 BLAKE2B b434aaf09a256d2432d24b439df9fc2116519c4f3a82d0e99491e208a0a39818d916b0b7e4414eaba9a0edbed60585e02469496f0d240424da909c09e13e4dd8 SHA512 7d7f11f1799fca275b4f957d2570fee153ae01b8bf871d93a158511bd3c15a03802b6058994b4cb53cea1e0a63901e51f42fa5db2b9c554dd9fce4075c179de5
EBUILD sus-0.21.0.ebuild 835 BLAKE2B 53b841f3f72e29c3bdf6fe876e7a3fa9e33af958f7888473d0a09dde876910ff08583f044385c0f65796f4fec46b4ee75a5e307535fe88634d611c4de354472f SHA512 b61b6a5611d954fbf6646d61c8b869be7012b755558ac7ef217d5849dc7ba6a863bdb8c33fa2f7580976a1c60170ddfe6033fd834a7eedf40e1472c1348355f0
EBUILD sus-0.21.1.ebuild 834 BLAKE2B ff1b9bcf310292ebdfcdae11eab6952a53aedfde44e60d9df72815c51702788927c21c344e5cf1a7ccbaacc4663576d8992a38ce9418dc9f39e94fa872cc3d9f SHA512 d5d62f380659cf9373221a69f6a6ae83f8a798e7a0478c55d1a2d1cba4eb8c6bc4a3174d5bbab836c7e03d78ca342b857bbd565bf2671b68ae1c8352580e79a3
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/Manifest b/dev-ruby/syslogger/Manifest
index 4f2adaede355..486e9ade7f03 100644
--- a/dev-ruby/syslogger/Manifest
+++ b/dev-ruby/syslogger/Manifest
@@ -1,3 +1,3 @@
DIST syslogger-1.6.6.gem 13824 BLAKE2B c70c8e727ac9f4754a42cd3be27eaa2ad19e5ec61745433a8654fd495736a72b5242242fc663b1d4d995164c42d4ea5bf3a15edeb6711abf6f69663ce6918496 SHA512 23947699de94c6bbca4a7ca4df52e9fb9ad06fa29e29f406255369728971007bb78ec4aa1748fec123658b0202e98dd6500649092456a9f579db30acbe04c42d
-EBUILD syslogger-1.6.6-r2.ebuild 694 BLAKE2B e290a99ac0e5d834d7b8574cc5f1c3aea7d854bc8ddcf2c46de1b277401298d13120c96a71ae800b2ec8b7185fc50772748a27eecf0afe034b247252eaf86879 SHA512 aca4c93c953ba4fe8bb288601c8b98528b6984a2634cb719da78ec3f5a8ebdfa0e37ba599b92f6d15372a9e0183fbf5a00b28e85478b3bcd9bf6371bd69cf697
+EBUILD syslogger-1.6.6-r2.ebuild 694 BLAKE2B 7b85ba735d9a662ed62de63669fc4bf09c28da6c4e7e971e5fe91689b63077c347d3ec873d57080b6cb283cbc18d43a8fe3fa28965433dbd32711f5926cbd8e7 SHA512 936a4d6e43cc91a68df27c1642bbcf67a8fa35808984e89a837914f889d0d25e2c3d462fb9db5816a703f348a620aa563b34d6f674be04f3853fe41fac3eedf2
MISC metadata.xml 342 BLAKE2B b0123049165c54c179063d02f66fed75c8266900322b19c7cc8d1b1d8f9475024f0c49afeb5b1fc08f5d65e07d6998a3129a17dba2c5184035a6a0caa0560d94 SHA512 0bb428624b427f6d37d659ee458a9b9e9ed26e85924069bede22f2242d0b9d90f126bccb712b0af48d4b7655309d9ab73fee00f502be256ee2a81e8fbc82edd4
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 cefaf4d315e3..0f5ab4053b5d 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,7 +1,5 @@
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
EBUILD temple-0.10.0.ebuild 557 BLAKE2B d23c9490c8f2baae1ebd39536a880d7270e7ba1a2ea668cda113ba4f6b4a7201acf0f3cb3df0546987cc76f0f9e71dbdd73a6fa15ef5f49821318c5449e4dbe9 SHA512 a09ea060284d1e937fbafd14255cde74385fb759de18e7175335913388e551fbfd8dde395844f0d30a96d5b0b0b506610066af588788a7a7e6449a25425043b5
EBUILD temple-0.10.2.ebuild 556 BLAKE2B df8906abe0becb0fa120cd010c64c678330f58ec7ab2c601021c7b83f49ef4e0e4c1f4ff03c833504dfac1af551ef14e9424c661a8362cd82479e148720209e8 SHA512 15ea213ad5fb1fc7b28cf001ebf17e6f491c0f16db90df8f9d964fa6bfcc0ed167eba66d67e457f20994a106db23c930b6e7e22243580aa9948969c62e9ee4da
-EBUILD temple-0.9.1.ebuild 543 BLAKE2B d5771179517887c2239156e9492753c645afe3c02de92d1091a834fcf5abcc74f324cbe15bf0702303e3fdffe3e53c4b473ff1e5e2697819a532b62b8febb5de SHA512 f82430124c090bedc5ae74db480902f2c8a643c70533f603b39049682e2461b2bbce32fd254c71766057113f3e7c5df6aadb5280d91241f3979213d8b82dcd68
MISC metadata.xml 341 BLAKE2B bb4b05f83022291b67e3d322192b7deaa8f2c7ef07990014ff3c1cbe82295beb599d649b90971b9ddbf972c1296211e2d829f14efc1d48b2bde6f1164e1ae290 SHA512 a9ab79fa9ff13f53b6634cd86efcf57df5810946275dd12a34fdf8eadac12153743cca92e98dd8ff4bc792f912cb9c72a08abf33a68b5849fe67776937e933c5
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 48cc9bbe5d74..e84d78b271e4 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,5 +1,7 @@
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
EBUILD tilt-2.0.11.ebuild 1326 BLAKE2B cfcca1b12c5a716d9db6fac9ab530299486de446e5da1691a11b1bd4ccc2df79202be529f788134944be2945c87b2f426d1305a0f14e066b09a7d2d8d1e2430d SHA512 60f2b95a57305756de8b3a8b973195a7ef881f0a70840350b95eb6081091d2478d8814c60e6f1b77c3b12c11b141971e491408139a83a3bc933b8252380369b0
EBUILD tilt-2.1.0.ebuild 1330 BLAKE2B a362dc305af6e323cfe43cc3021f5ea992c440d066e95560cfac0eb99f797d423d6a9ac9d981074fabb4b7d2be3c80044223040e6fdac03c2bea23cd84760346 SHA512 e3e8627b4910ba462ba03f25685877d31755424a3fd75f961136ab2b36c18e8fa4b28dbccd40b467883a548e2bf2c53b2c998bb2b08bfad4f2e921cb602fa37e
+EBUILD tilt-2.2.0.ebuild 1366 BLAKE2B b2631a4781e6ae39bfa05bbb7eb1e1d8b1a6a13bc64ed0430ef184bad5468fa15f4892acb8e339364027937b76b8017ef37265fa7da31c43ae3df35fa1390b04 SHA512 1770022a72ca40b70cf2c9220df9c68fe15d5767e024dc9e1f28f12fbba6439ecf0be6c79ba426d6bc4cb972ea7168540bf1c6cffa9b8d0a7330693b0cb8669e
MISC metadata.xml 340 BLAKE2B 5414049365511f348e3da85bf3f207b791dc4269331e6a650f90398b6afe2502e2e62624ec9597a2d55dca4a7e4a99e209837c44bac7a901ec42139518f41647 SHA512 4be8002eca7cc4c0204311dd7dd187caeee3f40db9b00d108fb18e97009f8cec10d298a958bf83d24177297cebd78789cdd546a0c5e9c7288aa697dee1facf71
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-util/Manifest.gz b/dev-util/Manifest.gz
index cc434ac8e36e..9ae431a0a721 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index ced9a6635bdc..3d05ab9a5ecf 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,11 +1,11 @@
-AUX jenkins-bin-r1.confd 849 BLAKE2B 72adf7227153e169cfce5f9c0b273ac5318e7e12cbec983fa32ee03be17fe8530085b82c32608fdd614dedbb3a0f7e24fda78c516fd74eddc2d423c87796467e SHA512 578bfde6ee95d5bf36c335cc27079c3038dd76b4e9f604afd19adea9e6841948a18b5921af9361e47f473ef149091effdc3dac4c6eb0e27f520cc33a9e2b1468
-AUX jenkins-bin-r3.init 1590 BLAKE2B ebf33e8290d660706428987e956ff6de8b78f7c590ce46b6229a381f7d3243fbd0681bcb6deeac42d8c13feb927040a09ac0f0e00eb72ad36b390c246bd124bc SHA512 00689236137f8a272ce723d2017548d925066db71499ecf6921a370dd21da9efea9e6850a64ba3504a985fe7904a55ab988609b5f86f5193b6a4b97a1f90a843
+AUX jenkins-bin-r1.confd 846 BLAKE2B 8ecbab9b974eca823a0039ccf83735648d57604ff8aaa8896b39bfe869eea6cc6837ce22ac2d8d110884c8934aaa558442d537dfe424662d5e5ba13dd17377f0 SHA512 a7c84e33d2b7e6ec2b195fc419715a8486f204dcd10806a9f32fc9133f295b9efbc63abefcac5f2e44d40d2dec04ced3b94a50674fe5066b8e32ee0cde042e20
+AUX jenkins-bin-r3.init 1485 BLAKE2B e15269e812ae1aed54f4aa88d161e182e7e20433832608481a2a29c79f8da9a3f4e9f29204ba6bf9944e54f3cb1662bfda8500a13ba55d97bdcfd5387ad1cf8f SHA512 fff205e58a09d4f2369aba61598e697542b8cf29908382f973ba465b6c32a57686e6389244f2188b0b432d49f3b633fbd616e002656f9e8dd10ad742b3786abc
AUX jenkins-bin-r3.logrotate 188 BLAKE2B 0dc1f24b3f6f709060dcc4d758c4aa7b1555309ba7967873699a16a32da3e4e1eb2270d47e9dbd07833cd6afb9bbc65f2bce7c7345891bf1f4bcd2abb3bc40eb SHA512 f064f8516a7c158fee47a4d1c2a5d2520e88483226139b50e9cff828ccb46c41d01f4e8d4c76e82d1400b8c816edeaed18f0ee82f1a353f43f7bf0e6d987dc0d
AUX jenkins-bin-r4.service 518 BLAKE2B bfd33c8afc8db031903c5d66dd3bba7c77b6b1ea179c91918daa8b03f7437092c948f00836f3382731096af3f3c76990412efb0b3c753d5de54709f0c64588b7 SHA512 330143f3527095cd7cf0cdfdbec0641c5bd6f10b6d62853c887193400162c9a1125de65f0baed9cec9f501d6d966a46c42b66030669c7b9f167808d2fe67f8e7
DIST jenkins-bin-2.401.1.war 98362423 BLAKE2B b1c3853b463a4003ff5d40dc5299ce2ea717fc018adf4b80a241ba6912b3642ebb334681a08b7cb8b7088d3abe37775ed1e3d51feefc5953ce68be15c4482648 SHA512 6150e9b871ba2b0b1366751e9ef3c67a50e129ec091fea3c336325cc1a5c15b1182a3c71ea3092de1ec85e035e0edb97de9c2801654c8e116501cc6f3f7eb077
DIST jenkins-bin-2.401.2.war 98406337 BLAKE2B 58f5b2ddc8883816423f577c1a10f5de256b34d40f7b71d78f1948330187ee76dff02c2afa7754b677a578639e81a0d0af4d7b1210b13f3138bc8467c9c448d0 SHA512 82029df261d823556616198a1f8e9371ef991abf9d6ac08d5582b7c1b97a52c4fd3220012d22b0720c297520fb7083b22e14cda2797e17e23de3d359e6d025b4
DIST jenkins-bin-2.410.war 93652415 BLAKE2B df4bf3939fd785e963b59e2cb6e434e2f89a78c3c3e36001189c9eb6f1a74c6c722a68835e189535f669977cd911f24819e9a015028c51bf6e94b7c6c55f0735 SHA512 61d69190b7fcc28fadbec678f3e0d815e6e5809f7dfdaf3ddff80573589a67d8b84b5487b35a5af16e444bf4876708d3f3e4d254b1432c2e1359ec8f76d2029c
EBUILD jenkins-bin-2.401.1.ebuild 1126 BLAKE2B 8c198605bd0648fbb8f5e9288a5ff9a9f17d9b3a0de2bbb95f0e8425732f9efb7509bdf852e6797b36f3756470a576dd7c24f8001efb4762030316355070cd79 SHA512 edd5aeedc0565fda3ec2e72ad82302e99f4d9c5559ba3216584e40ecf0447fe2f4a92155faefacfea55daa512b85e39e183be257bdcd44d5273638aba1d6a911
-EBUILD jenkins-bin-2.401.2.ebuild 1126 BLAKE2B 8c198605bd0648fbb8f5e9288a5ff9a9f17d9b3a0de2bbb95f0e8425732f9efb7509bdf852e6797b36f3756470a576dd7c24f8001efb4762030316355070cd79 SHA512 edd5aeedc0565fda3ec2e72ad82302e99f4d9c5559ba3216584e40ecf0447fe2f4a92155faefacfea55daa512b85e39e183be257bdcd44d5273638aba1d6a911
-EBUILD jenkins-bin-2.410.ebuild 1119 BLAKE2B 89b7a2fc96aae40f76d164d1b85990afc1bc8d8dbb7fa5a8856646ea3a8bcc3f7417a362fc81b5f3e612b3e7f7a9c1637f17d63980a939a65121c7b82a5e82d0 SHA512 ffa1e674a53db715b38450d7f92c7a65f04b852cb2bd86082f8717a599c8e442372f5309cb05892a4940b04539c3a0324f1117c825def7b76abd61cfd5e4c49d
+EBUILD jenkins-bin-2.401.2.ebuild 1119 BLAKE2B 7234bc114bcd3977367718ab1c26249be50e0717143b4b5694990a9a749656a5ece6bebf7260f12c4fcbc74aee6c05dc902981e8d3e335a307ff9adba6839385 SHA512 75bf75545d99862e411a915da771bc45e6436e6536511c23791d87e76ce4377dc5911cf66f9bca316470bd88cad5fd5ac6c7286008611d6f94303a6f68fba850
+EBUILD jenkins-bin-2.410.ebuild 1113 BLAKE2B 49366c6cba2458efb0bdf491f1c00daa0a222874dd1b59e2dbf932f00e6d3491bc69988a3e471c43a99fb6013d80a41e7dd66dce9930015b8d14b30200d1d9ef SHA512 31b4c802f5900d7b686ca21cc094d42e3c63252476c95f20ce86d00cdb1ca644c286689fb64d6eea1f466e0e4da298a58baa6e088b847a230869eff950937577
MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
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/eclass/Manifest.gz b/eclass/Manifest.gz
index c515ad269817..f29ce0668bdc 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
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/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 724fbfd1d88b..76c72f14b4ca 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 2915e1e2174c..719a421d4524 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,5 @@
DIST graphviz-8.0.5.tar.xz 21426200 BLAKE2B 0b84dd788c2e8ee54941c9093ad8b9208d30bb42f1b6c62afd136ddc4616c2a851ce78b62631ec8023b39bdb861c3aa3ecc89b1804dbd77f56530a1ab8217a5d SHA512 1bcde81cd8bb370e6b843b02eecc96459d7567ff982a2fc4a97b50b43dad45ac2d4d5fb5f5f629562585600256878dd81c7b4c51ab1691cb3b6f4dcc054c7443
+DIST graphviz-8.1.0.tar.xz 21429292 BLAKE2B ed70eb6edf9394409edea252eae3c882d69cac3dba6464f9dfcc33fffbffd7dfdea931efb5e25aab65f027022065757c5cf1bf805f794fd7368da1005dfcfde1 SHA512 56ce357999b7e7c623ec410eb772a98a23be2d7e871c5e6f500ea000d217714b8f6114d35844dac576e2dcb059f74037833e7728b85fc2c8fa67589e716a39e1
EBUILD graphviz-8.0.5.ebuild 6057 BLAKE2B ecc94d020ea95ab7d92d0807801a9a38ff186c208db70399ca1b261971777e032df819446756357ab42dec60848776797b2316cefd446a7844e289b6ba35cc11 SHA512 8c051bf8a9947ffaf62560c084347fa06d437b64d8d60911e7c5509df4d14a21c28254def43f2fbe73f86c80236c5239ce55aa36dcfa28dd4f5f7f156c8adb98
+EBUILD graphviz-8.1.0.ebuild 6066 BLAKE2B d8318a30b004ea67a12fc7ac0e1cec613e92d04b7dbfa462aa05bab2473ab30639915246bcc7beba308055fcf8d9a3963530021595ae91565b6d0185a513060a SHA512 f05ba385ee995833858407959bad314d86bab8c6f8ad637fc009d4b403756dbfcf1c066b2823d7cf22e774994b75c9d428079dbaab5d6847bda6c604681dfd3c
MISC metadata.xml 2324 BLAKE2B 206e5312317fb7bf8f4bba64196a6fa89a8a9e30be3b5e0bf598485cdc2a862e1cc302024b9d170aa6c8ebbbd429ab839d296076bc6f1ac3b154678773cd4d5f SHA512 8eb9a1508823a06fbb180755a7dd173cb2365d7d90e25ad211d56645ee213ee825a991ba56b3f1c8d952c0a7baaa1ea3f8d8d35bdedbffbdce608d66645dd2b0
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 3dc53737c719..48067ff2bc82 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 6ecc2c49299a..1abac20200dc 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -8,6 +8,6 @@ EBUILD dav1d-0.9.2.ebuild 1392 BLAKE2B bfc3a4e00ab29a8492a714e27ae9577ef5fa0963d
EBUILD dav1d-1.0.0.ebuild 1309 BLAKE2B de42f5a7895e34cf5acf6916f1cae3d7cb4837395a250b5bdd695e523dd49e8c1844bec32cc89323360117c35ccbf0f8529a531181f45f991366d17d70a1e8c2 SHA512 4d68269aec8f7b3f5cdca296d2faa1ab13ca3c482cb3aaaaf1e9a74d5cae6491582077bf4a1b886600d917189dad7f4e7f0b8d4111094c8fa4a84db41be46ff2
EBUILD dav1d-1.1.0.ebuild 1321 BLAKE2B b0b6dda3b52dbffb3592e563645c35efca4343a888a242529cd0f18eec1986bbbcc3fd9f12b6e6855fe945122e555a61af3c555abcf04935371589ab5ce8fb0a SHA512 0bafdafc9715e590ed953366700d47df193aecf043d86f4030565de2996cf32436a1613fb2be766ce0c0f0e24bff4c3d3f5b4e5f70f745f84f188040703c69b6
EBUILD dav1d-1.2.0.ebuild 1330 BLAKE2B 19b2fcff6f97bcf0000833a2673e0f5614678e270a843f10915af7d525a78252fc8053ae838db3aaaccd57fd769be634c9e3937bd64ffa86b0c5e36208e1e9dd SHA512 33796b8adcdf2096c45009de0cba1e544eb3d57084050e0b2ef740986f0b6e6e75c1e3efbe227aad60d01e0002368fda1e07b246bd322d4f0aa2b96eec2cefaf
-EBUILD dav1d-1.2.1.ebuild 1350 BLAKE2B 2dfb020177b501a82b88c2761ada5b59bfa941dd2496cc79c0190b2ccd8a6073606883c50f014704c30898c2afc30af684efa4f204872c84154885d417004f11 SHA512 093ec944238b3d069409ee449e09e79cb0c1e4bcd5693bd85d4b36934be840ba3b8dbf24ca820854cb321c071283456f6f36fb433485caae87a3bdd097623b13
+EBUILD dav1d-1.2.1.ebuild 1349 BLAKE2B 3ef4f9c9ff21c800a89e3904f4da4709ae5efa8aa55260f2a5c0851edac77da99e76217e28d2d16a8d1e532a1d0819ed08dd21d9c35e450d689c54c624320757 SHA512 ed1abaf90f5f0f4b74bad1eb2daf2c1122ad37e93223b88c85272f00acf692d0ca76e9590e536918ceb525ebc4e087eef674a86f99c5fec98a6dc0869cb41672
EBUILD dav1d-9999.ebuild 1330 BLAKE2B 19b2fcff6f97bcf0000833a2673e0f5614678e270a843f10915af7d525a78252fc8053ae838db3aaaccd57fd769be634c9e3937bd64ffa86b0c5e36208e1e9dd SHA512 33796b8adcdf2096c45009de0cba1e544eb3d57084050e0b2ef740986f0b6e6e75c1e3efbe227aad60d01e0002368fda1e07b246bd322d4f0aa2b96eec2cefaf
MISC metadata.xml 626 BLAKE2B 517fdb1d54d2714913d8d7644c5cc9d72ad04aa51160ba3b31b9915246c1aba3f18c3870428ce66a5b13afb50e6e65e95f12a65af931baf9b73defa8dba16c82 SHA512 7fca750f4f56a87b44ef4a14c466818411ff8a4aa1a376abb11b41648a661ef77c58611d649daebf97fafc1f5bc712d9486327b8f7ea6d94e1981a1d14bf2fd3
diff --git a/media-libs/dav1d/dav1d-1.2.1.ebuild b/media-libs/dav1d/dav1d-1.2.1.ebuild
index 359b4afeefe7..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-sound/Manifest.gz b/media-sound/Manifest.gz
index 30c03962c86c..9f38481f9356 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
Binary files differ
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 85daaeaea8fe..db89839bb31c 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -28,7 +28,7 @@ DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0
DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
EBUILD mixxx-2.3.3-r1.ebuild 3854 BLAKE2B 3acfe0eab04b4629aee801936e8a7057dbe2ed68e2e1cde34a6d7de93fb1f4e21465971a4e81beae1a5945ff96d984d5775ee71d1780806b2590955239a8b274 SHA512 f6fd7a0b72418d7904433282be559910cb45bb23bf7b32a269ea1fcfdf4e06d9cf728bf8f4b7b33ae700ba000ec1d3666c19e86b2b8775d4f4ac37b4f8d9a11c
-EBUILD mixxx-2.3.5-r1.ebuild 3787 BLAKE2B 8711e24095f55d55b8211edd14fde29991e9edd166b7c5da99a75083099686d9fce7bf780985c3e9d891da249e191647f322aa79510d95d41591c03d2229f389 SHA512 a1b42980ab6d58fabf6e79d8a4b6f43fb6aee7fb684fdf89438b6e6c7904e35a5bfc00650930668f6cccf943ab2bab8ce66aa65e36b667917d6bcc5adc707c9e
+EBUILD mixxx-2.3.5-r1.ebuild 3786 BLAKE2B cfd13b9e0ec845245e086e90895658dd1b4011071525b1166de348bfca7ef45c566d4b5095a81dc44fb264b5ea78e172ba3d173fb5dc61d32cf2dbb28754c2d0 SHA512 6c64e16c7f47237fa1e7ed0577e9060246a7ee453e5b388157b9556a9f53f1381e32e3a7ebef3982a04bef13324edf7c0e20d5999e51214288620285e0980c59
EBUILD mixxx-2.3.9999.ebuild 3686 BLAKE2B a3693db71d5c8c264e008cc0e813d46a887e2e1cc7430a3e47316338710d1a49c8922ebd731fdd32d89ee7b70da2b52639f8348438ca353f52a55177f31810ba SHA512 948003c5a5e08fc001b298a006230621c51dd5dbd51f86c737cf446e4f8d6d8fa8e3474fdfc3538d8480cef4b828d4b1444f338ab025cba50d3162ee62aeb3ff
EBUILD mixxx-9999.ebuild 2829 BLAKE2B f21165282b08bcd40f3a345bf523c3881efc1268634a2a2f19fa387ad946d447f94c2f22300d5ecb2c553461d1b93edcc2e879962cd83bff9da73cb264664cf0 SHA512 eb55e944cda6a0eff9416415c84cff5e1ad6d35b808b19699e852740587f4020f44b1978236e14254cb8e66bfcede63c88e0eb69b611afdb67932886167c1221
MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
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 fb01f45bfc38..d17c9822f910 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 905b71109fe4..e0919ca3495e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,7 +9,7 @@ AUX vlc-9999-configure-lua-version.patch 1840 BLAKE2B 1b9f11c05ed58e12616732c73a
AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f941520b5435f852e0b0e7cdb8763e15df645cdc794087c188fb17ee331be7ba4d953311276583886e3fe0f93d6de32e63e3207 SHA512 93893a0accecc3470f33e505ef2ce86aeb5f2a3a6524adc7de354366bb8e51def2d67957be4ea705ff20c1510e7274691e587e70740d4b3657b35f5c91de7280
AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B 73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d SHA512 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
-EBUILD vlc-3.0.18-r3.ebuild 13603 BLAKE2B b76ca0f87241bb562eb60bb71f1a3cd49fc074e25f11844e7a4cec0347250ed0accbf7e814e860c72974a9aee7d63c0ed482a4ae9c7e39cef31466323589bf9f SHA512 8e1d57c5a708043583b6538ec45c68b4e05bedc5641b8976b221e42dbc36b55be53c3830c16c61496499b66c7ad3b7f349e58d9b22c29ffb643ca66ed5f76881
+EBUILD vlc-3.0.18-r3.ebuild 13600 BLAKE2B 9f5dafa3970b8afd0a8bba9b4cde6f8820026c46da6379ec159fc376691a9190fcd3ae0a812875b4aaea43ea96213f31a398e41934e2ceed97902da672c26e90 SHA512 b61dd918c8571a075a6a09962074de75986a44946c59b9b8018775cfd721462021b82319105032497b38dda494c988d022547a5dbe64defd308e22511a0e27a1
EBUILD vlc-3.0.18.ebuild 13526 BLAKE2B 2b49edb906c471bd08cba2d7d06e2223f7619537301c84e9047edee0faaa8f330881ae2f60013addf133312e4ad7d0ef4c79758ecb05076645f6fff9fd6b32e8 SHA512 a815bea94b0d0f777e318077ee4f32cbac128bf1e67dcf288ddf63c342052bc8b77f60c065cf389d50dccd33cb51bdf1b20f301fa4b50aaac5916f63bc243c8a
EBUILD vlc-3.0.9999.ebuild 13570 BLAKE2B 8148d0bd881f9d679054222fc0fe2272ccfc832e8f4df403b4c8c7ed1150ea019d4051a5b3aead2fc35442ee1bd78f6d74e6973b9bbb4b56ede125ed90b44760 SHA512 6fe9c692d59f9dae4ff1e25f293818d07577be1d26bd6857bfe4b8a23c37f3935229510ca49a62a1856c343de35371a822d8e1ce9eb9d6397053b44f28f26491
EBUILD vlc-9999.ebuild 13428 BLAKE2B 4d357b5258bbcd59a215f4f0bf5c0ca8deeda0b62baa30010d19ed15df8234d7068c536837b542936af030b149c5b4cc67cb56d33b46653ff91f660d74b312ca SHA512 4c490d5bfe7d50915aca7dd07b8b2cc7fe40bcac28b003dee2866b5c6703abf00836f4f136b0c5de8952c5c9556019ac3ad2c0e6184a712ffacfcfa549b53a4a
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 0094d0767907..5226fa62c1f9 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
Binary files differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index bf38ad300d5e..f313886aabba 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Jul 2023 14:39:42 +0000
+Sun, 09 Jul 2023 20:39:39 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 70abb0c9f70a..4680857986c9 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-07-09T14:39:44Z
+TIMESTAMP 2023-07-09T20:39:43Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSqxrBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSrGw9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBm6A/9HGe/dQrMtVXqnGSG6TFg4eJV2oOyh/w9Hih4+h5zHkUUqkgxtguLgmQm
-XoUjc6pgHS+ozV9wKx+ike9cxKw+RL4TcLzOPhMJ3M+KxRYW3JmI/y6tdjnYCx4c
-IvnxCYF56eeRZbTZu97Gnep1bVJwgt94nzs5x9ZoFvx+5CueOxfjUQi+lhCNs47e
-FhmPFyRCvrUclGvVfiW3eJ2MdExDLTmWt9YVTtr9EFS51IiQ1ccUVuH70ttszO+L
-bp8j7QEYoYGuK+qlyPLypGYNY2Jc3RFKbx7DhI/UCpd8SB/VNjjt3o6al6GHY5Y4
-nWtwtnuWCDfai7kHbrhuRT1hoZFjxont0wVa10dXHfSuQ6yAlFL1KllQO2J3cIdC
-6vikPEdOit/WtAm4iCpFfUp04YHEKi9yuheX7Dg8vVDfwBUX1aw2ZcNN90A2V08v
-qLXkgbuYQp3r5IH/QirR6CPH44cZ60v4g5p45wYsReK4A+we7fIyql3M8qV5iI9Z
-o+zaPArbdQVL5TPUfKkTSTDnPcND4bxhHemfEN+D9c36nFYT8hGmHWwOBm8M9sEx
-GobfvInQMxeRc9gTd84JLLgGmUSO5n+1a6L1fIYE7T98RxOvkuZpS72usQGCOJ4X
-VUHQE3jFuC7wpkFuv7IT/i3qffp/PS+roRw8Oz28hkA9QAb8MaU=
-=sDpu
+klBeAQ//Q8Hd7FFWiA5fsuTbFFidbUA4LLA8zoS0WV9GQdDtA6gVnwD0JshKesmB
+MRCuVWDd2Pa51R6syukhOoZ3myQCrxEOZ6wIIc+8dX+Ma+pAwTAHkB+KJySFVFBi
+/oMrOKTNpICUrnPzXgGPngzvAU239/ImUsEKE6tPFy/HtjYH0wXhsaAklgeLz30t
+ixH94/cg29FbOxDEcRXaC/2CK/bqIzXkfjtrrlSJkOUWm9oFM45IFYuM3jaIZryn
+D4dhUdz1AxZ5Bbu+R4DN99ImcAEub+TrTdYlIziWyxfUWjHu0C4Bdw1NLnTv0Zjp
+4bs3RPARafyLQZ8h4hrSnRvTN1isW1cYFgtRLdNwA8Dq9X7cptc4twSzswbOL/qb
+ZkbDsQWE1QxbgTpxSfl6YXO0hr2VjltbMmgDo7xZyV8vqqrLa3okXrBShvdS7u9t
+M86gRLhtP/WOizBwg8n1vRkzKW+3ub2Tqv4jsGzILjSrK3Aq3bheM8to/QjLCxw7
+XEJ2159NMiow9wYLuHjpjzj58EoYHp8pe8LiDC6oK0+HDTbDA7pzjod3wieoH7EQ
+3xiFVwlGMqc+z4M9XB2QN5J2b0JNg2p52EelMoJn1gnjgi8Qa0HnQS5hFbk+sz91
+6SYEko923ju+XvLlCX8UxH6VYHLzhgXz3aWOlOwm4ucRf7Hjw8k=
+=zTu9
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index bf38ad300d5e..f313886aabba 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Jul 2023 14:39:42 +0000
+Sun, 09 Jul 2023 20:39:39 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8ec300d22b8a..2db23fec43f1 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 8a7a84a71e8a..864c3dc7bccc 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
Binary files 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
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
Binary files 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-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 24793c70b054..3160018e8def 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
Binary files 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-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index f857059f5dbe..fd2de1653276 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
Binary files 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/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c7d18a33388c..0b33b2ae5c74 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
Binary files 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 c45f6491b4c4..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_=5ee5aab8a22a5327dc6a5b0d7a5c5f9d
+_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 3455a9e1ce01..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_=7243f337699a9ee59c66652b70396b90
+_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 b65ff22ea9a2..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_=837ad9c54498c16f859c6a99b01e733b
+_md5_=183306c84cc0bcbb271905e36b5b6626
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 22cbc0ff9371..ee485f36b41c 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
Binary files differ
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-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 0926abca0fe6..550d85bfe7f1 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
Binary files differ
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.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/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f156282b26e5..11ae244cd5de 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
Binary files differ
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/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/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-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/cryptography-41.0.1 b/metadata/md5-cache/dev-python/cryptography-41.0.1
index 67a28816cb1f..a8f96dac2874 100644
--- a/metadata/md5-cache/dev-python/cryptography-41.0.1
+++ b/metadata/md5-cache/dev-python/cryptography-41.0.1
@@ -6,7 +6,7 @@ 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
+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 )
@@ -14,4 +14,4 @@ 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
+_md5_=130cb9cb2e969af10b7e3225fe1b54bc
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-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.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/eradicate-2.3.0 b/metadata/md5-cache/dev-python/eradicate-2.3.0
index 49845a7aee72..cbc4c54ff4c9 100644
--- a/metadata/md5-cache/dev-python/eradicate-2.3.0
+++ b/metadata/md5-cache/dev-python/eradicate-2.3.0
@@ -5,7 +5,7 @@ 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
+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 )
@@ -13,4 +13,4 @@ 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
_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_=7a6701c8d1af8c6cf4a3c58d2ee1bdd4
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/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.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-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/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-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-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/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-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/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-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.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.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/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/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.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/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.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/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.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.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-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/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-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.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/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.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
index eb29c2c37fb7..0c4737f40357 100644
--- a/metadata/md5-cache/dev-python/rpds-py-0.8.10
+++ b/metadata/md5-cache/dev-python/rpds-py-0.8.10
@@ -6,7 +6,7 @@ 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 ~arm64 ~riscv
+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 )
@@ -14,4 +14,4 @@ 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_=7bcef29c7dec275b041047d2633b5c89
+_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.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/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-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-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.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.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-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-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.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-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.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.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-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-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-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-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.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-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_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.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.23.1 b/metadata/md5-cache/dev-python/virtualenv-20.23.1
index c2238060bc1d..fff0d18e7887 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 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_=632c091332766c78d1ba9822d2a4158a
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.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..e68b02a92a56 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_=3dbc8977da099aec3279199c0d24d44a
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 6076c709b44a..a0d646d3ea0f 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.10 b/metadata/md5-cache/dev-qt/assistant-5.15.10
index d63d8bc5ecc6..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5 xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=d86d59781ecde6260d0df5c5a174e499
+_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 7f4ecc7427e2..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5 xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=e9c0714ef5111adba2e08a851720497d
+_md5_=011ada4deba068d17b48ecf2e99329bc
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.10 b/metadata/md5-cache/dev-qt/linguist-5.15.10
index bd459fa19fdd..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5 xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=8a740edd19bd1529042ea172de9a56ad
+_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 cc04a2383bb0..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=39a5ecddc35cf9c89c10ddc1b2e4d081
+_md5_=e19a9272093df368ee6c15e54fb09cd4
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.10 b/metadata/md5-cache/dev-qt/pixeltool-5.15.10
index 06776d77a585..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=8f91f400ac394370a035b4afbed9a2f2
+_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 56f551ee8860..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=c01d997ae1086c07425cf18cbcfefe0a
+_md5_=22206e844dd151f4a5668d9ac8cd7e5a
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10
index a94cbf265e6e..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5 xdg-utils baea6080dd821f5562d715887954c9d3
-_md5_=399b0af45014373a4edc78b925c11ca3
+_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 9e2787520866..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=e0aed67f843d04721f8b8e3e18e7994f
+_md5_=847236a2fca9f6a6277cf671fb1162c5
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.10 b/metadata/md5-cache/dev-qt/qt3d-5.15.10
index 73f1afab6f0e..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=190840849ee66cc159c793053980d3e0
+_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 d7658dac5588..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=c65b7419d350a02219e526e59ec0ee9b
+_md5_=a1276afe67db5cb677b8475a1c6a4c5c
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.10 b/metadata/md5-cache/dev-qt/qtcharts-5.15.10
index 4c8b800d7a3c..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=8e1ac51b99f084dd9e70a6d8a3674025
+_md5_=14a9252918136c30f0ecbc479fcc877d
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10
index 7a61ba1cf258..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=1256adb2e70cda66e60a9bdf4c4d44ef
+_md5_=b22e0e0bad533c98183d2cc93b2deb0a
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.10 b/metadata/md5-cache/dev-qt/qtcore-5.15.10
index 0db0cd0aec1d..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=72ac1345c2bd2315362a8c5ec2a2cd73
+_md5_=3c0928b569f09f350e7a04de9fdf90e8
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10
index e85d61f7bdaf..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=ee74276a815bde9922938e6141d9aa5c
+_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 d49eaa834555..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=db32f12594938ad50e2ecb6214c6accf
+_md5_=48b1b64070f0fa29db4df0e5939fc7b6
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 facac79d0b5f..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=a12804bf309496d46498747f42c93ace
+_md5_=6ca8bbb1ad48d9ad819361127360b335
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.10 b/metadata/md5-cache/dev-qt/qtdiag-5.15.10
index 125895d22091..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=f34dbb783c562db1e61e61c28e7b9943
+_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 56fa706e900c..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=6751c280375e61f0988de2f9fa74b630
+_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 f9a6524b6e0e..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=e76a27c74205a621daf2051ac93d1fe4
+_md5_=ec050b1e58cdf22ae73dbaf36ae9f1a1
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.10 b/metadata/md5-cache/dev-qt/qtgui-5.15.10
index 2044729baef2..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 )
@@ -15,4 +15,4 @@ 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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=d8bbcf5b6f33128ae5caf1e2f48106cf
+_md5_=376f3678c856859f610b2b901329ee49
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.10 b/metadata/md5-cache/dev-qt/qthelp-5.15.10
index 7b6b41da627e..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=ce1e8c1a7a1f78982d0ec62bd28873ec
+_md5_=10fe6268d73c0ea4549dd6a12eb965b8
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.10 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.10
index 69c8131e0214..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=93d2e234d374a017bfcc45375c11522b
+_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 702d36294b93..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=eb526639bb6158f3dd1b0bfde62b0d13
+_md5_=7fa92ef6a25245abcb11ceb2a3c1c9dc
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10
index 32a28440fa44..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=0c49bd2ad9668e1477123376c3e31c65
+_md5_=806fad83c23afc2a5c1e024e105f3379
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 c68175411c00..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=de98f964cff98de00605151daa4fd0bd
+_md5_=b878feecc606e805793cd999f3cbecd3
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10
index 3130f271f964..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=27840167f3f78313f0b2fdf1721da3f7
+_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 3268cc939f51..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=03efc5503e6d6fcb0646e60198e7ccaf
+_md5_=928f02b82d5ee3ad8dd7e3ad3d0cda0f
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.10 b/metadata/md5-cache/dev-qt/qtpaths-5.15.10
index 8c93e9b538b3..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=98422e486f780febee0fe34f27f81586
+_md5_=0a5552d1c15cbd0dabcaf87cd1370d2f
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.10 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
index c03880bb83a4..64c332a1d3d6 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
@@ -6,7 +6,7 @@ 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* )
@@ -14,4 +14,4 @@ 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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=07552b6ef2b4e5a1d17a86cb85195547
+_md5_=d5c821bc3568e357c2d1ed00cfbb084f
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10
index 7545743217e0..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=4199c357e4b46c1a7f33d63fad5e8a8c
+_md5_=b04d3cb066a9e03ec0d94fa345019111
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10
index 745eb7c856c2..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=3bc465c2529424d4526c24dcb583dc78
+_md5_=ffad4ed63b3add334b197eefcda2b9d5
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10
index 007e21eef1a6..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=cbfcafc19a75713cc0ee97e254a0234f
+_md5_=67cf7102d72001b377b8364054c88962
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.10 b/metadata/md5-cache/dev-qt/qtscript-5.15.10
index 6f1f4b06b5ff..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=3dc7bdd0bf3478c7cd58f72626fc2f58
+_md5_=09cc9bcf79055c165d198fc7eafcc32c
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.10 b/metadata/md5-cache/dev-qt/qtscxml-5.15.10
index bfece3bfca86..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=baf1853ae6e9c77a5103860c8de90be0
+_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 2ec858ce218d..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=335fa425c647d7a0d19ef3140726de99
+_md5_=8fc4069e55ce4e77aefa35974da6cbba
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.10 b/metadata/md5-cache/dev-qt/qtserialport-5.15.10
index 38fa15ff6169..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=30b1bd81318884ff99ab6ebc33964c34
+_md5_=15dd667d57a59844148a752d22f5cb4c
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.10 b/metadata/md5-cache/dev-qt/qtspeech-5.15.10
index 60a39897a31f..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=087aac1d05feb20413bc0ae9301decbf
+_md5_=cc63202e32b0a95e7d26035a2e22a10a
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.10 b/metadata/md5-cache/dev-qt/qtsql-5.15.10
index 97e154482d3d..f20744c69442 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtsql-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=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 )
@@ -14,4 +14,4 @@ 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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=98b047dfc3640fdbbab311e3176996f9
+_md5_=e639af51c148570448757a72fe90dd47
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.10 b/metadata/md5-cache/dev-qt/qtsvg-5.15.10
index 461d9b39fab5..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=25290ed7a5b8c3897aae1f0aa27082e8
+_md5_=8f3a0a40f827753cd2fa593eedc1382d
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.10 b/metadata/md5-cache/dev-qt/qttest-5.15.10
index cdce57093859..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=33997db537d70022334652757a336712
+_md5_=ebe2a196f51bbbf825b29b5557c06585
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.10 b/metadata/md5-cache/dev-qt/qttranslations-5.15.10
index 242ea6a7c719..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=67497341c3a6007941c424a5042e96c0
+_md5_=454a9c5991008e49b2426cf0df640123
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10
index d913057247f3..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=6650804b3bc0cb0b3cdc15fa4234f516
+_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 f1c087d923d3..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=54b48e014dc1c4bf4bd61df54eea2c9f
+_md5_=e73990c924ea1ed8b8c3d04e56f8ade0
diff --git a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10 b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10
index 0271995ad12d..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=bec03d88137ad4526df2dff4e7f8aa6a
+_md5_=759ff9590db719c9209ef86211f5664c
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10
index f20fc7318ece..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=0d1f69d6336ee2584f048d11b4344496
+_md5_=a4fcdd75d99a785197cd14f1c8ce4ee3
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 6aae33029342..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,7 +6,7 @@ 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 )
@@ -14,4 +14,4 @@ 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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=fd23b3d5859639ba673bbe8d1dba7d6d
+_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 140137a39397..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=196474422fcb4b6f77d9aa07c4f32541
+_md5_=099897f7b2d577f7b8af095fc3b20fa0
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.10 b/metadata/md5-cache/dev-qt/qtwebview-5.15.10
index a7efab13694a..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=fe2de0641f096b7243b3a935d65e1991
+_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 d2e38423b67d..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,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=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 )
@@ -14,4 +14,4 @@ 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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=d742ee379f79ad2497e479f931acc3e5
+_md5_=eaca4436983393762e05cc78a5767d53
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.10 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.10
index 3faa1f7ca971..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=f8cec7bd99d1ee62de62605a3795ffb3
+_md5_=0c90e8b5eca510c45f0cecff7b04f2a3
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.10 b/metadata/md5-cache/dev-qt/qtxml-5.15.10
index 4ea39fb9e266..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=7662d102d163b38f29d83604e7ac3ae5
+_md5_=592ed6b2d504245488616a158f3777e2
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10
index 63f46f717109..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 e6315b433ff1f5a5778a08518785ba91 toolchain-funcs 513c31b3346458ed1f3878b57da6d61c virtualx 817571665ee28575da44ee08135089e5
-_md5_=1fb9ef71166de47d7347d15a43ae11f9
+_md5_=9c39006e26a7917831b494698f960bb8
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6181b80c93ca..10fdf37d1ed5 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
Binary files differ
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-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4d85608888fd..8ef6853803be 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
Binary files differ
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/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 0e1afd731ea1..cd7614bbe1ff 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
Binary files 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 cb667f86f447..828e0726dfc2 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-libs/dav1d-1.2.1 b/metadata/md5-cache/media-libs/dav1d-1.2.1
index 55b980dce3e4..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_=8c9e833836774e6b629a930eaf820491
+_md5_=c8708a18ff89631e25e2b325262af1fc
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 11887ee7ce61..18ad8137dded 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
Binary files 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 839b93246c03..60f392a98f6b 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
Binary files differ
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
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
Binary files 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 310c3b072702..5ff7b35db3e3 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
Binary files differ
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 624527126231..4b75794bede9 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
Binary files differ
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/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
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
Binary files 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-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 85e144f0dc0f..fb585ead28e4 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
Binary files 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 9c002823cc0e..a4080c06e23c 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-misc/iperf-3.14 b/metadata/md5-cache/net-misc/iperf-3.14
index 516c1fcc24cd..f589b78e5b42 100644
--- a/metadata/md5-cache/net-misc/iperf-3.14
+++ b/metadata/md5-cache/net-misc/iperf-3.14
@@ -6,10 +6,10 @@ 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
+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_=28682972969263499af2006f3814c81e
+_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 cc32a6999bbc..568a47bf092c 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-print/cups-2.4.6 b/metadata/md5-cache/net-print/cups-2.4.6
index 91fa58cef388..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_=8c2f2cb21959df797a2ae01f45d43862
+_md5_=d5ca3675073a36cb8f40c9db1fcbfd4d
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index aa2f2958ec71..3ad2a34dafd1 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
Binary files 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..09943588447a
--- /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_=d0823db579b204d4fec4fb815bade85b
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-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index aca318658aa8..5166aae09467 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
Binary files 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-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 42eaf65676fe..48f840a3eb6d 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
Binary files 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 9e96ffba2e5f..5c9c9570a6ec 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
Binary files differ
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-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 4b97a23c45d1..64217bb089af 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
Binary files 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-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index e9aabc9bc3a1..71a9de7fce35 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
Binary files 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/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 9b869c49e290..c8d371c76bac 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
Binary files 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/Manifest b/metadata/news/Manifest
index 65f23ce09bc3..045233966770 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-07-09T14:39:44Z
+TIMESTAMP 2023-07-09T20:39:43Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSqxrBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSrGw9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWIQ/6A1t/m0Dfk7kNdfPBVOm94JFj2Tk42SocsP76gyqLgLhOSAK+CwOkSl3B
-bS13lxiG/tdGlqrzKmF5rZhWaPZAsvzzxYeqJGydEZr4fl/+7iz2uNO/XJ6K6mF+
-A7zd5LeZSofz0DeV324QiH3o0L8Tey9ozzW7pZGXxOVIbB+30OQO+6k+KCvxIdR8
-iHmSsxmbLiqqNrTHGDVJC07WMXBgzs2em+6vqUDK8hLcYeukwxjrk09muCDvJH7s
-ObP3KWP8/L6lTv+8uSsrtKvwPbdr240g7t14thnbL+EVqugg03/Dag9O30jljrL7
-hvnI/0Rh2iH/8zm/z/yhr8HlezjKxq076Xyqa6tPkVAnV8PbP8zGqgDqH2KdOQGf
-ZVSW/DwvLzuANTR5KCHEajplVbecvbB0g+1RZi9WW5GFQUQhFDJsaq5aYof0mnym
-0YUOmuNs5zNn1ayQEQzBi8LIap1L3d/OCs1Q3CJxpsQ2V+zYDrYiv1Ru7OBxOLk9
-MT849fJcTS0B76FIbXHT2zEs25uKG3YWOeYr70ZyGiIeeJC267qSd4BgHhxl/fz0
-WjdxwcAEpZ6qo50NH6z24GJS+diR9RJpC5Xriq5yvcGOAVVNAXWOGXvAhx3xAG1g
-db4HnTgyWmVmESwfUtSgyBLVFweYmFVMFQqbr+40w7nY4+On6KI=
-=0BIg
+klApsQ//ZIfs71mFCCpQvFqIChxZi4OaPIVQNuC/ozqPsdW+h5NLOeWb+UcxI8Ow
+Vf34GUx2gDC/QreIfbWOU0gszcTuHzb4WmtF9uTEHqN7lPGsyfhnmqXj2FqtR2H4
+FEYMR42qTD9EgYOm7U5CrWrDR0YnT1DEJ4JisbPUdSbMEdyczVWAPCCjxESIZsm7
+N1hk82pDlhhEwmwsyxEIwSqUCFmdhODzgiu9+qAY+9Yw5OiDPiLdgnU1f9AmD6/o
+3XAmMB2lZMczql47XTdf3utm0c0/K90akEN3Gz6Eb3a7jEs9neRldnfBIgWu+qsd
+usP4IXzZagArGao6op8/6Dd22R+3UFCxcLermnvvlkKQLgZxKJE6kAJjvAWDzMow
+kBgZcOJlTiI9rIqQ+DtWg9JmklWap09pT3p7/of9rmPZZ4njFTL2cNI/d1zpBMoO
+Yxe1BRdsYlAloIgwD16tuS756sE2hXqydiEzBFEtdQbtkSza6zieDqiNSTpYpUEA
+GGnWWC4qYB02BjunkdJJNnwR37p/gLl6aCgyzAZ3al781O3VJ+1C5vB4dhAPZkN7
+ZqbfrgBCwYPdA+a0nTuBOtcv4EjSf3sQJ/L9Jem8wwnLQFer8UZWFA7MuX3bf1eC
+tiNTshfPNlY1+ozcKkGkO//VIfNEb1TdTrfV31cPZL0kSh6Fvgc=
+=YFIK
-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bf38ad300d5e..f313886aabba 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Jul 2023 14:39:42 +0000
+Sun, 09 Jul 2023 20:39:39 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 873122a6f744..d052b756e164 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jul 9 02:39:42 PM UTC 2023
+Sun Jul 9 08:39:39 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7aec19899a06..36b6b70a687e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Jul 2023 14:45:01 +0000
+Sun, 09 Jul 2023 20:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d8fca5bdd173..5c2eb5b5f274 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-50de3b8796725a4b6dd952f12fe1cc2a1c953134 1688907804 2023-07-09T13:03:24+00:00
+7dec1b581da6fb8755ce2fcf466d8de88fd45b84 1688934336 2023-07-09T20:25:36+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index dd25016e5927..a47851c44a81 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1688913602 Sun 09 Jul 2023 02:40:02 PM UTC
+1688935201 Sun 09 Jul 2023 08:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index bf38ad300d5e..f313886aabba 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 09 Jul 2023 14:39:42 +0000
+Sun, 09 Jul 2023 20:39:39 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a90240e760c4..212328a59501 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 626437fbe349..602d4174749a 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -25,5 +25,6 @@ DIST munin-remove-Date-Manip-DM5.patch 3587 BLAKE2B fab1fb61607e83aac5cbd699c930
EBUILD munin-2.0.67-r7.ebuild 12210 BLAKE2B 617c37895b988f782b173b273e9eb5a2ef99fffc1b13a9b0d2981f5366def49df9d26214109842f2e79e121197ec544c46edd0894ca6a781596a8011533ffa8e SHA512 341f59ef4d2956cf2543862eeca71b696766a2e03189d650d1f2ff492ce53f5b92116ad93ce5890aa9b14714b6eda29b5d6c682cd7ecc1820f4f16b572d14ad0
EBUILD munin-2.0.69-r1.ebuild 12568 BLAKE2B af5b2c07a81c6c1cf733fb3200aa69a81f1c7ec4b7dbdee6b1665d1070c18e9983d7a6adbd01c84c21cfa5f978fc34cec3aff1eb0b394da994e72b02e3c683e9 SHA512 66efe60daf5edfcb2d3198e0f398a01d5a68f31143b5b9723d43cf00ccf8256aa12c9e29ee57bb8fc742ee53332c1a671cd470c655d505b4e5bae16c2d0a86a2
EBUILD munin-2.0.69.ebuild 12215 BLAKE2B 080a68bac7fad148d6205272ed093b2887ceae393ca495edd352506b5f9bc05cd10c77bbf3cc380d2159ef781a872c600130802e5c831861a599d9fcfbb3d81d SHA512 5fcb50e15646f957937ea16238c723145eb6a4a92a72deb539e30c735f5dc6030391e92c86beb85d5b12753bf5a0fee51685625830f6cbbdd7bb0d86c09619a4
+EBUILD munin-2.0.73-r1.ebuild 12274 BLAKE2B 2002080dad8728b31ddb3c32dea575bb7a7d04b60b6a736d77ee196b35de318aa6f7e13c925abfc083d8e2db10993e4fe6966a8ef8c1aa9282654252f625b071 SHA512 6d1f6c3932790ca1020fd0fbc573cdef3a0c9797e90ea5e714e384b06c5a758f263235a3981559f07b84445cb6c98a4f1f17fd5b10c20fdd2fa7fb574a5cbf52
EBUILD munin-2.0.73.ebuild 12147 BLAKE2B f6ca54234cec7e66ca0faac3e9f299827b16b613ec30010fd464a837e057d68e7256d7958e9f44437f7aebb3b0a35ec9730c07385cb451b29d8d6cf5f2e96ab0 SHA512 c5ab32698a3d10c52e9232c90042b0797e2cf43b34dff5a6f98de4fec3282b43db9422de54fb570f645cbe54a077601eb2bce2f1edf5d9d3c5f13c0ee66b3d5b
MISC metadata.xml 3933 BLAKE2B e13958d477a85e5f2327ffb529567dc129e6531a114b304d930399fe9cb81e6581f1df9d884860294984580c5b3e4335dfb623fca85e18e1de818430476eacfb SHA512 f824ef7f1a950ab81c4e3f2e81f44c6b3a49dc56a4aab977fad14e5d757875f8cb4900d8cd528c16449fafc8d08ab3792be8dc5a2a820932add7ce03ca35102c
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-dns/Manifest.gz b/net-dns/Manifest.gz
index 568ad48acbf8..55356916819f 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
Binary files differ
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 411fdc3b0af3..0f40c2497cfc 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -4,7 +4,9 @@ AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad335726
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
EBUILD pdns-4.7.3.ebuild 4522 BLAKE2B 7039db58b03dfac26327a2a360eedcfbd2f87bb09fbe1e2e09ce0449909ea72e9931b1dd66d09cd1deaab4f55f91c1afef35466f8c7f1adbca3bd4da13f5fe20 SHA512 1211981597b1d033c81c14793682630bd3682fc928c35427bb9cf18265974eaee9fbcc26275d803d6f583ca54333a4df29fbdd4caf1ffb075c68d92ef518bb4a
EBUILD pdns-4.7.4.ebuild 4476 BLAKE2B c8821e5893510b20788070f86dd039b08cdc5483ae5358a0477538c6bcf2f9e2a46d6ca0e9abbebe72b46a9112c8b2ecfdb51c40b881a4b850cfa756c56c7381 SHA512 fc1a08db1b2f584f1bb2c0a276f79bc9fda97e34145a516333fa83d95d3b44067adb9fab3318e3ef80b4f12c133b9f5659ce867760149861ec42544df9da31ef
EBUILD pdns-4.8.0.ebuild 4384 BLAKE2B bb4a5472b3d3865567dc25f47bcc3b93e677c97af09308b72c9078493e2a1e4186bfaac726fd982820cb908a65aa92c921c49611e9913f485afcea09f9254c53 SHA512 df6497435a55ed40b753ffe517bcdfee8e4ad51d71db8c57312f8aa8e16527a1eb4ac5c0ed0bfa7d997ff6946ae07b89e5d17c5d30e11687583ac4d880523897
+EBUILD pdns-4.8.1.ebuild 4384 BLAKE2B bb4a5472b3d3865567dc25f47bcc3b93e677c97af09308b72c9078493e2a1e4186bfaac726fd982820cb908a65aa92c921c49611e9913f485afcea09f9254c53 SHA512 df6497435a55ed40b753ffe517bcdfee8e4ad51d71db8c57312f8aa8e16527a1eb4ac5c0ed0bfa7d997ff6946ae07b89e5d17c5d30e11687583ac4d880523897
MISC metadata.xml 951 BLAKE2B 37f168bd4a7db2c11c6da9d5a07abc506c5b7115f10512b0e500cb3c3ea64758cd44d4222b2d750be3a731e8a6d12dee922f829ee5beb11eb1bd5c01f0827af1 SHA512 70612d620009416b680dc442cc0cfe7ea903f87a27f9b2e76fe77ad14eb1428f5a0133eb9e393bd286f404a755246250feeb5f5da63772aa2be2c5db4bc11ee9
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-misc/Manifest.gz b/net-misc/Manifest.gz
index 5f71f649186c..87b3ec3e5ec3 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 237c6b0fedab..3eb6697d7506 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -12,5 +12,5 @@ DIST iperf-3.14.tar.gz 650626 BLAKE2B 3809689964721ec2f58d29985c1767bc12473f9b65
EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B 48a3db3ec6b41bad2abef2854e694949a1e14cb71c01b52de2ca28149c9430a9b052f70959b1eb0630ca6ee6460dd54e0e0420a65892e6a86eb3e67875b673b0 SHA512 cd0241a86c550a18572042151c402913ec5e362611580b7a70de5b38c6664c3398f06258be706d311704046f4add0b868a81f913c7afd1d06622307fdc215913
EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7
EBUILD iperf-3.13.ebuild 1144 BLAKE2B a8dd65ba919a755de98b36345eda0b394195d7c898cce1a45a72b94681ed065d465ba5cd49b4002c759f16fdc6bd15ab1b3afa0a875aa86ef8b1336f96f011fa SHA512 cc05d282e01ddb988bba00d41deb347c4e34434bb808783b35e96e65960e64e944338bca5374afc828e2d4e8f8eae19c7a01c4dd770177f14de1168000c98ff7
-EBUILD iperf-3.14.ebuild 1148 BLAKE2B a3bd0bbaaa034d960a9cd54093caeba357bddb6f6a4b17165975b29cdca6ed83a1395be3d3025ab465a1567642e570fe470f95564ad604890597f4fa421153bd SHA512 c8651bb85cda13c8c42fa1e2f5cfd3cd4d54d8c78b21aa75ae05e5bc238877bc1aa7d9739e36695b72b430a483c3e130e7234e41345a87a4dde6db306a601d67
+EBUILD iperf-3.14.ebuild 1145 BLAKE2B 1b04c8ad7cb1916e156a4c2aa8380eea651e67c26ee0a7d4919bc55985c494d61bc996aa1756369086ebf3d8709f28590115888b8d50917f5799b82557c09729 SHA512 a253674fccd957f1ce34497abc6fba559f8fa57afdc6563f3d00ffde2fee981959d28d6e05e02ba526dfd8f59fded8e6ed53a9663877d9956fa150e0c2e24208
MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/iperf-3.14.ebuild b/net-misc/iperf/iperf-3.14.ebuild
index 9b15e102c4c1..bac1a8c31e7d 100644
--- a/net-misc/iperf/iperf-3.14.ebuild
+++ b/net-misc/iperf/iperf-3.14.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="sctp"
DEPEND="
diff --git a/net-misc/lyricwikia/Manifest b/net-misc/lyricwikia/Manifest
index 23712d550f6d..6560e37445b6 100644
--- a/net-misc/lyricwikia/Manifest
+++ b/net-misc/lyricwikia/Manifest
@@ -1,4 +1,5 @@
AUX lyricwikia-0.1.11-skip-online-test.patch 506 BLAKE2B 92bf9826dd35d483fdabae057884e36847e2be273e668adae281962ec26ec05338b5fe53debb01655136af6a1325a20d043f023e756ee674c876c40d08095915 SHA512 6bb6d2960c39bee05e1d5b3a01656d78bce4fe07038758029274cf7e4d8495a29ffd2b79a7f3e02902a5e73fce03b505d1fed48a75e3681ab004a95cd6466416
DIST lyricwikia-0.1.11.tar.gz 5571 BLAKE2B 1e2fb5400b4c0ed07d419e577e3c12c6b8eca749ce1a5b7dea51d6d055979722b82d003eac20402da873d3011d1b444c0783935adbc01ec99dd6079b234e6bc7 SHA512 53ff9a2837ccc10be62c2a92240e9849a9c88b7979f8058deff87ce6eda6e98e39fb86c78052de9a885db679cd87a6c5749af2f9502d3316fbbf2c0796718805
EBUILD lyricwikia-0.1.11-r1.ebuild 1319 BLAKE2B 88b2507dd610d72229663cbb154f75882237909a009be8aa33195bcb5b92214bfae169a0420d164b1bb0f386f97c635fc63a39cd11cc4218556673ab1bf94244 SHA512 358906eba20db0ff3bbda15496d77a638947eb8f78902fc386798c9cb42e48037e3673a6606d90b506f1562df7e8aa8d64ed1d6df7f0c7e502c21e9ec94e2dbc
-MISC metadata.xml 284 BLAKE2B 6ea63280a95dc3b6ebb3a35ce1f2de07164e12774246db1f4117fa0d70dbd903633a24240fa1475a93b87610068c84cb52360037cd8d1dad231b1738e6bfcca2 SHA512 53b66619d17399f0d78bcc6586d0cbed9edc88d0f815822b1bd55dd3dcf85b4c0fae6bb377a060d1a188016eaac9af14e0eb7003aae47a74ce4ac14839cfc07f
+EBUILD lyricwikia-0.1.11-r2.ebuild 1350 BLAKE2B 754185ce161f5ecfad79ef6878e60d8630ee207b22dae048146a7866a30ea1841cacd582d870eb8a23afbdd321482db10ed542b0412c96a6bf01b61ebe05998b SHA512 39fb244209f3876fc37a7bb560d5a8e44fd0a34b256023eece44608938b302ef3249cfaef850480d89a41805f2c3ed3f446a31f44e49889bcfd05a8b9de6fc9d
+MISC metadata.xml 371 BLAKE2B 1c361d1b40b41a7ff164b8edbfbe2629b8145c39a33a05d601281ec23b8a02d866f502e5e2660544e209191373970a1b99d86ded2ecdc2f923779d5df9772820 SHA512 808b26a8659941b6dddb268cbfcd09604335a0172fc8df2e5dc0d123c9903fd9b67e7bf3aebeaba7929fe7fb84ba98163b6efb7c949bf05038d43b6f4e89df1a
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-print/Manifest.gz b/net-print/Manifest.gz
index 3180ad9bf831..723094d86e23 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
Binary files differ
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 8790b3f1a9b4..f6d799cda276 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -12,6 +12,6 @@ DIST cups-2.4.6-source.tar.gz 8135135 BLAKE2B 4e61112ddaa46f20b1cfcb8f523dd07ba7
EBUILD cups-2.4.2-r7.ebuild 9765 BLAKE2B bab5aaa86a5ef65a7f15678ff716279ef580a9b79b6c160ec1b60ee913a146d20756699fb0d721f5e118691c0696a234c781b0d7aae0bb0f22c976f5efa556b9 SHA512 e0e4a3426f08858fc3f6006e1db3cff31b347404089d465efe379d1b0ddf313990346c81d915f3e82d4ebdcabd11bd2edd196cca987be7fb475d4e45aac7f8b7
EBUILD cups-2.4.4.ebuild 9421 BLAKE2B 018f860b5a3eb6b210d6b06646d3dbaa5698d6b0f2fb6c151b12531eaedbfac1fffeb99d5c728bf30ef48676444bf8b35a458343537d947f74331b02e0ce931e SHA512 fc3a1536454fb5724c1f7301661b00835b46290762f0843a9ae2d371a5f317f6e51dc6df0118df599e0999e2ee44ef1bd634c87da3c269521476020c458a3766
EBUILD cups-2.4.5.ebuild 9421 BLAKE2B 018f860b5a3eb6b210d6b06646d3dbaa5698d6b0f2fb6c151b12531eaedbfac1fffeb99d5c728bf30ef48676444bf8b35a458343537d947f74331b02e0ce931e SHA512 fc3a1536454fb5724c1f7301661b00835b46290762f0843a9ae2d371a5f317f6e51dc6df0118df599e0999e2ee44ef1bd634c87da3c269521476020c458a3766
-EBUILD cups-2.4.6.ebuild 9423 BLAKE2B da53992c81065c6625636f959a53d4c3480a5157e04fba2eeabb8912324e8a60ed56d5191e39c68d68857d2bb96c65abaa3ed33e45e975996655fd7ce8f688a9 SHA512 15455d1223f58efcd7cb7e654d8a7bf4aa825c64bbf8cfc24802cc1d4e14b92a2e4ede0879f93783e4fe2425dbfe932fefda1bc341119349e52ef4a83b94489e
+EBUILD cups-2.4.6.ebuild 9422 BLAKE2B bccd3354310a0f72dfd5f878b676429a102f3aef4d6d791c99da3b6f558aed8a8368faf31d4a4115ed414579f49bb4ca157e9a54c8c4f4268571bf7039454ae6 SHA512 02869064b80c0909ed04950bdae926397c76274a66a2ba897f751e7187eae8bf33a7eaa8ded8e46c809f7090f09b8df88fd822231215a3fbe1cf7906f1c587e7
EBUILD cups-9999.ebuild 9429 BLAKE2B c25dfe792b5c3a63274823ad9d7f7578bd8bd05cab2f4840cd53e425a830c84465a7bc463e38a7fff1daa801137de19cf95151e2cd474e0edf88b44c4e835f87 SHA512 444117c67782830965c4b64ed366c010f943bd2256cc4a1c56ade6e0adfb4eb8d0af39696296d81dc5829097b1acdb79058f806cbd3af64dbecf5960b57c57bb
MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.6.ebuild b/net-print/cups/cups-2.4.6.ebuild
index e3856851f513..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/profiles/Manifest.gz b/profiles/Manifest.gz
index 22b39675dabb..d1a476d6a162 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
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/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 0613147f2248..b16a9781dab5 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
Binary files differ
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 218e603335f5..8c5f03003229 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -7,38 +7,30 @@ 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
-EBUILD gromacs-2018.8-r1.ebuild 6676 BLAKE2B 2e5e65df1624f4528c5af0bfcaafed549f5ae2b8a22d9e78192a57790d60f189fdf6f974906f266cbfe51872e0d7d3860e39d7d4b7f6489809a9c691bf9630d9 SHA512 f501cebf3a84158874b53d07cdf8417a223db835f8d941bf19bf391b3d6539c171816c23ebca30784a95554e7ac7322520a33a8b12857f6652c4ab5256d02657
-EBUILD gromacs-2019.6-r2.ebuild 7054 BLAKE2B 60f0cad724bb6077365e56bae32e260b23379ab8a66064d99777cc1ea81f953dc6da1e84bdafdc01b026c8f5f48ee986c97dccb5de3ad0a84ad51ef2f79f7ccd SHA512 bdd28079d2ad8c0ce1a463df54b869d9de41f7b408a136d3ed5a084e51490c776b939929cdd041e042f0a124254ed1d5abde540adf21689dbf8624ea7fcbdc61
-EBUILD gromacs-2020.7.ebuild 9848 BLAKE2B 8b93a2b444fd68583cd87273a7d00cbf24e6189de59c93e238bf048c963b4f8ed22cad9d401b7b633feb575c4d63f29dfd9fdcc151566eff14523c66ec349d4e SHA512 a907d50286541a1e4c8606427eceac6effdc6189f5ea209d5cf147c009beeb05065c16ea480277fd40d8fee72d0077e602e5a74cb9feb70ffeef6cb6e2bd32b7
+EBUILD gromacs-2018.8-r2.ebuild 6678 BLAKE2B 02eaf7b1141c3942990493ea43d1e07700b64f5c3cb17d79d5fe2e368e9ebdc532b611c5fc4c83b6d232f6597454db7f5f4996141c90a9a53808d0d235db2b05 SHA512 34a91d37b6a5cb888d9d495e415a74edf600cc1cb024021ac026e87ffbdf681b5b3e5c29c966b93af6070f0fe81722cae38c49d749bdd5d9305bb8749273612b
+EBUILD gromacs-2019.6-r3.ebuild 7056 BLAKE2B 3a2b43e4a0152c5f081d5cb675971c5bb86d59c8ec0432bcfb9143fcdb35ef807553c6aa60c376307aa2a285379da8a7ac6378e47f8682d08252680ffee68164 SHA512 2521b048d84392b972a0247fa586256da1b827838cd954ee2672d8da55c0dc0b57cedb9bac7704ae0594e304433b5a0c2568b49a0fe272d23ff1c03aee16b3e0
+EBUILD gromacs-2020.7-r1.ebuild 9850 BLAKE2B 1bdc5d13bcfa5624e4069469a9f8e4d02652b4d64f54215d70e62651aafc06e0a3edfb73b3ed6568025e23670411e81b46c0ee773b641f9e0e82031ac41f14d4 SHA512 f88deaf0117b3de34a00935df82caa6996b8be4af995dd4747a4eb363ea806aedd59187888480c71a01a178e8b6d83228a86db828116e3ab2435af0d2ae4942c
EBUILD gromacs-2021.6.ebuild 10055 BLAKE2B 30bf21addedf543188153211a8b89204bd86b18d7a3fda1d30bba80db5049e45d1113110eafd0ed5ee899481385d890b69dbe8c0b3ce3f7f75a1740b334c6960 SHA512 b171081fabae29c44e7827c36dcda8a4b787dd6a335c3ee31ad6c2a811fac05331381213b3a978daf28d62dd96bb930c5d1bb05182b2b537ad8bd56c2acc4d35
-EBUILD gromacs-2021.7.ebuild 10105 BLAKE2B a97146e3165e8ee528921d48375a7968ced93de69aad48a028227a8c418b03af044ec47c7674dd3e5adf89c85368cc53c18740ceccb9a4c59ec0631c23807bc7 SHA512 158aa5c265d3fd4a0b59a2c7abc467ef873599e12f07bf939eea56661b659b42d163e3c1363e772f86c112d41b1b8658df5499302f2584a5a69acde9cf57ee22
-EBUILD gromacs-2022.4.ebuild 9596 BLAKE2B b3e675f96621add5f81b07ca1ec6a6c4f4f3f61f69051ba6f6319bd5f5044bacb67554bd7e85877485163c4695cee7dc3246b024b904a0f97d2d858065a4a098 SHA512 f81d9732b050c4cd8d453031e3122e5c0beeacda352493e0acc0b8cade05b36fd4671f87a89036bcc7dddd098ebd825d3c17af3c06b391d7514d75520ca9368b
-EBUILD gromacs-2022.5.ebuild 9596 BLAKE2B b3e675f96621add5f81b07ca1ec6a6c4f4f3f61f69051ba6f6319bd5f5044bacb67554bd7e85877485163c4695cee7dc3246b024b904a0f97d2d858065a4a098 SHA512 f81d9732b050c4cd8d453031e3122e5c0beeacda352493e0acc0b8cade05b36fd4671f87a89036bcc7dddd098ebd825d3c17af3c06b391d7514d75520ca9368b
-EBUILD gromacs-2022.9999.ebuild 9596 BLAKE2B b3e675f96621add5f81b07ca1ec6a6c4f4f3f61f69051ba6f6319bd5f5044bacb67554bd7e85877485163c4695cee7dc3246b024b904a0f97d2d858065a4a098 SHA512 f81d9732b050c4cd8d453031e3122e5c0beeacda352493e0acc0b8cade05b36fd4671f87a89036bcc7dddd098ebd825d3c17af3c06b391d7514d75520ca9368b
-EBUILD gromacs-2023.1.ebuild 9751 BLAKE2B ce0c5a8698cd561ccb691ff145336fe902af8cef5530c290dfb6b007fc5f5a1df4ea1351ae9909df008c0b2a642fd59ee9c3be1aba861aa363191405214a8a11 SHA512 d8600b5eac1cb7fb0b2bde1bc2086f827849f25052e12799c2d1862e4e1b7608ff5614316b51c200f166bd469fad9c6252f6e39936eefd9ef36e9d9a282d2dd6
-EBUILD gromacs-2023.9999.ebuild 9751 BLAKE2B ce0c5a8698cd561ccb691ff145336fe902af8cef5530c290dfb6b007fc5f5a1df4ea1351ae9909df008c0b2a642fd59ee9c3be1aba861aa363191405214a8a11 SHA512 d8600b5eac1cb7fb0b2bde1bc2086f827849f25052e12799c2d1862e4e1b7608ff5614316b51c200f166bd469fad9c6252f6e39936eefd9ef36e9d9a282d2dd6
-EBUILD gromacs-2023.ebuild 9751 BLAKE2B ce0c5a8698cd561ccb691ff145336fe902af8cef5530c290dfb6b007fc5f5a1df4ea1351ae9909df008c0b2a642fd59ee9c3be1aba861aa363191405214a8a11 SHA512 d8600b5eac1cb7fb0b2bde1bc2086f827849f25052e12799c2d1862e4e1b7608ff5614316b51c200f166bd469fad9c6252f6e39936eefd9ef36e9d9a282d2dd6
-EBUILD gromacs-9999.ebuild 9751 BLAKE2B ce0c5a8698cd561ccb691ff145336fe902af8cef5530c290dfb6b007fc5f5a1df4ea1351ae9909df008c0b2a642fd59ee9c3be1aba861aa363191405214a8a11 SHA512 d8600b5eac1cb7fb0b2bde1bc2086f827849f25052e12799c2d1862e4e1b7608ff5614316b51c200f166bd469fad9c6252f6e39936eefd9ef36e9d9a282d2dd6
+EBUILD gromacs-2021.7-r1.ebuild 10107 BLAKE2B 5c9187453b1a6c4ca4b233ef1ace70eabeeab6c10d03d7f873958a69c6e8b9f5a1f0f5f42ba72c8f844047b93e22865aec58b4ed3f8c94ffb0db9ec4416f6b66 SHA512 c5f5b5847d1c8797d193b72c37893ff4a417c86e2ac61dc5581ce4e7bb40511f104833ee90b20a92391969a8ad01933382c62d46e18123565eecdd73aa14e1d0
+EBUILD gromacs-2022.5-r1.ebuild 9598 BLAKE2B 934002e01c79ff4e9bf06ce3ceb397fbc5fbca2803d8a1efc4896678d631294a34cb0dd4d468b316c1d293084c052240aaa5569e4eaaab497eec3b8e70e70569 SHA512 001c68fd73dee20a2813252ba8ef397da2fa1f6b7a4c4983d8317496641a91e06a2bea065c74067bda7a57ed40a984671373c2a608369bd86aac28cfc0b3fddb
+EBUILD gromacs-2022.9999.ebuild 9598 BLAKE2B 934002e01c79ff4e9bf06ce3ceb397fbc5fbca2803d8a1efc4896678d631294a34cb0dd4d468b316c1d293084c052240aaa5569e4eaaab497eec3b8e70e70569 SHA512 001c68fd73dee20a2813252ba8ef397da2fa1f6b7a4c4983d8317496641a91e06a2bea065c74067bda7a57ed40a984671373c2a608369bd86aac28cfc0b3fddb
+EBUILD gromacs-2023.1-r1.ebuild 9753 BLAKE2B d806432a95974f89b8596dbb86e5f2adffb4240d3f1182b54353a1abf0ea280593f7d4fa04791ecb2603108c56752c9d50e35a37bbf6c676f53370ae1fe3d2f5 SHA512 04c1e2ea6b0850696dd3e846e115a73978b25d28ebc486e2e11fb04d49e8935e6b39513a4d9463985d872e557e43294433e74a4a01165f6f1e80b7fe5ee6e3f9
+EBUILD gromacs-2023.9999.ebuild 9753 BLAKE2B d806432a95974f89b8596dbb86e5f2adffb4240d3f1182b54353a1abf0ea280593f7d4fa04791ecb2603108c56752c9d50e35a37bbf6c676f53370ae1fe3d2f5 SHA512 04c1e2ea6b0850696dd3e846e115a73978b25d28ebc486e2e11fb04d49e8935e6b39513a4d9463985d872e557e43294433e74a4a01165f6f1e80b7fe5ee6e3f9
+EBUILD gromacs-9999.ebuild 9753 BLAKE2B d806432a95974f89b8596dbb86e5f2adffb4240d3f1182b54353a1abf0ea280593f7d4fa04791ecb2603108c56752c9d50e35a37bbf6c676f53370ae1fe3d2f5 SHA512 04c1e2ea6b0850696dd3e846e115a73978b25d28ebc486e2e11fb04d49e8935e6b39513a4d9463985d872e557e43294433e74a4a01165f6f1e80b7fe5ee6e3f9
MISC metadata.xml 1375 BLAKE2B 321b7db8536061655a6efaa40110f4858633921292eba465b85fe0cb50280842e511f2f11385fe5d62bbdfb40e9c0c76e8e986a1efce8eac25d52c438d7ed5f4 SHA512 cc61e0b477f6576079a0f7910475b9091c1c521fbb48efab365d355e3c0a80cd19e1ea9028cb269d37c2572546b1be66a210512e40ff0f2d6314d1b0138cdba6
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..e66da7ff4b97
--- /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-libs/Manifest.gz b/sci-libs/Manifest.gz
index 98677ad7d3aa..eec36623b683 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
Binary files differ
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index c28df75e4d20..8c8c41852655 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -10,5 +10,5 @@ DIST hdf5-1.14.1.tar.bz2 16257319 BLAKE2B fbabbe2a61fca3f841d0206e3918390001ec1e
EBUILD hdf5-1.10.5-r1.ebuild 2940 BLAKE2B 45e4cf6004cb70667829844ddf37f2c4f96d6b5c92a8eb9b3c757ea47e6d9f98e28f906c7d2c6a33efd95328bc0b6358d640da36c82fc5408bbb968c38b95115 SHA512 04ac047f56128f41f4cdc8b07caa0d656f31d34200961a1ee525583263dc338abff7860158f9549ddf31bf0563ed963fbd5dff4ee212d85443aff599e5d2c25a
EBUILD hdf5-1.12.2-r4.ebuild 3209 BLAKE2B eb7b30bee62cbad778b07f089026395d70046e3845b636bdb526e0960e4ae3789f2e5d1c9eac6fc213b755809c42946cf332446582d032d04900cfd80b57b06a SHA512 e6c2c24f9558c381b8ae5da8f0967635c64b02ad5f8288d5a08841c7637f8de7b72229f89d8be2cff5cd0c8c4482b404db3a7d41aeeaa927157c257f91fb62a3
EBUILD hdf5-1.12.2-r6.ebuild 3341 BLAKE2B c574efa933f240fae23049007c320138ea43354ddd78194d74e6b27f630a6ad0fa2a1bc083b563006eb7dd7e36ee00a77a6f684ad42bee383372a79750726d9a SHA512 0385774ab2be1abeec7467886f8900b514d8c1410c531dac7753570cb9e47d35750cd8ddfe92a0df524ecae8889602cc27caa15a52d8e94aa10455e50cf18df3
-EBUILD hdf5-1.14.1.ebuild 3065 BLAKE2B 940d57e4b42479eb75da50be5c71de8b9818e154cbe8ccee08fa4427cd8c4c1ac2a4814f2e7549b9df979e50a361c18939b40548c97e5552c0ad996fc8e31568 SHA512 fa1f712d61494ddd1a24bb23db0fa4eccc3df7d1c893de8502a3293bb97fcb85f2de1acadfd01afbc05fade4f3770777f9f597f173fac5bca80d8091fc3ec6b3
+EBUILD hdf5-1.14.1.ebuild 3078 BLAKE2B 30428ba92c299c92463276e3853c8332efb0904856749f6a6f716b2f07a58a7fc12c62a7298d15067af9b436a5e5f237c322ff30a942337ab9e65a4f1765074f SHA512 076ceaa6f8eb5330e8bf1913ddfc659524a4770e2df0d459b88ce41eec4d99e4e0b9da42f7b690b24bc678f15dd96ba8d20c443bbd9f4afe9c111abe5efc9f10
MISC metadata.xml 826 BLAKE2B fd131bb207e4ab863ef7c05ab95e5c0254fa08230139a2508ab5f0c363809b0735532498ad26cc39621495a063de86ab5bd97447514ff561a63302e8b1d7d26d SHA512 290883ed9bf3de60bf04e2474c4db50e095b1b87974867e58601a5c5c2f98d6b839ed22d9ce2798bc44f484f1a38ee4b6df99aaea7d134629bd441d34b5a29b5
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/Manifest b/sci-libs/openblas/Manifest
index f00a81968dd9..324800bf01fc 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -5,5 +5,5 @@ AUX openblas-0.3.23-shared-blas-lapack.patch 2128 BLAKE2B 42e6ac46c9d62609731e3d
DIST openblas-0.3.21.tar.gz 23729571 BLAKE2B 678bfb13ead69045e7d4d840bbcaed884d9ebedded5425cfa1f55e3d85bda31a3eb43dbbf9f07099d0d198f97ae68ef3b3b2b78aa1bd5b4999dd729dc08f7e28 SHA512 4625c8e6ccfa9120281fd714d3f6b7c3ba2265470c1be76121d6b25dc3dacb899d26e5d9a417ddc616d23909f1411495aa995ef8d8d6df8511cd5cefbabcb1c5
DIST openblas-0.3.23.tar.gz 23950794 BLAKE2B 8394e09c682bba10450248cbbe090bb81c26661eac7d238942055ae0eecce752c8a3481af905de9efe20fe635f2c4a0e06af83bb64c998ab410e4cdc56751a47 SHA512 ea64c693e57eb63cc2a88e4d6ab2d8cf9ab84ae6a15048fb12090a3570dd41053e62e99c1ff9d3e02dd67ca93233591ab41b8c017d06585d0a69222e1ad3023f
EBUILD openblas-0.3.21-r1.ebuild 5639 BLAKE2B 9f42f3af66c8d65d208cff75c03df80df9f9337c55a8c52557e9c6fecbc732cf10a47b36d341bafc0960550fbdc989f263d2aa07a04d7cc1911682ec3953c1b4 SHA512 4a663034ad381724dcaaaabe292d5f5c527c0d66c10f8b7f674ec6d66976d75f072299a90162e04379e6426ca0b4a3967b8ca253e0f125053911b37325f2ad9f
-EBUILD openblas-0.3.23.ebuild 5606 BLAKE2B 4368577b91e5c22611ba8448ad72e693ce52c611a80814e67a96985e8c4d3c031db71d1fc4b70f689d20e18f7ca487cedeaa6895d4152b5aec177430d55f5b0b SHA512 8f0676b584eecba6858931a10face910d608cf9a95018af6ac69be407c7617880a1ca200452aa6ac9307b41e4f8ee33dd947e0913bb602c9f930d7b79a3f2dc0
+EBUILD openblas-0.3.23.ebuild 5699 BLAKE2B ab60b8eb8c0d958efac5527e082b666daf5848906db5255a25bcd90d3d0283fc9fbc537e2021f991ccdf75e504a614ffaa242d8e678d22ba85a821c1a413049c SHA512 495e32fc542a959f033989d013c10ed97ced5cbf96701645c889fecb17ca0a7935c91a77626c7aaf7369501850ab6789dea192e828614405baffbbf918075212
MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
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-misc/Manifest.gz b/sci-misc/Manifest.gz
index 37dcc75922ec..f926c037e405 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
Binary files differ
diff --git a/sci-misc/jupyterlab-desktop-bin/Manifest b/sci-misc/jupyterlab-desktop-bin/Manifest
index 6f8a64922741..daf2008f10bb 100644
--- a/sci-misc/jupyterlab-desktop-bin/Manifest
+++ b/sci-misc/jupyterlab-desktop-bin/Manifest
@@ -1,7 +1,7 @@
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
EBUILD jupyterlab-desktop-bin-3.6.3.1.ebuild 2854 BLAKE2B 215468c0a9ea9b5dabac685bc9c517a8ecb7fccd2858a05bb8e27c9a43d97b5bd26da4e38bc0f5bbb82cbff0958dd6587e32eb405fd526c8a1eb9ec1652ea580 SHA512 1116113a52da40171efa751ba0cdd1f431c47a0d541bf5db2cc0d57c4df79b511605bfeaa79b26ab485fe5ee8d309874581b3176614da51a790fa9455bc9d3fe
EBUILD jupyterlab-desktop-bin-4.0.0.1.ebuild 2854 BLAKE2B 215468c0a9ea9b5dabac685bc9c517a8ecb7fccd2858a05bb8e27c9a43d97b5bd26da4e38bc0f5bbb82cbff0958dd6587e32eb405fd526c8a1eb9ec1652ea580 SHA512 1116113a52da40171efa751ba0cdd1f431c47a0d541bf5db2cc0d57c4df79b511605bfeaa79b26ab485fe5ee8d309874581b3176614da51a790fa9455bc9d3fe
-EBUILD jupyterlab-desktop-bin-4.0.1.1.ebuild 2854 BLAKE2B 215468c0a9ea9b5dabac685bc9c517a8ecb7fccd2858a05bb8e27c9a43d97b5bd26da4e38bc0f5bbb82cbff0958dd6587e32eb405fd526c8a1eb9ec1652ea580 SHA512 1116113a52da40171efa751ba0cdd1f431c47a0d541bf5db2cc0d57c4df79b511605bfeaa79b26ab485fe5ee8d309874581b3176614da51a790fa9455bc9d3fe
+EBUILD jupyterlab-desktop-bin-4.0.2.1.ebuild 2854 BLAKE2B 215468c0a9ea9b5dabac685bc9c517a8ecb7fccd2858a05bb8e27c9a43d97b5bd26da4e38bc0f5bbb82cbff0958dd6587e32eb405fd526c8a1eb9ec1652ea580 SHA512 1116113a52da40171efa751ba0cdd1f431c47a0d541bf5db2cc0d57c4df79b511605bfeaa79b26ab485fe5ee8d309874581b3176614da51a790fa9455bc9d3fe
MISC metadata.xml 430 BLAKE2B 1bd3f621bb4d25086cc80c5b44a7eef4a61f58c1f56c7cb91ca4e39b8a5e7d5fdd37e912e48d99ee6ba6a19de1c61252b4ebe3afd554d487c549d22597c376fc SHA512 b99b088cb0bdcfdaa9d584fb580b12a754f30a378fdede655f7723075e81948fc57f9aad11a59944b164eb8c9c24f6f0828e95c5a227766e985778900ea08079
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
index 4bb8e3351976..4bb8e3351976 100644
--- 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
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e20b4a2ab362..a5ab82cd11a9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/locale-gen/Manifest b/sys-apps/locale-gen/Manifest
index a5b3fa3319a3..bbb65003ba97 100644
--- a/sys-apps/locale-gen/Manifest
+++ b/sys-apps/locale-gen/Manifest
@@ -1,3 +1,3 @@
DIST locale-gen-2.23.tar.bz2 7664 BLAKE2B a529b62fbb840c9352f06e8f5c80fc764425a2619dc69cc820f550a026d391788d5e2cfeeb46a8b5b9716da63340b4fce57a5b523edd4196ee1219c1200cb752 SHA512 c1245caadb04403c535a836f19bc410d0f04b5c0e297ea5be9852e6d71e08e528071ae769d63d31a677dda8fdd618b4c4d581ed525cf8786b82d8f37636db754
-EBUILD locale-gen-2.23-r1.ebuild 896 BLAKE2B d69dd5dc80e64c03b6694c771069dd6a14abaa367e065885ebd5aeb1db88783f88de8ab04fab651f69f68341816418cb7b50e22f450aebde959e0edb99df9280 SHA512 43485cbb57e7a9ab1de99b486d36f1767d740308bd025735ffdba2c4282b8e698e3ad8b77212676384088259a0f02445f1f12316a4e071e7a5a2770e2acc1014
+EBUILD locale-gen-2.23-r1.ebuild 893 BLAKE2B ff6af3f5cc6895fae0ca2f9933f4f7c14a7284e27e99266d526a3b32b44dd2516e462a0d883ef8f00eb757aca1665874fc53d6d4d194c274e8718fdaf70b2d46 SHA512 5264c1e962c9c8afe6e7c5268073609a9dd66ea5b410a652b39298b4a7ce671186c34ed93aceefcf5e3a466f79c737b274aee4981dd58b3740b254a0aecc14dd
MISC metadata.xml 399 BLAKE2B 9b0c4e964dbb8808d803352f78417d770e494ca88c28db4f7dbcbef8e43caadf6df701da762aa5704c15a0c685467cd4c51a9bdf3397a909a920f1a3a67ae7aa SHA512 04d82d54da06605db532ceae7a3a2e6bfc2d737d395f4c45f1d695a3b61d52717fd16db613d5b17b47e1d18e3f91327660c9bf1eeee36d3d3ebc85408d378eca
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-libs/Manifest.gz b/sys-libs/Manifest.gz
index bc8bad241908..b547b0cc8322 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
Binary files differ
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c134d5c26d35..3a64f75a1b6d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,6 +45,6 @@ EBUILD glibc-2.34-r14.ebuild 49647 BLAKE2B 62f4b3d27f645c2576dc58e3079829dfe6260
EBUILD glibc-2.35-r11.ebuild 50188 BLAKE2B 7877e71cb62608e79ac5e2a7751f453aa9d1444571612da11ab98e55ecb70b025c7372fea749cb438d89bb8e5fd85e97f2224c542df1da3ba05424a1079a0a1a SHA512 a1d133c50f7012ce01c7394fdfc69ca17eee9af9643d29274a4e47a9dd844e15ead16ea477bc9eb4131202b4caa878f320d799f05858143da33742930fad8cc7
EBUILD glibc-2.36-r8.ebuild 52466 BLAKE2B fc59a2935c5e9487585449477ae7a0db2b005467071d4fae7b23169a1c309b716771d9dec01920deeea5eab1dfbc363817612e560cf49be1306c0691d0badd86 SHA512 9510470fa442309ca0df07ff2f0f0ac664cecd3b11080a1aa765aa6307057bf28a35742bedbd83b7d77fec63a67886bb109b5841cdafdec3e374d7df73bb2016
EBUILD glibc-2.37-r2.ebuild 52535 BLAKE2B c866bd4c4854a982c4f893b0a4a29245876d70a17cd4a44b941c36f15ffcb2d8afacbb96003277c7380e26a982b74e32baa238dfa3d34047ad3ab48c9ca8b7c5 SHA512 86483f33efaa2a3fe3786ef148c7b0964884b6f15b44ab8a846a799d93af2bb46c174d5b6680724325000e61d2f370a5f61f0edf202289a76f5f9fde14b7dcdd
-EBUILD glibc-2.37-r3.ebuild 51967 BLAKE2B 8793357aabc7c4be6336e8d6e59ab642d7d2a9e5e12fa840b519b1c408dcac385bddef53275722dc547eb27353636b1f2daf97dc667c21dac7fc5c4944c34988 SHA512 cd6074eed204fbb4c386a83bf1cb001488bf43f678a4152803fbb99d4aa343e23c8d14d12e509888bf59d0cb953aae97d107d318e49bbbf8a06918213c3fea72
+EBUILD glibc-2.37-r3.ebuild 51964 BLAKE2B a88b1894ae4130bc9ceb9aa20e2c3ca7693b4b3bf733c2d2ea03aeb3220d13f43ca61bed6ac0cfb4ffe9384d97dab1ed4f33f7db9e12d9f0b938688644088687 SHA512 d37209191042630fdc293df9404a3a33a05e2c79fd3401ba7eb20f247e8fd29515fd2aa53e9fa1587ca71a3672e17a00e7d312e34e0edbeeb123412c556809af
EBUILD glibc-9999.ebuild 51968 BLAKE2B e3fefa1aa8f96b4b2836ff5c69df50009bd094a25ae0b5767a18d8866ace5793bc43b979ec85993c39762165797b45e908faf68fc71cf1a3947a8427f40fdab9 SHA512 904f8f9c9cf513b15ccec2524d254964825707ea472be99f680fe8d61a610a01fb028c1a3d2bb15c6a26b54cbbafa7085f1f443a868f505342a1b532825faab0
MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
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